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

fix compiler warnings in WrapperWidget and View

Browse Source
This commit is contained in:
Julian Winkler
2023-10-28 08:04:00 +02:00
parent 9ef2151c5e
commit a2381f4721
3 changed files with 8 additions and 4 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

@@ -9,7 +9,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; unsigned int num_clicks;};
static void call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d) static void call_ontouch_callback(int action, double x, double y, struct touch_callback_data *d)
{ {
@@ -253,7 +253,7 @@ JNIEXPORT jlong JNICALL Java_android_view_View_native_1constructor(JNIEnv *env,
return _INTPTR(widget); return _INTPTR(widget);
} }
JNIEXPORT void JNICALL Java_android_view_View_nativeInvalidate(JNIEnv *env, jclass, jlong widget_ptr) { JNIEXPORT void JNICALL Java_android_view_View_nativeInvalidate(JNIEnv *env, jclass class, jlong widget_ptr) {
GtkWidget *widget = GTK_WIDGET(_PTR(widget_ptr)); GtkWidget *widget = GTK_WIDGET(_PTR(widget_ptr));
gtk_widget_queue_draw(gtk_widget_get_parent(widget)); gtk_widget_queue_draw(gtk_widget_get_parent(widget));

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

@@ -31,8 +31,9 @@ static void wrapper_widget_dispose(GObject *wrapper_widget)
G_OBJECT_CLASS (wrapper_widget_parent_class)->dispose (wrapper_widget); G_OBJECT_CLASS (wrapper_widget_parent_class)->dispose (wrapper_widget);
} }
void skia_draw_func(SKArea *sk_area, sk_canvas_t *canvas, WrapperWidget *wrapper_widget) void skia_draw_func(SKArea *sk_area, sk_canvas_t *canvas, void *user_data)
{ {
WrapperWidget *wrapper_widget = WRAPPER_WIDGET(user_data);
JNIEnv *env; JNIEnv *env;
(*wrapper_widget->jvm)->GetEnv(wrapper_widget->jvm, (void**)&env, JNI_VERSION_1_6); (*wrapper_widget->jvm)->GetEnv(wrapper_widget->jvm, (void**)&env, JNI_VERSION_1_6);
if(wrapper_widget->canvas == NULL) { if(wrapper_widget->canvas == NULL) {
@@ -128,6 +129,6 @@ 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");
if (ontouchevent_method != handle_cache.view.onTouchEvent) { if (ontouchevent_method != handle_cache.view.onTouchEvent) {
/* use gtk_widget_get_first_child since the jobject may not have the "widget" variable set yet */ /* use gtk_widget_get_first_child since the jobject may not have the "widget" variable set yet */
_setOnTouchListener(env, jobj, gtk_widget_get_first_child(wrapper), NULL); _setOnTouchListener(env, jobj, gtk_widget_get_first_child(GTK_WIDGET(wrapper)), NULL);
} }
} }

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

@@ -2,6 +2,7 @@
#define WRAPPER_WIDGET_H #define WRAPPER_WIDGET_H
#include <jni.h> #include <jni.h>
#include <gtk/gtk.h>
G_DECLARE_FINAL_TYPE (WrapperWidget, wrapper_widget, WRAPPER, WIDGET, GtkWidget) G_DECLARE_FINAL_TYPE (WrapperWidget, wrapper_widget, WRAPPER, WIDGET, GtkWidget)
@@ -24,4 +25,6 @@ GtkWidget * wrapper_widget_new(void);
void wrapper_widget_set_child(WrapperWidget *parent, GtkWidget *child); void wrapper_widget_set_child(WrapperWidget *parent, GtkWidget *child);
void wrapper_widget_set_jobject(WrapperWidget *wrapper, JNIEnv *env, jobject jobj); void wrapper_widget_set_jobject(WrapperWidget *wrapper, JNIEnv *env, jobject jobj);
void _setOnTouchListener(JNIEnv *env, jobject this, GtkWidget *widget, jobject on_touch_listener);
#endif #endif