Archive/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-04-28 12:17:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "View: call onLayout() only on size change or on request"

Browse source 
This reverts commit b33a470c7b.

This commit was added as fix for layout recreation loops, but this is no
longer a problem, since ViewGroup.detachViewFromParent() has been
improved. The first fix is no longer needed and it seems to cause some
minor regressions, so we revert it.
This commit is contained in:
Julian Winkler 2025-03-25 19:59:25 +01:00
parent caa4700487
commit 15a6432d01
3 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api-impl-jni/util.c
View file

@ -134,7 +134,7 @@ void set_up_handle_cache(JNIEnv *env)
handle_cache.view.onTouchEvent = _METHOD(handle_cache.view.class, "onTouchEvent", "(Landroid/view/MotionEvent;)Z");
handle_cache.view.dispatchTouchEvent = _METHOD(handle_cache.view.class, "dispatchTouchEvent", "(Landroid/view/MotionEvent;)Z");
handle_cache.view.onInterceptTouchEvent = _METHOD(handle_cache.view.class, "onInterceptTouchEvent", "(Landroid/view/MotionEvent;)Z");
handle_cache.view.layoutInternal = _METHOD(handle_cache.view.class, "layoutInternal", "(II)Z");
handle_cache.view.layoutInternal = _METHOD(handle_cache.view.class, "layoutInternal", "(II)V");
handle_cache.view.measure = _METHOD(handle_cache.view.class, "measure", "(II)V");
handle_cache.view.performLongClick = _METHOD(handle_cache.view.class, "performLongClick", "(FF)Z");
handle_cache.view.getId = _METHOD(handle_cache.view.class, "getId", "()I");

11
src/api-impl-jni/views/AndroidLayout.c
View file

@ -70,18 +70,9 @@ static void android_layout_allocate(GtkLayoutManager *layout_manager, GtkWidget
height = layout->real_height;
}
jboolean layoutChanged = (*env)->CallBooleanMethod(env, layout->view, handle_cache.view.layoutInternal, width, height);
(*env)->CallVoidMethod(env, layout->view, handle_cache.view.layoutInternal, width, height);
if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env);
if (!layoutChanged) { // No change in layout. Reapply the current allocations
for (GtkWidget *child = gtk_widget_get_first_child(widget); child; child = gtk_widget_get_next_sibling(child)) {
graphene_matrix_t transform_matrix;
if (gtk_widget_compute_transform(child, widget, &transform_matrix)) {
GskTransform *transform = gsk_transform_matrix(NULL, &transform_matrix);
gtk_widget_allocate(child, gtk_widget_get_width(child), gtk_widget_get_height(child), gtk_widget_get_baseline(child), transform);
}
}
}
}
static GtkSizeRequestMode android_layout_get_request_mode(GtkLayoutManager *layout_manager, GtkWidget *widget)

20
src/api-impl/android/view/View.java
View file

@ -848,7 +848,6 @@ public class View implements Drawable.Callback {
private int oldWidthMeasureSpec = -1;
private int oldHeightMeasureSpec = -1;
private boolean layoutRequested = true;
private boolean layoutPending = true;
private int oldWidth;
private int oldHeight;
protected boolean haveCustomMeasure = true;
@ -1372,7 +1371,6 @@ public class View implements Drawable.Callback {
oldHeightMeasureSpec = heightMeasureSpec;
onMeasure(widthMeasureSpec, heightMeasureSpec);
layoutRequested = false;
layoutPending = true;
}
}
@ -1448,10 +1446,8 @@ public class View implements Drawable.Callback {
native_layout(widget, l, t, r, b);
}
/** Helper function to be called from GTK's LayoutManager via JNI
* @return true if the layout changed
*/
private boolean layoutInternal(int width, int height) {
/** Helper function to be called from GTKs LayoutManager via JNI */
private void layoutInternal(int width, int height) {
// if the layout is triggered from a native widget, we might not have measured yet
if (width != getMeasuredWidth() || height != getMeasuredHeight()) {
measure(width | MeasureSpec.EXACTLY, height | MeasureSpec.EXACTLY);
@ -1461,15 +1457,9 @@ public class View implements Drawable.Callback {
onSizeChanged(width, height, oldWidth, oldHeight);
bottom = top + height;
right = left + width;
if (changed || layoutPending) {
layoutPending = false;
onLayout(changed, 0, 0, width, height);
oldWidth = width;
oldHeight = height;
return true;
} else {
return false;
}
onLayout(changed, 0, 0, width, height);
oldWidth = width;
oldHeight = height;
}
public int getLeft() {