gimp r26992 - in trunk: . app/widgets

[mitch svn gnome org]

Author: mitch
Date: Thu Sep 18 10:55:53 2008
New Revision: 26992
URL: http://svn.gnome.org/viewvc/gimp?rev=26992&view=rev

Log:
2008-09-18  Michael Natterer  <mitch gimp org>

	* app/widgets/gimpdock.c (gimp_dock_style_set): reset the RC
	styles of the dock's children after parsing the RC file snippet
	for them. Fixes font size for detached dockables.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpdock.c

Modified: trunk/app/widgets/gimpdock.c
==============================================================================
--- trunk/app/widgets/gimpdock.c	(original)
+++ trunk/app/widgets/gimpdock.c	Thu Sep 18 10:55:53 2008
@@ -324,12 +324,13 @@
 
   GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
 
-  gtk_widget_style_get (widget, "default-height", &default_height, NULL);
+  gtk_widget_style_get (widget,
+                        "default-height", &default_height,
+                        "font-scale",     &font_scale,
+                        NULL);
 
   gtk_window_set_default_size (GTK_WINDOW (widget), -1, default_height);
 
-  gtk_widget_style_get (widget, "font-scale", &font_scale, NULL);
-
   if (font_scale != 1.0)
     {
       PangoContext         *context;
@@ -361,6 +362,9 @@
 
       gtk_rc_parse_string (rc_string);
       g_free (rc_string);
+
+      if (gtk_bin_get_child (GTK_BIN (widget)))
+        gtk_widget_reset_rc_styles (gtk_bin_get_child (GTK_BIN (widget)));
     }
 }