Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #85312 from YuriSizov/window-and-the-case-of-an-unexpected-shrinkage

Browse source 
Make sure `Window`'s title is respected before we compute the size
This commit is contained in:
Rémi Verschelde 2023-12-05 13:05:23 +01:00
commit 36e033bce8
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scene/main/window.cpp
View file

@ -967,6 +967,10 @@ Size2i Window::_clamp_window_size(const Size2i &p_size) {
void Window::_update_window_size() {
Size2i size_limit = get_clamped_minimum_size();
if (!embedder && window_id != DisplayServer::INVALID_WINDOW_ID && keep_title_visible) {
Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(tr_title, window_id);
size_limit = size_limit.max(title_size);
}
size = size.max(size_limit);
@ -998,12 +1002,6 @@ void Window::_update_window_size() {
}
DisplayServer::get_singleton()->window_set_max_size(max_size_used, window_id);
if (keep_title_visible) {
Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(tr_title, window_id);
size_limit = size_limit.max(title_size);
}
DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id);
DisplayServer::get_singleton()->window_set_size(size, window_id);
}