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

Proposed by Kirill Romanov
Status: Rejected
Rejected by: Daniel Fore
Proposed branch: lp:~djaler1/slingshot/resurrection_icon_size_option
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 50 lines (+5/-3)
2 files modified
src/Backend/App.vala (+3/-2)
src/Widgets/AppEntry.vala (+2/-1)
To merge this branch: bzr merge lp:~djaler1/slingshot/resurrection_icon_size_option
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+297411@code.launchpad.net

Description of the change

Resurrection of option for change icon size by gsettings

To post a comment you must log in.
Revision history for this message
Daniel Fore (danrabbit) wrote :

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

Unmerged revisions

659. By Kirill Romanov

Resurrection of option for change icon size by gsettings

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
72 private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";72 private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";
73 private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";73 private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";
74 private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};74 private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
75 private static int ICON_SIZE = Slingshot.settings.icon_size;
7576
76 public App (GMenu.TreeEntry entry) {77 public App (GMenu.TreeEntry entry) {
77 app_type = AppType.APP;78 app_type = AppType.APP;
@@ -93,7 +94,7 @@
93 }94 }
9495
95 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();96 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
96 if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {97 if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
97 icon = new ThemedIcon ("application-default-icon");98 icon = new ThemedIcon ("application-default-icon");
98 }99 }
99 }100 }
@@ -121,7 +122,7 @@
121 }122 }
122123
123 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();124 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
124 if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {125 if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
125 icon = new ThemedIcon ("application-default-icon");126 icon = new ThemedIcon ("application-default-icon");
126 }127 }
127128
128129
=== 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 @@
6262
63#if HAS_PLANK_0_1163#if HAS_PLANK_0_11
64 private const int SURFACE_SIZE = 48;64 private const int SURFACE_SIZE = 48;
65 private static int ICON_SIZE = Slingshot.settings.icon_size;
65 private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");66 private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");
6667
67 private static Plank.DBusClient plank_client;68 private static Plank.DBusClient plank_client;
@@ -97,7 +98,7 @@
9798
98 image = new Gtk.Image ();99 image = new Gtk.Image ();
99 image.gicon = app.icon;100 image.gicon = app.icon;
100 image.pixel_size = 64;101 image.pixel_size = ICON_SIZE;
101 image.margin_top = 12;102 image.margin_top = 12;
102103
103 count_image = new Gtk.Image ();104 count_image = new Gtk.Image ();

Subscribers

People subscribed via source and target branches