Merge lp:~brandontschaefer/unity/hud-to-dash-loses-win-focus into lp:unity

[Brandon Schaefer]

Fixed going from the Hud to the Dash forgetting window focus when exiting from the Dash.

=== Problem ===
Going from the Hud to the Dash and then quiting causes the window focus to be lost.

=== Fix ===
This line of code adapter->saveInputFoucs() was causing the problem, removed it. It makes AdapterPlugin::restoreInputFocus() use m_Screen->focusDefaultWindow() instead of using the _last_focused_window.

=== Test ===
AP test included, and all Dash AP test pass.

[Thomi Richards (thomir)]

+1

review: Approve

[Thomi Richards (thomir)]

review: Approve

[Andrea Azzarone (azzar1)]

How can this work if you remove the call to saveInputFocus?

review: Needs Information

[Andrea Azzarone (azzar1)]

> How can this work if you remove the call to saveInputFocus?
How can this work if you're removing the call to saveInputFocus?

review: Needs Information

[Andrea Azzarone (azzar1)]

Btw it works so +1

review: Approve

[Brandon Schaefer (brandontschaefer)]

> > How can this work if you remove the call to saveInputFocus?
> How can this work if you're removing the call to saveInputFocus?

It makes it use m_Screen->focusDefaultWindow() which gets the top window on the screen. I can't find a case where this wont work correctly...It is also how the Hud does it.

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-04-18 14:06:50 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-04-18 22:02:20 +0000
@@ -268,8 +268,6 @@
     return;
   }
 
-  adaptor->saveInputFocus ();
-
   view_->AboutToShow();
 
   window_->ShowWindow(true);

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-04-18 20:50:16 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-04-18 22:02:20 +0000
@@ -262,9 +262,7 @@
         """This test that Alt+F1 is disabled when the dash is opened."""
         self.dash.ensure_visible()
 
-        launcher = self.launcher.get_launcher_for_monitor(0)
-        launcher.key_nav_start()
-
+        self.keybinding("launcher/keynav")
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
 
@@ -508,3 +506,31 @@
 
         self.assertThat(self.dash.visible, Eventually(Equals(True)))
 
+class DashRestoreFocus(DashTestCase):
+    """Tests that the dash restores focus on exit."""
+    def setUp(self):
+        super(DashRestoreFocus,self).setUp()
+
+    def test_dash_restores_window_focus(self):
+        """Make sure the dash restores the last focused window."""
+        calc = self.start_app("Calculator")
+        [calc_win] = calc.get_windows()
+        self.assertTrue(calc_win.is_focused)
+
+        self.dash.ensure_visible()
+        self.dash.ensure_hidden()
+
+        self.assertTrue(calc_win.is_focused)
+
+    def test_hud_to_dash_restores_window_focus(self):
+        """Make sure the hud->dash restores the last focused window."""
+        calc = self.start_app("Calculator")
+        [calc_win] = calc.get_windows()
+        self.assertTrue(calc_win.is_focused)
+
+        self.keybinding("hud/reveal")
+        self.dash.ensure_visible()
+        self.dash.ensure_hidden()
+
+        self.assertTrue(calc_win.is_focused)
+