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

onInterceptTouchEvent: don't self propagate cancel

Browse Source 
This is needed, to make Gravity Defied keyboard work again
This commit is contained in:
Julian Winkler
2024-03-11 22:50:39 +01:00
parent 49aef9ff08
commit 75e42e6bff
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@
struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class; bool intercepted; }; struct touch_callback_data { JavaVM *jvm; jobject this; jobject on_touch_listener; jclass on_touch_listener_class; bool intercepted; };
static GdkEvent *canceled_event = NULL; static GdkEvent *canceled_event = NULL;
static struct touch_callback_data *cancel_triggerer = NULL;
static bool call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d, GtkPropagationPhase phase, guint32 timestamp, GdkEvent *event) static bool call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d, GtkPropagationPhase phase, guint32 timestamp, GdkEvent *event)
{ {
@@ -28,6 +29,7 @@ static bool call_ontouch_callback(int action, double x, double y, struct touch_c
if (d->intercepted) { if (d->intercepted) {
// store the event that was canceled and let it propagate to the child widgets // store the event that was canceled and let it propagate to the child widgets
canceled_event = event; canceled_event = event;
cancel_triggerer = d;
} }
ret = false; ret = false;
} else if(d->on_touch_listener) /* NULL listener means the callback was registered for onTouchEvent */ } else if(d->on_touch_listener) /* NULL listener means the callback was registered for onTouchEvent */
@@ -65,7 +67,7 @@ static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *e
guint32 timestamp = gdk_event_get_time(event); guint32 timestamp = gdk_event_get_time(event);
// TODO: this doesn't work for multitouch // TODO: this doesn't work for multitouch
if (event == canceled_event) { if (event == canceled_event && cancel_triggerer != d) {
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_CANCEL, x, y, d, phase, timestamp, event); return call_ontouch_callback(MOTION_EVENT_ACTION_CANCEL, x, y, d, phase, timestamp, event);
} }