Selaa lähdekoodia

Merge pull request #100746 from syntaxerror247/size-regression

Android: Fix `Window` size changes ignored when node is not in tree
Thaddeus Crews 8 kuukautta sitten
vanhempi
commit
a7fb67b827
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      scene/main/window.cpp

+ 3 - 3
scene/main/window.cpp

@@ -399,7 +399,7 @@ void Window::move_to_center() {
 void Window::set_size(const Size2i &p_size) {
 	ERR_MAIN_THREAD_GUARD;
 #if defined(ANDROID_ENABLED)
-	if (!get_parent()) {
+	if (!get_parent() && is_inside_tree()) {
 		// Can't set root window size on Android.
 		return;
 	}
@@ -475,7 +475,7 @@ void Window::_validate_limit_size() {
 void Window::set_max_size(const Size2i &p_max_size) {
 	ERR_MAIN_THREAD_GUARD;
 #if defined(ANDROID_ENABLED)
-	if (!get_parent()) {
+	if (!get_parent() && is_inside_tree()) {
 		// Can't set root window size on Android.
 		return;
 	}
@@ -498,7 +498,7 @@ Size2i Window::get_max_size() const {
 void Window::set_min_size(const Size2i &p_min_size) {
 	ERR_MAIN_THREAD_GUARD;
 #if defined(ANDROID_ENABLED)
-	if (!get_parent()) {
+	if (!get_parent() && is_inside_tree()) {
 		// Can't set root window size on Android.
 		return;
 	}