Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 10:45:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-03-14 19:09:21 -03:00
parent 80abe1865a
commit 379fa9783f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
View file

@ -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();