Merge lp:~3v1n0/unity/scale-maximized-windows-misalignment-fix into lp:unity

[Marco Trevisan (Treviño)]

LayoutSystem: add ComputeDecorationHeight method to LayoutWindow

Use this only for SwitcherView, while we don't need this trick when using
these windows for generating the spread grid.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4056
http://jenkins.qa.ubuntu.com/job/unity-ci/1384/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/36/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4057
http://jenkins.qa.ubuntu.com/job/unity-ci/1387/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/39

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2015-12-11 12:44:53 +0000
+++ launcher/SwitcherView.cpp	2015-12-16 11:18:42 +0000
@@ -604,8 +604,9 @@
 
   for (Window window : xids)
   {
+    bool selected = (window == model_->DetailSelectionWindow());
     auto layout_window = std::make_shared<LayoutWindow>(window);
-    bool selected = (window == model_->DetailSelectionWindow());
+    layout_window->ComputeDecorationHeight();
     layout_window->selected = selected;
     layout_window->alpha = (selected ? 1.0f : 0.9f) * progress;
 

=== modified file 'tests/test_layout_system.cpp'
--- tests/test_layout_system.cpp	2014-03-10 13:17:01 +0000
+++ tests/test_layout_system.cpp	2015-12-16 11:18:42 +0000
@@ -81,11 +81,71 @@
   auto fake_window = AddFakeWindowToWM(xid);
   wm->Maximize(xid);
 
+  LayoutWindow lwin(xid);
+  EXPECT_EQ(lwin.xid, xid);
+  EXPECT_EQ(lwin.geo, fake_window->geo);
+  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.selected, false);
+  EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
+}
+
+TEST_F(TestLayoutWindow, InitializationMinimizedMaximizedWindow)
+{
+  const Window xid = g_random_int();
+  auto fake_window = AddFakeWindowToWM(xid);
+  wm->Maximize(xid);
+  wm->Minimize(xid);
+
+  LayoutWindow lwin(xid);
+  EXPECT_EQ(lwin.xid, xid);
+  EXPECT_EQ(lwin.geo, fake_window->geo);
+  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.selected, false);
+  EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
+}
+
+TEST_F(TestLayoutWindow, DecorationHeightNormalWindow)
+{
+  const Window xid = g_random_int();
+  auto fake_window = AddFakeWindowToWM(xid);
+
+  LayoutWindow lwin(xid);
+  lwin.ComputeDecorationHeight();
+  EXPECT_EQ(lwin.xid, xid);
+  EXPECT_EQ(lwin.geo, fake_window->geo);
+  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.selected, false);
+  EXPECT_FLOAT_EQ(lwin.scale, 1.0f);
+  EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
+}
+
+TEST_F(TestLayoutWindow, DecorationHeightMinimizedNormalWindow)
+{
+  const Window xid = g_random_int();
+  auto fake_window = AddFakeWindowToWM(xid);
+  wm->Minimize(xid);
+
+  LayoutWindow lwin(xid);
+  lwin.ComputeDecorationHeight();
+  EXPECT_EQ(lwin.xid, xid);
+  EXPECT_EQ(lwin.geo, fake_window->geo);
+  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.selected, false);
+  EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
+}
+
+TEST_F(TestLayoutWindow, DecorationHeightMaximizedWindow)
+{
+  const Window xid = g_random_int();
+  auto fake_window = AddFakeWindowToWM(xid);
+  wm->Maximize(xid);
+
   nux::Geometry expected_geo(fake_window->geo);
   unsigned top_deco = wm->GetWindowDecorationSize(xid, WindowManager::Edge::TOP).height;
   expected_geo.height += top_deco;
 
   LayoutWindow lwin(xid);
+  lwin.ComputeDecorationHeight();
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, expected_geo);
   EXPECT_EQ(lwin.decoration_height, top_deco);
@@ -93,7 +153,7 @@
   EXPECT_EQ(lwin.aspect_ratio, expected_geo.width / static_cast<float>(expected_geo.height));
 }
 
-TEST_F(TestLayoutWindow, InitializationMinimizedMaximizedWindow)
+TEST_F(TestLayoutWindow, DecorationHeightMinimizedMaximizedWindow)
 {
   const Window xid = g_random_int();
   auto fake_window = AddFakeWindowToWM(xid);

=== modified file 'unity-shared/LayoutSystem.cpp'
--- unity-shared/LayoutSystem.cpp	2014-10-09 13:08:19 +0000
+++ unity-shared/LayoutSystem.cpp	2015-12-16 11:18:42 +0000
@@ -301,6 +301,9 @@
  , aspect_ratio(geo.width / static_cast<float>(geo.height))
  , scale(1.0f)
  , alpha(0.0f)
+{}
+
+void LayoutWindow::ComputeDecorationHeight()
 {
   auto& wm = WindowManager::Default();
 

=== modified file 'unity-shared/LayoutSystem.h'
--- unity-shared/LayoutSystem.h	2014-10-09 13:08:19 +0000
+++ unity-shared/LayoutSystem.h	2015-12-16 11:18:42 +0000
@@ -38,6 +38,8 @@
 
   LayoutWindow(Window xid);
 
+  void ComputeDecorationHeight();
+
   Window xid;
 
   nux::Geometry geo;