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

More toplevel fixes

Browse source
This commit is contained in:
Ian Douglas Scott 2023-01-05 18:41:48 -08:00
parent e14db1a243
commit 8a6ee91647
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main.rs
View file

@ -299,8 +299,9 @@ fn layer_surface<'a>(app: &'a App, surface: &'a LayerSurface) -> cosmic::Element
), ),
toplevel_previews(app.toplevels.iter().filter(|i| { toplevel_previews(app.toplevels.iter().filter(|i| {
if let Some(workspace) = &i.info.workspace { if let Some(workspace) = &i.info.workspace {
app.workspace_for_handle(workspace) app.workspace_for_handle(workspace).map_or(false, |x| {
.map_or(false, |x| x.is_active) x.is_active && x.output_name == surface.output_name
})
} else { } else {
false false
} }
@ -339,10 +340,14 @@ fn toplevel_preview<'a>(toplevel: &'a Toplevel) -> cosmic::Element<'a, Msg> {
// capture of window // capture of window
// - selectable // - selectable
// name of window // name of window
widget::button(widget::Image::new(toplevel.img.clone().unwrap_or_else( widget::column![
|| widget::image::Handle::from_pixels(0, 0, vec![0, 0, 0, 255]), widget::button(widget::text("X")), // TODO close button
))) widget::button(widget::Image::new(toplevel.img.clone().unwrap_or_else(
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())) || widget::image::Handle::from_pixels(0, 0, vec![0, 0, 0, 255]),
)))
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())),
widget::text(&toplevel.info.title)
]
.into() .into()
} }