godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Merge pull request #92317 from bruvzg/emb_decorations

Browse Source 
Fix `get_position_with_decorations` and `get_size_with_decorations` for embedded windows.
This commit is contained in:
Rémi Verschelde
2024-05-30 11:48:02 +02:00
parent 4cd39c56fb 64d789aba7
commit c9f249796d
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/main/window.cpp
View File

@@ -408,6 +408,16 @@ Point2i Window::get_position_with_decorations() const {
if (window_id != DisplayServer::INVALID_WINDOW_ID) {
return DisplayServer::get_singleton()->window_get_position_with_decorations(window_id);
}
if (visible && is_embedded() && !get_flag(Window::FLAG_BORDERLESS)) {
Size2 border_offset;
if (theme_cache.embedded_border.is_valid()) {
border_offset = theme_cache.embedded_border->get_offset();
}
if (theme_cache.embedded_unfocused_border.is_valid()) {
border_offset = border_offset.max(theme_cache.embedded_unfocused_border->get_offset());
}
return position - border_offset;
}
return position;
}
@@ -416,6 +426,16 @@ Size2i Window::get_size_with_decorations() const {
if (window_id != DisplayServer::INVALID_WINDOW_ID) {
return DisplayServer::get_singleton()->window_get_size_with_decorations(window_id);
}
if (visible && is_embedded() && !get_flag(Window::FLAG_BORDERLESS)) {
Size2 border_size;
if (theme_cache.embedded_border.is_valid()) {
border_size = theme_cache.embedded_border->get_minimum_size();
}
if (theme_cache.embedded_unfocused_border.is_valid()) {
border_size = border_size.max(theme_cache.embedded_unfocused_border->get_minimum_size());
}
return size + border_size;
}
return size;
}