Merge lp:~robert-ancell/unity-control-center/even-icon-sizes into lp:unity-control-center

[Robert Ancell]

Only allow icons sizes to be even numbers because odd sizes look blurry.

Limit the icon sizes to even numbers by using a scale for the half-size and then doubling it.

This obsoletes the proposal in lp:~kokoto-java/unity-control-center/fix-lp-1292112.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12752
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robert-ancell/unity-control-center/even-icon-sizes/+merge/211238/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/73

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

review: Needs Fixing (continuous-integration)

[asmoore82 (asmoore82)]

This works great! But the new effective page increment might be unintentionally large. Since it's 8 with a "scaling factor" of 2x it actually jumps 16 at a time. I would recommend 4 now to get the effect of 8:

+++ panels/appearance/cc-appearance-panel.c 2014-03-17 03:50:51 +0000
@@ -1869,1 +1869,1 @@
- iconsize_adj = gtk_adjustment_new (DEFAULT_ICONSIZE / 2, MIN_ICONSIZE / 2, MAX_ICONSIZE / 2, 1, 8, 0);
+ iconsize_adj = gtk_adjustment_new (DEFAULT_ICONSIZE / 2, MIN_ICONSIZE / 2, MAX_ICONSIZE / 2, 1, 4, 0);

Thanks!

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robert-ancell/unity-control-center/even-icon-sizes]

12753. By Robert Ancell on 2014-03-17

Fix icon size adjustment page size being out by a factor of two

[Robert Ancell (robert-ancell)]

> This works great! But the new effective page increment might be
> unintentionally large. Since it's 8 with a "scaling factor" of 2x it actually
> jumps 16 at a time. I would recommend 4 now to get the effect of 8:

Thanks for spotting that, fixed.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good to me, thanks

review: Approve

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2014-02-25 18:45:48 +0000
+++ panels/appearance/cc-appearance-panel.c	2014-03-17 04:23:19 +0000
@@ -121,18 +121,11 @@
 
 #define MIN_ICONSIZE 16.0
 #define MAX_ICONSIZE 64.0
+#define DEFAULT_ICONSIZE 48.0
 
 #define MIN_LAUNCHER_SENSIVITY 0.2
 #define MAX_LAUNCHER_SENSIVITY 8.0
 
-typedef struct
-{
-  gdouble min;
-  gdouble max;
-} MinMax;
-static MinMax iconsize_values;
-static MinMax launchersensitivity_values;
-
 #define WID(y) (GtkWidget *) gtk_builder_get_object (priv->builder, y)
 
 static void
@@ -1412,7 +1405,7 @@
 iconsize_widget_refresh (GtkAdjustment *iconsize_adj, GSettings *unity_settings)
 {
   gint value = g_settings_get_int (unity_settings, UNITY_ICONSIZE_KEY);
-  gtk_adjustment_set_value (iconsize_adj, (gdouble)value);
+  gtk_adjustment_set_value (iconsize_adj, (gdouble)value / 2);
 }
 
 static void
@@ -1423,10 +1416,16 @@
   iconsize_widget_refresh (GTK_ADJUSTMENT (user_data), settings);
 }
 
+static gchar *
+on_iconsize_format_value (GtkScale *scale, gdouble value)
+{
+  return g_strdup_printf ("%d", (int) value * 2);
+}
+
 static void
 on_iconsize_changed (GtkAdjustment *adj, GSettings *unity_settings)
 {
-  g_settings_set_int (unity_settings, UNITY_ICONSIZE_KEY, (gint)gtk_adjustment_get_value (adj));
+  g_settings_set_int (unity_settings, UNITY_ICONSIZE_KEY, (gint)gtk_adjustment_get_value (adj) * 2);
 }
 
 static void
@@ -1791,21 +1790,21 @@
 /* Get scrolling in the right direction */
 static gboolean
 on_scale_scroll_event (GtkWidget      *widget,
-                       GdkEventScroll *event,
-                       gpointer *data)
+                       GdkEventScroll *event)
 {
   gdouble value;
   GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (widget));
-  MinMax *iconsize_values = (MinMax *) data;
-  gdouble delta = iconsize_values->max - iconsize_values->min;
+  double min = gtk_adjustment_get_lower (adj);
+  double max = gtk_adjustment_get_upper (adj);
+  gdouble delta = max - min;
 
   value = gtk_adjustment_get_value (adj);
 
   if ((event->direction == GDK_SCROLL_UP) ||
      (event->direction == GDK_SCROLL_SMOOTH && event->delta_y < 0))
     {
-      if (value + delta/8 > iconsize_values->max)
-        value = iconsize_values->max;
+      if (value + delta/8 > max)
+        value = max;
       else
         value = value + delta/8;
       gtk_adjustment_set_value (adj, value);
@@ -1813,8 +1812,8 @@
   else if ((event->direction == GDK_SCROLL_DOWN) ||
            (event->direction == GDK_SCROLL_SMOOTH && event->delta_y > 0))
     {
-      if (value - delta/8 < iconsize_values->min)
-        value = iconsize_values->min;
+      if (value - delta/8 < min)
+        value = min;
       else
         value = value - delta/8;
       gtk_adjustment_set_value (adj, value);
@@ -1866,20 +1865,20 @@
   if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)
     return;
 
-  /* Icon size change */
-  iconsize_values.min = MIN_ICONSIZE;
-  iconsize_values.max = MAX_ICONSIZE;
-  iconsize_adj = gtk_adjustment_new (48, iconsize_values.min, iconsize_values.max, 1, 5, 0);
+  /* Icon size change - we halve the sizes so we can only get even values*/
+  iconsize_adj = gtk_adjustment_new (DEFAULT_ICONSIZE / 2, MIN_ICONSIZE / 2, MAX_ICONSIZE / 2, 1, 4, 0);
   iconsize_scale = GTK_SCALE (WID ("unity-iconsize-scale"));
   gtk_range_set_adjustment (GTK_RANGE (iconsize_scale), iconsize_adj);
-  gtk_scale_add_mark (iconsize_scale, 48, GTK_POS_BOTTOM, NULL);
+  gtk_scale_add_mark (iconsize_scale, DEFAULT_ICONSIZE / 2, GTK_POS_BOTTOM, NULL);
   g_signal_connect (priv->unity_settings, "changed::" UNITY_ICONSIZE_KEY,
                     G_CALLBACK (ext_iconsize_changed_callback), iconsize_adj);
 
+  g_signal_connect (G_OBJECT (iconsize_scale), "format-value",
+                    G_CALLBACK (on_iconsize_format_value), NULL);
   g_signal_connect (iconsize_adj, "value_changed",
                     G_CALLBACK (on_iconsize_changed), priv->unity_settings);
   g_signal_connect (G_OBJECT (iconsize_scale), "scroll-event",
-                    G_CALLBACK (on_scale_scroll_event), &iconsize_values);
+                    G_CALLBACK (on_scale_scroll_event), NULL);
   iconsize_widget_refresh (iconsize_adj, priv->unity_settings);
 
   /* Reveal spot setting */
@@ -1892,9 +1891,7 @@
   reveallauncher_widget_refresh (self);
 
   /* Launcher reveal */
-  launchersensitivity_values.min = MIN_LAUNCHER_SENSIVITY;
-  launchersensitivity_values.max = MAX_LAUNCHER_SENSIVITY;
-  launcher_sensitivity_adj = gtk_adjustment_new (2, launchersensitivity_values.min, launchersensitivity_values.max, 0.1, 1, 0);
+  launcher_sensitivity_adj = gtk_adjustment_new (2, MIN_LAUNCHER_SENSIVITY, MAX_LAUNCHER_SENSIVITY, 0.1, 1, 0);
   launcher_sensitivity_scale = GTK_SCALE (WID ("unity-launcher-sensitivity"));
   gtk_range_set_adjustment (GTK_RANGE (launcher_sensitivity_scale), launcher_sensitivity_adj);
   gtk_scale_add_mark (launcher_sensitivity_scale, 2, GTK_POS_BOTTOM, NULL);
@@ -1903,7 +1900,7 @@
   g_signal_connect (launcher_sensitivity_adj, "value_changed",
                     G_CALLBACK (on_launchersensitivity_changed), self);
   g_signal_connect (G_OBJECT (launcher_sensitivity_scale), "scroll-event",
-                    G_CALLBACK (on_scale_scroll_event), &launchersensitivity_values);
+                    G_CALLBACK (on_scale_scroll_event), NULL);
   launcher_sensitivity_widget_refresh (launcher_sensitivity_adj, priv->unity_settings);
 
   /* Autohide launcher setting */