Merge pull request #58490 from bruvzg/imporve_popup_menu_handling

3 files changed, 25 insertions, 32 deletions

diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 4a5dc57e36..24b91cd16a 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -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) {
@@ -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();
 	}
 }
@@ -111,19 +115,7 @@ 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::_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 +176,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));
 }
diff --git a/scene/gui/popup.h b/scene/gui/popup.h
index 5678043b23..a3c56c9ff1 100644
--- a/scene/gui/popup.h
+++ b/scene/gui/popup.h
@@ -42,7 +42,6 @@ class Popup : public Window {
 
 	LocalVector<Window *> visible_parents;
 	bool popped_up = false;
-	bool close_on_parent_focus = true;
 
 	void _input_from_window(const Ref<InputEvent> &p_event);
 
@@ -61,9 +60,6 @@ protected:
 public:
 	void set_as_minsize();
 
-	void set_close_on_parent_focus(bool p_close);
-	bool get_close_on_parent_focus();
-
 	Popup();
 	~Popup();
 };
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index deca1451ee..af2edfa090 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -205,7 +205,6 @@ void PopupMenu::_activate_submenu(int p_over) {
 		submenu_pos.x = this_pos.x - submenu_size.width;
 	}
 
-	submenu_popup->set_close_on_parent_focus(false);
 	submenu_popup->set_position(submenu_pos);
 
 	PopupMenu *submenu_pum = Object::cast_to<PopupMenu>(submenu_popup);
@@ -223,6 +222,11 @@ void PopupMenu::_activate_submenu(int p_over) {
 
 	// Set autohide areas.
 
+	Rect2 safe_area = this_rect;
+	safe_area.position.y += items[p_over]._ofs_cache + scroll_offset + style->get_offset().height - vsep / 2;
+	safe_area.size.y = items[p_over]._height_cache;
+	DisplayServer::get_singleton()->window_set_popup_safe_rect(submenu_popup->get_window_id(), safe_area);
+
 	// Make the position of the parent popup relative to submenu popup.
 	this_rect.position = this_rect.position - submenu_pum->get_position();