summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-01-14 13:16:19 -0300
committerJuan Linietsky <reduzio@gmail.com>2019-01-14 13:16:19 -0300
commited9b230744eb5dbb3a5e956c32ea87791abed68c (patch)
tree68ac17bd214a93cd4ac6d7fee7d205e2ec8d4ab1
parent81180b266a80799d4744b5f94d9458da90a424ea (diff)
Hide visible popups by default if visible when entering tree, unless on editor. Fixes #24737
-rw-r--r--scene/gui/popup.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index c733319cd4..2d2c54594a 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -52,9 +52,13 @@ void Popup::_notification(int p_what) {
//small helper to make editing of these easier in editor
#ifdef TOOLS_ENABLED
if (Engine::get_singleton()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) {
+ //edited on editor
set_as_toplevel(false);
- }
+ } else
#endif
+ if (is_visible()) {
+ hide();
+ }
}
}