fix: fix editor progress position

harbin1053020115 · Oct 16, 2023 · cea64be · cea64be
1 parent 8f2c0e7
commit cea64be
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
@@ -734,7 +734,6 @@
 		"--tab-sizing-fixed-min-width",
 		"--tab-sizing-fixed-max-width",
 		"--editor-group-tab-height",
-		"--editor-group-tab-total-height",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",

diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css
@@ -90,7 +90,7 @@
 .monaco-workbench .part.editor > .content .monaco-progress-container {
 	position: absolute;
 	left: 0;
-	top: var(--editor-group-tab-total-height);
+	bottom: 0;
 	z-index: 5; /* on top of things */
 	height: 2px;
 }

diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -181,8 +181,16 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			// Watermark & shortcuts
 			this._register(this.instantiationService.createInstance(EditorGroupWatermark, this.element));
 
+			// Context keys
+			this.handleGroupContextKeys();
+
+			// Title container
+			this.titleContainer = document.createElement('div');
+			this.titleContainer.classList.add('title');
+			this.element.appendChild(this.titleContainer);
+
 			// Progress bar
-			this.progressBar = this._register(new ProgressBar(this.element, defaultProgressBarStyles));
+			this.progressBar = this._register(new ProgressBar(this.titleContainer, defaultProgressBarStyles));
 			this.progressBar.hide();
 
 			// Scoped instantiation service
@@ -191,14 +199,6 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 				[IEditorProgressService, this._register(new EditorProgressIndicator(this.progressBar, this))]
 			));
 
-			// Context keys
-			this.handleGroupContextKeys();
-
-			// Title container
-			this.titleContainer = document.createElement('div');
-			this.titleContainer.classList.add('title');
-			this.element.appendChild(this.titleContainer);
-
 			// Title control
 			this.titleControl = this._register(this.scopedInstantiationService.createInstance(EditorTitleControl, this.titleContainer, this.editorPartsView, this.groupsView, this, this.model));
 

diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -404,7 +404,6 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 
 	protected updateTabHeight(): void {
 		this.parent.style.setProperty('--editor-group-tab-height', `${this.tabHeight}px`);
-		this.parent.parentElement?.style.setProperty('--editor-group-tab-total-height', `${this.tabHeight * (this.groupsView.partOptions.pinnedTabsOnSeparateRow ? 2 : 1)}px`);
 	}
 
 	updateOptions(oldOptions: IEditorPartOptions, newOptions: IEditorPartOptions): void {