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

[Florian Boucault]

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

[Albert Astals Cid (aacid)]

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

[Florian Boucault (fboucault)]

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.

[Albert Astals Cid (aacid)]

Ok, approving then

review: Approve

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-08 12:04:38 +0000
+++ shell/dash/Dash.qml	2012-02-09 02:14:53 +0000
@@ -106,7 +106,13 @@
         }
     }
 
+    SpreadMonitor {
+        id: spreadMonitor
+    }
+
     function activateLens(lensId) {
+        if (spreadMonitor.shown) return
+
         /* check if lenses variable was populated already */
         if (lenses.rowCount() == 0) {
             queuedLensId = lensId
@@ -138,6 +144,8 @@
     }
 
     function activateHome() {
+        if (spreadMonitor.shown) return
+
         /* When Home is shown, need to notify all other lenses. Those in the global view
            (in home search results page) are set to HomeView, all others to Hidden */
         for (var i=0; i<lenses.rowCount(); i++) {