From fdb4b88333037d0e7e8a87a71927d1f941537776 Mon Sep 17 00:00:00 2001
From: Peter Fajdiga <peter.fajdiga@gmail.com>
Date: Mon, 8 Jul 2024 12:04:24 +0200
Subject: [PATCH] Column: remove `moveAfter`

---
 src/lib/Actions.ts       | 8 ++++----
 src/lib/layout/Column.ts | 7 -------
 src/lib/layout/Grid.ts   | 3 +++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/lib/Actions.ts b/src/lib/Actions.ts
index 9c7aa2d..2d7131b 100644
--- a/src/lib/Actions.ts
+++ b/src/lib/Actions.ts
@@ -148,13 +148,13 @@ namespace Actions {
 
             case "column-move-start": return () => {
                 world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
-                    column.moveAfter(null);
+                    grid.moveColumn(column, null);
                 });
             };
 
             case "column-move-end": return () => {
                 world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
-                    column.moveAfter(grid.getLastColumn());
+                    grid.moveColumn(column, grid.getLastColumn());
                 });
             };
 
@@ -287,9 +287,9 @@ namespace Actions {
                         return;
                     }
                     if (targetColumn.isAfter(column)) {
-                        column.moveAfter(targetColumn);
+                        grid.moveColumn(column, targetColumn);
                     } else {
-                        column.moveAfter(grid.getPrevColumn(targetColumn));
+                        grid.moveColumn(column, grid.getPrevColumn(targetColumn));
                     }
                 });
             };
diff --git a/src/lib/layout/Column.ts b/src/lib/layout/Column.ts
index 82eea30..c26e0d4 100644
--- a/src/lib/layout/Column.ts
+++ b/src/lib/layout/Column.ts
@@ -30,13 +30,6 @@ class Column {
         }
     }
 
-    public moveAfter(prevColumn: Column|null) {
-        if (prevColumn === this) {
-            return;
-        }
-        this.grid.moveColumn(this, prevColumn);
-    }
-
     public isAfter(other: Column) {
         return this.gridX > other.gridX;
     }
diff --git a/src/lib/layout/Grid.ts b/src/lib/layout/Grid.ts
index e34bdf8..5996f0c 100644
--- a/src/lib/layout/Grid.ts
+++ b/src/lib/layout/Grid.ts
@@ -25,6 +25,9 @@ class Grid {
     }
 
     public moveColumn(column: Column, prevColumn: Column|null) {
+        if (column === prevColumn) {
+            return;
+        }
         const movedLeft = prevColumn === null ? true : column.isAfter(prevColumn);
         const firstMovedColumn = movedLeft ? column : this.getNextColumn(column);
         this.columns.move(column, prevColumn);