diff --git a/QuickLook/Helpers/GlobalKeyboardHook.cs b/QuickLook/Helpers/GlobalKeyboardHook.cs index 5aa0303..9da842a 100644 --- a/QuickLook/Helpers/GlobalKeyboardHook.cs +++ b/QuickLook/Helpers/GlobalKeyboardHook.cs @@ -29,7 +29,7 @@ internal class GlobalKeyboardHook : IDisposable private static GlobalKeyboardHook _instance; private User32.KeyboardHookProc _callback; - private IntPtr _hhook = IntPtr.Zero; + private nint _hHook = IntPtr.Zero; protected GlobalKeyboardHook() { @@ -49,7 +49,7 @@ internal class GlobalKeyboardHook : IDisposable internal static GlobalKeyboardHook GetInstance() { - return _instance ?? (_instance = new GlobalKeyboardHook()); + return _instance ??= new GlobalKeyboardHook(); } private void Hook() @@ -57,14 +57,14 @@ internal class GlobalKeyboardHook : IDisposable _callback = HookProc; var hInstance = Kernel32.LoadLibrary("user32.dll"); - _hhook = User32.SetWindowsHookEx(User32.WH_KEYBOARD_LL, _callback, hInstance, 0); + _hHook = User32.SetWindowsHookEx(User32.WH_KEYBOARD_LL, _callback, hInstance, 0); } private void Unhook() { if (_callback == null) return; - User32.UnhookWindowsHookEx(_hhook); + User32.UnhookWindowsHookEx(_hHook); _callback = null; } @@ -72,10 +72,10 @@ internal class GlobalKeyboardHook : IDisposable private int HookProc(int code, int wParam, ref User32.KeyboardHookStruct lParam) { if (code < 0) - return User32.CallNextHookEx(_hhook, code, wParam, ref lParam); + return User32.CallNextHookEx(_hHook, code, wParam, ref lParam); if (IsWindowsKeyPressed()) - return User32.CallNextHookEx(_hhook, code, wParam, ref lParam); + return User32.CallNextHookEx(_hHook, code, wParam, ref lParam); var key = (Keys)lParam.vkCode; key = AddModifiers(key); @@ -87,7 +87,7 @@ internal class GlobalKeyboardHook : IDisposable else if (wParam == User32.WM_KEYUP || wParam == User32.WM_SYSKEYUP) KeyUp?.Invoke(this, kea); - return kea.Handled ? 1 : User32.CallNextHookEx(_hhook, code, wParam, ref lParam); + return kea.Handled ? 1 : User32.CallNextHookEx(_hHook, code, wParam, ref lParam); } private bool IsWindowsKeyPressed() diff --git a/QuickLook/KeystrokeDispatcher.cs b/QuickLook/KeystrokeDispatcher.cs index 035aea3..4a112ed 100644 --- a/QuickLook/KeystrokeDispatcher.cs +++ b/QuickLook/KeystrokeDispatcher.cs @@ -43,11 +43,11 @@ internal class KeystrokeDispatcher : IDisposable { InstallKeyHook(KeyDownEventHandler, KeyUpEventHandler); - _validKeys = new HashSet(new[] - { + _validKeys = new HashSet( + [ Keys.Up, Keys.Down, Keys.Left, Keys.Right, Keys.Enter, Keys.Space, Keys.Escape - }); + ]); } public void Dispose() @@ -169,6 +169,6 @@ internal class KeystrokeDispatcher : IDisposable internal static KeystrokeDispatcher GetInstance() { - return _instance ?? (_instance = new KeystrokeDispatcher()); + return _instance ??= new KeystrokeDispatcher(); } }