From 369f0b0793686cff47dc2ef73b4fc2a1ebc2665a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E4=B8=9C=E6=96=B9?= Date: Wed, 1 Mar 2023 17:00:51 +0800 Subject: [PATCH] Fix 'Window' key is treated as 'unknown' in Firefox (#175739) --- src/vs/base/browser/keyboardEvent.ts | 4 +--- src/vs/base/common/keyCodes.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts index 7af942951d7..9dd0862c003 100644 --- a/src/vs/base/browser/keyboardEvent.ts +++ b/src/vs/base/browser/keyboardEvent.ts @@ -34,9 +34,7 @@ function extractKeyCode(e: KeyboardEvent): KeyCode { if (platform.isMacintosh) { return KeyCode.Meta; } } } else if (browser.isWebKit) { - if (keyCode === 91) { - return KeyCode.Meta; - } else if (platform.isMacintosh && keyCode === 93) { + if (platform.isMacintosh && keyCode === 93) { // the two meta keys in the Mac have different key codes (91 and 93) return KeyCode.Meta; } else if (!platform.isMacintosh && keyCode === 92) { diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts index 44488dbb299..4f204f40435 100644 --- a/src/vs/base/common/keyCodes.ts +++ b/src/vs/base/common/keyCodes.ts @@ -648,7 +648,7 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) { [5, 1, ScanCode.None, empty, KeyCode.Ctrl, 'Ctrl', 17, 'VK_CONTROL', empty, empty], [4, 1, ScanCode.None, empty, KeyCode.Shift, 'Shift', 16, 'VK_SHIFT', empty, empty], [6, 1, ScanCode.None, empty, KeyCode.Alt, 'Alt', 18, 'VK_MENU', empty, empty], - [57, 1, ScanCode.None, empty, KeyCode.Meta, 'Meta', 0, 'VK_COMMAND', empty, empty], + [57, 1, ScanCode.None, empty, KeyCode.Meta, 'Meta', 91, 'VK_COMMAND', empty, empty], [5, 1, ScanCode.ControlLeft, 'ControlLeft', KeyCode.Ctrl, empty, 0, 'VK_LCONTROL', empty, empty], [4, 1, ScanCode.ShiftLeft, 'ShiftLeft', KeyCode.Shift, empty, 0, 'VK_LSHIFT', empty, empty], [6, 1, ScanCode.AltLeft, 'AltLeft', KeyCode.Alt, empty, 0, 'VK_LMENU', empty, empty],