Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2024-12-25 09:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix focused_window not returning None if no window is focused

Browse source
This commit is contained in:
Ottatop 2024-03-04 19:34:00 -06:00
parent a83d8275fa
commit d02c138414
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/focus.rs
View file

@ -18,16 +18,20 @@ impl State {
// TODO: see if the below is necessary
// output.with_state(|state| state.focus_stack.stack.retain(|win| win.alive()));
output.with_state(|state| {
state
.focus_stack
.stack
.iter()
.rev()
.filter(|win| win.is_on_active_tag())
.find(|win| !win.is_x11_override_redirect())
.cloned()
})
output
.with_state(|state| {
state.focus_stack.focused.then(|| {
state
.focus_stack
.stack
.iter()
.rev()
.filter(|win| win.is_on_active_tag())
.find(|win| !win.is_x11_override_redirect())
.cloned()
})
})
.flatten()
}
/// Update the keyboard focus.