gimp r25512 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Tue Apr 22 10:15:06 2008
New Revision: 25512
URL: http://svn.gnome.org/viewvc/gimp?rev=25512&view=rev

Log:
2008-04-22  Sven Neumann  <sven gimp org>

	* app/display/gimpstatusbar.c (gimp_statusbar_frame_size_request):
	take vertical padding into account to avoid resizing the statusbar.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpstatusbar.c

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Tue Apr 22 10:15:06 2008
@@ -289,27 +289,33 @@
                                    GimpStatusbar  *statusbar)
 {
   GtkRequisition  child_requisition;
-  gint            width = 0;
+  gint            width   = 0;
+  gint            padding = 2 * widget->style->ythickness;
 
   /*  also consider the children which can be invisible  */
 
   gtk_widget_size_request (statusbar->cursor_label, &child_requisition);
   width += child_requisition.width;
-  requisition->height = MAX (requisition->height, child_requisition.height);
+  requisition->height = MAX (requisition->height,
+                             padding + child_requisition.height);
 
   gtk_widget_size_request (statusbar->unit_combo, &child_requisition);
   width += child_requisition.width;
-  requisition->height = MAX (requisition->height, child_requisition.height);
+  requisition->height = MAX (requisition->height,
+                             padding + child_requisition.height);
 
   gtk_widget_size_request (statusbar->scale_combo, &child_requisition);
   width += child_requisition.width;
-  requisition->height = MAX (requisition->height, child_requisition.height);
+  requisition->height = MAX (requisition->height,
+                             padding + child_requisition.height);
 
   gtk_widget_size_request (statusbar->progressbar, &child_requisition);
-  requisition->height = MAX (requisition->height, child_requisition.height);
+  requisition->height = MAX (requisition->height,
+                             padding + child_requisition.height);
 
   gtk_widget_size_request (statusbar->cancel_button, &child_requisition);
-  requisition->height = MAX (requisition->height, child_requisition.height);
+  requisition->height = MAX (requisition->height,
+                             padding + child_requisition.height);
 
   requisition->width = MAX (requisition->width, width + 24);
 }