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

remove View.haveComplexMeasure as it is redundant with haveCustomMeasure

Browse Source 
Makes haveCustomMeasure true by default. And disable it for widgets
which previously set haveComplexMeasure
This commit is contained in:
Julian Winkler
2024-03-12 18:19:43 +01:00
parent c0bc875c11
commit f852c2bbc9
9 changed files with 13 additions and 17 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: (JIIZ)V
* Signature: (JII)V
*/
JNIEXPORT void JNICALL Java_android_view_View_native_1measure
(JNIEnv *, jobject, jlong, jint, jint, jboolean);
(JNIEnv *, jobject, jlong, jint, jint);
/*
* Class: android_view_View

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

@@ -347,7 +347,6 @@ JNIEXPORT jlong JNICALL Java_android_view_View_native_1constructor(JNIEnv *env,
jmethodID layout_method = _METHOD(class, "onLayout", "(ZIIII)V");
if (measure_method != handle_cache.view.onMeasure || layout_method != handle_cache.view.onLayout) {
gtk_widget_set_layout_manager(widget, android_layout_new(_REF(this)));
(*env)->SetBooleanField(env, this, _FIELD_ID(class, "haveCustomMeasure", "Z"), true);
}
if (_METHOD(_CLASS(this), "onGenericMotionEvent", "(Landroid/view/MotionEvent;)Z") != handle_cache.view.onGenericMotionEvent) {
@@ -376,7 +375,7 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1destructor(JNIEnv *env, jo
#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, jboolean is_complex) {
JNIEXPORT void JNICALL Java_android_view_View_native_1measure(JNIEnv *env, jobject this, jlong widget_ptr, jint width_spec, jint height_spec) {
int width = -1;
int height = -1;
GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(widget_ptr)));
@@ -386,11 +385,11 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1measure(JNIEnv *env, jobje
int height_spec_mode = height_spec & MEASURE_SPEC_MASK;
GtkSizeRequestMode request_mode;
if (width_spec_mode == MEASURE_SPEC_EXACTLY || (!is_complex && width_spec_mode == MEASURE_SPEC_AT_MOST)) {
if (width_spec_mode == MEASURE_SPEC_EXACTLY) {
width = width_spec_size;
request_mode = GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
}
if (height_spec_mode == MEASURE_SPEC_EXACTLY || (!is_complex && height_spec_mode == MEASURE_SPEC_AT_MOST)) {
if (height_spec_mode == MEASURE_SPEC_EXACTLY) {
height = height_spec_size;
request_mode = GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
}

1
src/api-impl-jni/widgets/android_widget_ScrollView.c
View File

@@ -13,7 +13,6 @@ JNIEXPORT jlong JNICALL Java_android_widget_ScrollView_native_1constructor(JNIEn
GtkWidget *scrolled_window = gtk_scrolled_window_new();
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), scrolled_window);
gtk_widget_set_name(scrolled_window, "ScrollView");
(*env)->SetBooleanField(env, this, _FIELD_ID(_CLASS(this), "haveCustomMeasure", "Z"), true);
return _INTPTR(scrolled_window);
}