some more polish

microsoft · Sep 16, 2020 · c290d7c · c290d7c
1 parent 417e97b
commit c290d7c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -41,7 +41,7 @@
 	flex-wrap: wrap;
 }
 
-.monaco-workbench .part.editor>.content .editor-group-container>.title.tabs >.tabs-and-actions-container.multi-line>.monaco-scrollable-element>.tabs-container::after {
+.monaco-workbench .part.editor>.content .editor-group-container>.title.tabs >.tabs-and-actions-container.multi-line > .monaco-scrollable-element > .tabs-container::after {
 	content: ""; /* Add a hidden space after the last tab in multi-line tabs */
 	flex: 1 0 auto;
 }

diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -1051,11 +1051,8 @@ export class TabsTitleControl extends TitleControl {
 		// Borders / Outline
 		const borderRightColor = ((isTabLastSticky ? this.getColor(TAB_LAST_PINNED_BORDER) : undefined) || this.getColor(TAB_BORDER) || this.getColor(contrastBorder));
 		tabContainer.style.borderRight = borderRightColor ? `1px solid ${borderRightColor}` : '';
+		tabContainer.style.borderBottom = borderRightColor && this.accessor.partOptions.multiLineTabs ? `1px solid ${borderRightColor}` : ''; // bottom border when wrapping multi-line
 		tabContainer.style.outlineColor = this.getColor(activeContrastBorder) || '';
-		// Add a border to the bottom of the tabs if multi-line tabs is enabled
-		if (this.accessor.partOptions.multiLineTabs) {
-			tabContainer.style.borderBottom = `1px solid ${borderRightColor}`;
-		}
 
 		// Settings
 		const tabActionsVisibility = isTabSticky && options.pinnedTabSizing === 'compact' ? 'off' /* treat sticky compact tabs as tabCloseButton: 'off' */ : options.tabCloseButton;

diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -1219,6 +1219,7 @@ export interface IWorkbenchEditorConfiguration {
 
 interface IEditorPartConfiguration {
 	showTabs?: boolean;
+	multiLineTabs?: boolean;
 	scrollToSwitchTabs?: boolean;
 	highlightModifiedTabs?: boolean;
 	tabCloseButton?: 'left' | 'right' | 'off';
@@ -1243,7 +1244,6 @@ interface IEditorPartConfiguration {
 		value?: number;
 		perEditorGroup?: boolean;
 	};
-	multiLineTabs?: boolean;
 }
 
 export interface IEditorPartOptions extends IEditorPartConfiguration {