Merge lp:~fboucault/unity-2d/no_dash_when_spread_shown into lp:~unity-2d-team/unity-2d/unity-2d-shell

Proposed by Florian Boucault
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 992
Merged at revision: 994
Proposed branch: lp:~fboucault/unity-2d/no_dash_when_spread_shown
Merge into: lp:~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 26 lines (+8/-0)
1 file modified
shell/dash/Dash.qml (+8/-0)
To merge this branch: bzr merge lp:~fboucault/unity-2d/no_dash_when_spread_shown
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+92183@code.launchpad.net

Description of the change

Inhibit Dash.qml's activateLens() and activateHome() if spread is shown.

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Since the dash is part of the shell can't you use the SpreadMonitor of the Shell instead of creating a new one?

review: Needs Fixing
Revision history for this message
Florian Boucault (fboucault) wrote :

Yeah I thought about that but I thought there was some reason not to do that.
Maybe it was that I want to be able to run the dash on its own.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok, approving then

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/dash/Dash.qml'
2--- shell/dash/Dash.qml 2012-02-08 12:04:38 +0000
3+++ shell/dash/Dash.qml 2012-02-09 02:14:53 +0000
4@@ -106,7 +106,13 @@
5 }
6 }
7
8+ SpreadMonitor {
9+ id: spreadMonitor
10+ }
11+
12 function activateLens(lensId) {
13+ if (spreadMonitor.shown) return
14+
15 /* check if lenses variable was populated already */
16 if (lenses.rowCount() == 0) {
17 queuedLensId = lensId
18@@ -138,6 +144,8 @@
19 }
20
21 function activateHome() {
22+ if (spreadMonitor.shown) return
23+
24 /* When Home is shown, need to notify all other lenses. Those in the global view
25 (in home search results page) are set to HomeView, all others to Hidden */
26 for (var i=0; i<lenses.rowCount(); i++) {

Subscribers

People subscribed via source and target branches