Merge lp:~larsu/overlay-scrollbar/only-enable-for-supported-themes into lp:overlay-scrollbar

[Lars Karlitski]

Only show scrollbars if the theme supports it

Keep the gsetting so that users can override this.

Only show scrollbars if the theme supports it

Keep the gsetting so that users can override this. This way we never accidentally enable overlay scrollbars in themes that don't support it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:386
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/17/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Just found this while proposing another MP. I guess it's still necessary so here is a small review. :)

review: Needs Fixing

Unmerged revisions

386. By Lars Karlitski on 2014-07-29

Only show scrollbars if the theme supports it

Keep the gsetting so that users can override this.

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2014-06-09 03:50:50 +0000
+++ os/os-scrollbar.c	2014-07-29 12:56:53 +0000
@@ -153,6 +153,7 @@
 static GSList *scrollbar_list = NULL;
 static GQuark os_quark_placement = 0;
 static GQuark os_quark_qdata = 0;
+static gboolean theme_supports_os = FALSE;
 static ScrollbarMode scrollbar_mode = SCROLLBAR_MODE_NORMAL;
 static cairo_region_t *os_workarea = NULL;
 
@@ -3262,9 +3263,9 @@
 use_overlay_scrollbar (void)
 {
 #ifdef USE_GTK3
-  return scrollbar_mode != SCROLLBAR_MODE_NORMAL;
+  return theme_supports_os && scrollbar_mode != SCROLLBAR_MODE_NORMAL;
 #else
-  return scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar ();
+  return theme_supports_os && scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar ();
 #endif
 }
 
@@ -4263,16 +4264,37 @@
   gtk_widget_queue_resize (widget);
 }
 
-/* Callback called when scrollbar-mode changes. */
+static gboolean
+theme_supports_overlay_scrollbars ()
+{
+  gchar *theme;
+  gchar **data_dirs;
+  gchar *filename;
+  GKeyFile *keyfile;
+  gboolean ret = FALSE;
+
+  if (g_getenv ("XDG_DATA_DIRS") == NULL)
+    return FALSE;
+
+  g_object_get (gtk_settings_get_default (), "gtk-theme-name", &theme, NULL);
+  data_dirs = g_strsplit (g_getenv ("XDG_DATA_DIRS"), ":", 0);
+  filename = g_build_path ("/", "themes", theme, "index.theme", NULL);
+  keyfile = g_key_file_new ();
+  if (g_key_file_load_from_dirs (keyfile, filename, (const gchar **) data_dirs, NULL, G_KEY_FILE_NONE, NULL))
+    ret = g_key_file_get_boolean (keyfile, "X-GNOME-Metatheme", "X-Ubuntu-UseOverlayScrollbars", NULL);
+
+  g_key_file_unref (keyfile);
+  g_free (filename);
+  g_strfreev (data_dirs);
+  g_free (theme);
+  return ret;
+}
+
 static void
-scrollbar_mode_changed_cb (GObject    *object,
-                           GParamSpec *pspec,
-                           gpointer    user_data)
+update_scrollbars ()
 {
-  GSettings *settings;
   GSList *tmp_list, *mapped_list;
 
-  settings = G_SETTINGS (object);
   tmp_list = g_slist_copy (scrollbar_list);
 
   /* Initialize the pointer by initializing its variable. */
@@ -4281,9 +4303,6 @@
   /* Unload all scrollbars, using previous scrollbar_mode. */
   g_slist_foreach (tmp_list, scrollbar_mode_changed_unload_gfunc, &mapped_list);
 
-  /* Update the scrollbar_mode variable. */
-  scrollbar_mode = g_settings_get_enum (settings, "scrollbar-mode");
-
 #ifdef USE_GTK3
   /* Load or unload custom style for overlay scrollbar. */
   if (use_overlay_scrollbar ())
@@ -4306,6 +4325,27 @@
   g_slist_free (tmp_list);
 }
 
+static void
+theme_changed_cb (GObject    *object,
+                  GParamSpec *pspec,
+                  gpointer    user_data)
+{
+  theme_supports_os = theme_supports_overlay_scrollbars ();
+  update_scrollbars ();
+}
+
+/* Callback called when scrollbar-mode changes. */
+static void
+scrollbar_mode_changed_cb (GObject    *object,
+                           GParamSpec *pspec,
+                           gpointer    user_data)
+{
+  GSettings *settings = G_SETTINGS (object);
+
+  scrollbar_mode = g_settings_get_enum (settings, "scrollbar-mode");
+  update_scrollbars ();
+}
+
 /* Suppress the warning 'missing-declarations'. */
 void gtk_module_init (void);
 
@@ -4376,6 +4416,10 @@
                     G_CALLBACK (scrollbar_mode_changed_cb), NULL);
   scrollbar_mode = g_settings_get_enum (settings, "scrollbar-mode");
 
+  g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
+                    G_CALLBACK (theme_changed_cb), NULL);
+  theme_supports_os = theme_supports_overlay_scrollbars ();
+
 #ifdef USE_GTK3
   /* Initialize styling bits. */
   provider = gtk_css_provider_new ();