Settings editor - lazier paging when scrolling, looks nicer

microsoft · Aug 28, 2018 · ba7f67a · ba7f67a
1 parent f704211
commit ba7f67a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -556,7 +556,7 @@ export class SettingsEditor2 extends BaseEditor {
 
 	private updateTreePagingByScroll(): void {
 		const lastVisibleElement = this.settingsTree.getLastVisibleElement();
-		if (lastVisibleElement && this.settingsTreeDataSource.pageTo(lastVisibleElement.index)) {
+		if (lastVisibleElement && this.settingsTreeDataSource.pageTo(lastVisibleElement.index, false)) {
 			this.renderTree();
 		}
 	}

diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -208,15 +208,18 @@ export class SettingsDataSource implements IDataSource {
 
 export class SimplePagedDataSource implements IDataSource {
 	private static readonly SETTINGS_PER_PAGE = 30;
+	private static readonly BUFFER = 5;
 
 	private loadedToIndex: number;
 
 	constructor(private realDataSource: IDataSource) {
 		this.loadedToIndex = SimplePagedDataSource.SETTINGS_PER_PAGE * 2;
 	}
 
-	pageTo(index: number): boolean {
-		if (index > this.loadedToIndex - SimplePagedDataSource.SETTINGS_PER_PAGE) {
+	pageTo(index: number, top = true): boolean {
+		const buffer = top ? SimplePagedDataSource.SETTINGS_PER_PAGE : SimplePagedDataSource.BUFFER;
+
+		if (index > this.loadedToIndex - buffer) {
 			this.loadedToIndex = (Math.ceil(index / SimplePagedDataSource.SETTINGS_PER_PAGE) + 1) * SimplePagedDataSource.SETTINGS_PER_PAGE;
 			return true;
 		} else {