diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index bd252533f22..5bf708fa53c 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -1065,14 +1065,14 @@ export class TabsTitleControl extends TitleControl { removeClass(tabContainer, 'has-icon'); } - ['compact', 'shrink', 'standard'].forEach(option => { + ['compact', 'shrink', 'normal'].forEach(option => { const domAction = isTabSticky && options.pinnedTabSizing === option ? addClass : removeClass; domAction(tabContainer, `sticky-${option}`); }); // Sticky compact/shrink tabs need a position to remain at their location // when scrolling to stay in view (requirement for position: sticky) - if (isTabSticky && options.pinnedTabSizing !== 'standard') { + if (isTabSticky && options.pinnedTabSizing !== 'normal') { let stickyTabWidth = 0; switch (options.pinnedTabSizing) { case 'compact': diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index c4bd84323df..27f66b36f24 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -88,12 +88,12 @@ import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuratio }, 'workbench.editor.pinnedTabSizing': { 'type': 'string', - 'enum': ['compact', 'shrink', 'standard'], + 'enum': ['compact', 'shrink', 'normal'], 'default': 'compact', '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."), - nls.localize('workbench.editor.pinnedTabSizing.standard', "A pinned tab inherits the look of non pinned tabs.") + nls.localize('workbench.editor.pinnedTabSizing.normal', "A pinned tab inherits the look of non pinned tabs.") ], 'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'pinnedTabSizing' }, "Controls the sizing of pinned editor tabs. Pinned tabs are sorted to the begining of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is `false`.") }, diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index 2fa0b1f0c51..dfcf7814468 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -1223,7 +1223,7 @@ interface IEditorPartConfiguration { highlightModifiedTabs?: boolean; tabCloseButton?: 'left' | 'right' | 'off'; tabSizing?: 'fit' | 'shrink'; - pinnedTabSizing?: 'compact' | 'shrink' | 'standard'; + pinnedTabSizing?: 'compact' | 'shrink' | 'normal'; titleScrollbarSizing?: 'default' | 'large'; focusRecentEditorAfterClose?: boolean; showIcons?: boolean;