From 32e6778bda06f348796df60dce7c2d40f3d97452 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 26 Jul 2013 18:25:44 +0200 Subject: [PATCH] Stop unconditional synth of mouse events on Android Before this patch we always send mouse events for each touch event that happens. This is redundant (we already synthesize in QGuiApplicatioin) and breaks some touch handling in QtQuick2. Change-Id: I4bc1686a7a46039901315619a0acdf2888ad6775 Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../org/qtproject/qt5/android/QtNative.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 22e3701e47..122fc55aad 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -343,28 +343,6 @@ public class QtNative touchEnd(id,1); } //@ANDROID-5 - - switch (event.getAction()) { - case MotionEvent.ACTION_UP: - mouseUp(id,(int) event.getX(), (int) event.getY()); - break; - - case MotionEvent.ACTION_DOWN: - mouseDown(id,(int) event.getX(), (int) event.getY()); - m_oldx = (int) event.getX(); - m_oldy = (int) event.getY(); - break; - - case MotionEvent.ACTION_MOVE: - int dx = (int) (event.getX() - m_oldx); - int dy = (int) (event.getY() - m_oldy); - if (Math.abs(dx) > m_moveThreshold || Math.abs(dy) > m_moveThreshold) { - mouseMove(id, (int) event.getX(), (int) event.getY()); - m_oldx = (int) event.getX(); - m_oldy = (int) event.getY(); - } - break; - } } static public void sendTrackballEvent(MotionEvent event, int id)