Take thickness into account in the size allocation of the child widgets in

2008-03-11  Alberto Ruiz  <aruiz@gnome.org>

	* gtk/gtkcombobox.c (gtk_combo_box_size_allocate):
	Take thickness into account in the size allocation of the child widgets in
	list mode.
	Fixes #521442

svn path=/trunk/; revision=19747

diff --git a/ChangeLog b/ChangeLog
index bc06afd99b0b049877dd0231f13b1bfb30263cee..701c508fe7eea4b772e1b4d14e343c402da0ffa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-11  Alberto Ruiz  <aruiz@gnome.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate):
+       Take thickness into account in the size allocation of the child widgets in
+       list mode.
+       Fixes #521442
+
 2008-03-11  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkwindow-quartz.c: Implement gdk_window_reparent.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a43a0c9234e6d41fc6ea68d613710fc90771e782..1828ceca3a4893d1db45eb68f08dbe0b8730e7ed 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2320,8 +2320,14 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
            }
         }
       
+      child.x += shadow_width;
+      child.y += shadow_height;
+      child.width -= shadow_width * 2;
+      child.height -= shadow_height * 2;
+      
       child.width = MAX (1, child.width);
       child.height = MAX (1, child.height);
+      
       gtk_widget_size_allocate (GTK_BIN (combo_box)->child, &child);
     }
 }