Merge lp:~sil2100/unity/fix_alt_tab_horrors_6.0 into lp:unity/6.0

[Łukasz Zemczak]

Cherry-picked rev 2870 from lp:unity:
A workaround fix for Alt+TAB picking up wrong window when used on a application group. The check for Quirk::ACTIVE is not valid right now due to the fact we're making the switcher window active prior to display (this is done this way to fix some other bugs). So a workaround is to save the last active window prior to this action and use this during the checks. It fixes a very annoying bug.

- Problem

When tapping Alt+Tab not-too-fast (not doing a quick-tap) when having 2 same application windows, the focus doesn't change to the next window of the application, but stays on the currently active window. It should switch to the next window, just as it does for a quick tap.

- Fix

It's actually fixed with a workaround. The bug appeared actually because we're focusing the switcher window when the switcher is being shown (therefore fixing a few other bugs). But because of this, the Quirk::ACTIVE is on the switcher window, not on the last active window. Because fixing it the right way would probably need more thinking, this is a quick workaround fix.
What we're doing is: we save the last focused/active window before showing the switcher, and using this one as a reference for switching.

- Tests

Covered by 2 autopilot tests.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-09-28 13:24:37 +0000
+++ launcher/SwitcherController.cpp	2012-10-30 16:14:24 +0000
@@ -94,6 +94,11 @@
 
   SelectFirstItem();
 
+  // XXX: Workaround for a problem related to Alt+TAB which is needed since the
+  //   switcher is set as the active window (LP: #1071298)
+  if (model_->Selection()->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE))
+    last_active_selection_ = model_->Selection();
+
   visible_ = true;
 
   if (timeout_length > 0)
@@ -239,7 +244,7 @@
       }
       else
       {
-        if (selection->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE) &&
+        if (selection == last_active_selection_ &&
             !model_->DetailXids().empty ())
         {
           selection->Activate(ActionArg (ActionArg::SWITCHER, 0, model_->DetailXids()[0]));
@@ -274,6 +279,8 @@
 
   ubus_manager_.SendMessage(UBUS_SWITCHER_SHOWN, g_variant_new("(bi)", false, monitor_));
 
+  last_active_selection_ = nullptr;
+
   view_.Release();
 }
 

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-09-28 13:24:37 +0000
+++ launcher/SwitcherController.h	2012-10-30 16:14:24 +0000
@@ -138,6 +138,8 @@
   nux::Color bg_color_;
   DetailMode detail_mode_;
 
+  launcher::AbstractLauncherIcon::Ptr last_active_selection_;
+
   UBusManager ubus_manager_;
   glib::SourceManager sources_;
 };

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-10-12 12:57:35 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-10-30 16:14:24 +0000
@@ -246,6 +246,31 @@
         self.assertProperty(calc_win, is_focused=True)
         self.assertVisibleWindowStack([calc_win, char_win1])
 
+    def test_switcher_rises_next_window_of_same_application(self):
+        """Tests if alt+tab invoked normally switches to the next application
+        window of the same type.
+
+        """
+        char_win1, char_win2 = self.start_applications("Character Map", "Character Map")
+        self.assertVisibleWindowStack([char_win2, char_win1])
+
+        self.keybinding("switcher/reveal_normal")
+        self.assertProperty(char_win1, is_focused=True)
+
+    def test_switcher_rises_other_application(self):
+        """Tests if alt+tab invoked normally switches correctly to the other
+        application window when the last focused application had 2 windows
+
+        """
+        char_win1, char_win2, calc_win = self.start_applications("Character Map", "Character Map", "Calculator")
+        self.assertVisibleWindowStack([calc_win, char_win2, char_win1])
+
+        self.keybinding("switcher/reveal_normal")
+        self.assertProperty(char_win2, is_focused=True)
+
+        self.keybinding("switcher/reveal_normal")
+        self.assertProperty(calc_win, is_focused=True)
+
 
 class SwitcherDetailsTests(SwitcherTestCase):
     """Test the details mode for the switcher."""