Merge lp:~azzar1/unity/dash-window-buttons-align into lp:unity

[Andrea Azzarone]

Fix the alignment of the dash window buttons.

== Problem ==
The alignment of the dash window buttons is wrong.

== Fix ==
Update the padding values.

== Test ==
Not applicable

== Screenshot ==
http://ubuntuone.com/0uvd039cgo6cdd7cmZUPKv

[Andrea Cimitan (cimi)]

Well done!
Approving design and code

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

[italian]
Maledetto, mi sovrascrivi il codice!! :)
[/italian]

Code looks fine (for now).

review: Approve

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2012-03-21 12:31:11 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2012-03-23 12:50:29 +0000
@@ -306,14 +306,17 @@
 
   nux::Geometry geo = GetGeometry();
 
+  int h_padding = _padding - 2;
+  int v_padding = 1;
+
   old_window_buttons_w = _window_buttons->GetContentWidth();
-  _window_buttons->SetGeometry(geo.x + _padding, geo.y, old_window_buttons_w, geo.height);
+  _window_buttons->SetGeometry(geo.x + h_padding, geo.y + v_padding, old_window_buttons_w, geo.height);
   _window_buttons->ComputeContentSize();
   new_window_buttons_w = _window_buttons->GetContentWidth();
 
   /* Explicitly set the size and position of the widgets */
-  geo.x += _padding + new_window_buttons_w + _padding;
-  geo.width -= _padding + new_window_buttons_w + _padding;
+  geo.x += h_padding + new_window_buttons_w + h_padding;
+  geo.width -= h_padding + new_window_buttons_w + h_padding;
 
   old_menu_area_w = _menu_layout->GetContentWidth();
   _menu_layout->SetGeometry(geo.x, geo.y, old_menu_area_w, geo.height);