Merge lp:~3v1n0/unity/single-workspace-scale-fix-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

PluginAdapterCompiz: ignore offscreen windows when looking for the top one

Ported branch lp:~3v1n0/unity/single-workspace-scale-fix/+merge/112867 to 5.0

[Brandon Schaefer (brandontschaefer)]

Looks good and confirmed working! +1

review: Approve

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-04-26 05:56:55 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2012-06-29 23:38:19 +0000
@@ -533,9 +533,7 @@
 PluginAdapter::IsWindowOnTop(guint32 xid)
 {
   Window win = xid;
-  CompWindow* window;
-
-  window = m_Screen->findWindow(win);
+  CompWindow* window = m_Screen->findWindow(win);
 
   if (window)
   {
@@ -543,6 +541,7 @@
       return false;
 
     CompPoint window_vp = window->defaultViewport();
+    nux::Geometry const& window_vp_geo = GetWorkAreaGeometry(window->id());
     std::vector<Window> const& our_xids = nux::XInputWindow::NativeHandleList();
 
     for (CompWindow* sibling = window->next; sibling; sibling = sibling->next)
@@ -550,6 +549,13 @@
       if (sibling->defaultViewport() == window_vp && !sibling->minimized() &&
           sibling->isMapped() && sibling->isViewable() && !sibling->inShowDesktopMode() &&
           !(sibling->state() & CompWindowStateAboveMask) &&
+          !(sibling->type() & CompWindowTypeSplashMask) &&
+          !(sibling->type() & CompWindowTypeDockMask) &&
+          /* FIXME: This should be included by the above defaultViewport() check,
+           * but it doesn't seem to work correctly when there's only one workspace
+           * enabled, so please drop the line above when bug #996604 is fixed in
+           * Compiz. */
+          !window_vp_geo.Intersect(GetWindowGeometry(sibling->id())).IsNull() &&
           std::find(our_xids.begin(), our_xids.end(), sibling->id()) == our_xids.end())
       {
         return false;

=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-06-21 17:30:08 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-06-29 23:38:19 +0000
@@ -456,6 +456,33 @@
         self.assertTrue(mah_win2.is_hidden)
         self.assertVisibleWindowStack([mah_win1, calc_win])
 
+    def test_clicking_icon_twice_initiates_spread(self):
+        """This tests shows that when you click on a launcher icon twice,
+        when an application window is focused, the spread is initiated.
+        """
+        calc = self.start_app("Calculator")
+        [calc_win1] = calc.get_windows()
+        self.assertTrue(calc_win1.is_focused)
+
+        self.start_app("Calculator")
+        # Sleeping due to the start_app only waiting for the bamf model to be
+        # updated with the application.  Since the app has already started,
+        # and we are just waiting on a second window, however a defined sleep
+        # here is likely to be problematic.
+        # TODO: fix bamf emulator to enable waiting for new windows.
+        sleep(1)
+        [calc_win2] = [w for w in calc.get_windows() if w.x_id != calc_win1.x_id]
+
+        self.assertVisibleWindowStack([calc_win2, calc_win1])
+        self.assertTrue(calc_win2.is_focused)
+
+        calc_icon = self.launcher.model.get_icon_by_desktop_id(calc.desktop_file)
+        self.addCleanup(self.keybinding, "spread/cancel")
+        self.launcher_instance.click_launcher_icon(calc_icon)
+
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+        self.assertThat(self.window_manager.scale_active_for_group, Eventually(Equals(True)))
+
     def test_icon_shows_on_quick_application_reopen(self):
         """Icons should stay on launcher when an application is quickly closed/reopened."""
         calc = self.start_app("Calculator")