feat(wm): cycle monocle container when focusing in direction

The commit migrates this feature as it was added in
LGUG2Z/komorebi@5f629e1f1a.
This commit is contained in:
LGUG2Z committed 2026-03-09 16:14:53 -07:00
1 parent b4e12d8c39
commit 24878dc3a4
2 files changed
+52 -5

No files matched your search

+35 -5
View File
@@ -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")?;
+17
View File
@@ -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;