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).

diff --git a/ChangeLog b/ChangeLog
index 78dc760dbf27b1248e75d643b8427b16bfdf91d9..878d74c522db46beab42bd2d7c71caa5ce9d6801 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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).
+
 2004-09-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemunix.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 78dc760dbf27b1248e75d643b8427b16bfdf91d9..878d74c522db46beab42bd2d7c71caa5ce9d6801 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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).
+
 2004-09-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemunix.c: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 78dc760dbf27b1248e75d643b8427b16bfdf91d9..878d74c522db46beab42bd2d7c71caa5ce9d6801 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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).
+
 2004-09-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemunix.c: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 78dc760dbf27b1248e75d643b8427b16bfdf91d9..878d74c522db46beab42bd2d7c71caa5ce9d6801 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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).
+
 2004-09-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemunix.c: 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 54f634732498700d4b28124de91ab55805ba627c..b60a7f89ba99e3fc888ebddff09e84b199a400fd 100644 (file)
--- 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);
            }