From 1e1f49e09a8fb141c31875c415e8bd9172dcb0e2 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Tue, 11 Mar 2008 13:46:37 +0000 Subject: [PATCH] Take thickness into account in the size allocation of the child widgets in 2008-03-11 Alberto Ruiz * 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 --- ChangeLog | 7 +++++++ gtk/gtkcombobox.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index bc06afd99b..701c508fe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-11 Alberto Ruiz + + * 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 * gdk/quartz/gdkwindow-quartz.c: Implement gdk_window_reparent. diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index a43a0c9234..1828ceca3a 100644 --- 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); } }