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

Simplify native interface of widget implementations

Browse Source 
Makes it easier to overwrite behavior in subclasses. Have a fallback
implementation for ViewGroup.
Save some _GET_LONG_FIELD / _SET_LONG_FIELD calls by directly passing
the native pointers to and from native methods.
This commit is contained in:
Julian Winkler
2023-08-17 12:59:37 +02:00
parent 82744e9e5e
commit 4d90002ec6
33 changed files with 403 additions and 553 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

@@ -174,7 +174,7 @@ gboolean tick_callback(GtkWidget* widget, GdkFrameClock* frame_clock, gpointer u
return G_SOURCE_CONTINUE;
}
JNIEXPORT void JNICALL Java_android_view_View_native_1constructor(JNIEnv *env, jobject this, jobject Context)
JNIEXPORT jlong JNICALL Java_android_view_View_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs)
{
GtkWidget *wrapper = wrapper_widget_new();
GtkWidget *area = gtk_drawing_area_new();
@@ -183,7 +183,7 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1constructor(JNIEnv *env, j
gtk_widget_add_tick_callback(area, tick_callback, NULL, NULL);
_SET_LONG_FIELD(this, "widget", (long)area);
return _INTPTR(area);
}
JNIEXPORT void JNICALL Java_android_view_View_nativeInvalidate(JNIEnv *env, jclass, jlong widget_ptr) {

57
src/api-impl-jni/views/android_view_ViewGroup.c
View File

@@ -3,21 +3,32 @@
#include "../defines.h"
#include "../util.h"
#include "../widgets/WrapperWidget.h"
#include "../generated_headers/android_view_ViewGroup.h"
#include "../generated_headers/android_view_View.h"
JNIEXPORT void JNICALL Java_android_view_ViewGroup_addView(JNIEnv *env, jobject this, jobject child, jint index, jobject layout_params)
/**
* Should be overwritten by ViewGroup subclasses.
* Fall back to vertical GtkBox if subclass is not implemented yet
*/
JNIEXPORT jlong JNICALL Java_android_view_ViewGroup_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs)
{
GtkWidget *_child = gtk_widget_get_parent(GTK_WIDGET(_PTR(_GET_LONG_FIELD(child, "widget"))));
jint child_width = -1;
jint child_height = -1;
GtkWidget *wrapper = wrapper_widget_new();
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); // spacing of 1
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), box);
gtk_widget_set_name(GTK_WIDGET(box), "ViewGroup");
return _INTPTR(box);
}
JNIEXPORT void JNICALL Java_android_view_ViewGroup_native_1addView(JNIEnv *env, jobject this, jlong widget, jlong child, jint index, jobject layout_params)
{
if(layout_params) {
(*env)->CallVoidMethod(env, child, handle_cache.view.setLayoutParams, layout_params);
if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env);
/*
GtkWidget *_child = gtk_widget_get_parent(GTK_WIDGET(_PTR(child)));
jint child_width = -1;
jint child_height = -1;
jint child_width = _GET_INT_FIELD(layout_params, "width");
jint child_height = _GET_INT_FIELD(layout_params, "height");
@@ -33,34 +44,10 @@ JNIEXPORT void JNICALL Java_android_view_ViewGroup_addView(JNIEnv *env, jobject
Java_android_view_View_setGravity(env, child, child_gravity);
}*/
}
_SET_OBJ_FIELD(child, "parent", "Landroid/view/ViewGroup;", this);
jobject children = _GET_OBJ_FIELD(this, "children", "Ljava/util/ArrayList;");
(*env)->CallVoidMethod(env, children, handle_cache.array_list.add, child);
gtk_box_append(GTK_BOX(_PTR(widget)), gtk_widget_get_parent(GTK_WIDGET(_PTR(child)))); // FIXME - ignores index argument
}
JNIEXPORT void JNICALL Java_android_view_ViewGroup_removeView(JNIEnv *env, jobject this, jobject child)
JNIEXPORT void JNICALL Java_android_view_ViewGroup_native_1removeView(JNIEnv *env, jobject this, jlong widget, jlong child)
{
_SET_OBJ_FIELD(child, "parent", "Landroid/view/ViewGroup;", NULL);
jobject children = _GET_OBJ_FIELD(this, "children", "Ljava/util/ArrayList;");
(*env)->CallVoidMethod(env, children, handle_cache.array_list.remove, child);
}
JNIEXPORT void JNICALL Java_android_view_ViewGroup_removeAllViews(JNIEnv *env, jobject this)
{
jobject children = _GET_OBJ_FIELD(this, "children", "Ljava/util/ArrayList;");
jint size = (*env)->CallIntMethod(env, children, handle_cache.array_list.size);
for(int i = 0; i < size; i++) {
jobject child = (*env)->CallObjectMethod(env, children, handle_cache.array_list.get, i);
_SET_OBJ_FIELD(child, "parent", "Landroid/view/ViewGroup;", NULL);
}
(*env)->CallVoidMethod(env, children, handle_cache.array_list.clear);
gtk_box_remove(GTK_BOX(_PTR(widget)), gtk_widget_get_parent(GTK_WIDGET(_PTR(child))));
}