From ed8ec7c794cd417631c56ec1bd3d1ddfe60806f4 Mon Sep 17 00:00:00 2001
From: Peter Fajdiga <peter.fajdiga@gmail.com>
Date: Sat, 15 Jul 2023 12:39:06 +0200
Subject: [PATCH] move `Grid.isColumnVisible` to `Column.isVisible`

---
 src/layout/Column.ts |  8 ++++++++
 src/layout/Grid.ts   | 12 +-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/layout/Column.ts b/src/layout/Column.ts
index 8a889dc..ff5a44b 100644
--- a/src/layout/Column.ts
+++ b/src/layout/Column.ts
@@ -208,6 +208,14 @@ class Column {
         this.stacked = !this.stacked;
     }
 
+    public isVisible(scrollPos: ScrollPos, fullyVisible: boolean) {
+        if (fullyVisible) {
+            return this.getLeft() >= scrollPos.getLeft() && this.getRight() <= scrollPos.getRight();
+        } else {
+            return this.getRight() >= scrollPos.getLeft() && this.getLeft() <= scrollPos.getRight();
+        }
+    }
+
     onWindowAdded(window: Window) {
         this.windows.insertEnd(window);
         if (this.width === 0) {
diff --git a/src/layout/Grid.ts b/src/layout/Grid.ts
index 9885144..1c9cb08 100644
--- a/src/layout/Grid.ts
+++ b/src/layout/Grid.ts
@@ -99,21 +99,11 @@ class Grid {
         return last;
     }
 
-    isColumnVisible(column: Column, scrollPos: ScrollPos, fullyVisible: boolean) {
-        const left = column.getLeft();
-        const right = column.getRight();
-        if (fullyVisible) {
-            return left >= scrollPos.getLeft() && right <= scrollPos.getRight();
-        } else {
-            return right >= scrollPos.getLeft() && left <= scrollPos.getRight();
-        }
-    }
-
     getVisibleColumnsWidth(scrollPos: ScrollPos, fullyVisible: boolean) {
         let width = 0;
         let nVisible = 0;
         for (const column of this.columns.iterator()) {
-            if (this.isColumnVisible(column, scrollPos, fullyVisible)) {
+            if (column.isVisible(scrollPos, fullyVisible)) {
                 width += column.width;
                 nVisible++;
             }