Merge lp:~larsu/unity-control-center/add-overlay-scrollbar-key into lp:unity-control-center

[Lars Karlitski]

appearance: introduce X-Ubuntu-UseOverlayScrollbars

So that theme authors can opt in to using overlay scrollbars.

appearance: introduce X-Ubuntu-UseOverlayScrollbars

So that theme authors can opt in to using overlay scrollbars.

This should land at the same time as lp:~larsu/ubuntu-themes/use-overlay-scrollbars. Otherwise, overlay-scrollbars will be turned off for Ambiance and Radiance as well.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12786
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/104/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Looks good, but why did you remove the g_settings_delay / g_settings_apply?

review: Needs Information

[Lars Karlitski (larsu)]

> Looks good, but why did you remove the g_settings_delay / g_settings_apply?

Because canonical_interface_settings has only ever one key set (the overlay-scrollbar one). delay/apply only makes sense when you set multiple keys at once (to only trigger one write of the dconf db) or when you have a dialog that is not instant-apply.

[Robert Ancell (robert-ancell)]

review: Approve

[Lars Karlitski (larsu)]

This is actually not the right place for deciding whether to show overlay-scrollbars. Instead, the overlay scrollbar module should look at the key and only enable itself when the theme supports this. The gsettings key can then be used as a manual override for users.

I've done this at https://code.launchpad.net/~larsu/overlay-scrollbar/only-enable-for-supported-themes

Thanks to Ryan for bringing this to my attention.

review: Disapprove

Unmerged revisions

12786. By Lars Karlitski on 2014-07-22

appearance: introduce X-Ubuntu-UseOverlayScrollbars

So that theme authors can opt in to using overlay scrollbars.

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2014-07-02 09:42:52 +0000
+++ panels/appearance/cc-appearance-panel.c	2014-07-22 14:48:59 +0000
@@ -1261,7 +1261,8 @@
 		gchar **gtk_theme,
 		gchar **icon_theme,
 		gchar **window_theme,
-		gchar **cursor_theme)
+		gchar **cursor_theme,
+		gboolean *use_overlay_scrollbars)
 {
   gchar *path;
   GKeyFile *theme_file;
@@ -1279,6 +1280,9 @@
       *window_theme = g_key_file_get_string (theme_file, "X-GNOME-Metatheme", "MetacityTheme", NULL);
       *cursor_theme = g_key_file_get_string (theme_file, "X-GNOME-Metatheme", "CursorTheme", NULL);
 
+      if (use_overlay_scrollbars)
+        *use_overlay_scrollbars = g_key_file_get_boolean (theme_file,  "X-GNOME-Metatheme", "X-Ubuntu-UseOverlayScrollbars", NULL);
+
       result = TRUE;
     }
   else
@@ -1298,33 +1302,28 @@
 {
   gint active;
   gchar *gtk_theme, *icon_theme, *window_theme, *cursor_theme;
+  gboolean use_overlay_scrollbars;
 
   active = gtk_combo_box_get_active (combo);
   g_return_if_fail (active >= 0 && active < G_N_ELEMENTS (themes_id));
 
   if (!get_theme_data (gtk_combo_box_get_active_id (combo),
-                       &gtk_theme, &icon_theme, &window_theme, &cursor_theme))
+                       &gtk_theme, &icon_theme, &window_theme, &cursor_theme, &use_overlay_scrollbars))
     return;
 
   g_settings_delay (self->priv->interface_settings);
 
-  if (self->priv->canonical_interface_settings != NULL)
-    g_settings_delay (self->priv->canonical_interface_settings);
-
   g_settings_set_string (self->priv->interface_settings, "gtk-theme", gtk_theme);
   g_settings_set_string (self->priv->interface_settings, "icon-theme", icon_theme);
   g_settings_set_string (self->priv->interface_settings, "cursor-theme", cursor_theme);
   g_settings_set_string (self->priv->wm_theme_settings, "theme", window_theme);
 
-
-  /* disable overlay scrollbars for a11y if installed*/
   if (self->priv->canonical_interface_settings)
     {
-      if (g_strcmp0 (gtk_theme, "HighContrast") == 0 )
+      if (use_overlay_scrollbars)
+        g_settings_reset (self->priv->canonical_interface_settings, "scrollbar-mode");
+      else
         g_settings_set_string (self->priv->canonical_interface_settings, "scrollbar-mode", "normal");
-      else
-        g_settings_reset (self->priv->canonical_interface_settings, "scrollbar-mode");
-      g_settings_apply (self->priv->canonical_interface_settings);
     }
 
   g_settings_apply (self->priv->interface_settings);
@@ -1370,7 +1369,7 @@
       gchar *gtk_theme, *icon_theme, *window_theme, *cursor_theme, *new_theme_name;
       GtkTreeIter iter;
 
-      if (!get_theme_data (themes_id[i], &gtk_theme, &icon_theme, &window_theme, &cursor_theme))
+      if (!get_theme_data (themes_id[i], &gtk_theme, &icon_theme, &window_theme, &cursor_theme, NULL))
         {
           current_theme_index--;
           continue;