Merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/even-top-margin into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Danielle Foré]

* Remove top margins from individual panes
* Double space around the view switcher
* Place a separator above the wallpaper flowbox to give it upper bounds
* Re-color flowbox with the view class
* Make wallpaper view a grid subclass

=== modified file 'src/Views/Dock.vala'
--- src/Views/Dock.vala	2017-02-11 23:12:13 +0000
+++ src/Views/Dock.vala	2017-02-15 02:31:39 +0000
@@ -29,8 +29,6 @@
         column_spacing = 12;
         halign = Gtk.Align.CENTER;
         row_spacing = 6;
-        margin = 24;
-        margin_top = 64;
 
         var icon_size = new Granite.Widgets.ModeButton ();
         icon_size.append_text (_("Small"));

=== modified file 'src/Views/HotCorners.vala'
--- src/Views/HotCorners.vala	2017-02-08 19:25:20 +0000
+++ src/Views/HotCorners.vala	2017-02-15 02:31:39 +0000
@@ -23,9 +23,7 @@
     construct {
         column_spacing = 12;
         row_spacing = 24;
-        margin = 32;
         halign = Gtk.Align.CENTER;
-        valign = Gtk.Align.CENTER;
 
         var expl = new Gtk.Label (_("When the cursor enters the corner of the display:"));
         expl.get_style_context ().add_class ("h4");

=== modified file 'src/Views/Wallpaper.vala'
--- src/Views/Wallpaper.vala	2017-02-14 19:30:26 +0000
+++ src/Views/Wallpaper.vala	2017-02-15 02:31:39 +0000
@@ -77,7 +77,7 @@
     public abstract void set_background_file (string filename) throws IOError;
 }
 
-public class Wallpaper : Gtk.EventBox {
+public class Wallpaper : Gtk.Grid {
     // name of the default-wallpaper-link that we can prevent loading it again
     // (assumes that the defaultwallpaper is also in the system wallpaper directory)
     static string DEFAULT_LINK = "file://%s/elementaryos-default".printf (SYSTEM_BACKGROUNDS_PATH);
@@ -121,10 +121,12 @@
             warning (e.message);
         }
 
+        var separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+
         wallpaper_view = new Gtk.FlowBox ();
         wallpaper_view.activate_on_single_click = true;
         wallpaper_view.column_spacing = wallpaper_view.row_spacing = 6;
-        wallpaper_view.margin = 12;
+        wallpaper_view.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
         wallpaper_view.homogeneous = true;
         wallpaper_view.selection_mode = Gtk.SelectionMode.SINGLE;
         wallpaper_view.child_activated.connect (update_checked_wallpaper);
@@ -179,11 +181,9 @@
         actionbar.pack_end (color_button);
         actionbar.pack_end (combo);
 
-        var grid = new Gtk.Grid ();
-        grid.margin_top = 24;
-        grid.attach (scrolled, 0, 0, 1, 1);
-        grid.attach (actionbar, 0, 1, 1, 1);
-        add (grid);
+        attach (separator, 0, 0, 1, 1);
+        attach (scrolled, 0, 1, 1, 1);
+        attach (actionbar, 0, 2, 1, 1);
     }
 
     private void load_settings () {

=== modified file 'src/desktop-plug.vala'
--- src/desktop-plug.vala	2016-12-21 18:48:26 +0000
+++ src/desktop-plug.vala	2017-02-15 02:31:39 +0000
@@ -53,7 +53,7 @@
             var stack_switcher = new Gtk.StackSwitcher ();
             stack_switcher.stack = stack;
             stack_switcher.halign = Gtk.Align.CENTER;
-            stack_switcher.margin_top = 12;
+            stack_switcher.margin = 24;
 
             main_grid.attach (stack_switcher, 0, 0, 1, 1);
             main_grid.attach (stack, 0, 1, 1, 1);