From 76a0ca0e8fdb153f7341ee0a2c45239550a14cfa Mon Sep 17 00:00:00 2001
From: Klesh Wong <klesh@qq.com>
Date: Thu, 8 Jul 2021 20:22:36 +0800
Subject: [PATCH] [bugfix] unable to save arrangement

---
 .editorconfig             |  3 +++
 win/ahk/WindowManager.ahk | 18 ++++++++++++------
 win/win.ahk               |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 70a3864..c998d45 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,3 +3,6 @@ indent_size=4
 
 [dwmbar]
 indent_size=4
+
+[*.ahk]
+indent_size=4
diff --git a/win/ahk/WindowManager.ahk b/win/ahk/WindowManager.ahk
index 873ade5..39e20a7 100644
--- a/win/ahk/WindowManager.ahk
+++ b/win/ahk/WindowManager.ahk
@@ -1,10 +1,4 @@
 ; WINDOWS MANAGER
-; global RATIO := 0.618
-global RATIO := 0.382
-global ID_SEEN := Object()
-global ARRANGEMENT := Object()
-global ARRANGEMENT_PATH := A_AppData . "\arrangement.json"
-global PADDING := 10
 
 ; =========================
 ; KEY BINDING
@@ -37,6 +31,13 @@ global PADDING := 10
 ; =========================
 
 InitWindowManager() {
+    LogDebug("InitWindowManager")
+    global RATIO := 0.618
+    global RATIO := 0.382
+    global ID_SEEN := Object()
+    global ARRANGEMENT := Object()
+    global ARRANGEMENT_PATH := A_AppData . "\arrangement.json"
+    global PADDING := 10
     LoadArrangement()
     SetTimer, AdjustNewWindow, 1000
 }
@@ -112,20 +113,24 @@ MoveActiveWinByDirection(direction) {
     wy := wy + PADDING
     wh := wh - PADDING * 2
     WinMove, A,, wx - l, wy - t, ww + l + r, wh + t + b
+    LogDebug(Format("move {1} to {2}", activeWinId, direction))
     SaveActiveWindowDirection(direction)
 }
 
 SaveArrangement() {
+    LogDebug("SaveArrangement start")
     global ARRANGEMENT
     global ARRANGEMENT_PATH
     file := FileOpen(ARRANGEMENT_PATH, "w")
     file.Write(JSON.Dump(ARRANGEMENT,, 2))
     file.Close()
+    LogDebug("SaveArrangement end")
 }
 
 LoadArrangement() {
     global ARRANGEMENT
     global ARRANGEMENT_PATH
+    LogDebug("LoadArrangement start " .ARRANGEMENT_PATH)
     try {
       FileRead, temp, %ARRANGEMENT_PATH%
       ARRANGEMENT := JSON.Load(temp)
@@ -144,6 +149,7 @@ LoadArrangement() {
     if not IsObject(ARRANGEMENT["whitelist"]) {
       ARRANGEMENT["whitelist"] := Object()
     }
+    LogDebug("LoadArrangement end")
 }
 
 GetActiveWindowPath() {
diff --git a/win/win.ahk b/win/win.ahk
index a1e8a10..a74a82d 100644
--- a/win/win.ahk
+++ b/win/win.ahk
@@ -7,7 +7,7 @@ CoordMode, Mouse, Screen ; mouse coordinates relative to the screen
 ; =========================
 ; DEBUGGING
 ; =========================
-global DEBUGGING := false
+global DEBUGGING := true
 
 ToggleDebugging() {
     global DEBUGGING