Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 15:01:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into benibenj/hideTabsActionBar

Browse Source
This commit is contained in:
Benjamin Pasero
2023-11-01 16:48:16 +01:00
parent 047fc0b770 b45119ef4d
commit e4a5c0948c
117 changed files with 1051 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/vs/workbench/browser/workbench.contribution.ts
View File

@@ -11,7 +11,7 @@ import { ConfigurationMigrationWorkbenchContribution, DynamicWorkbenchConfigurat
import { isStandalone } from 'vs/base/browser/browser';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { ActivityBarPosition, LayoutSettings } from 'vs/workbench/services/layout/browser/layoutService';
import { ActivityBarPosition, EditorTabsMode, LayoutSettings } from 'vs/workbench/services/layout/browser/layoutService';
const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -38,9 +38,9 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
description: localize('tabScrollbarHeight', "Controls the height of the scrollbars used for tabs and breadcrumbs in the editor title area."),
default: 'default',
},
'workbench.editor.showTabs': {
[LayoutSettings.EDITOR_TABS_MODE]: {
'type': 'string',
'enum': ['multiple', 'single', 'none'],
'enum': [EditorTabsMode.MULTIPLE, EditorTabsMode.SINGLE, EditorTabsMode.NONE],
'enumDescriptions': [
localize('workbench.editor.showTabs.multiple', "Each editor is displayed as a tab in the editor title area."),
localize('workbench.editor.showTabs.single', "The active editor is displayed as a single large tab in the editor title area."),
@@ -153,11 +153,21 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
}
}
},
'workbench.editor.tabCloseButton': {
'type': 'string',
'enum': ['left', 'right', 'off'],
'default': 'right',
'markdownDescription': localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' }, "Controls the position of the editor's tabs close buttons, or disables them when set to 'off'. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`.")
'workbench.editor.tabActionLocation': {
type: 'string',
enum: ['left', 'right'],
default: 'right',
markdownDescription: localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabActionLocation' }, "Controls the position of the editor's tabs action buttons (close, unpin). This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`.")
},
'workbench.editor.tabActionCloseVisibility': {
type: 'boolean',
default: true,
description: localize('workbench.editor.tabActionCloseVisibility', "Controls the visibility of the tab close action button.")
},
'workbench.editor.tabActionUnpinVisibility': {
type: 'boolean',
default: true,
description: localize('workbench.editor.tabActionUnpinVisibility', "Controls the visibility of the tab unpin action button.")
},
'workbench.editor.tabSizing': {
'type': 'string',
@@ -632,7 +642,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
'default': isMacintosh ? ' \u2014 ' : ' - ',
'markdownDescription': localize("window.titleSeparator", "Separator used by {0}.", '`#window.title#`')
},
'window.commandCenter': {
[LayoutSettings.COMMAND_CENTER]: {
type: 'boolean',
default: true,
markdownDescription: isWeb ?
@@ -806,11 +816,21 @@ Registry.as<IConfigurationMigrationRegistry>(Extensions.ConfigurationMigration)
return [['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value: value }]];
}
}, {
key: 'workbench.editor.showTabs', migrateFn: (value: any) => {
key: LayoutSettings.EDITOR_TABS_MODE, migrateFn: (value: any) => {
if (typeof value === 'boolean') {
value = value ? 'multiple' : 'single';
value = value ? EditorTabsMode.MULTIPLE : EditorTabsMode.SINGLE;
}
return [['workbench.editor.showTabs', { value: value }]];
return [[LayoutSettings.EDITOR_TABS_MODE, { value }]];
}
}, {
key: 'workbench.editor.tabCloseButton', migrateFn: (value: any) => {
const result: ConfigurationKeyValuePairs = [];
if (value === 'left' || value === 'right') {
result.push(['workbench.editor.tabActionLocation', { value }]);
} else if (value === 'off') {
result.push(['workbench.editor.tabActionCloseVisibility', { value: false }]);
}
return result;
}
}, {
key: 'zenMode.hideTabs', migrateFn: (value: any) => {