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

Proposed by Kirill Romanov on 2016-06-14
Status: Rejected
Rejected by: Daniel Fore on 2016-06-14
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 2016-06-14 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.
Daniel Fore (danrabbit) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Backend/App.vala'
2--- src/Backend/App.vala 2016-02-17 19:06:52 +0000
3+++ src/Backend/App.vala 2016-06-14 22:17:10 +0000
4@@ -72,6 +72,7 @@
5 private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";
6 private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";
7 private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
8+ private static int ICON_SIZE = Slingshot.settings.icon_size;
9
10 public App (GMenu.TreeEntry entry) {
11 app_type = AppType.APP;
12@@ -93,7 +94,7 @@
13 }
14
15 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
16- if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
17+ if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
18 icon = new ThemedIcon ("application-default-icon");
19 }
20 }
21@@ -121,7 +122,7 @@
22 }
23
24 weak Gtk.IconTheme theme = Gtk.IconTheme.get_default ();
25- if (theme.lookup_by_gicon (icon, 64, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
26+ if (theme.lookup_by_gicon (icon, ICON_SIZE, Gtk.IconLookupFlags.GENERIC_FALLBACK|Gtk.IconLookupFlags.USE_BUILTIN) == null) {
27 icon = new ThemedIcon ("application-default-icon");
28 }
29
30
31=== modified file 'src/Widgets/AppEntry.vala'
32--- src/Widgets/AppEntry.vala 2016-02-17 19:06:52 +0000
33+++ src/Widgets/AppEntry.vala 2016-06-14 22:17:10 +0000
34@@ -62,6 +62,7 @@
35
36 #if HAS_PLANK_0_11
37 private const int SURFACE_SIZE = 48;
38+ private static int ICON_SIZE = Slingshot.settings.icon_size;
39 private static Plank.DockTheme plank_theme = new Plank.DockTheme ("Gtk+");
40
41 private static Plank.DBusClient plank_client;
42@@ -97,7 +98,7 @@
43
44 image = new Gtk.Image ();
45 image.gicon = app.icon;
46- image.pixel_size = 64;
47+ image.pixel_size = ICON_SIZE;
48 image.margin_top = 12;
49
50 count_image = new Gtk.Image ();

Subscribers

People subscribed via source and target branches