Stop user from being able to bind multiple identical events to the same action #91278
+7
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RedMser
reviewed
Apr 28, 2024
editor/action_map_editor.cpp
Outdated
| @@ -58,7 +58,15 @@ void ActionMapEditor::_event_config_confirmed() { | |||
| Array events = new_action["events"].duplicate(); | |||
|
|
|||
| if (current_action_event_index == -1) { | |||
| // Add new event | |||
| // Add new event if not already bound | |||
| for (const Variant& event : events) | |||
There was a problem hiding this comment.
You should run clang format / the pre-commit hook on your code, this would fail the CI pipeline.
- Opening brace of for-loop and if-block must be on same line.
- Newly added comments should end with a period.
When updating your PR, make sure to amend and force-push so that you end up with one commit.
toadkarter
force-pushed
the
duplicate-events-bug-fix
branch
from
ab44b99
to
ece6426
Compare
toadkarter
commented
Apr 28, 2024
editor/action_map_editor.cpp
Outdated
Comment on lines
62
to
63
| for (const Variant &event : events) { | ||
| Ref<InputEvent> event_to_check = Ref<InputEvent>(event); |
There was a problem hiding this comment.
Suggested change
| for (const Variant &event : events) { | |
| Ref<InputEvent> event_to_check = Ref<InputEvent>(event); | |
| for (Ref<InputEvent> event_to_check : events) { |
There was a problem hiding this comment.
Thanks, agreed that this is a bit more succinct. Also made the reference const just because we're not mutating these events while iterating over them.
toadkarter
force-pushed
the
duplicate-events-bug-fix
branch
from
ece6426
to
1271215
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #91243
In
ActionMapEditor, when we return fromInputEventConfigurationDialog, and we have confirmed that this input relates to a new event being added, we loop through the events currently bound and early out if the new event matches any of the ones that have already been added.