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

Proposed by Brandon Schaefer
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 2215
Proposed branch: lp://qastaging/~brandontschaefer/unity/hud-to-dash-fix
Merge into: lp://qastaging/unity
Diff against target: 92 lines (+30/-3)
5 files modified
plugins/unityshell/src/HudController.cpp (+2/-0)
plugins/unityshell/src/LauncherController.cpp (+7/-0)
plugins/unityshell/src/LauncherController.h (+2/-0)
plugins/unityshell/src/unityshell.cpp (+3/-0)
tests/autopilot/autopilot/tests/test_hud.py (+16/-3)
To merge this branch: bzr merge lp://qastaging/~brandontschaefer/unity/hud-to-dash-fix
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+100064@code.qastaging.launchpad.net

Commit message

Fixes the pinyin pop up box disappearing in the hud.

Description of the change

== 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

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

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
Revision history for this message
Tim Penhey (thumper) wrote :

Looks fine now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.