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

Window: fix issue with multi Activity support

Browse Source 
each Activity has its own Window object. Therefore the check if the
contentView has changed needs to be in the common native window
This commit is contained in:
Julian Winkler
2023-10-28 09:21:04 +02:00
parent a2381f4721
commit 469d47091c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api-impl-jni/android_view_Window.c
View File

@@ -7,7 +7,11 @@
JNIEXPORT void JNICALL Java_android_view_Window_set_1widget_1as_1root(JNIEnv *env, jobject this, jlong window, jlong widget)
{
gtk_window_set_child(GTK_WINDOW(_PTR(window)), gtk_widget_get_parent(GTK_WIDGET(_PTR(widget))));
GtkWindow *gtk_window = GTK_WINDOW(_PTR(window));
GtkWidget *gtk_widget = gtk_widget_get_parent(GTK_WIDGET(_PTR(widget)));
if (gtk_widget != gtk_window_get_child(gtk_window)) {
gtk_window_set_child(gtk_window, gtk_widget);
}
}
// FIXME put this in a header file

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

@@ -41,11 +41,9 @@ public class Window {
}
public void setContentView(View view) {
if (view != contentView) {
contentView = view;
view.onAttachedToWindow();
set_widget_as_root(native_window, view.widget);
}
contentView = view;
view.onAttachedToWindow();
set_widget_as_root(native_window, view.widget);
}
public View getDecorView() {