shifting naming (#5190)

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas
2020-07-23 13:08:20 -07:00
committed by GitHub
parent 2bd2ec7a2e
commit 592d3afe6d

View File

@@ -2,9 +2,6 @@
// The Microsoft Corporation licenses this file to you under the MIT license. // The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Text;
using interop; using interop;
namespace Microsoft.PowerToys.Settings.UI.Lib namespace Microsoft.PowerToys.Settings.UI.Lib
@@ -15,41 +12,41 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public class HotkeySettingsControlHook public class HotkeySettingsControlHook
{ {
const int WM_KEYDOWN = 0x100; private const int WmKeyDown = 0x100;
const int WM_KEYUP = 0x101; private const int WmKeyUp = 0x101;
const int WM_SYSKEYDOWN = 0x0104; private const int WmSysKeyDown = 0x0104;
const int WM_SYSKEYUP = 0x0105; private const int WmSysKeyUp = 0x0105;
private KeyboardHook hook; private KeyboardHook _hook;
private KeyEvent keyDown; private KeyEvent _keyDown;
private KeyEvent keyUp; private KeyEvent _keyUp;
private IsActive isActive; private IsActive _isActive;
public HotkeySettingsControlHook(KeyEvent keyDown, KeyEvent keyUp, IsActive isActive) public HotkeySettingsControlHook(KeyEvent keyDown, KeyEvent keyUp, IsActive isActive)
{ {
this.keyDown = keyDown; _keyDown = keyDown;
this.keyUp = keyUp; _keyUp = keyUp;
this.isActive = isActive; _isActive = isActive;
hook = new KeyboardHook(HotkeySettingsHookCallback, IsActive, null); _hook = new KeyboardHook(HotkeySettingsHookCallback, IsActive, null);
hook.Start(); _hook.Start();
} }
private bool IsActive() private bool IsActive()
{ {
return isActive(); return _isActive();
} }
private void HotkeySettingsHookCallback(KeyboardEvent ev) private void HotkeySettingsHookCallback(KeyboardEvent ev)
{ {
switch (ev.message) switch (ev.message)
{ {
case WM_KEYDOWN: case WmKeyDown:
case WM_SYSKEYDOWN: case WmSysKeyDown:
keyDown(ev.key); _keyDown(ev.key);
break; break;
case WM_KEYUP: case WmKeyUp:
case WM_SYSKEYUP: case WmSysKeyUp:
keyUp(ev.key); _keyUp(ev.key);
break; break;
} }
} }
@@ -57,7 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public void Dispose() public void Dispose()
{ {
// Dispose the KeyboardHook object to terminate the hook threads // Dispose the KeyboardHook object to terminate the hook threads
hook.Dispose(); _hook.Dispose();
} }
} }
} }