[metacity/wip/gtk-theme: 39/52] Properly update on GTK+ theme changes



commit 607ba71e11d7a3f67908e500888b26a6d7b90911
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Sep 26 00:30:29 2014 +0200

    Properly update on GTK+ theme changes
    
    With geometry information picked up from GTK+, we need to queue a
    resize on GTK+ theme changes to correctly update to the new geometry.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741917
    
    NOTE: Updated for metacity in way it does not break existing themes.

 src/core/core.c    |    6 ++++++
 src/include/core.h |    5 +----
 src/ui/frames.c    |    9 +++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/src/core/core.c b/src/core/core.c
index 5b56ab6..c589e42 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -813,3 +813,9 @@ meta_invalidate_default_icons (void)
   g_slist_free (windows);
 }
 
+void
+meta_retheme_all (void)
+{
+  if (meta_get_display ())
+    meta_display_retheme_all ();
+}
diff --git a/src/include/core.h b/src/include/core.h
index 6cc41a6..f88f6cf 100644
--- a/src/include/core.h
+++ b/src/include/core.h
@@ -203,9 +203,6 @@ void       meta_core_set_screen_cursor (Display *xdisplay,
 void meta_core_increment_event_serial (Display *display);
 
 void meta_invalidate_default_icons (void);
+void meta_retheme_all (void);
 
 #endif
-
-
-
-
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 5b698c2..fb21e10 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -481,6 +481,15 @@ meta_frames_style_updated (GtkWidget *widget)
   g_hash_table_foreach (frames->frames,
                         reattach_style_func, frames);
 
+  if (g_getenv ("USE_METACITY_THEME") != NULL)
+    {
+      /* not needed for metacity theme */
+    }
+  else
+    {
+      meta_retheme_all ();
+    }
+
   GTK_WIDGET_CLASS (meta_frames_parent_class)->style_updated (widget);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]