Merge lp:~stolowski/unity-2d/hud-result-activation-fix into lp:unity-2d

Proposed by Paweł Stołowski
Status: Merged
Approved by: Gerry Boland
Approved revision: 1064
Merged at revision: 1065
Proposed branch: lp:~stolowski/unity-2d/hud-result-activation-fix
Merge into: lp:unity-2d
Diff against target: 32 lines (+11/-2)
2 files modified
shell/hud/Hud.qml (+1/-1)
tests/manual-tests/hud.txt (+10/-1)
To merge this branch: bzr merge lp:~stolowski/unity-2d/hud-result-activation-fix
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+102084@code.launchpad.net

Commit message

[hud] Activate correct hud search result on <Enter> key.
Pass index of active item instead of 0 to executeResult Hud function.

Description of the change

[hud] Activate correct hud search result on <Enter> key.

UNBLOCK

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/hud/Hud.qml'
2--- shell/hud/Hud.qml 2012-04-04 08:10:55 +0000
3+++ shell/hud/Hud.qml 2012-04-16 10:22:20 +0000
4@@ -215,7 +215,7 @@
5 hudModel.searchQuery = searchQuery
6 resultList.currentIndex = 0
7 }
8- onActivateFirstResult: executeResult(0)
9+ onActivateFirstResult: executeResult(resultList.currentIndex)
10 }
11
12 ListView {
13
14=== modified file 'tests/manual-tests/hud.txt'
15--- tests/manual-tests/hud.txt 2012-04-03 11:37:44 +0000
16+++ tests/manual-tests/hud.txt 2012-04-16 10:22:20 +0000
17@@ -30,4 +30,13 @@
18 * Have a fixed launcher
19 * Find a program without icon (i.e. uses the ? icon) (dconf-editor works here)
20 * Show and hide the hud
21---> Verify the BFB icon goes back to the ubuntu logo and does not get stuck in ?
22\ No newline at end of file
23+--> Verify the BFB icon goes back to the ubuntu logo and does not get stuck in ?
24+
25+----
26+ * Open an application
27+ * Hit Alt key
28+ * Navigate through results with keyboard arrow keys
29+ * Navigate to a result row different than the top one
30+ * Hit Enter to activate an action
31+--> Make sure correct action was activated. Repeat the test by activating different results.
32+

Subscribers

People subscribed via source and target branches