atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

View: use gdk_event_get_modifier_state() for onTouch handling

Browse Source 
previous implementation did not update num_clicks, when the
mouse was released outside the widget
This commit is contained in:
Julian Winkler
2023-11-03 22:16:57 +01:00
parent 29e88b08d8
commit 585d934483
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api-impl-jni/views/android_view_View.c
View File

@@ -10,7 +10,7 @@
#define SOURCE_TOUCHSCREEN 0x1002 #define SOURCE_TOUCHSCREEN 0x1002
struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class; unsigned int num_clicks;}; struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class;};
static bool call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d) static bool call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d)
{ {
@@ -53,19 +53,17 @@ static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *e
// TODO: this doesn't work for multitouch // TODO: this doesn't work for multitouch
switch(gdk_event_get_event_type(event)) { switch(gdk_event_get_event_type(event)) {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
d->num_clicks = 1;
case GDK_TOUCH_BEGIN: case GDK_TOUCH_BEGIN:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
return call_ontouch_callback(MOTION_EVENT_ACTION_DOWN, x, y, d); return call_ontouch_callback(MOTION_EVENT_ACTION_DOWN, x, y, d);
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
d->num_clicks = 0;
case GDK_TOUCH_END: case GDK_TOUCH_END:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
return call_ontouch_callback(MOTION_EVENT_ACTION_UP, x, y, d); return call_ontouch_callback(MOTION_EVENT_ACTION_UP, x, y, d);
break; break;
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
if(d->num_clicks == 0) if (!(gdk_event_get_modifier_state(event) & GDK_BUTTON1_MASK))
break; break;
case GDK_TOUCH_UPDATE: case GDK_TOUCH_UPDATE:
gdk_event_get_widget_relative_position(event, widget, &x, &y); gdk_event_get_widget_relative_position(event, widget, &x, &y);
@@ -99,7 +97,6 @@ void _setOnTouchListener(JNIEnv *env, jobject this, GtkWidget *widget, jobject o
callback_data->this = _REF(this); callback_data->this = _REF(this);
callback_data->on_touch_listener = on_touch_listener ? _REF(on_touch_listener) : NULL; callback_data->on_touch_listener = on_touch_listener ? _REF(on_touch_listener) : NULL;
callback_data->on_touch_listener_class = on_touch_listener ? _REF(_CLASS(callback_data->on_touch_listener)) : _REF(_CLASS(callback_data->this)); callback_data->on_touch_listener_class = on_touch_listener ? _REF(_CLASS(callback_data->on_touch_listener)) : _REF(_CLASS(callback_data->this));
callback_data->num_clicks = 0;
GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_touch_listener"); GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_touch_listener");
if(old_controller) if(old_controller)
@@ -134,7 +131,6 @@ JNIEXPORT void JNICALL Java_android_view_View_setOnClickListener(JNIEnv *env, jo
callback_data->this = _REF(this); callback_data->this = _REF(this);
callback_data->on_touch_listener = _REF(on_click_listener); callback_data->on_touch_listener = _REF(on_click_listener);
callback_data->on_touch_listener_class = _REF(_CLASS(callback_data->on_touch_listener)); callback_data->on_touch_listener_class = _REF(_CLASS(callback_data->on_touch_listener));
callback_data->num_clicks = 0;
GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_click_listener"); GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_click_listener");
if(old_controller) if(old_controller)