prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor HotkeyModel validation logic

Browse source
This commit is contained in:
Vic 2023-01-11 16:11:34 +08:00
parent a399d24c1e
commit 72f8b9e052
1 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs
View file

@ -13,18 +13,7 @@ namespace Flow.Launcher.Infrastructure.Hotkey
public bool Win { get; set; }
public bool Ctrl { get; set; }
private Key charKey = Key.None;
public Key CharKey
{
get => charKey;
set
{
if (ValidateHotkey(value))
{
charKey = value;
}
}
}
public Key CharKey { get; set; } = Key.None;
private static readonly Dictionary<Key, string> specialSymbolDictionary = new Dictionary<Key, string>
{
@ -149,32 +138,36 @@ namespace Flow.Launcher.Infrastructure.Hotkey
return string.Join(" + ", keys);
}
private bool ValidateHotkey(Key key)
public bool Validate()
{
HashSet<Key> invalidKeys = new()
switch (CharKey)
{
Key.LeftAlt, Key.RightAlt,
Key.LeftCtrl, Key.RightCtrl,
Key.LeftShift, Key.RightShift,
Key.LWin, Key.RWin,
};
if (invalidKeys.Contains(key))
{
return false;
case Key.LeftAlt:
case Key.RightAlt:
case Key.LeftCtrl:
case Key.RightCtrl:
case Key.LeftShift:
case Key.RightShift:
case Key.LWin:
case Key.RWin:
return false;
default:
if (ModifierKeys == ModifierKeys.None)
{
return CharKey >= Key.F1 && CharKey <= Key.F24;
}
else
{
return CharKey != Key.None;
}
}
if (ModifierKeys == ModifierKeys.None)
{
return key >= Key.F1 && key <= Key.F24;
}
return true;
}
public override bool Equals(object obj)
{
if (obj is HotkeyModel other)
{
return ModifierKeys == other.ModifierKeys && CharKey == other.charKey;
return ModifierKeys == other.ModifierKeys && CharKey == other.CharKey;
}
else
{