Commit 45513826 authored by Lars Hamann's avatar Lars Hamann Committed by Lars Hamann
Browse files

fixed auto resize bug.

Mon Jan 18 01:21:03 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkctree.c (draw_row): fixed auto resize bug.
parent d225ffbc
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
Mon Jan 18 01:21:03 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (draw_row): fixed auto resize bug.
Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org> Sun Jan 17 17:35:28 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.13 * Released GTK+ 1.1.13
......
...@@ -1791,8 +1791,7 @@ draw_row (GtkCList *clist, ...@@ -1791,8 +1791,7 @@ draw_row (GtkCList *clist,
(GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap, (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap,
&pixmap_width, &height); &pixmap_width, &height);
width = (pixmap_width + width = pixmap_width;
GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing);
if (GTK_CELL_PIXTEXT (clist_row->cell[i])->text) if (GTK_CELL_PIXTEXT (clist_row->cell[i])->text)
{ {
...@@ -1801,6 +1800,10 @@ draw_row (GtkCList *clist, ...@@ -1801,6 +1800,10 @@ draw_row (GtkCList *clist,
width += string_width; width += string_width;
} }
if (GTK_CELL_PIXTEXT (clist_row->cell[i])->text &&
GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
width += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
if (i == ctree->tree_column) if (i == ctree->tree_column)
width += (ctree->tree_indent * width += (ctree->tree_indent *
((GtkCTreeRow *)clist_row)->level); ((GtkCTreeRow *)clist_row)->level);
...@@ -1920,10 +1923,16 @@ draw_row (GtkCList *clist, ...@@ -1920,10 +1923,16 @@ draw_row (GtkCList *clist,
if (string_width) if (string_width)
{ {
if (clist->column[i].justification == GTK_JUSTIFY_RIGHT) if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
offset = (old_offset - string_width - {
GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing); offset = (old_offset - string_width);
if (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
offset -= GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
}
else else
offset += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing; {
if (GTK_CELL_PIXTEXT (clist_row->cell[i])->pixmap)
offset += GTK_CELL_PIXTEXT (clist_row->cell[i])->spacing;
}
if (style != GTK_WIDGET (clist)->style) if (style != GTK_WIDGET (clist)->style)
row_center_offset = (((clist->row_height - style->font->ascent - row_center_offset = (((clist->row_height - style->font->ascent -
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment