Merge lp:~aacid/unity-2d/hud_reset_icon_empty_list into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 1103
Merged at revision: 1102
Proposed branch: lp:~aacid/unity-2d/hud_reset_icon_empty_list
Merge into: lp:unity-2d
Diff against target: 29 lines (+11/-0)
2 files modified
shell/hud/Hud.qml (+6/-0)
tests/manual-tests/hud.txt (+5/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/hud_reset_icon_empty_list
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+107194@code.launchpad.net

Commit message

[hud] Reset the HUD icon to default when there are no results in the list

Description of the change

Reset the HUD icon to default when there are no results in the list

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-30 12:59:25 +0000
3+++ shell/hud/Hud.qml 2012-05-24 10:38:23 +0000
4@@ -260,6 +260,12 @@
5 appIcon = getActiveWindowIcon()
6 }
7 }
8+
9+ onCountChanged: {
10+ if (count == 0) {
11+ appIcon = getActiveWindowIcon()
12+ }
13+ }
14 }
15 }
16 }
17
18=== modified file 'tests/manual-tests/hud.txt'
19--- tests/manual-tests/hud.txt 2012-04-19 15:02:54 +0000
20+++ tests/manual-tests/hud.txt 2012-05-24 10:38:23 +0000
21@@ -46,3 +46,8 @@
22 * Navigate through results with keyboard arrow keys
23 * Navigate to a result row different than the top one
24 * Hit Enter to activate an action
25+----
26+ * Hit Alt key
27+ * Type something from indicators so that the hud icon changes
28+ * Clear the search line
29+ --> Verify the hud icon goes bacl to the current foregroud app one

Subscribers

People subscribed via source and target branches