mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Small HotkeyInfo refactor
This commit is contained in:
parent
9431dc1dda
commit
cd81629e32
1 changed files with 7 additions and 49 deletions
|
@ -39,45 +39,15 @@ public class HotkeyInfo
|
|||
[JsonIgnore]
|
||||
public HotkeyStatus Status { get; set; }
|
||||
|
||||
public Keys KeyCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return Hotkey & Keys.KeyCode;
|
||||
}
|
||||
}
|
||||
public Keys KeyCode => Hotkey & Keys.KeyCode;
|
||||
|
||||
public Keys ModifiersKeys
|
||||
{
|
||||
get
|
||||
{
|
||||
return Hotkey & Keys.Modifiers;
|
||||
}
|
||||
}
|
||||
public Keys ModifiersKeys => Hotkey & Keys.Modifiers;
|
||||
|
||||
public bool Control
|
||||
{
|
||||
get
|
||||
{
|
||||
return Hotkey.HasFlag(Keys.Control);
|
||||
}
|
||||
}
|
||||
public bool Control => Hotkey.HasFlag(Keys.Control);
|
||||
|
||||
public bool Shift
|
||||
{
|
||||
get
|
||||
{
|
||||
return Hotkey.HasFlag(Keys.Shift);
|
||||
}
|
||||
}
|
||||
public bool Shift => Hotkey.HasFlag(Keys.Shift);
|
||||
|
||||
public bool Alt
|
||||
{
|
||||
get
|
||||
{
|
||||
return Hotkey.HasFlag(Keys.Alt);
|
||||
}
|
||||
}
|
||||
public bool Alt => Hotkey.HasFlag(Keys.Alt);
|
||||
|
||||
public bool Win { get; set; }
|
||||
|
||||
|
@ -96,21 +66,9 @@ public Modifiers ModifiersEnum
|
|||
}
|
||||
}
|
||||
|
||||
public bool IsOnlyModifiers
|
||||
{
|
||||
get
|
||||
{
|
||||
return KeyCode == Keys.ControlKey || KeyCode == Keys.ShiftKey || KeyCode == Keys.Menu || (KeyCode == Keys.None && Win);
|
||||
}
|
||||
}
|
||||
public bool IsOnlyModifiers => KeyCode == Keys.ControlKey || KeyCode == Keys.ShiftKey || KeyCode == Keys.Menu || (KeyCode == Keys.None && Win);
|
||||
|
||||
public bool IsValidHotkey
|
||||
{
|
||||
get
|
||||
{
|
||||
return KeyCode != Keys.None && !IsOnlyModifiers;
|
||||
}
|
||||
}
|
||||
public bool IsValidHotkey => KeyCode != Keys.None && !IsOnlyModifiers;
|
||||
|
||||
public HotkeyInfo()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue