Fix a problem with large y thickness

svn path=/trunk/; revision=17231

diff --git a/ChangeLog b/ChangeLog
index 82148d8fea2a3737161314f75476c3b814b7c5dd..a33baa75f63308b6ca0ec3f4c5deb37aa0c4981d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_size_allocation): Fix a 
+       problem with large y thickness.  (#136592, Xan Lopez)
+
 2007-01-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaction.c (gtk_action_new): Use canonical

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index bc4585d3985a397ccbc56dc26c31a13507fd4b69..f5974022fc78e585f891f10e389db16057a2124c 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -640,7 +640,7 @@ gtk_frame_size_allocate (GtkWidget     *widget,
        (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_PAD;
       child_allocation.width = child_requisition.width;
 
-      child_allocation.y = frame->child_allocation.y - child_requisition.height;
+      child_allocation.y = frame->child_allocation.y - MAX (child_requisition.height, widget->style->ythickness);
       child_allocation.height = child_requisition.height;
 
       gtk_widget_size_allocate (frame->label_widget, &child_allocation);