Desktop.scrollToRange: simplify

2024-01-21 18:37:34 +01:00
parent 9e9ff2b74f
commit 03c7cc6503
1 changed files with 14 additions and 1 deletions
--- a/src/layout/Desktop.ts
+++ b/src/layout/Desktop.ts
@@ -74,7 +74,20 @@ class Desktop {
    }

    public scrollToRange(range: Desktop.Range) {
-        this.setScroll(this.calculateVisibleRange(range).getLeft(), true);
+        const left = range.getLeft();
+        const right = range.getRight();
+        const initialVisibleRange = this.getCurrentVisibleRange();
+
+        let targetScrollX: number;
+        if (left < initialVisibleRange.getLeft()) {
+            targetScrollX = left;
+        } else if (right > initialVisibleRange.getRight()) {
+            targetScrollX = right - this.tilingArea.width;
+        } else {
+            targetScrollX = initialVisibleRange.getLeft();
+        }
+
+        this.setScroll(targetScrollX, false);
    }

    public scrollCenterRange(range: Desktop.Range) {