wip

komorebi/src/process_event.rs

@@ -353,12 +353,14 @@ impl WindowManager {
                         }
                     }
 
+                    if matches!(event, WindowManagerEvent::Uncloak(_, _)) {
                         if workspace_contains_window && workspace_has_monocle_container {
                             self.toggle_monocle()?;
                             window.focus(self.mouse_follows_focus)?;
                         }
                     }
                 }
+            }
             WindowManagerEvent::MoveResizeStart(_, window) => {
                 if *self.focused_workspace()?.tile() {
                     let monitor_idx = self.focused_monitor_idx();

komorebi/src/window_manager.rs

@@ -1129,7 +1129,11 @@ impl WindowManager {
 
         tracing::info!("focusing container");
 
-        let new_idx = workspace.new_idx_for_direction(direction);
+        let new_idx = if workspace.monocle_container().is_some() {
+            None
+        } else {
+            workspace.new_idx_for_direction(direction)
+        };
 
         let mut cross_monitor_monocle = false;