1 files changed, 43 insertions, 42 deletions

diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index a48ad0f770..c4396f636a 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -42,26 +42,30 @@ void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
 }
 
 void Popup::_initialize_visible_parents() {
-	visible_parents.clear();
-
-	Window *parent_window = this;
-	while (parent_window) {
-		parent_window = parent_window->get_parent_visible_window();
-		if (parent_window) {
-			visible_parents.push_back(parent_window);
-			parent_window->connect("focus_entered", callable_mp(this, &Popup::_parent_focused));
-			parent_window->connect("tree_exited", callable_mp(this, &Popup::_deinitialize_visible_parents));
+	if (is_embedded()) {
+		visible_parents.clear();
+
+		Window *parent_window = this;
+		while (parent_window) {
+			parent_window = parent_window->get_parent_visible_window();
+			if (parent_window) {
+				visible_parents.push_back(parent_window);
+				parent_window->connect("focus_entered", callable_mp(this, &Popup::_parent_focused));
+				parent_window->connect("tree_exited", callable_mp(this, &Popup::_deinitialize_visible_parents));
+			}
 		}
 	}
 }
 
 void Popup::_deinitialize_visible_parents() {
-	for (uint32_t i = 0; i < visible_parents.size(); ++i) {
-		visible_parents[i]->disconnect("focus_entered", callable_mp(this, &Popup::_parent_focused));
-		visible_parents[i]->disconnect("tree_exited", callable_mp(this, &Popup::_deinitialize_visible_parents));
-	}
+	if (is_embedded()) {
+		for (uint32_t i = 0; i < visible_parents.size(); ++i) {
+			visible_parents[i]->disconnect("focus_entered", callable_mp(this, &Popup::_parent_focused));
+			visible_parents[i]->disconnect("tree_exited", callable_mp(this, &Popup::_deinitialize_visible_parents));
+		}
 
-	visible_parents.clear();
+		visible_parents.clear();
+	}
 }
 
 void Popup::_notification(int p_what) {
@@ -74,19 +78,19 @@ void Popup::_notification(int p_what) {
 				emit_signal(SNAME("popup_hide"));
 				popped_up = false;
 			}
-
 		} break;
+
 		case NOTIFICATION_WM_WINDOW_FOCUS_IN: {
 			if (has_focus()) {
 				popped_up = true;
 			}
 		} break;
+
 		case NOTIFICATION_EXIT_TREE: {
 			_deinitialize_visible_parents();
 		} break;
-		case NOTIFICATION_WM_CLOSE_REQUEST: {
-			_close_pressed();
-		} break;
+
+		case NOTIFICATION_WM_CLOSE_REQUEST:
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
 			_close_pressed();
 		} break;
@@ -94,7 +98,7 @@ void Popup::_notification(int p_what) {
 }
 
 void Popup::_parent_focused() {
-	if (popped_up && close_on_parent_focus) {
+	if (popped_up && get_flag(FLAG_POPUP)) {
 		_close_pressed();
 	}
 }
@@ -107,23 +111,12 @@ void Popup::_close_pressed() {
 	call_deferred(SNAME("hide"));
 }
 
-void Popup::set_as_minsize() {
-	set_size(get_contents_minimum_size());
-}
-
-void Popup::set_close_on_parent_focus(bool p_close) {
-	close_on_parent_focus = p_close;
-}
-
-bool Popup::get_close_on_parent_focus() {
-	return close_on_parent_focus;
+void Popup::_post_popup() {
+	Window::_post_popup();
+	popped_up = true;
 }
 
 void Popup::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_close_on_parent_focus", "close"), &Popup::set_close_on_parent_focus);
-	ClassDB::bind_method(D_METHOD("get_close_on_parent_focus"), &Popup::get_close_on_parent_focus);
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "close_on_parent_focus"), "set_close_on_parent_focus", "get_close_on_parent_focus");
-
 	ADD_SIGNAL(MethodInfo("popup_hide"));
 }
 
@@ -184,6 +177,7 @@ Popup::Popup() {
 	set_transient(true);
 	set_flag(FLAG_BORDERLESS, true);
 	set_flag(FLAG_RESIZE_DISABLED, true);
+	set_flag(FLAG_POPUP, true);
 
 	connect("window_input", callable_mp(this, &Popup::_input_from_window));
 }
@@ -241,13 +235,20 @@ void PopupPanel::_update_child_rects() {
 }
 
 void PopupPanel::_notification(int p_what) {
-	if (p_what == NOTIFICATION_THEME_CHANGED) {
-		panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("panel"), get_class_name()));
-	} else if (p_what == NOTIFICATION_READY || p_what == NOTIFICATION_ENTER_TREE) {
-		panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("panel"), get_class_name()));
-		_update_child_rects();
-	} else if (p_what == NOTIFICATION_WM_SIZE_CHANGED) {
-		_update_child_rects();
+	switch (p_what) {
+		case NOTIFICATION_THEME_CHANGED: {
+			panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("panel"), get_class_name()));
+		} break;
+
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_READY: {
+			panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("panel"), get_class_name()));
+			_update_child_rects();
+		} break;
+
+		case NOTIFICATION_WM_SIZE_CHANGED: {
+			_update_child_rects();
+		} break;
 	}
 }