admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

:bug:修复F1--F12快捷键不显示的问题

Browse Source
This commit is contained in:
liufei
2022-06-03 23:53:03 +08:00
parent e46d64193b
commit 2ecad2fea2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Control/UserControls/Config/MotionControl.xaml.cs
View File

@@ -35,8 +35,6 @@ namespace GeekDesk.Control.UserControls.Config
/// <param name="e"></param> /// <param name="e"></param>
private void HotKeyDown(object sender, KeyEventArgs e) private void HotKeyDown(object sender, KeyEventArgs e)
{ {
Console.WriteLine("downKey:" + e.Key.ToString());
lock (this) lock (this)
{ {
HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag; HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
@@ -49,8 +47,6 @@ namespace GeekDesk.Control.UserControls.Config
if (!CheckIsEnable(hkType)) return; if (!CheckIsEnable(hkType)) return;
Console.WriteLine("prevKeyTemp:" + prevKeyTemp.ToString());
if (prevKeyTemp == Key.None || prevKeyTemp != downKey) if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
{ {
@@ -101,7 +97,6 @@ namespace GeekDesk.Control.UserControls.Config
appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey); appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey);
break; break;
} }
Console.WriteLine("进入设置" + downKey.ToString());
prevKeyTemp = downKey; prevKeyTemp = downKey;
keysTemp.Add(e); keysTemp.Add(e);
} }
@@ -119,7 +114,10 @@ namespace GeekDesk.Control.UserControls.Config
KeyUtil.KeyProp keyProp = new KeyUtil.KeyProp(); KeyUtil.KeyProp keyProp = new KeyUtil.KeyProp();
KeyUtil.KeyToChar(downKey, ref keyProp, true); KeyUtil.KeyToChar(downKey, ref keyProp, true);
string downKeyStr = keyProp.character.ToString(); string downKeyStr = keyProp.character.ToString();
//string downKeyStr = ""; if (keyProp.character == '\x00')
{
downKeyStr = downKey.ToString();
}
switch (hkType) switch (hkType)
{ {
case HotKeyType.Main: case HotKeyType.Main: