Merge lp:~brandontschaefer/unity/lp.1100962-fix-hud-focus-problem-6.0 into lp:unity/6.0

[Brandon Schaefer]

The Hud now saves the last_focused_window before opening the Hud.

=== Problem ===
When Alt+Tab was used, a last_focused_window was being saved. This is used when restoring a window if Alt+Tab does not focus a new window. The problem is the Hud does not save this window, so after an Alt+Tab, the last_focused_window was pointed to the window before the Alt+Tab. Then opening/closing the Hud would cause the Hud to attempt to restore the lat_focsued_window if it exited, since Alt+Tab was saving it, it would focus the window before the Alt+tab (incorrect).

=== Fix ===
We have the Hud save the last_focused_window as the window that focused before opening the Hud...

=== Test ===
There is an AP test for this.

[Łukasz Zemczak (sil2100)]

Same bug, same awesomeness +1.

review: Approve

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-09-18 17:39:36 +0000
+++ hud/HudController.cpp	2013-01-17 21:58:22 +0000
@@ -369,6 +369,8 @@
     focused_app_icon_ = focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
   }
 
+  WindowManager::Default()->saveInputFocus();
+
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
   SetIcon(focused_app_icon_);
 

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-09-18 13:25:17 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-01-17 21:58:22 +0000
@@ -417,10 +417,10 @@
 
         (x,y,w,h) = self.hud.geometry
         (screen_x,screen_y,screen_w,screen_h) = self.screen_geo.get_monitor_geometry(current_monitor)
-        
+
         self.mouse.move(x + w + (screen_w-((screen_x-x)+w))/2, y + h + (screen_h-((screen_y-y)+h))/2)
         self.mouse.click()
-        
+
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
     def test_closes_then_focuses_window_on_mouse_down(self):
@@ -442,6 +442,20 @@
 
         self.assertProperty(char_win, is_active=True)
 
+    def test_hud_does_not_focus_wrong_window_after_alt_tab(self):
+        """Test the Hud focuses the correct window after an Alt+Tab."""
+
+        char_win = self.start_app('Character Map')
+        self.start_app('Calculator')
+
+        self.keybinding("switcher/reveal_normal")
+
+        self.hud.ensure_visible()
+        self.hud.ensure_hidden()
+
+        self.assertProperty(char_win, is_active=True)
+
+
 class HudLauncherInteractionsTests(HudTestsBase):
 
     launcher_modes = [('Launcher autohide', {'launcher_autohide': False}),