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

WrapperWidget: create SkArea also for Views with custom draw() method

Browse Source 
Previously we only handled custom onDraw() methods
This commit is contained in:
Julian Winkler
2024-05-19 15:04:15 +02:00
parent 2324418813
commit dd3965df8a
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api-impl-jni/util.c
View File

@@ -108,6 +108,7 @@ void set_up_handle_cache(JNIEnv *env)
if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env);
handle_cache.view.onDraw = _METHOD(handle_cache.view.class, "onDraw", "(Landroid/graphics/Canvas;)V");
handle_cache.view.draw = _METHOD(handle_cache.view.class, "draw", "(Landroid/graphics/Canvas;)V");
handle_cache.view.onMeasure = _METHOD(handle_cache.view.class, "onMeasure", "(II)V");
handle_cache.view.onLayout = _METHOD(handle_cache.view.class, "onLayout", "(ZIIII)V");
handle_cache.view.getMeasuredWidth = _METHOD(handle_cache.view.class, "getMeasuredWidth", "()I");

1
src/api-impl-jni/util.h
View File

@@ -62,6 +62,7 @@ struct handle_cache {
jclass class;
jmethodID setLayoutParams;
jmethodID onDraw;
jmethodID draw;
jmethodID onMeasure;
jmethodID onLayout;
jmethodID getMeasuredWidth;

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

@@ -175,8 +175,9 @@ void wrapper_widget_set_jobject(WrapperWidget *wrapper, JNIEnv *env, jobject job
(*env)->GetJavaVM(env, &jvm);
wrapper->jvm = jvm;
wrapper->jobj = _REF(jobj);
jmethodID draw_method = _METHOD(_CLASS(jobj), "onDraw", "(Landroid/graphics/Canvas;)V");
if (draw_method != handle_cache.view.onDraw) {
jmethodID on_draw_method = _METHOD(_CLASS(jobj), "onDraw", "(Landroid/graphics/Canvas;)V");
jmethodID draw_method = _METHOD(_CLASS(jobj), "draw", "(Landroid/graphics/Canvas;)V");
if (on_draw_method != handle_cache.view.onDraw || draw_method != handle_cache.view.draw) {
wrapper->draw_method = draw_method;
GtkWidget *sk_area = sk_area_new();

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

@@ -900,6 +900,9 @@ public class View implements Drawable.Callback {
}
public void onDraw(Canvas canvas) {}
public void draw(Canvas canvas) {
onDraw(canvas);
}
public View(Context context) {
this(context, null);