JakeStanger/ironbar
1
1
Fork 0
mirror of https://github.com/JakeStanger/ironbar.git synced 2024-11-29 10:33:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #630 from JakeStanger/fix/launcher-focus

Browse Source 
fix(launcher): apps with multiple windows stay focused when window closed
This commit is contained in:
Jake Stanger 2024-06-03 21:36:14 +01:00 committed by GitHub
commit a93108b7e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/clients/wayland/wlr_foreign_toplevel/handle.rs
View File

@ -49,6 +49,7 @@ impl ToplevelHandleData {
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct ToplevelHandleDataInner { pub struct ToplevelHandleDataInner {
initial_done: bool, initial_done: bool,
closed: bool,
output: Option<WlOutput>, output: Option<WlOutput>,
current_info: Option<ToplevelInfo>, current_info: Option<ToplevelInfo>,
@ -137,14 +138,17 @@ where
} }
Event::OutputEnter { output } => lock!(data.inner).output = Some(output), Event::OutputEnter { output } => lock!(data.inner).output = Some(output),
Event::OutputLeave { output: _ } => lock!(data.inner).output = None, Event::OutputLeave { output: _ } => lock!(data.inner).output = None,
Event::Closed => state.remove_handle( Event::Closed => {
lock!(data.inner).closed = true;
state.remove_handle(
conn, conn,
qh, qh,
ToplevelHandle { ToplevelHandle {
handle: handle.clone(), handle: handle.clone(),
}, },
), )
Event::Done => { }
Event::Done if !lock!(data.inner).closed => {
{ {
let pending_info = lock!(data.inner).pending_info.clone(); let pending_info = lock!(data.inner).pending_info.clone();
lock!(data.inner).current_info = Some(pending_info); lock!(data.inner).current_info = Some(pending_info);