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.onMeasure: handle MEASURE_SPEC_AT_MOST properly

Browse Source 
We decide between simple widgets which handles MEASURE_SPEC_AT_MOST the same way as
MEASURE_SPEC_EXACTLY, and complex widgets which handles MEASURE_SPEC_AT_MOST by measuring the content
This commit is contained in:
Julian Winkler
2023-10-14 11:06:27 +02:00
committed by Mis012
parent e735757a2e
commit 37d9b13470
6 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api-impl-jni/generated_headers/android_view_View.h
View File

@@ -258,10 +258,10 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1destructor
/*
* Class: android_view_View
* Method: native_measure
* Signature: (JII)V
* Signature: (JIIZ)V
*/
JNIEXPORT void JNICALL Java_android_view_View_native_1measure
(JNIEnv *, jobject, jlong, jint, jint);
(JNIEnv *, jobject, jlong, jint, jint, jboolean);
/*
* Class: android_view_View

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

@@ -218,27 +218,38 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1destructor(JNIEnv *env, jo
#define MEASURE_SPEC_UNSPECIFIED (0 << 30)
#define MEASURE_SPEC_EXACTLY (1 << 30)
#define MEASURE_SPEC_AT_MOST (2 << 30)
#define MEASURE_SPEC_MASK (0x3 << 30)
JNIEXPORT void JNICALL Java_android_view_View_native_1measure(JNIEnv *env, jobject this, jlong widget_ptr, jint width_spec, jint height_spec) {
JNIEXPORT void JNICALL Java_android_view_View_native_1measure(JNIEnv *env, jobject this, jlong widget_ptr, jint width_spec, jint height_spec, jboolean is_complex) {
int width;
int height;
int for_size;
GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(widget_ptr)));
int width_spec_size = width_spec & ~MEASURE_SPEC_MASK;
int height_spec_size = height_spec & ~MEASURE_SPEC_MASK;
int width_spec_mode = width_spec & MEASURE_SPEC_MASK;
int height_spec_mode = height_spec & MEASURE_SPEC_MASK;
if ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) {
width = width_spec & ~MEASURE_SPEC_MASK;
if (width_spec_mode == MEASURE_SPEC_EXACTLY || (!is_complex && width_spec_mode == MEASURE_SPEC_AT_MOST)) {
width = width_spec_size;
} else {
for_size = ((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (height_spec & ~MEASURE_SPEC_MASK) : -1;
for_size = (height_spec_mode == MEASURE_SPEC_EXACTLY) ? height_spec_size : -1;
gtk_widget_measure(widget, GTK_ORIENTATION_HORIZONTAL, for_size, NULL, &width, NULL, NULL);
}
if (width_spec_mode == MEASURE_SPEC_AT_MOST && width > width_spec_size) {
width = width_spec_size;
}
if ((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) {
height = height_spec & ~MEASURE_SPEC_MASK;
if (height_spec_mode == MEASURE_SPEC_EXACTLY || (!is_complex && height_spec_mode == MEASURE_SPEC_AT_MOST)) {
height = height_spec_size;
} else {
for_size = ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (width_spec & ~MEASURE_SPEC_MASK) : -1;
for_size = (width_spec_mode == MEASURE_SPEC_EXACTLY) ? width_spec_size : -1;
gtk_widget_measure(widget, GTK_ORIENTATION_VERTICAL, for_size, NULL, &height, NULL, NULL);
}
if (height_spec_mode == MEASURE_SPEC_AT_MOST && height > height_spec_size) {
height = height_spec_size;
}
(*env)->CallVoidMethod(env, this, handle_cache.view.setMeasuredDimension, width, height);
}

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

@@ -876,7 +876,11 @@ public class View extends Object {
protected native long native_constructor(Context context, AttributeSet attrs); // will create a custom GtkWidget with a custom drawing function
public native void native_setLayoutParams(long widget, int width, int height, int gravity, float weight);
protected native void native_destructor(long widget);
protected native void native_measure(long widget, int widthMeasureSpec, int heightMeasureSpec);
/**
* We decide between simple widgets which handles MEASURE_SPEC_AT_MOST the same way as
* MEASURE_SPEC_EXACTLY, and complex widgets which handles MEASURE_SPEC_AT_MOST by measuring the content
*/
protected native void native_measure(long widget, int widthMeasureSpec, int heightMeasureSpec, boolean isComplex);
protected native void native_layout(long widget, int l, int t, int r, int b);
protected native void native_requestLayout(long widget);
@@ -913,7 +917,7 @@ public class View extends Object {
};
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
native_measure(widget, widthMeasureSpec, heightMeasureSpec);
native_measure(widget, widthMeasureSpec, heightMeasureSpec, false);
}
public void setPressed(boolean pressed) {

5
src/api-impl/android/view/ViewGroup.java
View File

@@ -119,6 +119,11 @@ public class ViewGroup extends View implements ViewParent, ViewManager {
removeView(child);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
native_measure(widget, widthMeasureSpec, heightMeasureSpec, true);
}
@Override
protected native long native_constructor(Context context, AttributeSet attrs);
protected native void native_addView(long widget, long child, int index, LayoutParams params);

5
src/api-impl/android/widget/ImageView.java
View File

@@ -33,6 +33,11 @@ public class ImageView extends View {
super(context, attrs, defStyleAttr);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
native_measure(widget, widthMeasureSpec, heightMeasureSpec, true);
}
@Override
protected native long native_constructor(Context context, AttributeSet attrs);
protected native void native_setPixbuf(long pixbuf);

5
src/api-impl/android/widget/TextView.java
View File

@@ -66,6 +66,11 @@ public class TextView extends View {
setText(getContext().getResources().getText(resId));
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
native_measure(widget, widthMeasureSpec, heightMeasureSpec, true);
}
private native final void native_set_markup(int bool);
public native final void native_setText(String text);