From 99ed2556f26baeb1fea2975e63469ab9d11d90bd Mon Sep 17 00:00:00 2001 From: Vladyslav Stelmakhovskyi Date: Thu, 4 May 2017 16:11:07 +0200 Subject: [PATCH 1/2] Do not send non primary button events to Tablet window --- interface/src/ui/overlays/Web3DOverlay.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index fedead5aa5..38bf5b293b 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -421,6 +421,11 @@ void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) { return; } + //do not send non primary button events to tablet + if (event.getButton() != PointerEvent::PrimaryButton) { + return; + } + QTouchEvent::TouchPoint point; point.setId(event.getID()); point.setState(touchPointState); From c8a9b02c7a1fe873ab21c6190231793147d8440a Mon Sep 17 00:00:00 2001 From: Vladyslav Stelmakhovskyi Date: Thu, 4 May 2017 20:26:02 +0200 Subject: [PATCH 2/2] Block only secondary button --- interface/src/ui/overlays/Web3DOverlay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index 38bf5b293b..ecc63801fc 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -421,8 +421,10 @@ void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) { return; } - //do not send non primary button events to tablet - if (event.getButton() != PointerEvent::PrimaryButton) { + //do not send secondary button events to tablet + if (event.getButton() == PointerEvent::SecondaryButton || + //do not block composed events + event.getButtons() == PointerEvent::SecondaryButton) { return; }