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

Fix building with mock-backend

Browse source
This commit is contained in:
Ian Douglas Scott 2025-04-21 13:49:49 -07:00
parent 7037cd3d05
commit fc784af1b9
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/backend/mock.rs
View file

@ -3,7 +3,10 @@
use cosmic::{ use cosmic::{
cctk::{ cctk::{
cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1, cosmic_protocols::{
toplevel_info::v1::client::zcosmic_toplevel_handle_v1,
workspace::v2::client::zcosmic_workspace_handle_v2,
},
wayland_client::{ wayland_client::{
protocol::{wl_output, wl_shm}, protocol::{wl_output, wl_shm},
Connection, WEnum, Connection, WEnum,
@ -102,9 +105,10 @@ pub struct ToplevelInfo {
pub struct Workspace { pub struct Workspace {
pub handle: ExtWorkspaceHandleV1, pub handle: ExtWorkspaceHandleV1,
pub name: String, pub name: String,
// pub coordinates: Vec<u32>, pub coordinates: Vec<u32>,
pub state: ext_workspace_handle_v1::State, pub state: ext_workspace_handle_v1::State,
// pub capabilities: Vec<WEnum<zcosmic_workspace_handle_v1::ZcosmicWorkspaceCapabilitiesV1>>, pub capabilities: ext_workspace_handle_v1::WorkspaceCapabilities,
pub cosmic_capabilities: zcosmic_workspace_handle_v2::WorkspaceCapabilities,
// pub tiling: Option<WEnum<zcosmic_workspace_handle_v1::TilingState>>, // pub tiling: Option<WEnum<zcosmic_workspace_handle_v1::TilingState>>,
} }
@ -131,11 +135,14 @@ impl AppData {
let workspace = Workspace { let workspace = Workspace {
handle: workspace_handle.clone(), handle: workspace_handle.clone(),
name: format!("Workspace {i}"), name: format!("Workspace {i}"),
coordinates: vec![i],
state: if i == 0 { state: if i == 0 {
ext_workspace_handle_v1::State::Active ext_workspace_handle_v1::State::Active
} else { } else {
ext_workspace_handle_v1::State::empty() ext_workspace_handle_v1::State::empty()
}, },
capabilities: ext_workspace_handle_v1::WorkspaceCapabilities::Activate,
cosmic_capabilities: zcosmic_workspace_handle_v2::WorkspaceCapabilities::empty(),
}; };
// Add three toplevels for each workspace // Add three toplevels for each workspace
for j in 0..=3 { for j in 0..=3 {

2
src/main.rs
View file

@ -115,7 +115,7 @@ enum Msg {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
struct Workspace { struct Workspace {
info: cctk::workspace::Workspace, info: backend::Workspace,
// img_for_output: HashMap<wl_output::WlOutput, backend::CaptureImage>, // img_for_output: HashMap<wl_output::WlOutput, backend::CaptureImage>,
img: Option<backend::CaptureImage>, img: Option<backend::CaptureImage>,
outputs: HashSet<wl_output::WlOutput>, outputs: HashSet<wl_output::WlOutput>,