starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-03-24 18:31:22 +01:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

feat(wm): allow cycling for max & monacle windows

Browse Source 
This commit introduces focus cycling behaviour for a workspace when
either a maximized window or a monocle window exists.

Now, the container in the cycle direction relative to the current window
container will take the maximized or monocle window container space
whenever the cycle-focus command is called.

resolve #97
This commit is contained in:
LGUG2Z
2022-02-01 14:43:33 -08:00
parent 75234caa98
commit a4e8286327
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
komorebi/src/window_manager.rs
View File

@@ -908,6 +908,19 @@ impl WindowManager {
#[tracing::instrument(skip(self))]
pub fn focus_container_in_cycle_direction(&mut self, direction: CycleDirection) -> Result<()> {
tracing::info!("focusing container");
let mut maximize_next = false;
let mut monocle_next = false;
if self.focused_workspace_mut()?.maximized_window().is_some() {
maximize_next = true;
self.unmaximize_window()?;
}
if self.focused_workspace_mut()?.monocle_container().is_some() {
monocle_next = true;
self.monocle_off()?;
}
let workspace = self.focused_workspace_mut()?;
let new_idx = workspace
@@ -915,7 +928,14 @@ impl WindowManager {
.ok_or_else(|| anyhow!("this is not a valid direction from the current position"))?;
workspace.focus_container(new_idx);
self.focused_window_mut()?.focus(self.mouse_follows_focus)?;
if maximize_next {
self.toggle_maximize()?;
} else if monocle_next {
self.toggle_monocle()?;
} else {
self.focused_window_mut()?.focus(self.mouse_follows_focus)?;
}
Ok(())
}
@@ -1084,7 +1104,7 @@ impl WindowManager {
Some(_) => self.monocle_off()?,
}
self.update_focused_workspace(false)
self.update_focused_workspace(true)
}
#[tracing::instrument(skip(self))]
@@ -1112,7 +1132,7 @@ impl WindowManager {
Some(_) => self.unmaximize_window()?,
}
self.update_focused_workspace(false)
self.update_focused_workspace(true)
}
#[tracing::instrument(skip(self))]