Separate library implementations from module declarations

crates/ferese-theme-model/src/lib.rs

@@ -1,179 +1,7 @@
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
+//! Theme values shared by the compositor, shell and Settings.
 mod color;
 pub mod families;
+mod resolved_theme;
+
 pub use color::*;
-
-#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-pub enum Appearance {
-    Light,
-    #[default]
-    Dark,
-}
-
-#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-pub enum Mode {
-    Light,
-    #[default]
-    Dark,
-    Auto,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(default)]
-pub struct Accessibility {
-    pub increase_contrast: bool,
-    pub reduce_transparency: bool,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Colors {
-    pub surface_base: String,
-    pub surface_raised: String,
-    pub application_background: String,
-    pub text_primary: String,
-    pub text_muted: String,
-    pub accent: String,
-    pub on_accent: String,
-    pub border: String,
-    pub shadow: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Material {
-    pub style: String,
-    pub opacity: f64,
-    pub blur_radius: f64,
-    pub tint_strength: f64,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Geometry {
-    pub border_width: f64,
-    pub focus_ring_width: f64,
-    pub window_radius: f64,
-    pub shell_radius: f64,
-    pub control_gap: f64,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Typography {
-    pub font_family: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Background {
-    pub path: Option<PathBuf>,
-    pub lock_path: Option<PathBuf>,
-    pub mode: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct BarSurface {
-    pub background: String,
-    pub text_primary: String,
-    pub text_muted: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Surfaces {
-    pub bar: BarSurface,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct SoftShadow {
-    pub offset_y: f64,
-    pub blur: f64,
-    pub opacity: f64,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Shadows {
-    pub soft: SoftShadow,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Gradient {
-    pub from: String,
-    pub to: String,
-    pub angle: f64,
-}
-
-#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-pub enum PaintStyle {
-    #[default]
-    Auto,
-    Solid,
-}
-
-impl PaintStyle {
-    fn is_auto(&self) -> bool {
-        *self == Self::Auto
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
-pub struct Paint {
-    #[serde(default, skip_serializing_if = "PaintStyle::is_auto")]
-    pub style: PaintStyle,
-    pub gradient: Option<Gradient>,
-}
-
-impl Paint {
-    pub fn effective_gradient(&self) -> Option<&Gradient> {
-        if self.style == PaintStyle::Solid {
-            None
-        } else {
-            self.gradient.as_ref()
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct Tokens {
-    pub colors: Colors,
-    pub material: Material,
-    pub geometry: Geometry,
-    pub typography: Typography,
-    pub background: Background,
-    pub surface: Surfaces,
-    pub shadow: Shadows,
-    pub border: Paint,
-    pub focus_ring: Paint,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub struct ResolvedTheme {
-    pub appearance: Appearance,
-    pub tokens: Tokens,
-    pub requested_accent: String,
-    pub accessibility: Accessibility,
-    pub reduced_motion: bool,
-}
-
-/// Accessibility takes precedence over a panel's authored opacity.
-pub fn effective_panel_opacity(
-    inherited: f32,
-    custom: Option<f32>,
-    reduce_transparency: bool,
-) -> f32 {
-    if reduce_transparency {
-        1.0
-    } else {
-        custom.unwrap_or(inherited)
-    }
-}
-
-impl ResolvedTheme {
-    pub fn panel_opacity(&self, custom: Option<f32>) -> f32 {
-        let inherited = if self.tokens.material.style == "translucent" {
-            self.tokens.material.opacity as f32
-        } else {
-            1.0
-        };
-        effective_panel_opacity(inherited, custom, self.accessibility.reduce_transparency)
-    }
-}
+pub use resolved_theme::*;

crates/ferese-theme-model/src/resolved_theme.rs

@@ -0,0 +1,177 @@
+use std::path::PathBuf;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum Appearance {
+    Light,
+    #[default]
+    Dark,
+}
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum Mode {
+    Light,
+    #[default]
+    Dark,
+    Auto,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct Accessibility {
+    pub increase_contrast: bool,
+    pub reduce_transparency: bool,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Colors {
+    pub surface_base: String,
+    pub surface_raised: String,
+    pub application_background: String,
+    pub text_primary: String,
+    pub text_muted: String,
+    pub accent: String,
+    pub on_accent: String,
+    pub border: String,
+    pub shadow: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Material {
+    pub style: String,
+    pub opacity: f64,
+    pub blur_radius: f64,
+    pub tint_strength: f64,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Geometry {
+    pub border_width: f64,
+    pub focus_ring_width: f64,
+    pub window_radius: f64,
+    pub shell_radius: f64,
+    pub control_gap: f64,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Typography {
+    pub font_family: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Background {
+    pub path: Option<PathBuf>,
+    pub lock_path: Option<PathBuf>,
+    pub mode: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct BarSurface {
+    pub background: String,
+    pub text_primary: String,
+    pub text_muted: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Surfaces {
+    pub bar: BarSurface,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct SoftShadow {
+    pub offset_y: f64,
+    pub blur: f64,
+    pub opacity: f64,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Shadows {
+    pub soft: SoftShadow,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Gradient {
+    pub from: String,
+    pub to: String,
+    pub angle: f64,
+}
+
+#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum PaintStyle {
+    #[default]
+    Auto,
+    Solid,
+}
+
+impl PaintStyle {
+    fn is_auto(&self) -> bool {
+        *self == Self::Auto
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
+pub struct Paint {
+    #[serde(default, skip_serializing_if = "PaintStyle::is_auto")]
+    pub style: PaintStyle,
+    pub gradient: Option<Gradient>,
+}
+
+impl Paint {
+    pub fn effective_gradient(&self) -> Option<&Gradient> {
+        if self.style == PaintStyle::Solid {
+            None
+        } else {
+            self.gradient.as_ref()
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct Tokens {
+    pub colors: Colors,
+    pub material: Material,
+    pub geometry: Geometry,
+    pub typography: Typography,
+    pub background: Background,
+    pub surface: Surfaces,
+    pub shadow: Shadows,
+    pub border: Paint,
+    pub focus_ring: Paint,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+pub struct ResolvedTheme {
+    pub appearance: Appearance,
+    pub tokens: Tokens,
+    pub requested_accent: String,
+    pub accessibility: Accessibility,
+    pub reduced_motion: bool,
+}
+
+/// Accessibility takes precedence over a panel's authored opacity.
+pub fn effective_panel_opacity(
+    inherited: f32,
+    custom: Option<f32>,
+    reduce_transparency: bool,
+) -> f32 {
+    if reduce_transparency {
+        1.0
+    } else {
+        custom.unwrap_or(inherited)
+    }
+}
+
+impl ResolvedTheme {
+    pub fn panel_opacity(&self, custom: Option<f32>) -> f32 {
+        let inherited = if self.tokens.material.style == "translucent" {
+            self.tokens.material.opacity as f32
+        } else {
+            1.0
+        };
+        effective_panel_opacity(inherited, custom, self.accessibility.reduce_transparency)
+    }
+}