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

onClickListener: stop event propagation if click was handled

Browse Source
This commit is contained in:
Julian Winkler
2025-06-02 20:06:57 +02:00
parent e011092025
commit 12d25c162f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,12 +144,19 @@ void remove_pointer_fast(GPtrArray *pointer_indices, struct pointer *pointer)
pointer->id = 0; pointer->id = 0;
} }
static bool action_up_already_handled = false;
// TODO: find a way to reconcile this with libandroid/input.c? // TODO: find a way to reconcile this with libandroid/input.c?
static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *event, gpointer user_data) static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *event, gpointer user_data)
{ {
double x; double x;
double y; double y;
if ((gdk_event_get_event_type(event) == GDK_TOUCH_END || gdk_event_get_event_type(event) == GDK_BUTTON_RELEASE) && action_up_already_handled) {
action_up_already_handled = false;
return true;
}
uintptr_t id = (uintptr_t)gdk_event_get_event_sequence(event); uintptr_t id = (uintptr_t)gdk_event_get_event_sequence(event);
/* FIXME: this will clash with touchscreen */ /* FIXME: this will clash with touchscreen */
@@ -231,10 +238,19 @@ static void on_click(GtkGestureClick *gesture, int n_press, double x, double y,
GtkWidget *widget = gtk_event_controller_get_widget(GTK_EVENT_CONTROLLER(gesture)); GtkWidget *widget = gtk_event_controller_get_widget(GTK_EVENT_CONTROLLER(gesture));
WrapperWidget *wrapper = WRAPPER_WIDGET(gtk_widget_get_parent(widget)); WrapperWidget *wrapper = WRAPPER_WIDGET(gtk_widget_get_parent(widget));
(*env)->CallBooleanMethod(env, wrapper->jobj, handle_cache.view.performClick); jboolean handled = (*env)->CallBooleanMethod(env, wrapper->jobj, handle_cache.view.performClick);
if((*env)->ExceptionCheck(env)) if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
if (handled) {
gtk_gesture_set_state(GTK_GESTURE(gesture), GTK_EVENT_SEQUENCE_CLAIMED);
// claiming fails if there is no last event, set a flag in that case
GdkEvent *event = gtk_gesture_get_last_event(GTK_GESTURE(gesture), gtk_gesture_get_last_updated_sequence(GTK_GESTURE(gesture)));
if (!event) {
action_up_already_handled = true;
}
}
} }
#define SOURCE_CLASS_POINTER 0x2 #define SOURCE_CLASS_POINTER 0x2