From 379fa9783f73c1c06905ff9c81523487a477cac2 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Wed, 14 Mar 2018 19:09:21 -0300
Subject: [PATCH] No touch responsibility for KeyboardMouseDevice when
 TouchscreenVirtualPadDevice is initialized

---
 .../src/input-plugins/TouchscreenVirtualPadDevice.cpp         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
index 223775b222..55f06a9f4d 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
@@ -60,6 +60,8 @@ void TouchscreenVirtualPadDevice::init() {
     if (_fixedPosition) {
         virtualPadManager.getLeftVirtualPad()->setShown(virtualPadManager.isEnabled() && !virtualPadManager.isHidden()); // Show whenever it's enabled
     }
+
+    KeyboardMouseDevice::enableTouch(false); // Touch for view controls is managed by this plugin
 }
 
 void TouchscreenVirtualPadDevice::setupFixedCenter(VirtualPad::Manager& virtualPadManager, bool force) {
@@ -212,7 +214,6 @@ void TouchscreenVirtualPadDevice::touchBeginEvent(const QTouchEvent* event) {
     if (!virtualPadManager.isEnabled() && !virtualPadManager.isHidden()) {
         return;
     }
-    KeyboardMouseDevice::enableTouch(false);
 }
 
 void TouchscreenVirtualPadDevice::touchEndEvent(const QTouchEvent* event) {
@@ -225,7 +226,6 @@ void TouchscreenVirtualPadDevice::touchEndEvent(const QTouchEvent* event) {
     // touch end here is a big reset -> resets both pads
     _touchPointCount = 0;
     _unusedTouches.clear();
-    KeyboardMouseDevice::enableTouch(true);
     debugPoints(event, " END ----------------");
     moveTouchEnd();
     viewTouchEnd();