gtk+ r19748 - in branches/gtk-2-12: . gtk

[aruiz svn gnome org]

Author: aruiz
Date: Tue Mar 11 13:51:55 2008
New Revision: 19748
URL: http://svn.gnome.org/viewvc/gtk+?rev=19748&view=rev

Log:

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

	Merged from trunk:

  * 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



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkcombobox.c

Modified: branches/gtk-2-12/gtk/gtkcombobox.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkcombobox.c	(original)
+++ branches/gtk-2-12/gtk/gtkcombobox.c	Tue Mar 11 13:51:55 2008
@@ -2309,8 +2309,14 @@
 	    }
         }
       
+      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);
     }
 }