fix: fix editor progress position when enabled pinnedTabsOnSeparateRow

harbin1053020115 · Oct 11, 2023 · 8f2c0e7 · 8f2c0e7
1 parent 257d2bf
commit 8f2c0e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
@@ -734,6 +734,7 @@
  "--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",
@@ -780,4 +781,4 @@
  "--z-index-notebook-sticky-scroll",
  "--zoom-factor"
  ]
-}
+}
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: 33px; /* at the bottom of the 35px height title container */
+ top: var(--editor-group-tab-total-height);
  z-index: 5; /* on top of things */
  height: 2px;
 }

diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -404,12 +404,13 @@ 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 {
 
  // Update tab height
- if (oldOptions.tabHeight !== newOptions.tabHeight) {
+ if (oldOptions.tabHeight !== newOptions.tabHeight || oldOptions.pinnedTabsOnSeparateRow !== newOptions.pinnedTabsOnSeparateRow) {
  this.updateTabHeight();
  }
  }