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: properly handle MATCH_PARENT sizes

Browse Source
This commit is contained in:
Julian Winkler
2023-09-01 12:42:57 +02:00
parent c6b98b14f8
commit a79b464503
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,10 +145,19 @@ JNIEXPORT void JNICALL Java_android_view_View_setGravity(JNIEnv *env, jobject th
} }
} }
#define MATCH_PARENT (-1)
JNIEXPORT void JNICALL Java_android_view_View_native_1set_1size_1request(JNIEnv *env, jobject this, jint width, jint height) JNIEXPORT void JNICALL Java_android_view_View_native_1set_1size_1request(JNIEnv *env, jobject this, jint width, jint height)
{ {
GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(_GET_LONG_FIELD(this, "widget")))); GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(_GET_LONG_FIELD(this, "widget"))));
if (width == MATCH_PARENT) {
gtk_widget_set_hexpand(widget, true);
}
if (height == MATCH_PARENT) {
gtk_widget_set_vexpand(widget, true);
}
if(width > 0) if(width > 0)
g_object_set(G_OBJECT(widget), "width-request", width, NULL); g_object_set(G_OBJECT(widget), "width-request", width, NULL);
if(height > 0) if(height > 0)
@@ -211,16 +220,20 @@ JNIEXPORT void JNICALL Java_android_view_View_native_1measure(JNIEnv *env, jobje
int for_size; int for_size;
GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(widget_ptr))); GtkWidget *widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(widget_ptr)));
if (((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) && ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY)) { if ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) {
width = width_spec & ~MEASURE_SPEC_MASK; width = width_spec & ~MEASURE_SPEC_MASK;
height = height_spec & ~MEASURE_SPEC_MASK;
} else { } else {
for_size = ((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (height_spec & ~MEASURE_SPEC_MASK) : -1; for_size = ((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (height_spec & ~MEASURE_SPEC_MASK) : -1;
gtk_widget_measure(widget, GTK_ORIENTATION_HORIZONTAL, for_size, NULL, &width, NULL, NULL); gtk_widget_measure(widget, GTK_ORIENTATION_HORIZONTAL, for_size, NULL, &width, NULL, NULL);
}
if ((height_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) {
height = height_spec & ~MEASURE_SPEC_MASK;
} else {
for_size = ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (width_spec & ~MEASURE_SPEC_MASK) : -1; for_size = ((width_spec & MEASURE_SPEC_MASK) == MEASURE_SPEC_EXACTLY) ? (width_spec & ~MEASURE_SPEC_MASK) : -1;
gtk_widget_measure(widget, GTK_ORIENTATION_VERTICAL, for_size, NULL, &height, NULL, NULL); gtk_widget_measure(widget, GTK_ORIENTATION_VERTICAL, for_size, NULL, &height, NULL, NULL);
} }
(*env)->CallVoidMethod(env, this, handle_cache.view.setMeasuredDimension, width, height); (*env)->CallVoidMethod(env, this, handle_cache.view.setMeasuredDimension, width, height);
} }