diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs index da9e1007..fd2b50bd 100644 --- a/komorebi/src/window_manager.rs +++ b/komorebi/src/window_manager.rs @@ -509,12 +509,19 @@ impl WindowManager { tracing::info!("focusing container"); - let new_idx = - if workspace.maximized_window.is_some() || workspace.monocle_container.is_some() { - None - } else { - workspace.new_idx_for_direction(direction) + if workspace.monocle_container.is_some() { + let cycle_direction = match direction { + OperationDirection::Left | OperationDirection::Down => CycleDirection::Previous, + OperationDirection::Right | OperationDirection::Up => CycleDirection::Next, }; + return self.cycle_monocle(cycle_direction); + } + + let new_idx = if workspace.maximized_window.is_some() { + None + } else { + workspace.new_idx_for_direction(direction) + }; let mut cross_monitor_monocle_or_max = false; @@ -1354,6 +1361,29 @@ impl WindowManager { workspace.reintegrate_monocle_container() } + #[tracing::instrument(skip(self))] + pub fn cycle_monocle(&mut self, direction: CycleDirection) -> eyre::Result<()> { + tracing::info!("cycling monocle container"); + + if self.focused_workspace()?.containers().is_empty() { + return Ok(()); + } + + let hiding_position = self + .focused_monitor() + .ok_or_eyre("there is no monitor")? + .window_hiding_position; + + self.focused_workspace_mut()? + .cycle_monocle_container(direction)?; + + for container in self.focused_workspace_mut()?.containers_mut() { + container.hide(hiding_position, None)?; + } + + self.update_focused_workspace(true, true) + } + #[tracing::instrument(skip(self))] pub fn toggle_float(&mut self, force_float: bool) -> eyre::Result<()> { let window_id = MacosApi::foreground_window_id().ok_or_eyre("no foreground window")?; diff --git a/komorebi/src/workspace.rs b/komorebi/src/workspace.rs index cc8cfc45..181fa129 100644 --- a/komorebi/src/workspace.rs +++ b/komorebi/src/workspace.rs @@ -934,6 +934,23 @@ impl Workspace { Ok(()) } + pub fn cycle_monocle_container(&mut self, direction: CycleDirection) -> eyre::Result<()> { + if self.containers().is_empty() { + return Ok(()); + } + + self.reintegrate_monocle_container()?; + + let new_idx = self + .new_idx_for_cycle_direction(direction) + .ok_or_eyre("there is no container to cycle monocle to")?; + + self.focus_container(new_idx); + self.new_monocle_container()?; + + Ok(()) + } + pub fn reintegrate_monocle_container(&mut self) -> eyre::Result<()> { let window_hiding_position = self.globals.window_hiding_position;