summaryrefslogtreecommitdiff
path: root/gtk/gtktoolbar.c
diff options
context:
space:
mode:
authorSøren Sandmann <sandmann@redhat.com>2004-09-01 17:55:09 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2004-09-01 17:55:09 +0000
commit0ac4f2837a6e8d57f79846f4cef65658122264b5 (patch)
tree6ccd1bd2935cb665e76643afb6a97bb3decac669 /gtk/gtktoolbar.c
parent951e6a1eb9e987e1e4cfeea8c8ae64643f833065 (diff)
downloadgtk+-0ac4f2837a6e8d57f79846f4cef65658122264b5.tar.gz
Make sure children of the toolbar are given positive dimensions. (149540,
Wed Sep 1 19:11:44 2004 Søren Sandmann <sandmann@redhat.com> * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure children of the toolbar are given positive dimensions. (149540, Felipe Heidrich).
Diffstat (limited to 'gtk/gtktoolbar.c')
-rw-r--r--gtk/gtktoolbar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 54f6347324..b60a7f89ba 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1491,7 +1491,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
if (need_arrow)
{
arrow_allocation.width = arrow_size;
- arrow_allocation.height = short_size;
+ arrow_allocation.height = MAX (short_size, 1);
}
/* expand expandable items */
@@ -1669,7 +1669,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
alloc = allocations[i];
}
- if (alloc.width == 0 || alloc.height == 0)
+ if (alloc.width <= 0 || alloc.height <= 0)
{
toolbar_content_set_child_visible (content, toolbar, FALSE);
}