gimp r25217 - in trunk: . app/display

[mitch svn gnome org]

Author: mitch
Date: Tue Mar 25 10:08:19 2008
New Revision: 25217
URL: http://svn.gnome.org/viewvc/gimp?rev=25217&view=rev

Log:
2008-03-25  Michael Natterer  <mitch gimp org>

	* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):
	fix to work without menubar, don't reset GDK_HINT_USER_POS.



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

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Tue Mar 25 10:08:19 2008
@@ -590,20 +590,27 @@
                               GtkStyle  *prev_style)
 {
   GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
-  GtkRequisition    menubar_req;
-  GtkRequisition    statusbar_req;
+  GtkRequisition    requisition;
   GdkGeometry       geometry;
 
   GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
 
-  gtk_widget_size_request (shell->menubar,   &menubar_req);
-  gtk_widget_size_request (shell->statusbar, &statusbar_req);
+  gtk_widget_size_request (shell->statusbar, &requisition);
 
-  geometry.min_width  = statusbar_req.width;
-  geometry.min_height = statusbar_req.height + menubar_req.height + 1;
+  geometry.min_width  = requisition.width;
+  geometry.min_height = requisition.height;
+
+  if (shell->menubar)
+    {
+      gtk_widget_size_request (shell->menubar, &requisition);
+
+      geometry.min_height += requisition.height + 1;
+    }
 
   gtk_window_set_geometry_hints (GTK_WINDOW (widget), NULL,
-                                 &geometry, GDK_HINT_MIN_SIZE);
+                                 &geometry,
+                                 GDK_HINT_MIN_SIZE |
+                                 GDK_HINT_USER_POS);
 }
 
 static void