Skip to content

Commit 3dc149a

Browse files
authored
improve title bar settings for web (microsoft#165068)
fixes microsoft#164768
1 parent 6800f96 commit 3dc149a

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

src/vs/workbench/browser/workbench.contribution.ts

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,9 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
454454
'workbench.layoutControl.enabled': {
455455
'type': 'boolean',
456456
'default': true,
457-
'markdownDescription': localize({ key: 'layoutControlEnabled', comment: ['{0} is a placeholder for a setting identifier.'] }, "Controls whether the layout controls in the custom title bar is enabled via {0}.", '`#window.titleBarStyle#`'),
457+
'markdownDescription': isWeb ?
458+
localize('layoutControlEnabledWeb', "Controls whether the layout control in the title bar is shown.") :
459+
localize({ key: 'layoutControlEnabled', comment: ['{0} is a placeholder for a setting identifier.'] }, "Controls whether the layout control is shown in the custom title bar. This setting only has an effect when {0} is set to {1}.", '`#window.titleBarStyle#`', '`custom`')
458460
},
459461
'workbench.layoutControl.type': {
460462
'type': 'string',
@@ -467,26 +469,6 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
467469
'default': 'both',
468470
'description': localize('layoutControlType', "Controls whether the layout control in the custom title bar is displayed as a single menu button or with multiple UI toggles."),
469471
},
470-
'workbench.experimental.layoutControl.enabled': {
471-
'type': 'boolean',
472-
'tags': ['experimental'],
473-
'default': false,
474-
'markdownDescription': localize({ key: 'layoutControlEnabled', comment: ['{0} is a placeholder for a setting identifier.'] }, "Controls whether the layout controls in the custom title bar is enabled via {0}.", '`#window.titleBarStyle#`'),
475-
'markdownDeprecationMessage': localize({ key: 'layoutControlEnabledDeprecation', comment: ['{0} is a placeholder for a setting identifier.'] }, "This setting has been deprecated in favor of {0}", '`#workbench.layoutControl.enabled#`')
476-
},
477-
'workbench.experimental.layoutControl.type': {
478-
'type': 'string',
479-
'enum': ['menu', 'toggles', 'both'],
480-
'enumDescriptions': [
481-
localize('layoutcontrol.type.menu', "Shows a single button with a dropdown of layout options."),
482-
localize('layoutcontrol.type.toggles', "Shows several buttons for toggling the visibility of the panels and side bar."),
483-
localize('layoutcontrol.type.both', "Shows both the dropdown and toggle buttons."),
484-
],
485-
'tags': ['experimental'],
486-
'default': 'both',
487-
'description': localize('layoutControlType', "Controls whether the layout control in the custom title bar is displayed as a single menu button or with multiple UI toggles."),
488-
'markdownDeprecationMessage': localize({ key: 'layoutControlTypeDeprecation', comment: ['{0} is a placeholder for a setting identifier.'] }, "This setting has been deprecated in favor of {0}", '`#workbench.layoutControl.type#`')
489-
},
490472
}
491473
});
492474

@@ -541,7 +523,9 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
541523
type: 'boolean',
542524
default: false,
543525
tags: ['experimental'],
544-
markdownDescription: localize('window.commandCenter', "Show command launcher together with the window title. This setting only has an effect when {0} is set to {1}.", '`#window.titleBarStyle#`', '`custom`')
526+
markdownDescription: isWeb ?
527+
localize('window.commandCenterWeb', "Show command launcher together with the window title.") :
528+
localize({ key: 'window.commandCenter', comment: ['{0} is a placeholder for a setting identifier.'] }, "Show command launcher together with the window title. This setting only has an effect when {0} is set to {1}.", '`#window.titleBarStyle#`', '`custom`')
545529
},
546530
'window.menuBarVisibility': {
547531
'type': 'string',
@@ -553,7 +537,9 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
553537
localize('window.menuBarVisibility.toggle.mac', "Menu is hidden but can be displayed at the top of the window by executing the `Focus Application Menu` command.") :
554538
localize('window.menuBarVisibility.toggle', "Menu is hidden but can be displayed at the top of the window via the Alt key."),
555539
localize('window.menuBarVisibility.hidden', "Menu is always hidden."),
556-
localize('window.menuBarVisibility.compact', "Menu is displayed as a compact button in the side bar. This value is ignored when {0} is {1}.", '`#window.titleBarStyle#`', '`native`')
540+
isWeb ?
541+
localize('window.menuBarVisibility.compact.web', "Menu is displayed as a compact button in the side bar.") :
542+
localize({ key: 'window.menuBarVisibility.compact', comment: ['{0} is a placeholder for a setting identifier.'] }, "Menu is displayed as a compact button in the side bar. This value is ignored when {0} is {1}.", '`#window.titleBarStyle#`', '`native`')
557543
],
558544
'default': isWeb ? 'compact' : 'classic',
559545
'scope': ConfigurationScope.APPLICATION,

0 commit comments

Comments
 (0)