diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts index de96a08b24d..6452a712aef 100644 --- a/src/vs/workbench/browser/parts/editor/editor.ts +++ b/src/vs/workbench/browser/parts/editor/editor.ts @@ -30,7 +30,7 @@ export const DEFAULT_EDITOR_PART_OPTIONS: IEditorPartOptions = { highlightModifiedTabs: false, tabCloseButton: 'right', tabSizing: 'fit', - pinnedTabSizing: 'compact', + pinnedTabSizing: 'shrink', titleScrollbarSizing: 'default', focusRecentEditorAfterClose: true, showIcons: true, diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 5bf708fa53c..21086caf7c8 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -585,11 +585,7 @@ export class TabsTitleControl extends TitleControl { const tabActionRunner = new EditorCommandsContextActionRunner({ groupId: this.group.id, editorIndex: index }); - const tabActionBar = new ActionBar(tabActionsContainer, { - ariaLabel: localize('ariaLabelTabActions', "Tab actions"), - actionRunner: tabActionRunner, - - }); + const tabActionBar = new ActionBar(tabActionsContainer, { ariaLabel: localize('ariaLabelTabActions', "Tab actions"), actionRunner: tabActionRunner, }); tabActionBar.onDidBeforeRun(e => { if (e.action.id === this.closeEditorAction.id) { this.blockRevealActiveTabOnce(); @@ -1101,7 +1097,7 @@ export class TabsTitleControl extends TitleControl { let name: string | undefined; let forceLabel = false; let description: string; - if (this.group.isSticky(index) && options.pinnedTabSizing === 'compact') { + if (options.pinnedTabSizing === 'compact' && this.group.isSticky(index)) { const isShowingIcons = options.showIcons && options.hasIcons; name = isShowingIcons ? '' : tabLabel.name?.charAt(0).toUpperCase(); description = ''; @@ -1287,7 +1283,7 @@ export class TabsTitleControl extends TitleControl { // // Synopsis // - allTabsWidth: sum of all tab widths - // - stickyTabsWidth: sum of all sticky tab widths (unless they inherit look from other tabs) + // - stickyTabsWidth: sum of all sticky tab widths (unless `pinnedTabSizing: normal`) // - visibleContainerWidth: size of tab container // - availableContainerWidth: size of tab container minus size of sticky tabs // @@ -1306,7 +1302,7 @@ export class TabsTitleControl extends TitleControl { // Compute width of sticky tabs depending on pinned tab sizing // - compact: sticky-tabs * TAB_SIZES.compact // - shrink: sticky-tabs * TAB_SIZES.shrink - // - inherit: 0 (sticky tabs inherit look and feel from non-sticky tabs) + // - normal: 0 (sticky tabs inherit look and feel from non-sticky tabs) let stickyTabsWidth = 0; if (this.group.stickyCount > 0) { let stickyTabWidth = 0; diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index 27f66b36f24..6f7e0de009b 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -89,7 +89,7 @@ import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuratio 'workbench.editor.pinnedTabSizing': { 'type': 'string', 'enum': ['compact', 'shrink', 'normal'], - 'default': 'compact', + 'default': 'shrink', 'enumDescriptions': [ nls.localize('workbench.editor.pinnedTabSizing.compact', "A pinned tab will show in a compact form with only icon or first letter of the editor name."), nls.localize('workbench.editor.pinnedTabSizing.shrink', "A pinned tab shrinks to a compact fixed size showing parts of the editor name."),