From 4a2e76a2cbaeecdfc9b2a88ef5461136ba12b7b7 Mon Sep 17 00:00:00 2001 From: Lysander Treumann Date: Sat, 31 Jan 2026 02:49:35 +0100 Subject: [PATCH] Moved default of WorkspaceMode from default implementation of WorkspacesConfig into WorkspaceMode declaration. WorkspaceConfig's default can then be derived. --- cosmic-comp-config/src/workspace.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/cosmic-comp-config/src/workspace.rs b/cosmic-comp-config/src/workspace.rs index 7ed73334..5f59063e 100644 --- a/cosmic-comp-config/src/workspace.rs +++ b/cosmic-comp-config/src/workspace.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::EdidProduct; -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)] pub struct WorkspaceConfig { pub workspace_mode: WorkspaceMode, #[serde(default)] @@ -13,18 +13,9 @@ pub struct WorkspaceConfig { pub action_on_typing: Action, } -impl Default for WorkspaceConfig { - fn default() -> Self { - Self { - workspace_mode: WorkspaceMode::OutputBound, - workspace_layout: WorkspaceLayout::Vertical, - action_on_typing: Action::default(), - } - } -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)] pub enum WorkspaceMode { + #[default] OutputBound, Global, }