Преглед изворни кода

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

liufei пре 3 година
родитељ
комит
2ecad2fea2
1 измењених фајлова са 4 додато и 6 уклоњено
  1. 4 6
      Control/UserControls/Config/MotionControl.xaml.cs

+ 4 - 6
Control/UserControls/Config/MotionControl.xaml.cs

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