diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2014-05-20 13:37:36 +0200 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2014-05-20 13:37:36 +0200 |
| commit | a712fca3ee4b1fc9455facbf66a31d7b82e82922 (patch) | |
| tree | ca051713c09ad6b4b55c495b4e776e983f243dde /plugins | |
| parent | 3bb3e30f3b71fcd3f837c8c2bd71a919b9580f12 (diff) | |
Disable switcher gestures if screen is locked. Fixed a regression.
Fixes LP: #1321043 (bzr r3806.4.3)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/unityshell/src/GesturalWindowSwitcher.cpp | 3 | ||||
| -rw-r--r-- | plugins/unityshell/src/GesturalWindowSwitcher.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/unityshell/src/GesturalWindowSwitcher.cpp b/plugins/unityshell/src/GesturalWindowSwitcher.cpp index 0546792b0..c6682e560 100644 --- a/plugins/unityshell/src/GesturalWindowSwitcher.cpp +++ b/plugins/unityshell/src/GesturalWindowSwitcher.cpp @@ -115,6 +115,9 @@ GesturalWindowSwitcherPrivate::GesturalWindowSwitcherPrivate() GestureDeliveryRequest GesturalWindowSwitcherPrivate::GestureEvent(nux::GestureEvent const& event) { + if (unity_screen->lockscreen_controller()->IsLocked()) + return GestureDeliveryRequest::NONE; + switch (state) { case State::WaitingCompoundGesture: diff --git a/plugins/unityshell/src/GesturalWindowSwitcher.h b/plugins/unityshell/src/GesturalWindowSwitcher.h index c5e5decbe..3d7c68475 100644 --- a/plugins/unityshell/src/GesturalWindowSwitcher.h +++ b/plugins/unityshell/src/GesturalWindowSwitcher.h @@ -77,6 +77,7 @@ class GesturalWindowSwitcher : public nux::GestureTarget private: GesturalWindowSwitcherPrivate* p; }; + typedef std::shared_ptr<GesturalWindowSwitcher> ShPtGesturalWindowSwitcher; } // namespace unity |