Merge lp:~elementary-apps/wingpanel-indicator-sound/reduce-margins into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Danielle Foré]

reduce extra margins

Reduces extra margins to match notification margin (#1461294)

[Cody Garver (codygarver)]

Conflicts with trunk

review: Needs Resubmitting

[Djax (parnold-x)]

I included this already...

Unmerged revisions

5. By Danielle Foré on 2015-06-02

kill extra margins

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-06-02 19:41:45 +0000
+++ src/Indicator.vala	2015-06-02 23:17:43 +0000
@@ -189,7 +189,7 @@
 			main_grid.attach (first_seperator, 0, position++, 1, 1);
 
 			volume_scale = new Widgets.IndicatorScale ("audio-volume-high-symbolic", true, 0.0, max_volume, 0.01);
-			volume_scale.margin_start = 12;
+			volume_scale.margin_start = 6;
 
 			volume_scale.get_switch ().active = volume_control.mute;
 			volume_scale.get_switch ().notify["active"].connect (() => {
@@ -216,7 +216,7 @@
 			main_grid.attach (new Wingpanel.Widgets.IndicatorSeparator (), 0, position++, 1, 1);
 
 			mic_scale = new Widgets.IndicatorScale ("audio-input-microphone-symbolic", true, 0.0, 1.0, 0.01);
-			mic_scale.margin_start = 12;
+			mic_scale.margin_start = 6;
 
 			mic_scale.get_switch ().notify["active"].connect (() => {
 				if (mic_scale.get_switch ().active) {

=== modified file 'src/Widgets/IndicatorScale.vala'
--- src/Widgets/IndicatorScale.vala	2015-06-02 19:41:45 +0000
+++ src/Widgets/IndicatorScale.vala	2015-06-02 23:17:43 +0000
@@ -22,8 +22,6 @@
 
 	public IndicatorScale (string icon, bool active = false, double min, double max, double step) {
 		this.hexpand = true;
-		this.margin_top = 6;
-		this.margin_bottom = 3;
 
 		image = new Gtk.Image.from_icon_name (icon, Gtk.IconSize.DIALOG);
 		image.halign = Gtk.Align.START;
@@ -31,7 +29,7 @@
 		this.attach (image, 0, 0, 1, 1);
 
 		scale_widget = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, min, max, step);
-		scale_widget.margin_start = 12;
+		scale_widget.margin_start = 6;
 		scale_widget.set_size_request (175, -1);
 		scale_widget.set_draw_value (false);
 		this.attach (scale_widget, 1, 0, 1, 1);
@@ -39,7 +37,7 @@
 		switch_widget = new Gtk.Switch ();
 		switch_widget.active = active;
 		switch_widget.halign = Gtk.Align.END;
-		switch_widget.margin_start = 12;
+		switch_widget.margin_start = 6;
 		switch_widget.margin_end = 0;
 
 		this.attach (switch_widget, 2, 0, 1, 1);

=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala	2015-06-02 19:41:45 +0000
+++ src/Widgets/MprisGui.vala	2015-06-02 23:17:43 +0000
@@ -39,14 +39,14 @@
      * @param client The underlying MprisClient instance to use
      */
     public ClientWidget(Services.MprisClient client) {
-        Object(orientation: Gtk.Orientation.VERTICAL, spacing: 3);
+        Object(orientation: Gtk.Orientation.VERTICAL, spacing: 0);
 
         this.client = client;
         load_remote_art_cancel = new Cancellable ();
 
         player_revealer = new Gtk.Revealer ();
         player_revealer.reveal_child = true;
-        var player_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
+        var player_box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
 
         if (client.player.desktop_entry != "") {
             var ainfo = new DesktopAppInfo(client.player.desktop_entry + ".desktop");
@@ -63,10 +63,8 @@
             background.set_from_icon_name("emblem-music-symbolic", Gtk.IconSize.DIALOG);
         }
 
-        background.margin_start = 12;
+        background.margin_start = 6;
         background.margin_end = 6;
-        this.margin_top = 6;
-        this.margin_bottom = 6;
 
         player_box.pack_start(background, false, false, 0);
 
@@ -84,7 +82,7 @@
         titles.pack_start(artist_label, false, false, 0);
         player_box.pack_start(titles, false, false, 0);
 
-        var controls = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
+        var controls = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
 
         var btn = new Gtk.Button.from_icon_name("media-seek-backward-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
         btn.set_sensitive(false);
@@ -268,4 +266,4 @@
                 artist_label.set_text(_("Not currently playing"));
         }
     }
-}
\ No newline at end of file
+}