zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

feat(launcher): slightly improve focus logic when clicking item with multiple windows

Browse source
This commit is contained in:
Jake Stanger 2023-06-29 16:42:03 +01:00
parent 4a9410abac
commit 27f920d012
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/launcher/mod.rs
View file

@ -274,10 +274,14 @@ impl Module<gtk::Box> for LauncherModule {
let items = lock!(items); let items = lock!(items);
let id = match event { let id = match event {
ItemEvent::FocusItem(app_id) => items ItemEvent::FocusItem(app_id) => items.get(&app_id).and_then(|item| {
.get(&app_id) item.windows
.and_then(|item| item.windows.first().map(|(_, win)| win.id)), .iter()
ItemEvent::FocusWindow(id) => Some(id), // FIXME: Broken on wlroots-git .find(|(_, win)| !win.open_state.is_focused())
.or_else(|| item.windows.first())
.map(|(_, win)| win.id)
}),
ItemEvent::FocusWindow(id) => Some(id),
ItemEvent::OpenItem(_) => unreachable!(), ItemEvent::OpenItem(_) => unreachable!(),
}; };
@ -285,6 +289,8 @@ impl Module<gtk::Box> for LauncherModule {
if let Some(window) = if let Some(window) =
items.iter().find_map(|(_, item)| item.windows.get(&id)) items.iter().find_map(|(_, item)| item.windows.get(&id))
{ {
debug!("Focusing window {id}: {}", window.name);
let seat = wl.get_seats().pop().expect("Failed to get Wayland seat"); let seat = wl.get_seats().pop().expect("Failed to get Wayland seat");
window.focus(&seat); window.focus(&seat);
} }