[gnome-shell/wip/re-search-v2: 26/29] overview, viewSelector: show/hide workspaces on apps button



commit d70f43dd6d87592ff97903ffef22d10d888a49be
Author: Tanner Doshier <doshitan gmail com>
Date:   Wed Oct 10 22:17:41 2012 -0500

    overview, viewSelector: show/hide workspaces on apps button

 js/ui/overview.js     |    4 +++-
 js/ui/viewSelector.js |    4 ++++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 1f94620..2a0d6f1 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -298,9 +298,11 @@ const Overview = new Lang.Class({
         if (!this.visible || this.animationInProgress)
             return;
 
+        let appsActive = this._viewSelector.getAppsActive();
         let searchActive = this._viewSelector.getSearchActive();
+
         let dashVisible = !searchActive || inDrag;
-        let thumbnailsVisible = !searchActive || inDrag;
+        let thumbnailsVisible = (!searchActive && !appsActive) || inDrag;
         let trayVisible = !searchActive;
 
         if (dashVisible)
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 9ed0f13..121a0d0 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -455,6 +455,10 @@ const ViewSelector = new Lang.Class({
         RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
     },
 
+    getAppsActive: function() {
+        return this._showAppsButton.checked;
+    },
+
     addSearchProvider: function(provider) {
         if (!this._shouldUseSearchProvider(provider))
             return;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]