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

fix(wm): switch to focused workspace

Browse Source 
This commit fixes corruption of workspace state when clicking a link
brings to the foreground a window in a different workspace, and also
ensures that the workspace containing the window coming to the
foreground will be focused and switched to as part of the Show event.
This commit is contained in:
LGUG2Z
2021-07-30 14:41:57 -07:00
parent 230b534735
commit b867db1900
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
komorebi/src/process_event.rs
View File

@@ -31,6 +31,7 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
}
impl WindowManager {
#[allow(clippy::too_many_lines)]
pub fn process_event(&mut self, event: &mut WindowManagerEvent) -> Result<()> {
if self.is_paused {
tracing::info!("ignoring events while paused");
@@ -105,6 +106,21 @@ impl WindowManager {
.focus_container_by_window(window.hwnd)?;
}
WindowManagerEvent::Show(_, window) => {
let mut switch_to = None;
for (i, monitors) in self.monitors().iter().enumerate() {
for (j, workspace) in monitors.workspaces().iter().enumerate() {
if workspace.contains_window(window.hwnd) {
switch_to = Some((i, j));
}
}
}
if let Some(indices) = switch_to {
self.focus_monitor(indices.0)?;
self.focus_workspace(indices.1)?;
return Ok(());
}
let workspace = self.focused_workspace_mut()?;
if workspace.containers().is_empty() || !workspace.contains_window(window.hwnd) {