Merge pull request #69631 from timothyqiu/tile-proxy-rmb

Fix error when right clicking proxy list in TileProxiesManagerDialog
This commit is contained in:
Rémi Verschelde 2022-12-06 11:00:42 +01:00
commit 75f8f22637
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions

View file

@ -36,7 +36,7 @@
#include "editor/editor_undo_redo_manager.h" #include "editor/editor_undo_redo_manager.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
void TileProxiesManagerDialog::_right_clicked(int p_item, Vector2 p_local_mouse_pos, Object *p_item_list, MouseButton p_mouse_button_index) { void TileProxiesManagerDialog::_right_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index, Object *p_item_list) {
if (p_mouse_button_index != MouseButton::RIGHT) { if (p_mouse_button_index != MouseButton::RIGHT) {
return; return;
} }

View file

@ -61,7 +61,7 @@ private:
EditorPropertyInteger *alternative_to_property_editor = nullptr; EditorPropertyInteger *alternative_to_property_editor = nullptr;
PopupMenu *popup_menu = nullptr; PopupMenu *popup_menu = nullptr;
void _right_clicked(int p_item, Vector2 p_local_mouse_pos, Object *p_item_list, MouseButton p_mouse_button_index); void _right_clicked(int p_item, Vector2 p_local_mouse_pos, MouseButton p_mouse_button_index, Object *p_item_list);
void _menu_id_pressed(int p_id); void _menu_id_pressed(int p_id);
void _delete_selected_bindings(); void _delete_selected_bindings();
void _update_lists(); void _update_lists();