Skip to content

Commit 302da3d

Browse files
committed
Merge pull request #99669 from syntaxerror247/root_window_issues
Fix root window size bug on `Android`
2 parents 200bb20 + c699d5b commit 302da3d

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

scene/main/window.cpp

+18
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,12 @@ void Window::move_to_center() {
397397

398398
void Window::set_size(const Size2i &p_size) {
399399
ERR_MAIN_THREAD_GUARD;
400+
#if defined(ANDROID_ENABLED)
401+
if (!get_parent()) {
402+
// Can't set root window size on Android.
403+
return;
404+
}
405+
#endif
400406

401407
size = p_size;
402408
_update_window_size();
@@ -467,6 +473,12 @@ void Window::_validate_limit_size() {
467473

468474
void Window::set_max_size(const Size2i &p_max_size) {
469475
ERR_MAIN_THREAD_GUARD;
476+
#if defined(ANDROID_ENABLED)
477+
if (!get_parent()) {
478+
// Can't set root window size on Android.
479+
return;
480+
}
481+
#endif
470482
Size2i max_size_clamped = _clamp_limit_size(p_max_size);
471483
if (max_size == max_size_clamped) {
472484
return;
@@ -484,6 +496,12 @@ Size2i Window::get_max_size() const {
484496

485497
void Window::set_min_size(const Size2i &p_min_size) {
486498
ERR_MAIN_THREAD_GUARD;
499+
#if defined(ANDROID_ENABLED)
500+
if (!get_parent()) {
501+
// Can't set root window size on Android.
502+
return;
503+
}
504+
#endif
487505
Size2i min_size_clamped = _clamp_limit_size(p_min_size);
488506
if (min_size == min_size_clamped) {
489507
return;

0 commit comments

Comments
 (0)