godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56221 from YeldhamDev/inputmap_undo_master

This commit is contained in:
Rémi Verschelde 2022-01-13 12:27:17 +01:00 committed by GitHub
parent e0f2902a11 6033711379
commit db155a7cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/action_map_editor.cpp
View File

@ -742,7 +742,7 @@ void ActionMapEditor::_event_config_confirmed() {
Ref<InputEvent> ev = event_config_dialog->get_event(); Ref<InputEvent> ev = event_config_dialog->get_event();
Dictionary new_action = current_action.duplicate(); Dictionary new_action = current_action.duplicate();
Array events = new_action["events"]; Array events = new_action["events"].duplicate();
if (current_action_event_index == -1) { if (current_action_event_index == -1) {
// Add new event // Add new event
@ -839,7 +839,6 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
current_action_event_index = -1; current_action_event_index = -1;
event_config_dialog->popup_and_configure(); event_config_dialog->popup_and_configure();
} break; } break;
case ActionMapEditor::BUTTON_EDIT_EVENT: { case ActionMapEditor::BUTTON_EDIT_EVENT: {
// Action and Action name is located on the parent of the event. // Action and Action name is located on the parent of the event.
@ -852,7 +851,6 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
if (ie.is_valid()) { if (ie.is_valid()) {
event_config_dialog->popup_and_configure(ie); event_config_dialog->popup_and_configure(ie);
} }
} break; } break;
case ActionMapEditor::BUTTON_REMOVE_ACTION: { case ActionMapEditor::BUTTON_REMOVE_ACTION: {
// Send removed action name // Send removed action name
@ -861,12 +859,12 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
} break; } break;
case ActionMapEditor::BUTTON_REMOVE_EVENT: { case ActionMapEditor::BUTTON_REMOVE_EVENT: {
// Remove event and send updated action // Remove event and send updated action
Dictionary action = item->get_parent()->get_meta("__action"); Dictionary action = item->get_parent()->get_meta("__action").duplicate();
String action_name = item->get_parent()->get_meta("__name"); String action_name = item->get_parent()->get_meta("__name");
int event_index = item->get_meta("__index"); int event_index = item->get_meta("__index");
Array events = action["events"]; Array events = action["events"].duplicate();
events.remove_at(event_index); events.remove_at(event_index);
action["events"] = events; action["events"] = events;