From 804b0380f709da94d8ec4ae9918dac7db0fd3590 Mon Sep 17 00:00:00 2001
From: thearturca <arti.1046@gmail.com>
Date: Tue, 23 Jul 2024 16:35:28 +0300
Subject: [PATCH] refactor(animation): remove `ANIMATION_TEMPORARILY_DISABLED`
 global vars

Global variable removed due to previous fix commit
---
 komorebi/src/lib.rs            |  1 -
 komorebi/src/process_event.rs  |  5 -----
 komorebi/src/window.rs         |  5 +----
 komorebi/src/window_manager.rs | 18 ------------------
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/komorebi/src/lib.rs b/komorebi/src/lib.rs
index a22d88bc..9d0fe247 100644
--- a/komorebi/src/lib.rs
+++ b/komorebi/src/lib.rs
@@ -225,7 +225,6 @@ pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
 
 pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
 pub static ANIMATION_ENABLED: AtomicBool = AtomicBool::new(false);
-pub static ANIMATION_TEMPORARILY_DISABLED: AtomicBool = AtomicBool::new(false);
 pub static ANIMATION_DURATION: AtomicU64 = AtomicU64::new(250);
 
 #[must_use]
diff --git a/komorebi/src/process_event.rs b/komorebi/src/process_event.rs
index 95512349..cd546b50 100644
--- a/komorebi/src/process_event.rs
+++ b/komorebi/src/process_event.rs
@@ -32,7 +32,6 @@ use crate::workspace_reconciliator::ALT_TAB_HWND;
 use crate::workspace_reconciliator::ALT_TAB_HWND_INSTANT;
 use crate::Notification;
 use crate::NotificationEvent;
-use crate::ANIMATION_TEMPORARILY_DISABLED;
 use crate::DATA_DIR;
 use crate::HIDDEN_HWNDS;
 use crate::REGEX_IDENTIFIERS;
@@ -478,8 +477,6 @@ impl WindowManager {
                                 origin_container_idx,
                             )) = pending
                             {
-                                ANIMATION_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
-
                                 let target_workspace_idx = self
                                     .monitors()
                                     .get(target_monitor_idx)
@@ -521,8 +518,6 @@ impl WindowManager {
                                 self.focus_monitor(target_monitor_idx)?;
                                 self.focus_workspace(target_workspace_idx)?;
                                 self.update_focused_workspace(false, false)?;
-
-                                ANIMATION_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
                             }
                             // Here we handle a simple move on the same monitor which is treated as
                             // a container swap
diff --git a/komorebi/src/window.rs b/komorebi/src/window.rs
index 1a50c6b3..4441f991 100644
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -5,7 +5,6 @@ use crate::stackbar_manager;
 use crate::ANIMATIONS_IN_PROGRESS;
 use crate::ANIMATION_DURATION;
 use crate::ANIMATION_ENABLED;
-use crate::ANIMATION_TEMPORARILY_DISABLED;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::Display;
@@ -225,9 +224,7 @@ impl Window {
             return Ok(());
         }
 
-        if ANIMATION_ENABLED.load(Ordering::SeqCst)
-            && !ANIMATION_TEMPORARILY_DISABLED.load(Ordering::SeqCst)
-        {
+        if ANIMATION_ENABLED.load(Ordering::SeqCst) {
             self.animate_position(&window_rect, layout, top)
         } else {
             WindowsApi::position_window(self.hwnd(), layout, top)
diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
index 61d3a6b6..09622253 100644
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -66,7 +66,6 @@ use crate::BorderColours;
 use crate::Colour;
 use crate::Rgb;
 use crate::WorkspaceRule;
-use crate::ANIMATION_TEMPORARILY_DISABLED;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
@@ -1109,7 +1108,6 @@ impl WindowManager {
         follow: bool,
     ) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
-        ANIMATION_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
 
         tracing::info!("moving container");
 
@@ -1181,15 +1179,12 @@ impl WindowManager {
 
         self.update_focused_workspace(self.mouse_follows_focus, true)?;
 
-        ANIMATION_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
-
         Ok(())
     }
 
     #[tracing::instrument(skip(self))]
     pub fn move_container_to_workspace(&mut self, idx: usize, follow: bool) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
-        ANIMATION_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
 
         tracing::info!("moving container");
 
@@ -1203,8 +1198,6 @@ impl WindowManager {
 
         self.update_focused_workspace(mouse_follows_focus, true)?;
 
-        ANIMATION_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
-
         Ok(())
     }
 
@@ -1308,13 +1301,6 @@ impl WindowManager {
         let origin_monitor_idx = self.focused_monitor_idx();
         let target_container_idx = workspace.new_idx_for_direction(direction);
 
-        let animation_temporarily_disabled = if target_container_idx.is_none() {
-            ANIMATION_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
-            true
-        } else {
-            false
-        };
-
         match target_container_idx {
             // If there is nowhere to move on the current workspace, try to move it onto the monitor
             // in that direction if there is one
@@ -1441,10 +1427,6 @@ impl WindowManager {
 
         self.update_focused_workspace(self.mouse_follows_focus, true)?;
 
-        if animation_temporarily_disabled {
-            ANIMATION_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
-        }
-
         Ok(())
     }