diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-04-03 23:17:16 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-04-03 23:17:16 +0000 |
| commit | 32cd050cfe286e636d4df6d96a4b46936279a5a6 (patch) | |
| tree | 4f45bb5081e616ff501d984ea7c3481e0d43ab74 /gtk/gtkvbox.c | |
| parent | 740b70ea0c1bcdb5943b85ed0bba434f73f9a292 (diff) | |
| download | gtk+-32cd050cfe286e636d4df6d96a4b46936279a5a6.tar.gz | |
More extensive debugging output
Fri Apr 3 17:14:55 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdk.c: More extensive debugging output
* gtk/gtkalignment.c gtk/gtkbutton.c gtk/gtkcheckbutton.c
gtk/gtkclist.c gtk/gtkeventbox.c gtk/gtkhandlebox.c
gtk/gtk[hv]box.c gtk/gtk[hv]paned.c gtk/gtklist.c
gtk/gtkmenu.c gtk/gtkmenubar.c gtk/gtkmenuitem.c
gtk/gtknotebook.c gtk/gtktable.c gtk/gtktree.c
gtk/gtktreeitem.c gtk/gtkviewport.c
Avoid assigning negative values to unsigned allocation.width and
height
* gtk/gtkwindow.c:
Instead of realizing the widget, then size allocating, (resulting
in XMoveResizeWindows for all children, do the size allocation
first, then realize.
In gtk_real_window_move_resize, combine move and resize
into a single GDK/X call when possible.
* gtk/gtkclist.c gtk/gtkdrawingarea.c:
Remove assumption that the widget will be size allocated _after_
it is realized.
* gtk/gtklist.c (gtk_list_motion_notify): Removed useless
debugging message.
Diffstat (limited to 'gtk/gtkvbox.c')
| -rw-r--r-- | gtk/gtkvbox.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index a26f33ebc1..46993902dd 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -187,7 +187,7 @@ gtk_vbox_size_allocate (GtkWidget *widget, } else if (nexpand_children > 0) { - height = allocation->height - widget->requisition.height; + height = (gint)allocation->height - (gint)widget->requisition.height; extra = height / nexpand_children; } else @@ -198,7 +198,7 @@ gtk_vbox_size_allocate (GtkWidget *widget, y = allocation->y + GTK_CONTAINER (box)->border_width; child_allocation.x = allocation->x + GTK_CONTAINER (box)->border_width; - child_allocation.width = allocation->width - GTK_CONTAINER (box)->border_width * 2; + child_allocation.width = MAX (0, allocation->width - GTK_CONTAINER (box)->border_width * 2); children = box->children; while (children) @@ -236,7 +236,7 @@ gtk_vbox_size_allocate (GtkWidget *widget, if (child->fill) { - child_allocation.height = child_height - child->padding * 2; + child_allocation.height = MAX (0, child_height - child->padding * 2); child_allocation.y = y + child->padding; } else @@ -289,7 +289,7 @@ gtk_vbox_size_allocate (GtkWidget *widget, if (child->fill) { - child_allocation.height = child_height - child->padding * 2; + child_allocation.height = MAX (0, child_height - child->padding * 2); child_allocation.y = y + child->padding - child_height; } else |