summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-02 22:12:11 +0200
committerGitHub <noreply@github.com>2021-07-02 22:12:11 +0200
commita8fb450b3ce568fa8e3c9c013821f9046b9a0396 (patch)
tree07451d1c8a60dd6843c0e6e9a6409dbac6d6d2e2
parent676027fc3df07ad0c59c7d128bcc15f5ff58ae4a (diff)
parenta829e88ddc0931a36e0b50d5307e93b1489b531b (diff)
Merge pull request #50092 from YeldhamDev/window_get_contents_expose
Expose `Window.get_contents_minimum_size()` to scripts
-rw-r--r--doc/classes/Window.xml7
-rw-r--r--scene/main/window.cpp2
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/classes/Window.xml b/doc/classes/Window.xml
index 6ae5a5f449..73a95967bd 100644
--- a/doc/classes/Window.xml
+++ b/doc/classes/Window.xml
@@ -19,6 +19,13 @@
<description>
</description>
</method>
+ <method name="get_contents_minimum_size" qualifiers="const">
+ <return type="Vector2">
+ </return>
+ <description>
+ Returns the combined minimum size from the child [Control] nodes of the window.
+ </description>
+ </method>
<method name="get_flag" qualifiers="const">
<return type="bool">
</return>
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index d793be1869..cf2a6b2adf 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -1393,6 +1393,8 @@ void Window::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_embedded"), &Window::is_embedded);
+ ClassDB::bind_method(D_METHOD("get_contents_minimum_size"), &Window::get_contents_minimum_size);
+
ClassDB::bind_method(D_METHOD("set_content_scale_size", "size"), &Window::set_content_scale_size);
ClassDB::bind_method(D_METHOD("get_content_scale_size"), &Window::get_content_scale_size);