noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Make sure Window's title is respected before we compute the size

Browse Source 
Also removes some suspicious and outdated code that forced this particular
dialog to change size when the warning message changed.
This commit is contained in:
Yuri Sizov
2023-11-24 16:31:24 +01:00
parent 1ba920fada
commit d9677be0ca
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

@@ -955,6 +955,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);
@@ -986,12 +990,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);
}