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

fix(panel_item): allow surfaces with size of 0,0

Browse Source
This commit is contained in:
Nova
2023-01-22 00:58:25 -05:00
parent c52472fe3c
commit 4f50772b92
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wayland/panel_item.rs
View File

@@ -505,8 +505,7 @@ impl PanelItem {
let Some(state) = self.toplevel_state() else { return }; let Some(state) = self.toplevel_state() else { return };
let mut state = state.lock(); let mut state = state.lock();
let mut queued_state = state.queued_state.take().unwrap(); let mut queued_state = state.queued_state.take().unwrap();
queued_state.mapped = queued_state.mapped = mapped_size.is_some();
mapped_size.is_some() && mapped_size.unwrap().x > 0 && mapped_size.unwrap().y > 0;
if let Some(size) = mapped_size { if let Some(size) = mapped_size {
queued_state.size = size; queued_state.size = size;
} }
@@ -568,9 +567,10 @@ impl ItemSpecialization for PanelItem {
let toplevel_state = self.toplevel_state(); let toplevel_state = self.toplevel_state();
let toplevel_state = toplevel_state.as_ref().map(|state| state.lock()); let toplevel_state = toplevel_state.as_ref().map(|state| state.lock());
let toplevel_state = toplevel_state.and_then(|state| { let toplevel_state = toplevel_state
(state.mapped && state.size.x > 0 && state.size.y > 0).then_some(state.clone()) .as_ref()
}); .and_then(|state| state.mapped.then_some(&**state));
serialize((id, (toplevel_state, cursor_size.zip(cursor_hotspot)))).unwrap() serialize((id, (toplevel_state, cursor_size.zip(cursor_hotspot)))).unwrap()
} }
} }