Merge pull request #12211 from AlexHolly/fix-itemlist-rmb-pos

Itemlist rmb now provides the same pos as Tree rmb
This commit is contained in:
Gilles Roudiere 2017-10-19 13:35:10 +02:00 committed by GitHub
commit 1c1ddc9381

View file

@ -489,7 +489,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) {
if (mb->get_button_index() == BUTTON_RIGHT) { if (mb->get_button_index() == BUTTON_RIGHT) {
emit_signal("item_rmb_selected", i, pos); emit_signal("item_rmb_selected", i, get_local_mouse_position());
} }
} else { } else {
@ -500,7 +500,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) {
if (items[i].selected && mb->get_button_index() == BUTTON_RIGHT) { if (items[i].selected && mb->get_button_index() == BUTTON_RIGHT) {
emit_signal("item_rmb_selected", i, pos); emit_signal("item_rmb_selected", i, get_local_mouse_position());
} else { } else {
bool selected = !items[i].selected; bool selected = !items[i].selected;
@ -515,7 +515,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) {
if (mb->get_button_index() == BUTTON_RIGHT) { if (mb->get_button_index() == BUTTON_RIGHT) {
emit_signal("item_rmb_selected", i, pos); emit_signal("item_rmb_selected", i, get_local_mouse_position());
} else if (/*select_mode==SELECT_SINGLE &&*/ mb->is_doubleclick()) { } else if (/*select_mode==SELECT_SINGLE &&*/ mb->is_doubleclick()) {
emit_signal("item_activated", i); emit_signal("item_activated", i);