From f467841b7b34558656181e7e00d56661baac690d Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 3 Jan 2018 10:54:41 +0100 Subject: [PATCH] tree: scroll position is 1 if scrolled all the way fixes #40899 --- src/vs/base/parts/tree/browser/treeView.ts | 4 ++-- src/vs/workbench/parts/debug/electron-browser/repl.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index 041c4285a43..5f331083499 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/vs/base/parts/tree/browser/treeView.ts @@ -826,7 +826,7 @@ export class TreeView extends HeightMap { public getScrollPosition(): number { const height = this.getTotalHeight() - this.viewHeight; - return height <= 0 ? 0 : this.scrollTop / height; + return height <= 0 ? 1 : this.scrollTop / height; } public setScrollPosition(pos: number): void { @@ -1653,4 +1653,4 @@ export class TreeView extends HeightMap { super.dispose(); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts index 81264733319..86bd470365c 100644 --- a/src/vs/workbench/parts/debug/electron-browser/repl.ts +++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts @@ -118,7 +118,7 @@ export class Repl extends Panel implements IPrivateReplService { this.refreshTimeoutHandle = null; const previousScrollPosition = this.tree.getScrollPosition(); this.tree.refresh().then(() => { - if (previousScrollPosition === 1 || previousScrollPosition === 0) { + if (previousScrollPosition === 1) { // Only scroll if we were scrolled all the way down before tree refreshed #10486 this.tree.setScrollPosition(1); } -- GitLab