Merge pull request #61001 from derammo/derammo_popup_conditional_hide

2 files changed, 19 insertions, 1 deletions

diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index b9e3e7814e..6532fc5934 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -108,11 +108,25 @@ void Popup::_close_pressed() {
 
 	_deinitialize_visible_parents();
 
-	call_deferred(SNAME("hide"));
+	// Hide after returning to process events, but only if we don't
+	// get popped up in the interim.
+	call_deferred(SNAME("_popup_conditional_hide"));
+}
+
+void Popup::_post_popup() {
+	Window::_post_popup();
+	popped_up = true;
+}
+
+void Popup::_popup_conditional_hide() {
+	if (!popped_up) {
+		hide();
+	}
 }
 
 void Popup::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("popup_hide"));
+	ClassDB::bind_method(D_METHOD("_popup_conditional_hide"), &Popup::_popup_conditional_hide);
 }
 
 Rect2i Popup::_popup_adjust_rect() const {
diff --git a/scene/gui/popup.h b/scene/gui/popup.h
index 6211af4d20..27f46d4a97 100644
--- a/scene/gui/popup.h
+++ b/scene/gui/popup.h
@@ -57,6 +57,10 @@ protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
+	void _popup_conditional_hide();
+
+	virtual void _post_popup() override;
+
 public:
 	Popup();
 	~Popup();