hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Don't allow duplicate events in ActionMapEditor

Browse source
This commit is contained in:
Nintorch 2026-02-03 17:15:15 +05:00
parent 0304036bed
commit da2fb043bf
3 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/settings/action_map_editor.cpp
View file

@ -170,7 +170,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
current_action_name = item->get_meta("__name");
current_action_event_index = -1;
event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name);
event_config_dialog->popup_and_configure(Ref<InputEvent>(), current_action_name, current_action);
} break;
case ActionMapEditor::BUTTON_EDIT_EVENT: {
// Action and Action name is located on the parent of the event.
@ -181,7 +181,7 @@ void ActionMapEditor::_tree_button_pressed(Object *p_item, int p_column, int p_i
Ref<InputEvent> ie = item->get_meta("__event");
if (ie.is_valid()) {
event_config_dialog->popup_and_configure(ie, current_action_name);
event_config_dialog->popup_and_configure(ie, current_action_name, current_action);
}
} break;
case ActionMapEditor::BUTTON_REMOVE_ACTION: {

35
editor/settings/input_event_configuration_dialog.cpp
View file

@ -56,6 +56,19 @@ void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, c
// Update Label
event_as_text->set_text(EventListenerLineEdit::get_event_text(event, true));
bool exists = false;
for (const Variant &v : action_events) {
Ref<InputEvent> ie = v;
if (ie.is_null()) {
continue;
} else if (ie->is_match(p_event)) {
exists = true;
break;
}
}
event_exists->set_visible(exists);
get_ok_button()->set_disabled(exists);
Ref<InputEventKey> k = p_event;
Ref<InputEventMouseButton> mb = p_event;
Ref<InputEventJoypadButton> joyb = p_event;
@ -195,6 +208,8 @@ void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event, c
original_event = Ref<InputEvent>();
event_listener->clear_event();
event_as_text->set_text(TTRC("No Event Configured"));
event_exists->set_visible(false);
get_ok_button()->set_disabled(false);
additional_options_container->hide();
input_list_tree->deselect_all();
@ -584,6 +599,7 @@ void InputEventConfigurationDialog::_notification(int p_what) {
icon_cache.joypad_axis = get_editor_theme_icon(SNAME("JoyAxis"));
event_as_text->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
event_exists->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
_update_input_list();
} break;
@ -596,8 +612,20 @@ void InputEventConfigurationDialog::_notification(int p_what) {
}
}
void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event, const String &p_current_action_name) {
void InputEventConfigurationDialog::popup_and_configure(const Ref<InputEvent> &p_event, const String &p_current_action_name, const Dictionary &p_current_action) {
action_events = p_current_action.get("events", Array()).duplicate();
if (p_event.is_valid()) {
// Here we remove one instance of the InputEvent being edited so it doesn't immediately get flagged as duplicated in the dialog.
for (int i = 0; i < action_events.size(); i++) {
Ref<InputEvent> ie = action_events[i];
if (ie.is_null()) {
continue;
} else if (ie->is_match(p_event)) {
action_events.remove_at(i);
break;
}
}
_set_event(p_event->duplicate(), p_event->duplicate());
} else {
// Clear Event
@ -778,4 +806,9 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
additional_options_container->add_child(location_container);
main_vbox->add_child(additional_options_container);
event_exists = memnew(Label(TTRC("Error: This action already contains this input event.")));
event_exists->set_theme_type_variation("HeaderSmall");
event_exists->set_visible(false);
main_vbox->add_child(event_exists);
}

5
editor/settings/input_event_configuration_dialog.h
View file

@ -51,6 +51,7 @@ private:
Ref<InputEvent> event;
Ref<InputEvent> original_event;
Array action_events;
bool in_tree_update = false;
@ -106,6 +107,8 @@ private:
HBoxContainer *location_container = nullptr;
OptionButton *key_location = nullptr;
Label *event_exists = nullptr;
void _set_event(const Ref<InputEvent> &p_event, const Ref<InputEvent> &p_original_event, bool p_update_input_list_selection = true);
void _on_listen_input_changed(const Ref<InputEvent> &p_event);
@ -129,7 +132,7 @@ protected:
public:
// Pass an existing event to configure it. Alternatively, pass no event to start with a blank configuration.
// An action name can be passed for descriptive purposes.
void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>(), const String &p_current_action_name = "");
void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>(), const String &p_current_action_name = "", const Dictionary &p_current_action = Dictionary());
Ref<InputEvent> get_event() const;
void set_allowed_input_types(int p_type_masks);