Merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/bigger-thumbs into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Felipe Escoto
Approved revision: 561
Merged at revision: 561
Proposed branch: lp:~elementary-pantheon/switchboard-plug-pantheon-shell/bigger-thumbs
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 37 lines (+2/-3)
3 files modified
src/Views/Wallpaper.vala (+0/-1)
src/Widgets/SolidColorContainer.vala (+1/-1)
src/Widgets/WallpaperContainer.vala (+1/-1)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/bigger-thumbs
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+317728@code.launchpad.net

Commit message

Wallpaper.vala: Remove spacing from flowbox children
SolidColorContainer.vala,
WallpaperContainer.vala: Increase thumbnail width by 12 pixels

Description of the change

Squeeze out just a few more pixels to get thumbs as wide as they can be without overflowing into another row at Switchboard's default size.

Flowbox children already have built in margins so no need for extra spacing

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Views/Wallpaper.vala'
2--- src/Views/Wallpaper.vala 2017-02-15 02:20:48 +0000
3+++ src/Views/Wallpaper.vala 2017-02-19 19:32:01 +0000
4@@ -125,7 +125,6 @@
5
6 wallpaper_view = new Gtk.FlowBox ();
7 wallpaper_view.activate_on_single_click = true;
8- wallpaper_view.column_spacing = wallpaper_view.row_spacing = 6;
9 wallpaper_view.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
10 wallpaper_view.homogeneous = true;
11 wallpaper_view.selection_mode = Gtk.SelectionMode.SINGLE;
12
13=== modified file 'src/Widgets/SolidColorContainer.vala'
14--- src/Widgets/SolidColorContainer.vala 2017-02-07 01:44:27 +0000
15+++ src/Widgets/SolidColorContainer.vala 2017-02-19 19:32:01 +0000
16@@ -30,7 +30,7 @@
17 }
18
19 public SolidColorContainer (string color_value) {
20- Object (color: color_value, thumb: new Gdk.Pixbuf (Gdk.Colorspace.RGB, false, 8, 150, 100));
21+ Object (color: color_value, thumb: new Gdk.Pixbuf (Gdk.Colorspace.RGB, false, 8, 162, 100));
22 }
23
24 construct {
25
26=== modified file 'src/Widgets/WallpaperContainer.vala'
27--- src/Widgets/WallpaperContainer.vala 2017-02-12 04:34:34 +0000
28+++ src/Widgets/WallpaperContainer.vala 2017-02-19 19:32:01 +0000
29@@ -91,7 +91,7 @@
30 if (Cache.is_cached (uri)) {
31 thumb = Cache.get_cached_image (uri);
32 } else {
33- thumb = new Gdk.Pixbuf.from_file_at_scale (GLib.Filename.from_uri (uri), 150, 100, false);
34+ thumb = new Gdk.Pixbuf.from_file_at_scale (GLib.Filename.from_uri (uri), 162, 100, false);
35 Cache.cache_image_pixbuf (thumb, uri);
36 }
37 }

Subscribers

People subscribed via source and target branches