zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-09-16 03:36:58 +02:00
Code Activity

Merge branch 'refs/heads/master' into develop

Browse source 
# Conflicts:
#	Cargo.toml
#	src/modules/volume.rs
This commit is contained in:
Reinout Meliesie 2024-06-05 12:49:39 +02:00
commit 3bf4e9b877
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
51 changed files with 867 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/clients/wayland/wlr_foreign_toplevel/handle.rs
View file

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