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

workspaces: Fix issues causing malformed or flood of messages

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-07-08 23:19:35 +02:00
parent 5a0752957b
commit 55e0c34e98
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/shell/mod.rs
View file

@ -505,7 +505,6 @@ impl Shell {
pub fn refresh(&mut self, dh: &DisplayHandle) {
self.popups.cleanup();
let mut state = self.workspace_state.update();
for output in &self.outputs {
let workspace = match &self.workspace_mode {
WorkspaceMode::OutputBound => {
@ -520,13 +519,14 @@ impl Shell {
WorkspaceMode::Global { active, .. } => &mut self.spaces[*active],
};
workspace.refresh(dh);
if workspace.space.windows().next().is_none() {
state.add_workspace_state(&workspace.handle, WState::Hidden);
if workspace.space.windows().next().is_none()
&& !self.workspace_state.workspace_states(&workspace.handle).map(|mut i| i.any(|s| s == &WState::Hidden)).unwrap_or(true)
{
self.workspace_state.update().add_workspace_state(&workspace.handle, WState::Hidden);
}
let mut map = layer_map_for_output(output);
map.cleanup(dh);
}
std::mem::drop(state);
self.toplevel_info_state
.refresh(Some(&self.workspace_state));
}