Jelajahi Sumber

Merge pull request #21062 from Ovnuniarchos/PopupCheckables

PopupMenu item_pressed is sent before checking hide flags.
Juan Linietsky 7 tahun lalu
induk
melakukan
b466561c4a
1 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 3 3
      scene/gui/popup_menu.cpp

+ 3 - 3
scene/gui/popup_menu.cpp

@@ -1071,6 +1071,9 @@ void PopupMenu::activate_item(int p_item) {
 		pop = Object::cast_to<PopupMenu>(next);
 		pop = Object::cast_to<PopupMenu>(next);
 	}
 	}
 
 
+	emit_signal("id_pressed", id);
+	emit_signal("index_pressed", p_item);
+
 	// Hides popup by default; unless otherwise specified
 	// Hides popup by default; unless otherwise specified
 	// by using set_hide_on_item_selection and set_hide_on_checkable_item_selection
 	// by using set_hide_on_item_selection and set_hide_on_checkable_item_selection
 
 
@@ -1084,9 +1087,6 @@ void PopupMenu::activate_item(int p_item) {
 		return;
 		return;
 
 
 	hide();
 	hide();
-
-	emit_signal("id_pressed", id);
-	emit_signal("index_pressed", p_item);
 }
 }
 
 
 void PopupMenu::remove_item(int p_idx) {
 void PopupMenu::remove_item(int p_idx) {