Add hotkey filtering functionality (by name and by context) #19979
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
|
How about: diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs
index 4a078409bc..8385cd2cc2 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs
@@ -216,7 +216,7 @@ void InitHotkeyRemapDialog(Widget panel)
var duplicateNotice = panel.Get<LabelWidget>("DUPLICATE_NOTICE");
duplicateNotice.TextColor = ChromeMetrics.Get<Color>("NoticeErrorColor");
duplicateNotice.IsVisible = () => !isHotkeyValid;
- var duplicateNoticeText = new CachedTransform<HotkeyDefinition, string>(hd => hd != null ? duplicateNotice.Text.F(hd.Description) : duplicateNotice.Text);
+ var duplicateNoticeText = new CachedTransform<HotkeyDefinition, string>(hd => hd != null ? duplicateNotice.Text.F(hd.Description, hd.Contexts.First(c => selectedHotkeyDefinition.Contexts.Contains(c))) : duplicateNotice.Text);
duplicateNotice.GetText = () => duplicateNoticeText.Update(duplicateHotkeyDefinition);
var originalNotice = panel.Get<LabelWidget>("ORIGINAL_NOTICE");
diff --git a/mods/cnc/chrome/settings-hotkeys.yaml b/mods/cnc/chrome/settings-hotkeys.yaml
index 310956c438..f5eee56fdf 100644
--- a/mods/cnc/chrome/settings-hotkeys.yaml
+++ b/mods/cnc/chrome/settings-hotkeys.yaml
@@ -128,7 +128,7 @@ Container@HOTKEYS_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Font: Tiny
- Text: This is already used for "{0}" in an overlapping context
+ Text: This is already used for "{0}" in the {1} context
Button@OVERRIDE_HOTKEY_BUTTON:
X: PARENT_RIGHT - 3 * WIDTH - 30
Y: 20(plus the other yaml files)? |
dragunoff
force-pushed
the
feature/hotkey-filtering-ui
branch
from
0c44fbe
to
964f6c2
Compare
|
Rebased and implemented #19979 (comment): |
pchote
previously approved these changes
Apr 30, 2022
abcdefg30
reviewed
May 2, 2022
Comment on lines
308
to
311
| var isFilteredByName = false; | ||
| var isFilteredByContext = false; | ||
|
|
||
| if (string.IsNullOrWhiteSpace(filter) || hd.Description.Contains(filter, StringComparison.OrdinalIgnoreCase)) | ||
| isFilteredByName = true; | ||
|
|
||
| if (currentContext == "Any" || hd.Contexts.Contains(currentContext)) | ||
| isFilteredByContext = true; | ||
|
|
||
| return isFilteredByName && isFilteredByContext; |
There was a problem hiding this comment.
Suggested change
| var isFilteredByName = false; | |
| var isFilteredByContext = false; | |
| if (string.IsNullOrWhiteSpace(filter) || hd.Description.Contains(filter, StringComparison.OrdinalIgnoreCase)) | |
| isFilteredByName = true; | |
| if (currentContext == "Any" || hd.Contexts.Contains(currentContext)) | |
| isFilteredByContext = true; | |
| return isFilteredByName && isFilteredByContext; | |
| var isFilteredByName = string.IsNullOrWhiteSpace(filter) || hd.Description.Contains(filter, StringComparison.OrdinalIgnoreCase); | |
| var isFilteredByContext = currentContext == "Any" || hd.Contexts.Contains(currentContext); | |
| return isFilteredByName && isFilteredByContext; |
| var duplicateNoticeText = new CachedTransform<HotkeyDefinition, string>(hd => | ||
| hd != null ? | ||
| duplicateNotice.Text.F(hd.Description, hd.Contexts.First(c => selectedHotkeyDefinition.Contexts.Contains(c))) : | ||
| duplicateNotice.Text); |
There was a problem hiding this comment.
The duplicate notice has {0} and {1} in it, so does it even make sense to display that here without .F? Also, if hd is null in this context, then duplicateHotkeyDefinition is also null, correct? In that case this text is not displayed anyway, so I'd suggest putting an empty string.
dragunoff
force-pushed
the
feature/hotkey-filtering-ui
branch
from
964f6c2
to
c74836b
Compare
|
Update: rebased and applied the fixups suggested by @abcdefg30 |
dragunoff
force-pushed
the
feature/hotkey-filtering-ui
branch
from
c74836b
to
9c89423
Compare
|
Update: Slight scope creep - I'm using the opportunity to remove a couple of stray yaml nodes that are no longer needed. |
abcdefg30
approved these changes
May 3, 2022
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.
This implements the UI part of #19898 (back-end part was done in #19900). Hotkey can be filtered by name and by context. Context overlap is used for validation so this new UI should make it clearer to the user how hotkeys are validated. The error message for duplicate bindings is expanded to clarify that.
Filtering by context
Filtering by name and a warning for duplicate binding
No matching hotkeys
Closes #19898