Merge lp:~robert-ancell/unity-control-center/ui-scale-keyboard into lp:unity-control-center

[Robert Ancell]

Allow the UI scale to be controlled by the keyboard

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12766
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/88

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good, thanks

review: Approve

=== modified file 'panels/display/cc-display-panel.c'
--- panels/display/cc-display-panel.c	2014-02-26 15:58:33 +0000
+++ panels/display/cc-display-panel.c	2014-03-24 23:19:46 +0000
@@ -67,6 +67,8 @@
 
 #define UI_SCALE_MIN 4.0
 #define UI_SCALE_MAX 32.0
+#define UI_SCALE_STEP 1.0
+#define UI_SCALE_DEFAULT 8.0
 
 enum {
   TEXT_COL,
@@ -602,15 +604,16 @@
     return;
   }
 
+  gtk_adjustment_set_step_increment (adj, UI_SCALE_STEP);
   gtk_adjustment_set_upper (adj, UI_SCALE_MAX);
   gtk_adjustment_set_lower (adj, UI_SCALE_MIN);
   gtk_scale_set_digits (GTK_SCALE(self->priv->ui_scale), 0);
-  gtk_scale_add_mark (GTK_SCALE(self->priv->ui_scale), 8, GTK_POS_TOP, NULL);
+  gtk_scale_add_mark (GTK_SCALE(self->priv->ui_scale), UI_SCALE_DEFAULT, GTK_POS_TOP, NULL);
 
   dict = g_settings_get_value (self->priv->desktop_settings, "scale-factor");
   if (!g_variant_lookup (dict, monitor_name, "i", &value))
   {
-    value = 8;
+    value = UI_SCALE_DEFAULT;
     self->priv->ui_prev_scale = value;
   }
   new_dict = add_dict_entry (dict, monitor_name, value);