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

fix: cleanup toplevel rects after the update confirming it has moved

Browse source
This commit is contained in:
Ashley Wulber 2026-07-08 17:13:04 -04:00 • committed by Jacob Kauffmann
parent a8998b3eb0
commit 20ac821954
1 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main.rs
View file

@ -499,6 +499,7 @@ impl App {
}) })
.flatten() .flatten()
.collect(); .collect();
strips.append(&mut rects); strips.append(&mut rects);
return Some( return Some(
@ -575,13 +576,13 @@ impl Application for App {
rects.push(*rect); rects.push(*rect);
return None; return None;
}; };
Some(cosmic::surface::corner_radius::rounded_rect_strips( Some(cosmic::surface::corner_radius::rounded_rect_strips(
*rect, rad, *rect, rad,
)) ))
}) })
.flatten() .flatten()
.collect(); .collect();
strips.append(&mut rects); strips.append(&mut rects);
return cosmic::iced::platform_specific::shell::commands::blur::blur( return cosmic::iced::platform_specific::shell::commands::blur::blur(
@ -652,6 +653,7 @@ impl Application for App {
if self.layer_surfaces.remove(&id).is_none() { if self.layer_surfaces.remove(&id).is_none() {
log::error!("removing non-existant layer shell id {}?", id); log::error!("removing non-existant layer shell id {}?", id);
} }
self.rects.retain(|k, _| k.id != id);
} }
_ => {} _ => {}
}, },
@ -721,6 +723,8 @@ impl Application for App {
return icon_task; return icon_task;
} }
backend::Event::UpdateToplevel(handle, info) => { backend::Event::UpdateToplevel(handle, info) => {
let mut t_w = None;
let mut tasks = Vec::new();
if let Some(toplevel) = self.toplevels.for_handle_mut(&handle) { if let Some(toplevel) = self.toplevels.for_handle_mut(&handle) {
let mut task = Task::none(); let mut task = Task::none();
if toplevel.info.app_id != info.app_id { if toplevel.info.app_id != info.app_id {
@ -731,9 +735,27 @@ impl Application for App {
) )
.map(cosmic::Action::App); .map(cosmic::Action::App);
} }
// XX must clean up rectangles after the window has moved
t_w = Some((handle.id(), info.workspace.clone()));
toplevel.info = info; toplevel.info = info;
return task;
tasks.push(task);
} }
if let Some((t, w)) = t_w {
tasks.push(Task::batch(w.iter().map(|w| {
self.rects.retain(|id, _| {
!(id.toplevel_id.as_ref().is_some_and(|old| *old == t)
&& id
.workspaces_id
.as_ref()
.is_some_and(|old| !old.contains(&w.id())))
});
self.update_active_workspace(w.id()).unwrap_or(Task::none())
})));
}
return Task::batch(tasks);
} }
backend::Event::CloseToplevel(handle) => { backend::Event::CloseToplevel(handle) => {
if let Some(idx) = self.toplevels.0.iter().position(|x| x.handle == handle) if let Some(idx) = self.toplevels.0.iter().position(|x| x.handle == handle)
@ -821,11 +843,6 @@ impl Application for App {
DropTarget::WorkspaceSidebarEntry(workspace, output) DropTarget::WorkspaceSidebarEntry(workspace, output)
| DropTarget::OutputToplevels(workspace, output), | DropTarget::OutputToplevels(workspace, output),
) => { ) => {
self.send_wayland_cmd(backend::Cmd::MoveToplevelToWorkspace(
handle.clone(),
workspace,
output,
));
let mut w = None; let mut w = None;
self.rects.retain(|id, _| { self.rects.retain(|id, _| {
id.toplevel_id.as_ref().is_none_or(|t| { id.toplevel_id.as_ref().is_none_or(|t| {
@ -836,6 +853,11 @@ impl Application for App {
keep keep
}) })
}); });
self.send_wayland_cmd(backend::Cmd::MoveToplevelToWorkspace(
handle.clone(),
workspace,
output,
));
if let Some(w) = w { if let Some(w) = w {
return Task::batch(w.into_iter().map(|w| { return Task::batch(w.into_iter().map(|w| {
self.update_active_workspace(w).unwrap_or(Task::none()) self.update_active_workspace(w).unwrap_or(Task::none())