Merge lp:~3v1n0/unity/launchers-setup-struts into lp:unity

[Marco Trevisan (Treviño)]

LauncherController: make the controller enable the launcher struts, based on hide-mode option

Launcher struts should be set on each constructed launcher, depending on the auto-hide option.
Fixed launcher controller to always do that. At this point the launcher struts hack is really no more needed.

Unit tests added.

[Brandon Schaefer (brandontschaefer)]

Looks good, and confirmed working. +1

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-25 15:54:29 +0000
+++ launcher/Launcher.cpp	2012-08-30 21:15:25 +0000
@@ -92,7 +92,6 @@
 const float DRAG_OUT_PIXELS = 300.0f;
 
 const std::string DND_CHECK_TIMEOUT = "dnd-check-timeout";
-const std::string STRUT_HACK_TIMEOUT = "strut-hack-timeout";
 const std::string START_DRAGICON_TIMEOUT = "start-dragicon-timeout";
 const std::string SCROLL_TIMEOUT = "scroll-timeout";
 const std::string ANIMATION_IDLE = "animation-idle";
@@ -215,7 +214,7 @@
   launcher_sheen_ = cache.FindTexture("dash_sheen", 0, 0, cb);
   launcher_pressure_effect_ = cache.FindTexture("launcher_pressure_effect", 0, 0, cb);
 
-  options.changed.connect(sigc::mem_fun (this, &Launcher::OnOptionsChanged));
+  options.changed.connect(sigc::mem_fun(this, &Launcher::OnOptionsChanged));
 }
 
 /* Introspection */
@@ -1428,21 +1427,9 @@
 
 /* End Launcher Show/Hide logic */
 
-// Hacks around compiz failing to see the struts because the window was just mapped.
-bool Launcher::StrutHack()
-{
-  _parent->InputWindowEnableStruts(false);
-
-  if (options()->hide_mode == LAUNCHER_HIDE_NEVER)
-    _parent->InputWindowEnableStruts(true);
-
-  return false;
-}
-
 void Launcher::OnOptionsChanged(Options::Ptr options)
 {
    UpdateOptions(options);
-
    options->option_changed.connect(sigc::mem_fun(this, &Launcher::OnOptionChanged));
 }
 
@@ -1473,26 +1460,9 @@
 
 void Launcher::SetHideMode(LauncherHideMode hidemode)
 {
-  if (hidemode != LAUNCHER_HIDE_NEVER)
-  {
-    _parent->InputWindowEnableStruts(false);
-  }
-  else
-  {
-    static bool first_time = true;
-
-    _parent->EnableInputWindow(true, launcher::window_title, false, false);
-
-    if (first_time && !sources_.GetSource(STRUT_HACK_TIMEOUT))
-    {
-      sources_.AddTimeout(1000, sigc::mem_fun(this, &Launcher::StrutHack), STRUT_HACK_TIMEOUT);
-      first_time = false;
-    }
-
-    _parent->InputWindowEnableStruts(true);
-  }
-
-  _hide_machine.SetMode((LauncherHideMachine::HideMode) hidemode);
+  bool fixed_launcher = (hidemode == LAUNCHER_HIDE_NEVER);
+  _parent->InputWindowEnableStruts(fixed_launcher);
+  _hide_machine.SetMode(static_cast<LauncherHideMachine::HideMode>(hidemode));
   EnsureAnimation();
 }
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-29 08:16:08 +0000
+++ launcher/LauncherController.cpp	2012-08-30 21:15:25 +0000
@@ -280,7 +280,7 @@
   launcher_window->SetBackgroundColor(nux::color::Transparent);
   launcher_window->ShowWindow(true);
   launcher_window->EnableInputWindow(true, launcher::window_title, false, false);
-  launcher_window->InputWindowEnableStruts(false);
+  launcher_window->InputWindowEnableStruts(parent_->options()->hide_mode == LAUNCHER_HIDE_NEVER);
   launcher_window->SetEnterFocusInputArea(launcher);
 
   launcher->launcher_addrequest.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequest));

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-08-10 09:58:49 +0000
+++ tests/test_launcher_controller.cpp	2012-08-30 21:15:25 +0000
@@ -52,7 +52,6 @@
 class MockBamfLauncherIcon : public BamfLauncherIcon
 {
 public:
-  //typedef nux::ObjectPtr<MockMockLauncherIcon> Ptr;
   MockBamfLauncherIcon(BamfApplication* app)
     : BamfLauncherIcon(app) {}
 
@@ -71,7 +70,6 @@
 
   virtual void SetUp()
   {
-    lc.options = std::make_shared<Options>();
     lc.multiple_launchers = true;
   }
 
@@ -98,6 +96,8 @@
 {
   EXPECT_NE(lc.options(), nullptr);
   EXPECT_TRUE(lc.multiple_launchers());
+  ASSERT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launcher().monitor(), 0);
 }
 
 TEST_F(TestLauncherController, MultimonitorMultipleLaunchers)
@@ -230,4 +230,65 @@
   favorite_store.favorite_removed.emit(USC_DESKTOP);
 }
 
-}
+TEST_F(TestLauncherController, EnabledStrutsByDefault)
+{
+  EXPECT_EQ(lc.launcher().options()->hide_mode, LAUNCHER_HIDE_NEVER);
+  EXPECT_TRUE(lc.launcher().GetParent()->InputWindowStrutsEnabled());
+}
+
+TEST_F(TestLauncherController, EnabledStrutsOnNeverHide)
+{
+  lc.multiple_launchers = true;
+  uscreen.SetupFakeMultiMonitor();
+  lc.options()->hide_mode = LAUNCHER_HIDE_NEVER;
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_TRUE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+}
+
+TEST_F(TestLauncherController, DisabledStrutsOnAutoHide)
+{
+  lc.multiple_launchers = true;
+  uscreen.SetupFakeMultiMonitor();
+  lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_FALSE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+}
+
+TEST_F(TestLauncherController, EnabledStrutsAddingNewLaunchersOnAutoHide)
+{
+  // This makes the controller to add multiple launchers
+  lc.multiple_launchers = true;
+  lc.options()->hide_mode = LAUNCHER_HIDE_NEVER;
+  uscreen.SetupFakeMultiMonitor();
+
+  // This makes the controller to remove unneeded launchers
+  lc.multiple_launchers = false;
+
+  // This makes the controller to add again new launchers
+  lc.multiple_launchers = true;
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_TRUE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+}
+
+TEST_F(TestLauncherController, DisabledStrutsAddingNewLaunchersOnNeverHide)
+{
+  // This makes the controller to add multiple launchers
+  lc.multiple_launchers = true;
+  lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
+  uscreen.SetupFakeMultiMonitor();
+
+  // This makes the controller to remove unneeded launchers
+  lc.multiple_launchers = false;
+
+  // This makes the controller to add again new launchers
+  lc.multiple_launchers = true;
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_FALSE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+}
+
+}
+