Merge lp:~hikiko/unity-control-center/unity-control-center.clamp-ui-scale into lp:unity-control-center

[Eleni Maria Stea]

When the u-c-c starts the UI scale is clamped to a reasonable value in order to make sure that the user can always see the slider.

When the u-c-c starts the UI scale is clamped to a reasonable value in order to make sure that the user can always see the slider.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~hikiko/unity-control-center/unity-control-center.clamp-ui-scale]

12771. By Eleni Maria Stea on 2014-04-04

used a fixed window size that always fit the screen instead of the
current window size, to have a predictable maximum value in the ui scale

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, looks fine to me

review: Approve

=== modified file 'panels/display/cc-display-panel.c'
--- panels/display/cc-display-panel.c	2014-03-28 12:57:57 +0000
+++ panels/display/cc-display-panel.c	2014-04-04 08:51:00 +0000
@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>
@@ -597,6 +598,42 @@
   return g_variant_builder_end (&builder);
 }
 
+static int
+get_ui_scale_from_monitor (CcDisplayPanel *self, const char *monitor_name)
+{
+  int value;
+  GVariant *dict;
+
+  dict = g_settings_get_value (self->priv->desktop_settings, "scale-factor");
+  if (!g_variant_lookup (dict, monitor_name, "i", &value))
+    value = UI_SCALE_DEFAULT;
+
+  return value;
+}
+
+static int
+calculate_max_ui_scale (CcDisplayPanel *self)
+{
+  int win_max_dimension;
+  int output_width, output_height;
+  float max_scale;
+
+  GnomeRROutputInfo *output = self->priv->current_output;
+  const char *monitor_name = gnome_rr_output_info_get_name (output);
+  int current_ui_scale = get_ui_scale_from_monitor (self, monitor_name);
+  float current_scale_factor = (float)current_ui_scale / 8.0;
+  float win_scale_factor = current_scale_factor > 1 ? floor (current_scale_factor) : 1;
+
+  get_geometry (output, &output_width, &output_height);
+
+  /* only the integer part of the scale-factor contributes to the window size */
+
+  win_max_dimension = MINIMUM_HEIGHT / win_scale_factor;
+  max_scale = (float)output_height / (float)win_max_dimension;
+
+  return (int)(max_scale * 8.0);
+}
+
 static void
 rebuild_ui_scale (CcDisplayPanel *self)
 {
@@ -615,7 +652,7 @@
   }
 
   gtk_adjustment_set_step_increment (adj, UI_SCALE_STEP);
-  gtk_adjustment_set_upper (adj, UI_SCALE_MAX);
+  gtk_adjustment_set_upper (adj, calculate_max_ui_scale(self));
   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), UI_SCALE_DEFAULT, GTK_POS_TOP, NULL);