#528 reset ffm cache upon space change

koekeishiya · May 18, 2020 · adf6aa8 · adf6aa8
1 parent 4aa233d
commit adf6aa8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Properly clear focus-follows-mouse cache upon space change [#528](https://github.com/koekeishiya/yabai/issues/528)
 
 ## [3.0.1] - 2020-05-09
 ### Changed

diff --git a/src/event.c b/src/event.c
@@ -815,7 +815,12 @@ static EVENT_CALLBACK(EVENT_HANDLER_SPACE_CHANGED)
         struct window *focused_window = window_manager_focused_window(&g_window_manager);
         if (focused_window && window_manager_find_lost_focused_event(&g_window_manager, focused_window->id)) {
             window_manager_set_window_opacity(&g_window_manager, focused_window, g_window_manager.active_window_opacity);
-            window_manager_center_mouse(&g_window_manager, focused_window);
+
+            if (g_mouse_state.ffm_window_id != focused_window->id) {
+                window_manager_center_mouse(&g_window_manager, focused_window);
+            }
+
+            g_mouse_state.ffm_window_id = 0;
             window_manager_remove_lost_focused_event(&g_window_manager, focused_window->id);
         }
     }