Merge d061312777 into b0ff814753

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -1,58 +0,0 @@
-name: Bug 报告
-description: 在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。
-title: "[Bug]: "
-labels: ["bug"]
-body:
-  - type: input
-    id: "expectation"
-    attributes:
-      label: "预期情况"
-      description: "描述你认为应该发生什么"
-    validations:
-      required: true
-  - type: textarea
-    id: "describe-the-bug"
-    attributes:
-      label: "实际情况"
-      description: "描述实际发生了什么"
-    validations:
-      required: true
-  - type: textarea
-    id: "reproduction-method"
-    attributes:
-      label: "复现方法"
-      description: "在BUG出现前执行了哪些操作"
-      placeholder: 标序号
-    validations:
-      required: true
-  - type: textarea
-    id: "log"
-    attributes:
-      label: "日志信息"
-      description: "位置在软件当前目录下的guiLogs"
-      placeholder: 在日志开始和结束位置粘贴冒号后的内容：```
-    validations:
-      required: true
-  - type: textarea
-    id: "more"
-    attributes:
-      label: "额外信息"
-      description: "可选"
-    validations:
-      required: false
-  - type: checkboxes
-    id: "latest-version"
-    attributes:
-      label: "我确认已更新至最新版本"
-      description: "否则请更新后尝试"
-      options:
-        - label: 是
-          required: true
-  - type: checkboxes
-    id: "issues"
-    attributes:
-      label: "我确认已查询历史issues"
-      description: "否则请查询后提出"
-      options:
-        - label: 是
-          required: true

.github/ISSUE_TEMPLATE/02_feature_request.yml

@@ -1,34 +0,0 @@
-name: Feature 请求
-description: "为这个项目提出一个建议"
-title: "[Feature request]: "
-labels: ['enhancement']
-body: 
-- type: input
-  id: problem
-  attributes:
-    label: 相关问题
-    description: "清楚而简洁地描述问题是什么。"
-    placeholder: "当我想要……时，软件不能……"
-  validations:
-    required: true
-- type: input
-  id: way-to-solve
-  attributes:
-    label: 描述你希望的解决方案
-    description: "你希望发生什么"
-  validations:
-    required: true
-- type: input
-  id: instead
-  attributes:
-    label: 描述你所考虑的替代方案
-  validations:
-    required: false
-- type: checkboxes
-  id: "issues"
-  attributes:
-    label: "我确认已查询历史issues"
-    description: "否则请查询后提出"
-    options:
-      - label: 是
-        required: true

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -54,22 +54,23 @@ namespace v2rayN.Views
             Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
         }
 
-
         private void TxtGlobalHotkey_KeyDown(object sender, KeyEventArgs e)
         {
-            var txt = ((TextBox)sender);
-            var index = Utils.ToInt(txt.Name.Substring(txt.Name.Length - 1, 1));
+            e.Handled = true;
+            var _ModifierKeys =  new Key[]{ Key.LeftCtrl, Key.RightCtrl, Key.LeftShift, Key.RightShift, Key.LeftAlt, Key.RightAlt };
+            if (!_ModifierKeys.Contains(e.Key) && !_ModifierKeys.Contains(e.SystemKey))
+            {
+                var txt = ((TextBox)sender);
+                var index = Utils.ToInt(txt.Name.Substring(txt.Name.Length - 1, 1));
+                var formsKey = (Forms.Keys)KeyInterop.VirtualKeyFromKey(e.Key == Key.System ? e.SystemKey : e.Key);
 
-            if (e.Key == Key.System)
-                return;
-            var formsKey = (Forms.Keys)KeyInterop.VirtualKeyFromKey(e.Key);
+                lstKey[index].KeyCode = formsKey;
+                lstKey[index].Alt = (Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt;
+                lstKey[index].Control = (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control;
+                lstKey[index].Shift = (Keyboard.Modifiers & ModifierKeys.Shift) == ModifierKeys.Shift;
 
-            lstKey[index].KeyCode = formsKey;
-            lstKey[index].Alt = Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt);
-            lstKey[index].Control = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl);
-            lstKey[index].Shift = Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift);
-
-            BindingData(index);
+                BindingData(index);
+            }
         }
 
         private void BindingData(int index)