提交 b7265738 编写于 作者: S SteVen Batten

menubar alt key settings cleanup

上级 15393823
...@@ -42,7 +42,7 @@ export abstract class MenubarControl extends Disposable { ...@@ -42,7 +42,7 @@ export abstract class MenubarControl extends Disposable {
protected keys = [ protected keys = [
'window.menuBarVisibility', 'window.menuBarVisibility',
'window.enableMenuBarMnemonics', 'window.enableMenuBarMnemonics',
'window.disableCustomMenuBarAltFocus', 'window.customMenuBarAltFocus',
'window.nativeTabs' 'window.nativeTabs'
]; ];
...@@ -610,9 +610,11 @@ export class CustomMenubarControl extends MenubarControl { ...@@ -610,9 +610,11 @@ export class CustomMenubarControl extends MenubarControl {
} }
private get currentDisableMenuBarAltFocus(): boolean { private get currentDisableMenuBarAltFocus(): boolean {
let disableMenuBarAltBehavior = this.configurationService.getValue<boolean>('window.disableCustomMenuBarAltFocus'); let settingValue = this.configurationService.getValue<boolean>('window.customMenuBarAltFocus');
if (typeof disableMenuBarAltBehavior !== 'boolean') {
disableMenuBarAltBehavior = false; let disableMenuBarAltBehavior = false;
if (typeof settingValue === 'boolean') {
disableMenuBarAltBehavior = !settingValue;
} }
return disableMenuBarAltBehavior; return disableMenuBarAltBehavior;
......
...@@ -291,14 +291,14 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform' ...@@ -291,14 +291,14 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform'
'type': 'boolean', 'type': 'boolean',
'default': true, 'default': true,
'scope': ConfigurationScope.APPLICATION, 'scope': ConfigurationScope.APPLICATION,
'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."), 'description': nls.localize('enableMenuBarMnemonics', "Controls whether the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
'included': isWindows || isLinux 'included': isWindows || isLinux
}, },
'window.disableCustomMenuBarAltFocus': { 'window.customMenuBarAltFocus': {
'type': 'boolean', 'type': 'boolean',
'default': false, 'default': true,
'scope': ConfigurationScope.APPLICATION, 'scope': ConfigurationScope.APPLICATION,
'markdownDescription': nls.localize('disableCustomMenuBarAltFocus', "If enabled, disables the ability to focus the menu bar with the Alt-key when not set to toggle."), 'markdownDescription': nls.localize('customMenuBarAltFocus', "Controls whether the menu bar will be focused by pressing the Alt-key. This setting has no effect on toggling the menu bar with the Alt-key."),
'included': isWindows || isLinux || isWeb 'included': isWindows || isLinux || isWeb
}, },
'window.openFoldersInNewWindow': { 'window.openFoldersInNewWindow': {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册