summaryrefslogtreecommitdiff
path: root/launcher
diff options
authorBrandon Schaefer <brandontschaefer@gmail.com>2014-01-08 13:48:18 -0800
committerBrandon Schaefer <brandontschaefer@gmail.com>2014-01-08 13:48:18 -0800
commitd968ae1b3d06ffd921155c45ed6d5a6d5a3f9c1d (patch)
tree5bed7dcc1b1b4629d0de0ccdb8ea81d1d26e41a9 /launcher
parentbd089bca0432c67fc36b24324061b720a47c206e (diff)
* Make sure we don't open the dash/hud on a monitor if the top most window on
it is fullscreen. Fixes LP: #1267210 (bzr r3616.2.1)
Diffstat (limited to 'launcher')
-rw-r--r--launcher/LauncherController.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/launcher/LauncherController.cpp b/launcher/LauncherController.cpp
index 98be37436..b1b068892 100644
--- a/launcher/LauncherController.cpp
+++ b/launcher/LauncherController.cpp
@@ -1202,7 +1202,10 @@ bool Controller::AboutToShowDash(int was_tap, int when) const
void Controller::HandleLauncherKeyRelease(bool was_tap, int when)
{
int tap_duration = when - pimpl->launcher_key_press_time_;
- if (tap_duration < options()->super_tap_duration && was_tap)
+ WindowManager& wm = WindowManager::Default();
+
+ if (tap_duration < options()->super_tap_duration && was_tap &&
+ !wm.IsTopWindowFullscreenOnMonitorWithMouse())
{
LOG_DEBUG(logger) << "Quick tap, sending activation request.";
pimpl->SendHomeActivationRequest();