[maemo-commits] [maemo-commits] r9830 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-02-13 18:10:00 +0200 (Tue, 13 Feb 2007)
New Revision: 9830

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkframe.c
Log:
Tue Feb 13 16:57:52 2007  Tim Janik  <timj at gtk.org>

        * gtk/gtkframe.c:  Fix a problem with large y thickness.
        (#136592, Xan Lopez)




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-13 16:07:25 UTC (rev 9829)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-13 16:10:00 UTC (rev 9830)
@@ -1,3 +1,8 @@
+Tue Feb 13 16:57:52 2007  Tim Janik  <timj at gtk.org>
+
+	* gtk/gtkframe.c:  Fix a problem with large y thickness.
+	(#136592, Xan Lopez)
+
 2007-02-13  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenuitem.[ch]: factor out _gtk_menu_item_popdown_submenu().

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkframe.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkframe.c	2007-02-13 16:07:25 UTC (rev 9829)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkframe.c	2007-02-13 16:10:00 UTC (rev 9830)
@@ -640,7 +640,7 @@
 	(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);