mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-06 17:37:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99669 from syntaxerror247/root_window_issues

Browse Source 
Fix root window size bug on `Android`
This commit is contained in:
Rémi Verschelde 2024-12-02 15:51:16 +01:00
commit 302da3d9a4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/main/window.cpp
View File

@ -397,6 +397,12 @@ void Window::move_to_center() {
void Window::set_size(const Size2i &p_size) { void Window::set_size(const Size2i &p_size) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
#if defined(ANDROID_ENABLED)
if (!get_parent()) {
// Can't set root window size on Android.
return;
}
#endif
size = p_size; size = p_size;
_update_window_size(); _update_window_size();
@ -467,6 +473,12 @@ void Window::_validate_limit_size() {
void Window::set_max_size(const Size2i &p_max_size) { void Window::set_max_size(const Size2i &p_max_size) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
#if defined(ANDROID_ENABLED)
if (!get_parent()) {
// Can't set root window size on Android.
return;
}
#endif
Size2i max_size_clamped = _clamp_limit_size(p_max_size); Size2i max_size_clamped = _clamp_limit_size(p_max_size);
if (max_size == max_size_clamped) { if (max_size == max_size_clamped) {
return; return;
@ -484,6 +496,12 @@ Size2i Window::get_max_size() const {
void Window::set_min_size(const Size2i &p_min_size) { void Window::set_min_size(const Size2i &p_min_size) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
#if defined(ANDROID_ENABLED)
if (!get_parent()) {
// Can't set root window size on Android.
return;
}
#endif
Size2i min_size_clamped = _clamp_limit_size(p_min_size); Size2i min_size_clamped = _clamp_limit_size(p_min_size);
if (min_size == min_size_clamped) { if (min_size == min_size_clamped) {
return; return;