Merge lp:~brandontschaefer/unity/overlay-window-button-hi-dpi-fix into lp:unity

[Brandon Schaefer]

When we update the OverlayWindowButtons geometry, make sure we ask the WindowButtons to update their geo as well. (This means poking it as if the DPI has changed). This way the overlay window buttons will be the correct sides per monitor.

When we update the OverlayWindowButtons geometry, make sure we ask the WindowButtons to update their geo as well. (This means poking it as if the DPI has changed).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3729
http://jenkins.qa.ubuntu.com/job/unity-ci/721/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/257/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/255/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/721/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3730
http://jenkins.qa.ubuntu.com/job/unity-ci/725/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/259

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/725/rebuild

review: Approve (continuous-integration)

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

Yeah!

review: Approve

=== modified file 'unity-shared/OverlayWindowButtons.cpp'
--- unity-shared/OverlayWindowButtons.cpp	2014-03-03 16:48:07 +0000
+++ unity-shared/OverlayWindowButtons.cpp	2014-03-03 16:48:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013-2014 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -56,13 +56,18 @@
 void OverlayWindowButtons::UpdateGeometry()
 {
   int monitor = unity::UScreen::GetDefault()->GetMonitorWithMouse();
+  int height  = panel::Style::Instance().PanelHeight(monitor);
   nux::Geometry const& geo = unity::UScreen::GetDefault()->GetMonitorGeometry(monitor);
 
   SetX(geo.x + MAIN_LEFT_PADDING);
-  SetY(geo.y + MENUBAR_PADDING);
-  SetHeight(panel::Style::Instance().PanelHeight(monitor));
+  SetY(geo.y);
+  SetHeight(height);
 
   window_buttons_->monitor = monitor;
+
+  window_buttons_->SetMinimumHeight(height);
+  window_buttons_->SetMaximumHeight(height);
+  window_buttons_->UpdateDPIChanged();
 }
 
 void OverlayWindowButtons::Show()