summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2020-06-30 14:01:10 -0300
committerJuan Linietsky <reduzio@gmail.com>2020-06-30 14:02:37 -0300
commitb19ab945acec594a17e8a11cec53eec17ad4c4a5 (patch)
tree1659295371b6022a7ade300b01e9f4aae09ab96c /scene/main
parent84e9e58084d12771d04cd2ece16b32720867fcbd (diff)
Make dialogs exclusive by default, fixes #37732
Also fix on set_visible, not creating exclusive children as it should.
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/window.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index da02f932f1..7f2160c6a5 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -398,6 +398,18 @@ void Window::set_visible(bool p_visible) {
emit_signal(SceneStringNames::get_singleton()->visibility_changed);
RS::get_singleton()->viewport_set_active(get_viewport_rid(), visible);
+
+ //update transient exclusive
+ if (transient_parent) {
+ if (exclusive && visible) {
+ ERR_FAIL_COND_MSG(transient_parent->exclusive_child && transient_parent->exclusive_child != this, "Transient parent has another exclusive child.");
+ transient_parent->exclusive_child = this;
+ } else {
+ if (transient_parent->exclusive_child == this) {
+ transient_parent->exclusive_child = nullptr;
+ }
+ }
+ }
}
void Window::_clear_transient() {