From 66f239584059b5cc13b23c73156595532004d822 Mon Sep 17 00:00:00 2001
From: LGUG2Z <jadeiqbal@fastmail.com>
Date: Sat, 15 Apr 2023 21:26:33 -0700
Subject: [PATCH] fix(wm): update border correctly on (un)stack

This commit ensures that when active, the border is drawn correctly
after the stack and unstack commands.

fix #396
---
 komorebi.generated.ps1          | 12 ++++++++++++
 komorebi/src/main.rs            |  3 ++-
 komorebi/src/process_command.rs | 16 ++++++++++++++++
 komorebi/src/window_manager.rs  |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/komorebi.generated.ps1 b/komorebi.generated.ps1
index 35133204..5afd0b88 100644
--- a/komorebi.generated.ps1
+++ b/komorebi.generated.ps1
@@ -76,6 +76,9 @@ komorebic.exe identify-border-overflow-application exe "DiscordPTB.exe"
 # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 komorebic.exe identify-tray-application exe "DiscordPTB.exe"
 
+# Dropbox
+komorebic.exe float-rule exe "Dropbox.exe"
+
 # ElectronMail
 # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 komorebic.exe identify-tray-application exe "ElectronMail.exe"
@@ -84,6 +87,9 @@ komorebic.exe identify-tray-application exe "ElectronMail.exe"
 # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 komorebic.exe identify-tray-application exe "Element.exe"
 
+# Elephicon
+komorebic.exe float-rule exe "Elephicon.exe"
+
 # ElevenClock
 # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 komorebic.exe identify-tray-application exe "ElevenClock.exe"
@@ -421,6 +427,12 @@ komorebic.exe identify-tray-application exe "VoiceAI.exe"
 # If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 komorebic.exe identify-tray-application exe "WebTorrent.exe"
 
+# WinZip (32-bit)
+komorebic.exe float-rule exe "winzip32.exe"
+
+# WinZip (64-bit)
+komorebic.exe float-rule exe "winzip64.exe"
+
 # Windows Console (conhost.exe)
 komorebic.exe manage-rule class "ConsoleWindowClass"
 
diff --git a/komorebi/src/main.rs b/komorebi/src/main.rs
index ad63469b..d7e8b411 100644
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -239,7 +239,7 @@ pub fn load_configuration() -> Result<()> {
     let mut config_pwsh = home.clone();
     config_pwsh.push("komorebi.ps1");
 
-    let mut config_ahk = home.clone();
+    let mut config_ahk = home;
     config_ahk.push("komorebi.ahk");
 
     if config_pwsh.exists() {
@@ -277,6 +277,7 @@ pub fn load_configuration() -> Result<()> {
     Ok(())
 }
 
+#[must_use]
 pub fn current_virtual_desktop() -> Option<Vec<u8>> {
     let hkcu = RegKey::predef(HKEY_CURRENT_USER);
 
diff --git a/komorebi/src/process_command.rs b/komorebi/src/process_command.rs
index 26fb50c7..f4f8ea5b 100644
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -1074,6 +1074,20 @@ impl WindowManager {
             }
         };
 
+        match message {
+            SocketMessage::StackWindow(_) => {
+                BORDER_COLOUR_CURRENT
+                    .store(BORDER_COLOUR_STACK.load(Ordering::SeqCst), Ordering::SeqCst);
+            }
+            SocketMessage::UnstackWindow => {
+                BORDER_COLOUR_CURRENT.store(
+                    BORDER_COLOUR_SINGLE.load(Ordering::SeqCst),
+                    Ordering::SeqCst,
+                );
+            }
+            _ => {}
+        }
+
         match message {
             SocketMessage::ChangeLayout(_)
             | SocketMessage::ChangeLayoutCustom(_)
@@ -1089,6 +1103,8 @@ impl WindowManager {
             | SocketMessage::ToggleMaximize
             | SocketMessage::Promote
             | SocketMessage::PromoteFocus
+            | SocketMessage::StackWindow(_)
+            | SocketMessage::UnstackWindow
             | SocketMessage::Retile
             // Adding this one so that changes can be seen instantly after
             // modifying the active window border offset
diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
index 89755bb3..15dd6ec5 100644
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -233,7 +233,7 @@ impl WindowManager {
         let mut config_pwsh = home.clone();
         config_pwsh.push("komorebi.ps1");
 
-        let mut config_ahk = home.clone();
+        let mut config_ahk = home;
         config_ahk.push("komorebi.ahk");
 
         if config_pwsh.exists() {