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: always call dispatchTouchEvent() if overwritten

Browse Source
This commit is contained in:
Julian Winkler
2024-12-10 23:41:33 +01:00
parent 1398125eb5
commit 864750020e
4 changed files with 8 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

@@ -27,7 +27,9 @@ static bool call_ontouch_callback(WrapperWidget *wrapper, int action, double x,
gdk_event_get_position(event, &raw_x, &raw_y); gdk_event_get_position(event, &raw_x, &raw_y);
jobject motion_event = (*env)->NewObject(env, handle_cache.motion_event.class, handle_cache.motion_event.constructor, SOURCE_TOUCHSCREEN, action, (float)x, (float)y, (long)timestamp, (float)raw_x, (float)raw_y); jobject motion_event = (*env)->NewObject(env, handle_cache.motion_event.class, handle_cache.motion_event.constructor, SOURCE_TOUCHSCREEN, action, (float)x, (float)y, (long)timestamp, (float)raw_x, (float)raw_y);
if (phase == GTK_PHASE_CAPTURE && !wrapper->intercepting_touch) { if (wrapper->custom_dispatch_touch) {
ret = (*env)->CallBooleanMethod(env, this, handle_cache.view.dispatchTouchEvent, motion_event);
} else if (phase == GTK_PHASE_CAPTURE && !wrapper->intercepting_touch) {
wrapper->intercepting_touch = (*env)->CallBooleanMethod(env, this, handle_cache.view.onInterceptTouchEvent, motion_event); wrapper->intercepting_touch = (*env)->CallBooleanMethod(env, this, handle_cache.view.onInterceptTouchEvent, motion_event);
if (wrapper->intercepting_touch) { if (wrapper->intercepting_touch) {
// 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
@@ -158,8 +160,9 @@ void _setOnTouchListener(JNIEnv *env, jobject this, GtkWidget *widget)
gtk_widget_add_controller(widget, controller); gtk_widget_add_controller(widget, controller);
g_object_set_data(G_OBJECT(widget), "on_touch_listener", controller); g_object_set_data(G_OBJECT(widget), "on_touch_listener", controller);
WrapperWidget *wrapper = WRAPPER_WIDGET(widget);
jmethodID onintercepttouchevent_method = _METHOD(_CLASS(this), "onInterceptTouchEvent", "(Landroid/view/MotionEvent;)Z"); jmethodID onintercepttouchevent_method = _METHOD(_CLASS(this), "onInterceptTouchEvent", "(Landroid/view/MotionEvent;)Z");
if (onintercepttouchevent_method != handle_cache.view.onInterceptTouchEvent) { if (onintercepttouchevent_method != handle_cache.view.onInterceptTouchEvent || wrapper->custom_dispatch_touch) {
GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_intercept_touch_listener"); GtkEventController *old_controller = g_object_get_data(G_OBJECT(widget), "on_intercept_touch_listener");
if(old_controller) if(old_controller)
gtk_widget_remove_controller(widget, old_controller); gtk_widget_remove_controller(widget, old_controller);
@@ -171,7 +174,6 @@ void _setOnTouchListener(JNIEnv *env, jobject this, GtkWidget *widget)
gtk_widget_add_controller(widget, controller); gtk_widget_add_controller(widget, controller);
g_object_set_data(G_OBJECT(widget), "on_intercept_touch_listener", controller); g_object_set_data(G_OBJECT(widget), "on_intercept_touch_listener", controller);
} }
WrapperWidget *wrapper = WRAPPER_WIDGET(widget);
if (!wrapper->needs_allocation && (wrapper->layout_width || wrapper->layout_height)) if (!wrapper->needs_allocation && (wrapper->layout_width || wrapper->layout_height))
gtk_widget_size_allocate(GTK_WIDGET(wrapper), &(GtkAllocation){.x = 0, .y = 0, .width = wrapper->layout_width, .height = wrapper->layout_height}, 0); gtk_widget_size_allocate(GTK_WIDGET(wrapper), &(GtkAllocation){.x = 0, .y = 0, .width = wrapper->layout_width, .height = wrapper->layout_height}, 0);
wrapper->needs_allocation = true; wrapper->needs_allocation = true;

3
src/api-impl-jni/widgets/WrapperWidget.c
View File

@@ -347,7 +347,8 @@ void wrapper_widget_set_jobject(WrapperWidget *wrapper, JNIEnv *env, jobject job
jmethodID ontouchevent_method = _METHOD(_CLASS(jobj), "onTouchEvent", "(Landroid/view/MotionEvent;)Z"); jmethodID ontouchevent_method = _METHOD(_CLASS(jobj), "onTouchEvent", "(Landroid/view/MotionEvent;)Z");
jmethodID dispatchtouchevent_method = _METHOD(_CLASS(jobj), "dispatchTouchEvent", "(Landroid/view/MotionEvent;)Z"); jmethodID dispatchtouchevent_method = _METHOD(_CLASS(jobj), "dispatchTouchEvent", "(Landroid/view/MotionEvent;)Z");
if (ontouchevent_method != handle_cache.view.onTouchEvent || dispatchtouchevent_method != handle_cache.view.dispatchTouchEvent) { wrapper->custom_dispatch_touch = dispatchtouchevent_method != handle_cache.view.dispatchTouchEvent;
if (ontouchevent_method != handle_cache.view.onTouchEvent || wrapper->custom_dispatch_touch) {
_setOnTouchListener(env, jobj, GTK_WIDGET(wrapper)); _setOnTouchListener(env, jobj, GTK_WIDGET(wrapper));
} }

1
src/api-impl-jni/widgets/WrapperWidget.h
View File

@@ -23,6 +23,7 @@ struct _WrapperWidget
int real_height; int real_height;
gboolean needs_allocation; gboolean needs_allocation;
gboolean intercepting_touch; gboolean intercepting_touch;
gboolean custom_dispatch_touch;
}; };
struct _WrapperWidgetClass struct _WrapperWidgetClass

2
src/api-impl/android/view/View.java
View File

@@ -1066,8 +1066,6 @@ public class View implements Drawable.Callback {
boolean handled = false; boolean handled = false;
if (on_touch_listener != null) if (on_touch_listener != null)
handled = on_touch_listener.onTouch(this, event); handled = on_touch_listener.onTouch(this, event);
if (!handled)
handled = dispatchTouchEvent(event);
return handled; return handled;
} }