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
=== modified file 'shell/hud/Hud.qml'
--- shell/hud/Hud.qml 2012-04-04 08:10:55 +0000
+++ shell/hud/Hud.qml 2012-04-16 10:22:20 +0000
@@ -215,7 +215,7 @@
215 hudModel.searchQuery = searchQuery215 hudModel.searchQuery = searchQuery
216 resultList.currentIndex = 0216 resultList.currentIndex = 0
217 }217 }
218 onActivateFirstResult: executeResult(0)218 onActivateFirstResult: executeResult(resultList.currentIndex)
219 }219 }
220220
221 ListView {221 ListView {
222222
=== modified file 'tests/manual-tests/hud.txt'
--- tests/manual-tests/hud.txt 2012-04-03 11:37:44 +0000
+++ tests/manual-tests/hud.txt 2012-04-16 10:22:20 +0000
@@ -30,4 +30,13 @@
30 * Have a fixed launcher30 * Have a fixed launcher
31 * Find a program without icon (i.e. uses the ? icon) (dconf-editor works here)31 * Find a program without icon (i.e. uses the ? icon) (dconf-editor works here)
32 * Show and hide the hud32 * Show and hide the hud
33--> Verify the BFB icon goes back to the ubuntu logo and does not get stuck in ?
34\ No newline at end of file33\ No newline at end of file
34--> Verify the BFB icon goes back to the ubuntu logo and does not get stuck in ?
35
36----
37 * Open an application
38 * Hit Alt key
39 * Navigate through results with keyboard arrow keys
40 * Navigate to a result row different than the top one
41 * Hit Enter to activate an action
42--> Make sure correct action was activated. Repeat the test by activating different results.
43

Subscribers

People subscribed via source and target branches