gimp r28225 - in branches/gimp-2-6: . app/display app/widgets

[mitch svn gnome org]

Author: mitch
Date: Sat Mar 28 13:20:16 2009
New Revision: 28225
URL: http://svn.gnome.org/viewvc/gimp?rev=28225&view=rev

Log:
2009-03-28  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	Bug 555025 â Action GEGL box widgets weirdness

	Must not set GDK_HINT_MIN_SIZE if we don't actually set a minimum
	size, or the window will be shrinkable to zero and it won't
	expand automatically when its contents' requisition grows.

	* app/widgets/gimpdialogfactory.[ch]: add hackish API
	gimp_dialog_factory_set,get_has_min_size() because GTK+ itself
	has no API for querying a window's GdkWindowHints.

	(gimp_dialog_factory_set_user_pos): set GDK_HINT_MIN_SIZE only if
	the window was being marked as having a minimum size using above
	new API.

	* app/widgets/gimptoolbox.c (gimp_toolbox_set_geometry)
	* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):
	call gimp_dialog_factory_set_has_min_size (window, TRUE).



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/display/gimpdisplayshell.c
   branches/gimp-2-6/app/widgets/gimpdialogfactory.c
   branches/gimp-2-6/app/widgets/gimpdialogfactory.h
   branches/gimp-2-6/app/widgets/gimptoolbox.c

Modified: branches/gimp-2-6/app/display/gimpdisplayshell.c
==============================================================================
--- branches/gimp-2-6/app/display/gimpdisplayshell.c	(original)
+++ branches/gimp-2-6/app/display/gimpdisplayshell.c	Sat Mar 28 13:20:16 2009
@@ -703,6 +703,8 @@
 
   gtk_window_set_geometry_hints (GTK_WINDOW (widget), NULL,
                                  &geometry, geometry_mask);
+
+  gimp_dialog_factory_set_has_min_size (GTK_WINDOW (widget), TRUE);
 }
 
 static void

Modified: branches/gimp-2-6/app/widgets/gimpdialogfactory.c
==============================================================================
--- branches/gimp-2-6/app/widgets/gimpdialogfactory.c	(original)
+++ branches/gimp-2-6/app/widgets/gimpdialogfactory.c	Sat Mar 28 13:20:16 2009
@@ -1197,6 +1197,27 @@
   return g_object_get_qdata (G_OBJECT (dialog), gimp_dialog_factory_key);
 }
 
+#define GIMP_DIALOG_FACTORY_MIN_SIZE_KEY "gimp-dialog-factory-min-size"
+
+void
+gimp_dialog_factory_set_has_min_size (GtkWindow *window,
+                                      gboolean   has_min_size)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  g_object_set_data (G_OBJECT (window), GIMP_DIALOG_FACTORY_MIN_SIZE_KEY,
+                     GINT_TO_POINTER (has_min_size ? TRUE : FALSE));
+}
+
+gboolean
+gimp_dialog_factory_get_has_min_size (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window),
+                                             GIMP_DIALOG_FACTORY_MIN_SIZE_KEY));
+}
+
 
 /*  private functions  */
 
@@ -1250,6 +1271,7 @@
                                   GdkEventConfigure *cevent,
                                   gpointer           data)
 {
+  GdkWindowHints          geometry_mask;
 #ifdef DEBUG_FACTORY
   GimpDialogFactoryEntry *entry;
 
@@ -1264,9 +1286,13 @@
                                         gimp_dialog_factory_set_user_pos,
                                         data);
 
+  geometry_mask = GDK_HINT_USER_POS;
+
+  if (gimp_dialog_factory_get_has_min_size (GTK_WINDOW (dialog)))
+    geometry_mask |= GDK_HINT_MIN_SIZE;
+
   gtk_window_set_geometry_hints (GTK_WINDOW (dialog), NULL, NULL,
-                                 GDK_HINT_MIN_SIZE |
-                                 GDK_HINT_USER_POS);
+                                 geometry_mask);
 
   return FALSE;
 }

Modified: branches/gimp-2-6/app/widgets/gimpdialogfactory.h
==============================================================================
--- branches/gimp-2-6/app/widgets/gimpdialogfactory.h	(original)
+++ branches/gimp-2-6/app/widgets/gimpdialogfactory.h	Sat Mar 28 13:20:16 2009
@@ -176,5 +176,9 @@
             gimp_dialog_factory_from_widget (GtkWidget               *dialog,
                                              GimpDialogFactoryEntry **entry);
 
+void        gimp_dialog_factory_set_has_min_size    (GtkWindow       *window,
+                                                     gboolean         has_min_size);
+gboolean    gimp_dialog_factory_get_has_min_size    (GtkWindow       *window);
+
 
 #endif  /*  __GIMP_DIALOG_FACTORY_H__  */

Modified: branches/gimp-2-6/app/widgets/gimptoolbox.c
==============================================================================
--- branches/gimp-2-6/app/widgets/gimptoolbox.c	(original)
+++ branches/gimp-2-6/app/widgets/gimptoolbox.c	Sat Mar 28 13:20:16 2009
@@ -615,6 +615,8 @@
                                      GDK_HINT_MIN_SIZE   |
                                      GDK_HINT_RESIZE_INC |
                                      GDK_HINT_USER_POS);
+
+      gimp_dialog_factory_set_has_min_size (GTK_WINDOW (toolbox), TRUE);
     }
 }