Merge lp:~djaler1/slingshot/resurrection_icon_size_option into lp:~elementary-pantheon/slingshot/trunk

[Kirill Romanov]

Resurrection of option for change icon size by gsettings

[Danielle Foré (danrabbit)]

We don't use configuration options for design of engineering decisions

Unmerged revisions

659. By Kirill Romanov on 2016-06-14

Resurrection of option for change icon size by gsettings

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2016-02-17 19:06:52 +0000
+++ src/Backend/App.vala	2016-06-14 22:17:10 +0000
@@ -72,6 +72,7 @@
     private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";
     private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";
     private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
+    private static int ICON_SIZE = Slingshot.settings.icon_size;
 
     public App (GMenu.TreeEntry entry) {
         app_type = AppType.APP;
@@ -93,7 +94,7 @@
         }
 
         weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
-        if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
+        if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
             icon = new ThemedIcon ("application-default-icon");
         }
     }
@@ -121,7 +122,7 @@
         }
 
         weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
-        if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
+        if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
             icon = new ThemedIcon ("application-default-icon");
         }
 
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-02-17 19:06:52 +0000
+++ src/Widgets/AppEntry.vala	2016-06-14 22:17:10 +0000
@@ -62,6 +62,7 @@
 
 #if HAS_PLANK_0_11
     private const int SURFACE_SIZE = 48;
+    private static int ICON_SIZE = Slingshot.settings.icon_size;
     private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");
 
     private static Plank.DBusClient plank_client;
@@ -97,7 +98,7 @@
 
         image = new Gtk.Image ();
         image.gicon = app.icon;
-        image.pixel_size = 64;
+        image.pixel_size = ICON_SIZE;
         image.margin_top = 12;
 
         count_image = new Gtk.Image ();