StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

feat(wayland/xdg_shell): set surface states None

Browse Source
This commit is contained in:
Nova
2022-12-26 11:15:37 -05:00
parent c512b2fef5
commit 93ca932da9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wayland/xdg_shell.rs
View File

@@ -299,12 +299,12 @@ impl Dispatch<XdgToplevel, XdgToplevelData, WaylandState> for WaylandState {
xdg_toplevel::Request::SetTitle { title } => { xdg_toplevel::Request::SetTitle { title } => {
let mut state = data.state.lock(); let mut state = data.state.lock();
let queued_state = state.queued_state.as_mut().unwrap(); let queued_state = state.queued_state.as_mut().unwrap();
queued_state.title = Some(title); queued_state.title = (!title.is_empty()).then_some(title);
} }
xdg_toplevel::Request::SetAppId { app_id } => { xdg_toplevel::Request::SetAppId { app_id } => {
let mut state = data.state.lock(); let mut state = data.state.lock();
let queued_state = state.queued_state.as_mut().unwrap(); let queued_state = state.queued_state.as_mut().unwrap();
queued_state.app_id = Some(app_id); queued_state.app_id = (!app_id.is_empty()).then_some(app_id);
} }
xdg_toplevel::Request::ShowWindowMenu { xdg_toplevel::Request::ShowWindowMenu {
seat: _, seat: _,
@@ -321,12 +321,14 @@ impl Dispatch<XdgToplevel, XdgToplevelData, WaylandState> for WaylandState {
xdg_toplevel::Request::SetMaxSize { width, height } => { xdg_toplevel::Request::SetMaxSize { width, height } => {
let mut state = data.state.lock(); let mut state = data.state.lock();
let queued_state = state.queued_state.as_mut().unwrap(); let queued_state = state.queued_state.as_mut().unwrap();
queued_state.max_size = Some(Vector2::from([width as u32, height as u32])); queued_state.max_size = (width > 1 || height > 1)
.then_some(Vector2::from([width as u32, height as u32]));
} }
xdg_toplevel::Request::SetMinSize { width, height } => { xdg_toplevel::Request::SetMinSize { width, height } => {
let mut state = data.state.lock(); let mut state = data.state.lock();
let queued_state = state.queued_state.as_mut().unwrap(); let queued_state = state.queued_state.as_mut().unwrap();
queued_state.min_size = Some(Vector2::from([width as u32, height as u32])); queued_state.min_size = (width > 1 || height > 1)
.then_some(Vector2::from([width as u32, height as u32]));
} }
xdg_toplevel::Request::SetMaximized => (), xdg_toplevel::Request::SetMaximized => (),
xdg_toplevel::Request::UnsetMaximized => (), xdg_toplevel::Request::UnsetMaximized => (),