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

fix(wm): correct workspace restore + remove workarounds

Browse Source 
This commit removes some workarounds on the `update_focused_workspace`
function that were there to fix issues related to some bugs on the
`workspace.restore()` function.

This commit fixes the bugs on the `restore` function instead. The
`update_focused_workspace` function should be used only to update a
workspace layout.
This commit is contained in:
alex-ds13
2025-03-17 11:09:38 +00:00
committed by LGUG2Z
parent df9ae931cc
commit 9f16894a09
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
komorebi/src/window_manager.rs
View File

@@ -1383,26 +1383,6 @@ impl WindowManager {
}
}
}
// This is to correctly restore and focus when switching to a workspace which
// contains a managed maximized window
if let Some(window) = self.focused_workspace()?.maximized_window() {
window.restore();
if trigger_focus {
window.focus(self.mouse_follows_focus)?;
}
}
// This is to correctly remove focus from the previous when changing focused workspace
// to a workspace which only contains floating windows and no other kind of managed window
if self.focused_workspace()?.containers().is_empty()
&& self.focused_workspace()?.monocle_container().is_none()
&& self.focused_workspace()?.maximized_window().is_none()
{
if let Some(window) = self.focused_workspace()?.floating_windows().first() {
window.focus(self.mouse_follows_focus)?;
}
}
}
Ok(())

8
komorebi/src/workspace.rs
View File

@@ -282,7 +282,7 @@ impl Workspace {
}
pub fn restore(&mut self, mouse_follows_focus: bool) -> Result<()> {
if let Some(container) = self.monocle_container_mut() {
if let Some(container) = self.monocle_container() {
if let Some(window) = container.focused_window() {
container.restore();
window.focus(mouse_follows_focus)?;
@@ -318,10 +318,16 @@ impl Workspace {
if self.maximized_window().is_none() && matches!(self.layer, WorkspaceLayer::Tiling) {
window.focus(mouse_follows_focus)?;
} else if let Some(maximized_window) = self.maximized_window() {
maximized_window.restore();
maximized_window.focus(mouse_follows_focus)?;
} else if let Some(floating_window) = self.floating_windows().first() {
floating_window.focus(mouse_follows_focus)?;
}
} else if let Some(maximized_window) = self.maximized_window() {
maximized_window.restore();
maximized_window.focus(mouse_follows_focus)?;
} else if let Some(floating_window) = self.floating_windows().first() {
floating_window.focus(mouse_follows_focus)?;
}
Ok(())