diff options
| -rw-r--r-- | doc/classes/Window.xml | 2 | ||||
| -rw-r--r-- | scene/main/window.cpp | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/doc/classes/Window.xml b/doc/classes/Window.xml index 9c0e8011dc..286b35d642 100644 --- a/doc/classes/Window.xml +++ b/doc/classes/Window.xml @@ -118,12 +118,14 @@ <return type="Vector2i" /> <description> Returns the window's position including its border. + [b]Note:[/b] If [member visible] is [code]false[/code], this method returns the same value as [member position]. </description> </method> <method name="get_size_with_decorations" qualifiers="const"> <return type="Vector2i" /> <description> Returns the window's size including its border. + [b]Note:[/b] If [member visible] is [code]false[/code], this method returns the same value as [member size]. </description> </method> <method name="get_theme_color" qualifiers="const"> diff --git a/scene/main/window.cpp b/scene/main/window.cpp index e9a7123da0..1649f8b73c 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -397,6 +397,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; } @@ -405,6 +415,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; } |