eu07/StarterNG
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/StarterNG.git synced 2026-10-16 23:49:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Let a captured key take over its combination

Browse Source 
Pressing a key for a command in the list doubled the combination up when
another command had it, and the simulator maps a combination to one command
only. It now moves over, as it already did from the key flyout.
This commit is contained in:
maj00r
2026-10-04 19:29:49 +02:00
parent 760dfb38da
commit 4da5991c13
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
StarterNG/Views/Settings.axaml.cs
View File

@@ -1007,6 +1007,8 @@ public partial class Settings : UserControl, ISettingsCapture
_capturing.Shift = e.KeyModifiers.HasFlag(KeyModifiers.Shift); _capturing.Shift = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
_capturing.Ctrl = e.KeyModifiers.HasFlag(KeyModifiers.Control); _capturing.Ctrl = e.KeyModifiers.HasFlag(KeyModifiers.Control);
_capturing.Key = token; _capturing.Key = token;
// As the key flyout does: the combination moves here, not doubled up.
ReleaseCombo(token, _capturing.Shift, _capturing.Ctrl, _capturing);
KeyboardConfig.Instance.Dirty = true; KeyboardConfig.Instance.Dirty = true;
MarkDirty(); MarkDirty();
e.Handled = true; e.Handled = true;
@@ -1247,17 +1249,7 @@ public partial class Settings : UserControl, ISettingsCapture
private void AssignSlot(string token, bool shift, bool ctrl, int selectedIndex, List<KeyBinding> commands) private void AssignSlot(string token, bool shift, bool ctrl, int selectedIndex, List<KeyBinding> commands)
{ {
KeyBinding? chosen = selectedIndex <= 0 ? null : commands[selectedIndex - 1]; KeyBinding? chosen = selectedIndex <= 0 ? null : commands[selectedIndex - 1];
ReleaseCombo(token, shift, ctrl, chosen);
foreach (var b in KeyboardConfig.Instance.Bindings)
{
if (!ReferenceEquals(b, chosen) && b.IsAssigned &&
string.Equals(b.Key, token, StringComparison.OrdinalIgnoreCase) &&
b.Shift == shift && b.Ctrl == ctrl)
{
b.Shift = b.Ctrl = false;
b.Key = "none";
}
}
if (chosen is not null) if (chosen is not null)
{ {
@@ -1270,6 +1262,25 @@ public partial class Settings : UserControl, ISettingsCapture
MarkDirty(); MarkDirty();
} }
/// <summary>
/// Frees a key combination for <paramref name="keeper"/>: the simulator maps a
/// combination to one command - in driving and outside the cab alike, the
/// editor has its own fixed keys - so of two, one would silently never fire.
/// </summary>
private static void ReleaseCombo(string token, bool shift, bool ctrl, KeyBinding? keeper)
{
foreach (var b in KeyboardConfig.Instance.Bindings)
{
if (!ReferenceEquals(b, keeper) && b.IsAssigned &&
string.Equals(b.Key, token, StringComparison.OrdinalIgnoreCase) &&
b.Shift == shift && b.Ctrl == ctrl)
{
b.Shift = b.Ctrl = false;
b.Key = "none";
}
}
}
private static KeyBinding? CommandInSlot(string token, bool shift, bool ctrl) => private static KeyBinding? CommandInSlot(string token, bool shift, bool ctrl) =>
KeyboardConfig.Instance.Bindings.FirstOrDefault(b => KeyboardConfig.Instance.Bindings.FirstOrDefault(b =>
b.IsAssigned && b.IsAssigned &&