Merge lp:~3v1n0/unity/launcher-primary-monitor into lp:unity

[Marco Trevisan (Treviño)]

LauncherController: show a launcher in the primary monitor if set

This ensures that the launcher is shown only on the primary one, not on the one at the left.

Make the Launcher controller be aware of the primary monitor.
This ensures that the launcher is shown only on the primary one.

Added a manual test for now, AP tests are already done, but needs to be polished.
I'll merge them soon.

18:03:18 <didrocks> just propose the branch with a manual test :)
18:03:30 <didrocks> for now
18:03:34 <didrocks> and automate later
18:06:15 <didrocks> tell in the MR that you discussed it with me
18:06:20 <didrocks> and UNBLOCK

;)

[Andrea Azzarone (azzar1)]

Looks good to me!

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-03-21 12:31:11 +0000
+++ manual-tests/Launcher.txt	2012-03-21 19:52:23 +0000
@@ -169,3 +169,22 @@
 
 Outcome:
   * The icon should go back to its correct position in the launcher.
+
+
+Test launchers with multiple monitors
+-------------------------------------
+This test checks if the launchers are shown in the correct monitor when
+using a multimonitor setup.
+
+#. Open CCSM and and set the Experimental -> "Launcher Monitors" unity setting
+   to "All Desktops"
+
+Outcome:
+  * A launcher should be shown in each monitor.
+
+#. Open CCSM and and set the Experimental -> "Launcher Monitors" unity setting
+   to "Primary Desktop"
+
+Outcome:
+  * Only the primary monitor should show a launcher. Changing the primary monitor
+    from gnome-control-center -> Monitor should update the launcher position.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-03-21 14:44:41 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-21 19:52:23 +0000
@@ -118,7 +118,7 @@
 
   void SetupBamf();
 
-  void EnsureLaunchers(std::vector<nux::Geometry> const& monitors);
+  void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
 
   void OnExpoActivated();
 
@@ -188,6 +188,7 @@
 {
   UScreen* uscreen = UScreen::GetDefault();
   auto monitors = uscreen->GetMonitors();
+  int primary = uscreen->GetPrimaryMonitor();
 
   launcher_open = false;
   launcher_keynav = false;
@@ -195,7 +196,7 @@
   reactivate_keynav = false;
   keynav_restore_window_ = true;
 
-  EnsureLaunchers(monitors);
+  EnsureLaunchers(primary, monitors);
 
   launcher_ = launchers[0];
 
@@ -279,39 +280,58 @@
   delete device_section_;
 }
 
-void Controller::Impl::EnsureLaunchers(std::vector<nux::Geometry> const& monitors)
+void Controller::Impl::EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors)
 {
-  unsigned int num_monitors;
-  if (parent_->multiple_launchers)
+  unsigned int num_monitors = monitors.size();
+  unsigned int num_launchers = parent_->multiple_launchers ? num_monitors : 1;
+  unsigned int launchers_size = launchers.size();
+  unsigned int last_monitor = 0;
+
+  if (num_launchers == 1)
   {
-    num_monitors = monitors.size();
+    if (launchers_size == 0)
+    {
+      launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(primary)));
+    }
+    else if (!launchers[0].IsValid())
+    {
+      launchers[0] = nux::ObjectPtr<Launcher>(CreateLauncher(primary));
+    }
+
+    launchers[0]->monitor(primary);
+    launchers[0]->Resize();
+    last_monitor = 1;
   }
   else
   {
-    num_monitors = 1;
-  }
-
-  unsigned int i;
-  for (i = 0; i < num_monitors; i++)
-  {
-    if (i >= launchers.size())
-      launchers.push_back(nux::ObjectPtr<Launcher> (CreateLauncher(i)));
-
-    launchers[i]->Resize();
-  }
-
-  for (; i < launchers.size(); ++i)
+    for (unsigned int i = 0; i < num_monitors; i++, last_monitor++)
+    {
+      if (i >= launchers_size)
+      {
+        launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(i)));
+      }
+
+      launchers[i]->monitor(i);
+      launchers[i]->Resize();
+    }
+  }
+
+  for (unsigned int i = last_monitor; i < launchers_size; ++i)
   {
     auto launcher = launchers[i];
     if (launcher.IsValid())
+    {
+      parent_->RemoveChild(launcher.GetPointer());
       launcher->GetParent()->UnReference();
+    }
   }
-  launchers.resize(num_monitors);
+
+  launchers.resize(num_launchers);
 }
 
 void Controller::Impl::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)
 {
-  EnsureLaunchers(monitors);
+  EnsureLaunchers(primary_monitor, monitors);
 }
 
 void Controller::Impl::OnWindowFocusChanged (guint32 xid)
@@ -803,7 +823,8 @@
   multiple_launchers.changed.connect([&](bool value) -> void {
     UScreen* uscreen = UScreen::GetDefault();
     auto monitors = uscreen->GetMonitors();
-    pimpl->EnsureLaunchers(monitors);
+    int primary = uscreen->GetPrimaryMonitor();
+    pimpl->EnsureLaunchers(primary, monitors);
     options()->show_for_all = !value;
   });
 }