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).
This commit is contained in:
Søren Sandmann
2004-09-01 17:49:20 +00:00
committed by Søren Sandmann Pedersen
parent c8c2a5c16e
commit 8e3e9b1fbe
5 changed files with 26 additions and 2 deletions

View File

@@ -1,3 +1,9 @@
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).
Wed Sep 1 01:16:22 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_class_init): Fix

View File

@@ -1,3 +1,9 @@
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).
Wed Sep 1 01:16:22 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_class_init): Fix

View File

@@ -1,3 +1,9 @@
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).
Wed Sep 1 01:16:22 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_class_init): Fix

View File

@@ -1,3 +1,9 @@
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).
Wed Sep 1 01:16:22 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_class_init): Fix

View File

@@ -1486,7 +1486,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 */
@@ -1664,7 +1664,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);
}