Merge pull request microsoft#201323 from microsoft/tyriar/201303

Tyriar · web-flow · commit fffda8e1feb4 · 2023-12-20T10:16:25.000-08:00
Fix sticky scroll showing up on first line
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
@@ -258,7 +258,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		const stickyScrollLineCount = Math.min(promptRowCount + commandRowCount - 1, maxLineCount) - rowOffset;
 
 		// Hide sticky scroll if it's currently on a line that contains it
-		if (buffer.viewportY === stickyScrollLineStart) {
+		if (buffer.viewportY <= stickyScrollLineStart) {
 			this._setVisible(false);
 			return;
 		}

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ export class TerminalStickyScrollOverlay extends Disposable {`
`258`	`258`	`const stickyScrollLineCount = Math.min(promptRowCount + commandRowCount - 1, maxLineCount) - rowOffset;`
`259`	`259`
`260`	`260`	`// Hide sticky scroll if it's currently on a line that contains it`
`261`		`- if (buffer.viewportY === stickyScrollLineStart) {`
	`261`	`+ if (buffer.viewportY <= stickyScrollLineStart) {`
`262`	`262`	`this._setVisible(false);`
`263`	`263`	`return;`
`264`	`264`	`}`