Tweak z-index so split pane sash is above everything

benoitf · Nov 9, 2021 · 2003092 · 2003092
1 parent d019c24
commit 2003092
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -63,12 +63,12 @@
 
 .monaco-workbench .editor-instance .xterm-viewport,
 .monaco-workbench .pane-body.integrated-terminal .xterm-viewport {
-	z-index: 100;
+	z-index: 30;
 }
 
 .monaco-workbench .editor-instance .xterm-screen,
 .monaco-workbench .pane-body.integrated-terminal .xterm-screen {
-	z-index: 101;
+	z-index: 31;
 }
 
 .xterm .xterm-screen {

diff --git a/src/vs/workbench/contrib/terminal/browser/media/widgets.css b/src/vs/workbench/contrib/terminal/browser/media/widgets.css
@@ -31,7 +31,7 @@
 	width: 28px;
 	height: 28px;
 	text-align: center;
-	z-index: 102;
+	z-index: 32;
 	opacity: 0.5;
 }
 

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -443,7 +443,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			return;
 		}
 
-		const computedStyle = window.getComputedStyle(this._wrapperElement!);
+		const computedStyle = window.getComputedStyle(this._container);
 		const width = parseInt(computedStyle.width);
 		const height = parseInt(computedStyle.height);
 
@@ -1679,6 +1679,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._hasScrollBar = true;
 		this._initDimensions();
 		// Always remove a row to make room for the scroll bar
+		console.log('_rows', this._rows);
 		this._fixedRows = this._rows - 1;
 		await this._resize();
 		this._terminalHasFixedWidth.set(true);