Merge lp:~brandontschaefer/unity/hud-to-dash-fix into lp:unity

[Brandon Schaefer]

Fixes the pinyin pop up box disappearing in the hud.

== Problem ==
When the Hud gets closed it doesn't emit end_key_nav, which resets the preedit box for ibus-pinyin engine. So when you reopened the Hud it wouldn't redraw the preedit window, because it didn't know it disappeared.

== Fix ==
The fix was to force Hud to lose key nav mode. This caused a problem with key focus when switching from the Hud to the Dash, this was fixed by making sure the Hud closes BEFORE the Dash opens.

== Test ==
Autopilot test

[Tim Penhey (thumper)]

At the end of test_hud_to_dash_has_key_focus you shouldn't need to ensure_hidden on the dash.

If you do because it is a hud test, then change it so the test goes like this:

  self.dash.ensure_visible()
  self.addCleanup(self.dash.ensure_hidden)

That way if the assert fails, the dash is still hidden.

Also, PEP-8 says only one blank line between class methods.

review: Needs Fixing

[lp:~brandontschaefer/unity/hud-to-dash-fix]

2197. By Brandon Schaefer on 2012-04-03

* Fixed ap test

2198. By Brandon Schaefer on 2012-04-03

* Merged trunk, fixed conflict

2199. By Brandon Schaefer on 2012-04-03

* More fixes to the ap test

[Tim Penhey (thumper)]

Looks fine now.

review: Approve

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-04-02 00:16:21 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-04-03 03:16:20 +0000
@@ -322,6 +322,8 @@
   window_->EnableInputWindow(false, "Hud", true, false);
   visible_ = false;
 
+  nux::GetWindowCompositor().SetKeyFocusArea(NULL,nux::KEY_NAV_NONE);
+
   StartShowHideTimeline();
 
   restore = true;

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-04-02 03:10:50 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-04-03 03:16:20 +0000
@@ -981,6 +981,13 @@
   pimpl->launcher_label_show_handler_id_ = g_timeout_add(local::shortcuts_show_delay, show_shortcuts, pimpl);
 }
 
+bool Controller::AboutToShowDash(int was_tap, int when) const
+{
+  if ((when - pimpl->launcher_key_press_time_) < local::super_tap_duration && was_tap)
+    return true;
+  return false;
+}
+
 void Controller::HandleLauncherKeyRelease(bool was_tap, int when)
 {
   int tap_duration = when - pimpl->launcher_key_press_time_;

=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2012-03-27 04:35:01 +0000
+++ plugins/unityshell/src/LauncherController.h	2012-04-03 03:16:20 +0000
@@ -60,6 +60,8 @@
 
   void SetShowDesktopIcon(bool show_desktop_icon);
 
+  bool AboutToShowDash(int was_tap, int when) const;
+
   void HandleLauncherKeyPress(int when);
   void HandleLauncherKeyRelease(bool was_tap, int when);
   bool HandleLauncherKeyEvent(Display *display, 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-02 15:07:57 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-03 03:16:20 +0000
@@ -1597,6 +1597,9 @@
   LOG_DEBUG(logger) << "Super released: " << (was_tap ? "tapped" : "released");
   int when = options[7].value().i();  // XEvent time in millisec
 
+  if (hud_controller_->IsVisible() && launcher_controller_->AboutToShowDash(was_tap, when))
+    hud_controller_->HideHud();
+
   super_keypressed_ = false;
   launcher_controller_->KeyNavTerminate(true);
   launcher_controller_->HandleLauncherKeyRelease(was_tap, when);

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-04-02 20:18:58 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-04-03 03:16:20 +0000
@@ -219,14 +219,27 @@
         self.dash.ensure_hidden()
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
+    def test_hud_to_dash_has_key_focus(self):
+        """When switching from the hud to the dash you don't lose key focus."""
+        self.hud.ensure_visible()
+        sleep(1)
+
+        self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
+
+        self.keyboard.type('focus1')
+
+        self.assertEqual(self.dash.search_string, 'focus1')
+
     def test_dash_to_hud_has_key_focus(self):
         """When switching from the dash to the hud you don't lose key focus."""
         self.dash.ensure_visible()
-        self.hud.toggle_reveal()
+        self.hud.ensure_visible()
         sleep(1)
 
-        self.keyboard.type('focus')
-        self.assertEqual(self.hud.searchbar.search_string, 'focus')
+        self.keyboard.type('focus2')
+       
+        self.assertEqual(self.hud.search_string, 'focus2')
 
     def test_hud_closes_on_workspace_switch(self):
         """This test shows that when you switch to another workspace the hud closes."""