From 3477e17bb3614b9e3dec8f5d0cb681742a5e9840 Mon Sep 17 00:00:00 2001 From: Peter Fajdiga Date: Sat, 20 Jan 2024 19:30:21 +0100 Subject: [PATCH] Desktop: scrollCenterRange: replace parameter `requireVisible` with `condition` --- src/layout/Desktop.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/layout/Desktop.ts b/src/layout/Desktop.ts index 943dd02..72ccf16 100644 --- a/src/layout/Desktop.ts +++ b/src/layout/Desktop.ts @@ -98,8 +98,8 @@ class Desktop { public scrollCenterVisible(focusedColumn: Column) { const columnRange = new Desktop.ColumnRange(focusedColumn); const visibleRange = this.getCurrentVisibleRange(); - columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, true); - columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, false); + columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, column => column.isVisible(visibleRange, true)); + columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, () => true); this.scrollCenterRange(columnRange); } @@ -244,7 +244,7 @@ namespace Desktop { this.width = initialColumn.getWidth(); } - public addNeighbors(visibleRange: Desktop.Range, gap: number, requireVisible: boolean) { + public addNeighbors(visibleRange: Desktop.Range, gap: number, condition: (column: Column) => boolean) { const grid = this.left.grid; let leftColumn: Column|null = this.left; @@ -252,7 +252,7 @@ namespace Desktop { leftColumn = grid.getPrevColumn(leftColumn); if ( leftColumn === null || - requireVisible && !leftColumn.isVisible(visibleRange, true) || + !condition(leftColumn) || this.width + gap + leftColumn.getWidth() > visibleRange.getWidth() ) { break; @@ -265,7 +265,7 @@ namespace Desktop { rightColumn = grid.getNextColumn(rightColumn); if ( rightColumn === null || - requireVisible && !rightColumn.isVisible(visibleRange, true) || + !condition(rightColumn) || this.width + gap + rightColumn.getWidth() > visibleRange.getWidth() ) { break;