summaryrefslogtreecommitdiff
path: root/launcher
diff options
authorBrandon Schaefer <brandontschaefer@gmail.com>2012-08-03 10:06:37 -0700
committerBrandon Schaefer <brandontschaefer@gmail.com>2012-08-03 10:06:37 -0700
commit79994e3c07ffd11111a4244c002563e9cddbccdd (patch)
tree624d9d11951d986603329d41b839f1f3233a4269 /launcher
parentfb7cea9136e3093cc3cee1dabf0b223b15bf3c33 (diff)
* Fixed up logic check, and ap test
(bzr r2529.8.3)
Diffstat (limited to 'launcher')
-rw-r--r--launcher/SwitcherController.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/SwitcherController.cpp b/launcher/SwitcherController.cpp
index c21b49a23..e76db9b2d 100644
--- a/launcher/SwitcherController.cpp
+++ b/launcher/SwitcherController.cpp
@@ -72,10 +72,10 @@ void Controller::OnBackgroundUpdate(GVariant* data)
bool Controller::CanShowSwitcher(const std::vector<AbstractLauncherIcon::Ptr>& results) const
{
- return (!(results.size() == 1 &&
- results[0]->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP) &&
- !WindowManager::Default()->IsWallActive() &&
- !results.empty());
+ bool empty = (show_desktop_disabled_ ? results.empty() : results.size() == 1);
+
+ return (!empty &&
+ !WindowManager::Default()->IsWallActive());
}
void Controller::Show(ShowMode show, SortMode sort, bool reverse,