Merge lp:~cimi/overlay-scrollbar/react-theme-change into lp:overlay-scrollbar

[Andrea Cimitan]

React to the theme change

[Neil J. Patel (njpatel)]

Looks good, approved!

review: Approve

[David Barth (dbarth)]

Are you sure pager is always valid in the cb? What happens if the pager is disposed? Is the signal disconnected autoamtically?

review: Needs Information

[Ted Gould (ted)]

  review approve
  merge approve

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-04-04 14:30:40 +0000
+++ os/os-pager.c	2011-04-06 16:21:06 +0000
@@ -48,6 +48,7 @@
   gfloat weight;
   gint width;
   gint height;
+  gulong handler_id;
 };
 
 static gboolean rectangle_changed (GdkRectangle rectangle1, GdkRectangle rectangle2);
@@ -57,6 +58,7 @@
 static void os_pager_create (OsPager *pager);
 static void os_pager_draw (OsPager *pager);
 static void os_pager_mask (OsPager *pager);
+static void os_pager_notify_gtk_theme_name_cb (GObject *object, GParamSpec* pspec, gpointer user_data);
 
 /* Private functions */
 
@@ -159,11 +161,11 @@
 
   gdk_colormap_alloc_color (gdk_drawable_get_colormap (priv->pager_window), &color, FALSE, TRUE);
 
+  gdk_window_set_background (priv->pager_window, &color);
+
+  gdk_window_clear (priv->pager_window);
+
   gdk_window_invalidate_rect (gtk_widget_get_window (priv->parent), &priv->allocation, TRUE);
-
-  gdk_window_set_background (priv->pager_window, &color);
-
-  gdk_window_clear (priv->pager_window);
 }
 
 /* Mask the pager. */
@@ -181,6 +183,21 @@
   gdk_window_clear (priv->pager_window);
 }
 
+static void
+os_pager_notify_gtk_theme_name_cb (GObject*    gobject,
+                                   GParamSpec* pspec,
+                                   gpointer    user_data)
+{
+  OsPager *pager;
+  OsPagerPrivate *priv;
+
+  pager = OS_PAGER (user_data);
+  priv = pager->priv;
+
+  if (priv->pager_window != NULL)
+    os_pager_draw (pager);
+}
+
 /* Type definition. */
 
 G_DEFINE_TYPE (OsPager, os_pager, G_TYPE_OBJECT);
@@ -228,6 +245,9 @@
 
   priv->animation = os_animation_new (RATE_FADE, DURATION_FADE_OUT,
                                       os_pager_change_state_cb, NULL, pager);
+
+  priv->handler_id = g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
+                                       G_CALLBACK (os_pager_notify_gtk_theme_name_cb), pager);
 }
 
 static void
@@ -245,6 +265,9 @@
       priv->animation = NULL;
     }
 
+  g_signal_handler_disconnect (gtk_settings_get_default (),
+                               priv->handler_id);
+
   G_OBJECT_CLASS (os_pager_parent_class)->dispose (object);
 }