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

Fix handling of active workspace

Browse source
This commit is contained in:
Ian Douglas Scott 2023-01-05 18:30:50 -08:00
parent 65f7052d8b
commit e14db1a243
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main.rs
View file

@ -45,6 +45,7 @@ struct Workspace {
img: Option<iced::widget::image::Handle>,
handle: zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1,
output_name: Option<String>,
is_active: bool,
}
#[derive(Debug)]
@ -57,7 +58,6 @@ struct Toplevel {
struct LayerSurface {
output: wl_output::WlOutput,
output_name: Option<String>,
active_workspace: Option<zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1>,
// for transitions, would need windows in more than one workspace? But don't capture all of
// them all the time every frame.
}
@ -80,6 +80,13 @@ impl App {
SurfaceId::new(self.max_surface_id)
}
fn workspace_for_handle(
&self,
handle: &zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1,
) -> Option<&Workspace> {
self.workspaces.iter().find(|i| &i.handle == handle)
}
fn workspace_for_handle_mut(
&mut self,
handle: &zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1,
@ -138,7 +145,6 @@ impl Application for App {
LayerSurface {
output: output.clone(),
output_name: info.name,
active_workspace: None,
},
);
return get_layer_surface(SctkLayerSurfaceSettings {
@ -185,15 +191,6 @@ impl Application for App {
let is_active = workspace.state.contains(&WEnum::Value(
zcosmic_workspace_handle_v1::State::Active,
));
if is_active {
// XXX
if let Some(surface) =
self.layer_surface_for_output_name(output_name.as_deref())
{
surface.active_workspace = Some(workspace.handle.clone());
// XXX
}
}
// XXX efficiency
let img = old_workspaces
@ -206,6 +203,7 @@ impl Application for App {
handle: workspace.handle,
output_name,
img,
is_active,
});
}
}
@ -299,11 +297,14 @@ fn layer_surface<'a>(app: &'a App, surface: &'a LayerSurface) -> cosmic::Element
.iter()
.filter(|i| &i.output_name == &surface.output_name),
),
toplevel_previews(
app.toplevels
.iter()
.filter(|i| i.info.workspace == surface.active_workspace)
),
toplevel_previews(app.toplevels.iter().filter(|i| {
if let Some(workspace) = &i.info.workspace {
app.workspace_for_handle(workspace)
.map_or(false, |x| x.is_active)
} else {
false
}
})),
]
.height(iced::Length::Fill)
.width(iced::Length::Fill)