Merge lp:~3v1n0/unity/lock-toggle-gestures into lp:unity

[Marco Trevisan (Treviño)]

UnityScreen: toggle gestures recognition on lock

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-09-01 23:56:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-11-28 23:42:44 +0000
@@ -3983,6 +3983,8 @@
 
   // We disable the edge barriers, to avoid blocking the mouse pointer during lockscreen
   edge_barriers_->force_disable = true;
+
+  UpdateGesturesSupport();
 }
 
 void UnityScreen::OnScreenUnlocked()
@@ -3999,6 +4001,8 @@
     screen->addAction(&action);
 
   edge_barriers_->force_disable = false;
+
+  UpdateGesturesSupport();
 }
 
 void UnityScreen::SaveLockStamp(bool save)
@@ -4207,9 +4211,11 @@
 
 void UnityScreen::UpdateGesturesSupport()
 {
-  Settings::Instance().gestures_launcher_drag() ? gestures_sub_launcher_->Activate() : gestures_sub_launcher_->Deactivate();
-  Settings::Instance().gestures_dash_tap() ? gestures_sub_dash_->Activate() : gestures_sub_dash_->Deactivate();
-  Settings::Instance().gestures_windows_drag_pinch() ? gestures_sub_windows_->Activate() : gestures_sub_windows_->Deactivate();
+  auto& s = Settings::Instance();
+  bool locked = lockscreen_controller_ && lockscreen_controller_->IsLocked();
+  (!locked && s.gestures_launcher_drag()) ? gestures_sub_launcher_->Activate() : gestures_sub_launcher_->Deactivate();
+  (!locked && s.gestures_dash_tap()) ? gestures_sub_dash_->Activate() : gestures_sub_dash_->Deactivate();
+  (!locked && s.gestures_windows_drag_pinch()) ? gestures_sub_windows_->Activate() : gestures_sub_windows_->Deactivate();
 }
 
 void UnityScreen::InitGesturesSupport()