Skip to content

Commit c699d5b

Browse files
Fix root window size bug on Android
1 parent 0c45ace commit c699d5b

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
@@ -390,6 +390,12 @@ void Window::move_to_center() {
390390

391391
void Window::set_size(const Size2i &p_size) {
392392
ERR_MAIN_THREAD_GUARD;
393+
#if defined(ANDROID_ENABLED)
394+
if (!get_parent()) {
395+
// Can't set root window size on Android.
396+
return;
397+
}
398+
#endif
393399

394400
size = p_size;
395401
_update_window_size();
@@ -460,6 +466,12 @@ void Window::_validate_limit_size() {
460466

461467
void Window::set_max_size(const Size2i &p_max_size) {
462468
ERR_MAIN_THREAD_GUARD;
469+
#if defined(ANDROID_ENABLED)
470+
if (!get_parent()) {
471+
// Can't set root window size on Android.
472+
return;
473+
}
474+
#endif
463475
Size2i max_size_clamped = _clamp_limit_size(p_max_size);
464476
if (max_size == max_size_clamped) {
465477
return;
@@ -477,6 +489,12 @@ Size2i Window::get_max_size() const {
477489

478490
void Window::set_min_size(const Size2i &p_min_size) {
479491
ERR_MAIN_THREAD_GUARD;
492+
#if defined(ANDROID_ENABLED)
493+
if (!get_parent()) {
494+
// Can't set root window size on Android.
495+
return;
496+
}
497+
#endif
480498
Size2i min_size_clamped = _clamp_limit_size(p_min_size);
481499
if (min_size == min_size_clamped) {
482500
return;

0 commit comments

Comments
 (0)