leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toplevel-info: Send initial state even if empty

Browse source 
This is imported given how
https://github.com/pop-os/cosmic-protocols/pull/39 uses this event.

But the protocol spec also states the event "is emitted on creation" so
this is seemingly incorrect regardless.
This commit is contained in:
Ian Douglas Scott 2025-01-07 14:04:48 -08:00 • committed by Victoria Brekenfeld
parent addcbc5039
commit c9f740210f
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/wayland/protocols/toplevel_info.rs
View file

@ -93,7 +93,7 @@ pub struct ToplevelHandleStateInner<W: Window> {
workspaces: Vec<WorkspaceHandle>, workspaces: Vec<WorkspaceHandle>,
title: String, title: String,
app_id: String, app_id: String,
states: Vec<States>, states: Option<Vec<States>>,
pub(super) window: Option<W>, pub(super) window: Option<W>,
} }
pub type ToplevelHandleState<W> = Mutex<ToplevelHandleStateInner<W>>; pub type ToplevelHandleState<W> = Mutex<ToplevelHandleStateInner<W>>;
@ -107,7 +107,7 @@ impl<W: Window> ToplevelHandleStateInner<W> {
workspaces: Vec::new(), workspaces: Vec::new(),
title: String::new(), title: String::new(),
app_id: String::new(), app_id: String::new(),
states: Vec::new(), states: None,
window: Some(window.clone()), window: Some(window.clone()),
}) })
} }
@ -120,7 +120,7 @@ impl<W: Window> ToplevelHandleStateInner<W> {
workspaces: Vec::new(), workspaces: Vec::new(),
title: String::new(), title: String::new(),
app_id: String::new(), app_id: String::new(),
states: Vec::new(), states: None,
window: None, window: None,
}) })
} }
@ -502,11 +502,12 @@ where
changed = true; changed = true;
} }
if (handle_state.states.contains(&States::Maximized) != window.is_maximized()) if handle_state.states.as_ref().map_or(true, |states| {
|| (handle_state.states.contains(&States::Fullscreen) != window.is_fullscreen()) (states.contains(&States::Maximized) != window.is_maximized())
|| (handle_state.states.contains(&States::Activated) != window.is_activated()) || (states.contains(&States::Fullscreen) != window.is_fullscreen())
|| (handle_state.states.contains(&States::Minimized) != window.is_minimized()) || (states.contains(&States::Activated) != window.is_activated())
{ || (states.contains(&States::Minimized) != window.is_minimized())
}) {
let mut states = Vec::new(); let mut states = Vec::new();
if window.is_maximized() { if window.is_maximized() {
states.push(States::Maximized); states.push(States::Maximized);
@ -525,7 +526,7 @@ where
{ {
states.push(States::Sticky); states.push(States::Sticky);
} }
handle_state.states = states.clone(); handle_state.states = Some(states.clone());
let states = states let states = states
.iter() .iter()