1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Support mouse hover

Browse Source 
Android supports hover events through the generic motion event. Routed
mouse events to specific mouse handler.

Task-number: QTBUG-42799
Change-Id: Iee17c71c09d84f52235e66ec08c65ffa30ec9cd9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Michael Dippold 2018-03-05 12:24:53 -08:00
parent 019dd88d2c
commit c80611a459
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
View File

@ -469,10 +469,11 @@ public class QtNative
case MotionEvent.TOOL_TYPE_ERASER: case MotionEvent.TOOL_TYPE_ERASER:
pointerType = 3; // QTabletEvent::Eraser pointerType = 3; // QTabletEvent::Eraser
break; break;
// TODO TOOL_TYPE_MOUSE
} }
if (m_tabletEventSupported && pointerType != 0) { if (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
sendMouseEvent(event, id);
} else if (m_tabletEventSupported && pointerType != 0) {
tabletEvent(id, event.getDeviceId(), event.getEventTime(), event.getAction(), pointerType, tabletEvent(id, event.getDeviceId(), event.getEventTime(), event.getAction(), pointerType,
event.getButtonState(), event.getX(), event.getY(), event.getPressure()); event.getButtonState(), event.getX(), event.getY(), event.getPressure());
} else { } else {
@ -507,7 +508,22 @@ public class QtNative
static public void sendTrackballEvent(MotionEvent event, int id) static public void sendTrackballEvent(MotionEvent event, int id)
{ {
switch (event.getAction()) { sendMouseEvent(event,id);
}
static public boolean sendGenericMotionEvent(MotionEvent event, int id)
{
if (((event.getAction() & (MotionEvent.ACTION_SCROLL | MotionEvent.ACTION_HOVER_MOVE)) == 0)
|| (event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != InputDevice.SOURCE_CLASS_POINTER) {
return false;
}
return sendMouseEvent(event, id);
}
static public boolean sendMouseEvent(MotionEvent event, int id)
{
switch (event.getActionMasked()) {
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
mouseUp(id, (int) event.getX(), (int) event.getY()); mouseUp(id, (int) event.getX(), (int) event.getY());
break; break;
@ -517,28 +533,27 @@ public class QtNative
m_oldx = (int) event.getX(); m_oldx = (int) event.getX();
m_oldy = (int) event.getY(); m_oldy = (int) event.getY();
break; break;
case MotionEvent.ACTION_HOVER_MOVE:
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
int dx = (int) (event.getX() - m_oldx); if (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
int dy = (int) (event.getY() - m_oldy); mouseMove(id, (int) event.getX(), (int) event.getY());
if (Math.abs(dx) > 5 || Math.abs(dy) > 5) { } else {
int dx = (int) (event.getX() - m_oldx);
int dy = (int) (event.getY() - m_oldy);
if (Math.abs(dx) > 5 || Math.abs(dy) > 5) {
mouseMove(id, (int) event.getX(), (int) event.getY()); mouseMove(id, (int) event.getX(), (int) event.getY());
m_oldx = (int) event.getX(); m_oldx = (int) event.getX();
m_oldy = (int) event.getY(); m_oldy = (int) event.getY();
}
} }
break; break;
case MotionEvent.ACTION_SCROLL:
mouseWheel(id, (int) event.getX(), (int) event.getY(),
event.getAxisValue(MotionEvent.AXIS_HSCROLL), event.getAxisValue(MotionEvent.AXIS_VSCROLL));
break;
default:
return false;
} }
}
static public boolean sendGenericMotionEvent(MotionEvent event, int id)
{
if (event.getActionMasked() != MotionEvent.ACTION_SCROLL
|| (event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != InputDevice.SOURCE_CLASS_POINTER) {
return false;
}
mouseWheel(id, (int) event.getX(), (int) event.getY(),
event.getAxisValue(MotionEvent.AXIS_HSCROLL), event.getAxisValue(MotionEvent.AXIS_VSCROLL));
return true; return true;
} }

3
src/plugins/platforms/android/androidjniinput.cpp
View File

@ -58,7 +58,6 @@ using namespace QtAndroid;
namespace QtAndroidInput namespace QtAndroidInput
{ {
static bool m_ignoreMouseEvents = false; static bool m_ignoreMouseEvents = false;
static bool m_softwareKeyboardVisible = false; static bool m_softwareKeyboardVisible = false;
static QRect m_softwareKeyboardRect; static QRect m_softwareKeyboardRect;
@ -174,7 +173,7 @@ namespace QtAndroidInput
QWindowSystemInterface::handleMouseEvent(tlw, QWindowSystemInterface::handleMouseEvent(tlw,
localPos, localPos,
globalPos, globalPos,
Qt::MouseButtons(Qt::LeftButton)); Qt::MouseButtons(m_mouseGrabber ? Qt::LeftButton : Qt::NoButton));
} }
static void mouseWheel(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y, jfloat hdelta, jfloat vdelta) static void mouseWheel(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y, jfloat hdelta, jfloat vdelta)