diff options
| author | Brandon Schaefer <brandontschaefer@gmail.com> | 2013-09-26 15:06:34 -0700 |
|---|---|---|
| committer | Brandon Schaefer <brandontschaefer@gmail.com> | 2013-09-26 15:06:34 -0700 |
| commit | 482a5a59a6bc37a3d109fdfa47528ef54007f412 (patch) | |
| tree | 721b147315df775c999859119b17ebf5a700b85e /plugins/unityshell | |
| parent | 5199219c6e42e9d950983d93c72a1ac756fba8f8 (diff) | |
| parent | ce4591e42bce36db23ca0424486dc93c9344fb6d (diff) | |
* Handle the disabling of the mouse better! Caused a regression :(
(bzr r3536.2.1)
Diffstat (limited to 'plugins/unityshell')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 28b98e9a5..c0251beb1 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -1695,10 +1695,15 @@ void UnityScreen::handleEvent(XEvent* event) break; } - if (!skip_other_plugins && !switcher_controller_->IsMouseDisabled() && + if (switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible()) + { + return; + } + + if (!skip_other_plugins && screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr)) { - wt->ProcessForeignEvent(event, nullptr); + wt->ProcessForeignEvent(event, nullptr); } } |