Merge lp:~fboucault/unity-2d/dash_hide_on_activate into lp:unity-2d/3.0

Proposed by Florian Boucault
Status: Merged
Approved by: Ugo Riboni
Approved revision: 432
Merged at revision: 433
Proposed branch: lp:~fboucault/unity-2d/dash_hide_on_activate
Merge into: lp:unity-2d/3.0
Diff against target: 31 lines (+8/-2)
2 files modified
places/UnityDefaultRenderer.qml (+4/-1)
places/UnityEmptySearchRenderer.qml (+4/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_hide_on_activate
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
Review via email: mp+52701@code.launchpad.net

Description of the change

[dash] Hide immediately upon clicking on a result.

To post a comment you must log in.
Revision history for this message
Ugo Riboni (uriboni) wrote :

Functionally it works ok, and the code is good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'places/UnityDefaultRenderer.qml'
2--- places/UnityDefaultRenderer.qml 2011-02-21 21:26:38 +0000
3+++ places/UnityDefaultRenderer.qml 2011-03-09 15:54:24 +0000
4@@ -14,7 +14,10 @@
5 property string displayName
6 property string comment
7
8- onClicked: placeEntryModel.place.activate(decodeURIComponent(uri.toString()))
9+ onClicked: {
10+ dashView.active = false
11+ placeEntryModel.place.activate(decodeURIComponent(uri.toString()))
12+ }
13
14 Image {
15 id: icon
16
17=== modified file 'places/UnityEmptySearchRenderer.qml'
18--- places/UnityEmptySearchRenderer.qml 2011-01-07 00:36:09 +0000
19+++ places/UnityEmptySearchRenderer.qml 2011-03-09 15:54:24 +0000
20@@ -36,7 +36,10 @@
21 /* If no uri is available then disable the button entirely (no
22 hovering, no clicking, etc. */
23 enabled: uri != ""
24- onClicked: placeEntryModel.place.activate(uri)
25+ onClicked: {
26+ dashView.active = false
27+ placeEntryModel.place.activate(uri)
28+ }
29
30 TextCustom {
31 text: displayName

Subscribers

People subscribed via source and target branches