From 2498497cc1e620a73f758b383c8119323d586c50 Mon Sep 17 00:00:00 2001 From: Tanner Doshier Date: Wed, 10 Oct 2012 22:17:41 -0500 Subject: [PATCH] overview, viewSelector: show/hide workspaces on apps button --- js/ui/overview.js | 4 +++- js/ui/viewSelector.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/ui/overview.js b/js/ui/overview.js index abd6bdf25..f7459c940 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 94ea78f65..d72d7c765 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;