From ce309db37b8eb9860ae1f1be1710fb39e7a9edea Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 4 Mar 2024 03:57:03 +0100
Subject: Try new approach to theming for `Slider`

---
 style/src/lib.rs    |   2 +-
 style/src/slider.rs |  29 ++++++++------
 style/src/theme.rs  | 108 +++++++++++++++-------------------------------------
 3 files changed, 49 insertions(+), 90 deletions(-)

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 3c2865eb..17ba09c4 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -10,7 +10,7 @@
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![deny(
     unused_results,
-    missing_docs,
+    // missing_docs,
     unused_results,
     rustdoc::broken_intra_doc_links
 )]
diff --git a/style/src/slider.rs b/style/src/slider.rs
index bf1c7329..0c19e47d 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -1,6 +1,6 @@
 //! Change the apperance of a slider.
 use crate::core::border;
-use crate::core::Color;
+use crate::core::{Color, Pixels};
 
 /// The appearance of a slider.
 #[derive(Debug, Clone, Copy)]
@@ -11,6 +11,17 @@ pub struct Appearance {
     pub handle: Handle,
 }
 
+impl Appearance {
+    /// Changes the [`HandleShape`] of the [`Appearance`] to a circle
+    /// with the given radius.
+    pub fn with_circular_handle(mut self, radius: impl Into<Pixels>) -> Self {
+        self.handle.shape = HandleShape::Circle {
+            radius: radius.into().0,
+        };
+        self
+    }
+}
+
 /// The appearance of a slider rail
 #[derive(Debug, Clone, Copy)]
 pub struct Rail {
@@ -54,15 +65,11 @@ pub enum HandleShape {
 
 /// A set of rules that dictate the style of a slider.
 pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the style of an active slider.
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the style of an hovered slider.
-    fn hovered(&self, style: &Self::Style) -> Appearance;
+    fn default() -> fn(&Self, Status) -> Appearance;
+}
 
-    /// Produces the style of a slider that is being dragged.
-    fn dragging(&self, style: &Self::Style) -> Appearance;
+pub enum Status {
+    Active,
+    Hovered,
+    Dragging,
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 0b56e101..656d6bf9 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -608,88 +608,40 @@ impl<T: Fn(&Theme) -> container::Appearance> container::StyleSheet for T {
     }
 }
 
-/// The style of a slider.
-#[derive(Default)]
-pub enum Slider {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn slider::StyleSheet<Style = Theme>>),
-}
-
 impl slider::StyleSheet for Theme {
-    type Style = Slider;
-
-    fn active(&self, style: &Self::Style) -> slider::Appearance {
-        match style {
-            Slider::Default => {
-                let palette = self.extended_palette();
-
-                let handle = slider::Handle {
-                    shape: slider::HandleShape::Rectangle {
-                        width: 8,
-                        border_radius: 4.0.into(),
-                    },
-                    color: Color::WHITE,
-                    border_color: Color::WHITE,
-                    border_width: 1.0,
-                };
-
-                slider::Appearance {
-                    rail: slider::Rail {
-                        colors: (
-                            palette.primary.base.color,
-                            palette.secondary.base.color,
-                        ),
-                        width: 4.0,
-                        border_radius: 2.0.into(),
-                    },
-                    handle: slider::Handle {
-                        color: palette.background.base.color,
-                        border_color: palette.primary.base.color,
-                        ..handle
-                    },
-                }
-            }
-            Slider::Custom(custom) => custom.active(self),
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> slider::Appearance {
-        match style {
-            Slider::Default => {
-                let active = self.active(style);
-                let palette = self.extended_palette();
-
-                slider::Appearance {
-                    handle: slider::Handle {
-                        color: palette.primary.weak.color,
-                        ..active.handle
-                    },
-                    ..active
-                }
-            }
-            Slider::Custom(custom) => custom.hovered(self),
-        }
+    fn default() -> fn(&Self, slider::Status) -> slider::Appearance {
+        slider
     }
+}
 
-    fn dragging(&self, style: &Self::Style) -> slider::Appearance {
-        match style {
-            Slider::Default => {
-                let active = self.active(style);
-                let palette = self.extended_palette();
+pub fn slider(theme: &Theme, status: slider::Status) -> slider::Appearance {
+    let palette = theme.extended_palette();
 
-                slider::Appearance {
-                    handle: slider::Handle {
-                        color: palette.primary.base.color,
-                        ..active.handle
-                    },
-                    ..active
-                }
-            }
-            Slider::Custom(custom) => custom.dragging(self),
-        }
+    let handle = slider::Handle {
+        shape: slider::HandleShape::Rectangle {
+            width: 8,
+            border_radius: 4.0.into(),
+        },
+        color: Color::WHITE,
+        border_color: Color::WHITE,
+        border_width: 1.0,
+    };
+
+    slider::Appearance {
+        rail: slider::Rail {
+            colors: (palette.primary.base.color, palette.secondary.base.color),
+            width: 4.0,
+            border_radius: 2.0.into(),
+        },
+        handle: slider::Handle {
+            color: match status {
+                slider::Status::Active => palette.background.base.color,
+                slider::Status::Hovered => palette.primary.weak.color,
+                slider::Status::Dragging => palette.primary.base.color,
+            },
+            border_color: palette.primary.base.color,
+            ..handle
+        },
     }
 }
 
-- 
cgit 


From 4130ae4be95ce850263fbc55f490b68a95361d58 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 4 Mar 2024 19:31:26 +0100
Subject: Simplify theming for `Text` widget

---
 style/src/theme.rs | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'style')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 656d6bf9..43e7cafd 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1203,32 +1203,7 @@ impl scrollable::StyleSheet for Theme {
     }
 }
 
-/// The style of text.
-#[derive(Clone, Copy, Default)]
-pub enum Text {
-    /// The default style.
-    #[default]
-    Default,
-    /// Colored text.
-    Color(Color),
-}
-
-impl From<Color> for Text {
-    fn from(color: Color) -> Self {
-        Text::Color(color)
-    }
-}
-
-impl text::StyleSheet for Theme {
-    type Style = Text;
-
-    fn appearance(&self, style: Self::Style) -> text::Appearance {
-        match style {
-            Text::Default => text::Appearance::default(),
-            Text::Color(c) => text::Appearance { color: Some(c) },
-        }
-    }
-}
+impl text::StyleSheet for Theme {}
 
 /// The style of a text input.
 #[derive(Default)]
-- 
cgit 


From f4a4845ddbdced81ae4ff60bfa19f0e602d84709 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 4 Mar 2024 20:42:37 +0100
Subject: Simplify theming for `Button` widget

---
 style/src/button.rs   |  78 --------------------------------
 style/src/checkbox.rs |  10 +---
 style/src/theme.rs    | 123 +-------------------------------------------------
 3 files changed, 2 insertions(+), 209 deletions(-)

(limited to 'style')

diff --git a/style/src/button.rs b/style/src/button.rs
index 0d7a668a..8b137891 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -1,79 +1 @@
-//! Change the apperance of a button.
-use iced_core::{Background, Border, Color, Shadow, Vector};
 
-/// The appearance of a button.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The amount of offset to apply to the shadow of the button.
-    pub shadow_offset: Vector,
-    /// The [`Background`] of the button.
-    pub background: Option<Background>,
-    /// The text [`Color`] of the button.
-    pub text_color: Color,
-    /// The [`Border`] of the buton.
-    pub border: Border,
-    /// The [`Shadow`] of the butoon.
-    pub shadow: Shadow,
-}
-
-impl std::default::Default for Appearance {
-    fn default() -> Self {
-        Self {
-            shadow_offset: Vector::default(),
-            background: None,
-            text_color: Color::BLACK,
-            border: Border::default(),
-            shadow: Shadow::default(),
-        }
-    }
-}
-
-/// A set of rules that dictate the style of a button.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the active [`Appearance`] of a button.
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the hovered [`Appearance`] of a button.
-    fn hovered(&self, style: &Self::Style) -> Appearance {
-        let active = self.active(style);
-
-        Appearance {
-            shadow_offset: active.shadow_offset + Vector::new(0.0, 1.0),
-            ..active
-        }
-    }
-
-    /// Produces the pressed [`Appearance`] of a button.
-    fn pressed(&self, style: &Self::Style) -> Appearance {
-        Appearance {
-            shadow_offset: Vector::default(),
-            ..self.active(style)
-        }
-    }
-
-    /// Produces the disabled [`Appearance`] of a button.
-    fn disabled(&self, style: &Self::Style) -> Appearance {
-        let active = self.active(style);
-
-        Appearance {
-            shadow_offset: Vector::default(),
-            background: active.background.map(|background| match background {
-                Background::Color(color) => Background::Color(Color {
-                    a: color.a * 0.5,
-                    ..color
-                }),
-                Background::Gradient(gradient) => {
-                    Background::Gradient(gradient.mul_alpha(0.5))
-                }
-            }),
-            text_color: Color {
-                a: active.text_color.a * 0.5,
-                ..active.text_color
-            },
-            ..active
-        }
-    }
-}
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
index 77093f69..5e1c8374 100644
--- a/style/src/checkbox.rs
+++ b/style/src/checkbox.rs
@@ -30,15 +30,7 @@ pub trait StyleSheet {
         let active = self.active(style, is_checked);
 
         Appearance {
-            background: match active.background {
-                Background::Color(color) => Background::Color(Color {
-                    a: color.a * 0.5,
-                    ..color
-                }),
-                Background::Gradient(gradient) => {
-                    Background::Gradient(gradient.mul_alpha(0.5))
-                }
-            },
+            background: active.background.transparentize(0.5),
             ..active
         }
     }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 43e7cafd..f967aebc 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -4,7 +4,6 @@ pub mod palette;
 pub use palette::Palette;
 
 use crate::application;
-use crate::button;
 use crate::checkbox;
 use crate::container;
 use crate::core::widget::text;
@@ -22,7 +21,7 @@ use crate::text_editor;
 use crate::text_input;
 use crate::toggler;
 
-use crate::core::{Background, Border, Color, Shadow, Vector};
+use crate::core::{Background, Border, Color, Shadow};
 
 use std::fmt;
 use std::rc::Rc;
@@ -285,126 +284,6 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     }
 }
 
-/// The style of a button.
-#[derive(Default)]
-pub enum Button {
-    /// The primary style.
-    #[default]
-    Primary,
-    /// The secondary style.
-    Secondary,
-    /// The positive style.
-    Positive,
-    /// The destructive style.
-    Destructive,
-    /// The text style.
-    ///
-    /// Useful for links!
-    Text,
-    /// A custom style.
-    Custom(Box<dyn button::StyleSheet<Style = Theme>>),
-}
-
-impl Button {
-    /// Creates a custom [`Button`] style variant.
-    pub fn custom(
-        style_sheet: impl button::StyleSheet<Style = Theme> + 'static,
-    ) -> Self {
-        Self::Custom(Box::new(style_sheet))
-    }
-}
-
-impl button::StyleSheet for Theme {
-    type Style = Button;
-
-    fn active(&self, style: &Self::Style) -> button::Appearance {
-        let palette = self.extended_palette();
-
-        let appearance = button::Appearance {
-            border: Border::with_radius(2),
-            ..button::Appearance::default()
-        };
-
-        let from_pair = |pair: palette::Pair| button::Appearance {
-            background: Some(pair.color.into()),
-            text_color: pair.text,
-            ..appearance
-        };
-
-        match style {
-            Button::Primary => from_pair(palette.primary.strong),
-            Button::Secondary => from_pair(palette.secondary.base),
-            Button::Positive => from_pair(palette.success.base),
-            Button::Destructive => from_pair(palette.danger.base),
-            Button::Text => button::Appearance {
-                text_color: palette.background.base.text,
-                ..appearance
-            },
-            Button::Custom(custom) => custom.active(self),
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> button::Appearance {
-        let palette = self.extended_palette();
-
-        if let Button::Custom(custom) = style {
-            return custom.hovered(self);
-        }
-
-        let active = self.active(style);
-
-        let background = match style {
-            Button::Primary => Some(palette.primary.base.color),
-            Button::Secondary => Some(palette.background.strong.color),
-            Button::Positive => Some(palette.success.strong.color),
-            Button::Destructive => Some(palette.danger.strong.color),
-            Button::Text | Button::Custom(_) => None,
-        };
-
-        button::Appearance {
-            background: background.map(Background::from),
-            ..active
-        }
-    }
-
-    fn pressed(&self, style: &Self::Style) -> button::Appearance {
-        if let Button::Custom(custom) = style {
-            return custom.pressed(self);
-        }
-
-        button::Appearance {
-            shadow_offset: Vector::default(),
-            ..self.active(style)
-        }
-    }
-
-    fn disabled(&self, style: &Self::Style) -> button::Appearance {
-        if let Button::Custom(custom) = style {
-            return custom.disabled(self);
-        }
-
-        let active = self.active(style);
-
-        button::Appearance {
-            shadow_offset: Vector::default(),
-            background: active.background.map(|background| match background {
-                Background::Color(color) => Background::Color(Color {
-                    a: color.a * 0.5,
-                    ..color
-                }),
-                Background::Gradient(gradient) => {
-                    Background::Gradient(gradient.mul_alpha(0.5))
-                }
-            }),
-            text_color: Color {
-                a: active.text_color.a * 0.5,
-                ..active.text_color
-            },
-            ..active
-        }
-    }
-}
-
 /// The style of a checkbox.
 #[derive(Default)]
 pub enum Checkbox {
-- 
cgit 


From 1f0a0c235a7729cf2d5716efeecb9c4dc972fdfa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 02:08:19 +0100
Subject: Simplify theming for `Checkbox` widget

---
 style/src/button.rs   |   1 -
 style/src/checkbox.rs |  37 -------------
 style/src/lib.rs      |   2 -
 style/src/theme.rs    | 151 --------------------------------------------------
 4 files changed, 191 deletions(-)
 delete mode 100644 style/src/button.rs
 delete mode 100644 style/src/checkbox.rs

(limited to 'style')

diff --git a/style/src/button.rs b/style/src/button.rs
deleted file mode 100644
index 8b137891..00000000
--- a/style/src/button.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
deleted file mode 100644
index 5e1c8374..00000000
--- a/style/src/checkbox.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-//! Change the appearance of a checkbox.
-use iced_core::{Background, Border, Color};
-
-/// The appearance of a checkbox.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the checkbox.
-    pub background: Background,
-    /// The icon [`Color`] of the checkbox.
-    pub icon_color: Color,
-    /// The [`Border`] of hte checkbox.
-    pub border: Border,
-    /// The text [`Color`] of the checkbox.
-    pub text_color: Option<Color>,
-}
-
-/// A set of rules that dictate the style of a checkbox.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the active [`Appearance`] of a checkbox.
-    fn active(&self, style: &Self::Style, is_checked: bool) -> Appearance;
-
-    /// Produces the hovered [`Appearance`] of a checkbox.
-    fn hovered(&self, style: &Self::Style, is_checked: bool) -> Appearance;
-
-    /// Produces the disabled [`Appearance`] of a checkbox.
-    fn disabled(&self, style: &Self::Style, is_checked: bool) -> Appearance {
-        let active = self.active(style, is_checked);
-
-        Appearance {
-            background: active.background.transparentize(0.5),
-            ..active
-        }
-    }
-}
diff --git a/style/src/lib.rs b/style/src/lib.rs
index 17ba09c4..1b2ce444 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -17,8 +17,6 @@
 pub use iced_core as core;
 
 pub mod application;
-pub mod button;
-pub mod checkbox;
 pub mod container;
 pub mod menu;
 pub mod pane_grid;
diff --git a/style/src/theme.rs b/style/src/theme.rs
index f967aebc..81303e68 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -4,7 +4,6 @@ pub mod palette;
 pub use palette::Palette;
 
 use crate::application;
-use crate::checkbox;
 use crate::container;
 use crate::core::widget::text;
 use crate::menu;
@@ -284,156 +283,6 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     }
 }
 
-/// The style of a checkbox.
-#[derive(Default)]
-pub enum Checkbox {
-    /// The primary style.
-    #[default]
-    Primary,
-    /// The secondary style.
-    Secondary,
-    /// The success style.
-    Success,
-    /// The danger style.
-    Danger,
-    /// A custom style.
-    Custom(Box<dyn checkbox::StyleSheet<Style = Theme>>),
-}
-
-impl checkbox::StyleSheet for Theme {
-    type Style = Checkbox;
-
-    fn active(
-        &self,
-        style: &Self::Style,
-        is_checked: bool,
-    ) -> checkbox::Appearance {
-        let palette = self.extended_palette();
-
-        match style {
-            Checkbox::Primary => checkbox_appearance(
-                palette.primary.strong.text,
-                palette.background.base,
-                palette.primary.strong,
-                is_checked,
-            ),
-            Checkbox::Secondary => checkbox_appearance(
-                palette.background.base.text,
-                palette.background.base,
-                palette.background.strong,
-                is_checked,
-            ),
-            Checkbox::Success => checkbox_appearance(
-                palette.success.base.text,
-                palette.background.base,
-                palette.success.base,
-                is_checked,
-            ),
-            Checkbox::Danger => checkbox_appearance(
-                palette.danger.base.text,
-                palette.background.base,
-                palette.danger.base,
-                is_checked,
-            ),
-            Checkbox::Custom(custom) => custom.active(self, is_checked),
-        }
-    }
-
-    fn hovered(
-        &self,
-        style: &Self::Style,
-        is_checked: bool,
-    ) -> checkbox::Appearance {
-        let palette = self.extended_palette();
-
-        match style {
-            Checkbox::Primary => checkbox_appearance(
-                palette.primary.strong.text,
-                palette.background.weak,
-                palette.primary.base,
-                is_checked,
-            ),
-            Checkbox::Secondary => checkbox_appearance(
-                palette.background.base.text,
-                palette.background.weak,
-                palette.background.strong,
-                is_checked,
-            ),
-            Checkbox::Success => checkbox_appearance(
-                palette.success.base.text,
-                palette.background.weak,
-                palette.success.base,
-                is_checked,
-            ),
-            Checkbox::Danger => checkbox_appearance(
-                palette.danger.base.text,
-                palette.background.weak,
-                palette.danger.base,
-                is_checked,
-            ),
-            Checkbox::Custom(custom) => custom.hovered(self, is_checked),
-        }
-    }
-
-    fn disabled(
-        &self,
-        style: &Self::Style,
-        is_checked: bool,
-    ) -> checkbox::Appearance {
-        let palette = self.extended_palette();
-
-        match style {
-            Checkbox::Primary => checkbox_appearance(
-                palette.primary.strong.text,
-                palette.background.weak,
-                palette.background.strong,
-                is_checked,
-            ),
-            Checkbox::Secondary => checkbox_appearance(
-                palette.background.strong.color,
-                palette.background.weak,
-                palette.background.weak,
-                is_checked,
-            ),
-            Checkbox::Success => checkbox_appearance(
-                palette.success.base.text,
-                palette.background.weak,
-                palette.success.weak,
-                is_checked,
-            ),
-            Checkbox::Danger => checkbox_appearance(
-                palette.danger.base.text,
-                palette.background.weak,
-                palette.danger.weak,
-                is_checked,
-            ),
-            Checkbox::Custom(custom) => custom.active(self, is_checked),
-        }
-    }
-}
-
-fn checkbox_appearance(
-    icon_color: Color,
-    base: palette::Pair,
-    accent: palette::Pair,
-    is_checked: bool,
-) -> checkbox::Appearance {
-    checkbox::Appearance {
-        background: Background::Color(if is_checked {
-            accent.color
-        } else {
-            base.color
-        }),
-        icon_color,
-        border: Border {
-            radius: 2.0.into(),
-            width: 1.0,
-            color: accent.color,
-        },
-        text_color: None,
-    }
-}
-
 /// The style of a container.
 #[derive(Default)]
 pub enum Container {
-- 
cgit 


From 29326215ccf13e1d1e25bf3bf5ada007856bff69 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 03:48:08 +0100
Subject: Simplify theming for `Container` widget

---
 style/src/theme.rs | 55 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 54 deletions(-)

(limited to 'style')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 81303e68..c3260427 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -20,7 +20,7 @@ use crate::text_editor;
 use crate::text_input;
 use crate::toggler;
 
-use crate::core::{Background, Border, Color, Shadow};
+use crate::core::{Background, Border, Color};
 
 use std::fmt;
 use std::rc::Rc;
@@ -283,59 +283,6 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     }
 }
 
-/// The style of a container.
-#[derive(Default)]
-pub enum Container {
-    /// No style.
-    #[default]
-    Transparent,
-    /// A simple box.
-    Box,
-    /// A custom style.
-    Custom(Box<dyn container::StyleSheet<Style = Theme>>),
-}
-
-impl From<container::Appearance> for Container {
-    fn from(appearance: container::Appearance) -> Self {
-        Self::Custom(Box::new(move |_: &_| appearance))
-    }
-}
-
-impl<T: Fn(&Theme) -> container::Appearance + 'static> From<T> for Container {
-    fn from(f: T) -> Self {
-        Self::Custom(Box::new(f))
-    }
-}
-
-impl container::StyleSheet for Theme {
-    type Style = Container;
-
-    fn appearance(&self, style: &Self::Style) -> container::Appearance {
-        match style {
-            Container::Transparent => container::Appearance::default(),
-            Container::Box => {
-                let palette = self.extended_palette();
-
-                container::Appearance {
-                    text_color: None,
-                    background: Some(palette.background.weak.color.into()),
-                    border: Border::with_radius(2),
-                    shadow: Shadow::default(),
-                }
-            }
-            Container::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl<T: Fn(&Theme) -> container::Appearance> container::StyleSheet for T {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> container::Appearance {
-        (self)(style)
-    }
-}
-
 impl slider::StyleSheet for Theme {
     fn default() -> fn(&Self, slider::Status) -> slider::Appearance {
         slider
-- 
cgit 


From d681aaa57e3106cf0ce90b74ade040ca7bb97832 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 04:42:25 +0100
Subject: Simplify theming for `Scrollable` widget

---
 style/src/container.rs  | 51 -----------------------------
 style/src/lib.rs        |  2 --
 style/src/scrollable.rs | 55 -------------------------------
 style/src/theme.rs      | 87 -------------------------------------------------
 4 files changed, 195 deletions(-)
 delete mode 100644 style/src/container.rs
 delete mode 100644 style/src/scrollable.rs

(limited to 'style')

diff --git a/style/src/container.rs b/style/src/container.rs
deleted file mode 100644
index 00649c25..00000000
--- a/style/src/container.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-//! Change the appearance of a container.
-use crate::core::{Background, Border, Color, Pixels, Shadow};
-
-/// The appearance of a container.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Appearance {
-    /// The text [`Color`] of the container.
-    pub text_color: Option<Color>,
-    /// The [`Background`] of the container.
-    pub background: Option<Background>,
-    /// The [`Border`] of the container.
-    pub border: Border,
-    /// The [`Shadow`] of the container.
-    pub shadow: Shadow,
-}
-
-impl Appearance {
-    /// Derives a new [`Appearance`] with a border of the given [`Color`] and
-    /// `width`.
-    pub fn with_border(
-        self,
-        color: impl Into<Color>,
-        width: impl Into<Pixels>,
-    ) -> Self {
-        Self {
-            border: Border {
-                color: color.into(),
-                width: width.into().0,
-                ..Border::default()
-            },
-            ..self
-        }
-    }
-
-    /// Derives a new [`Appearance`] with the given [`Background`].
-    pub fn with_background(self, background: impl Into<Background>) -> Self {
-        Self {
-            background: Some(background.into()),
-            ..self
-        }
-    }
-}
-
-/// A set of rules that dictate the [`Appearance`] of a container.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the [`Appearance`] of a container.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/lib.rs b/style/src/lib.rs
index 1b2ce444..da3c0676 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -17,7 +17,6 @@
 pub use iced_core as core;
 
 pub mod application;
-pub mod container;
 pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
@@ -25,7 +24,6 @@ pub mod progress_bar;
 pub mod qr_code;
 pub mod radio;
 pub mod rule;
-pub mod scrollable;
 pub mod slider;
 pub mod svg;
 pub mod text_editor;
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
deleted file mode 100644
index d2348510..00000000
--- a/style/src/scrollable.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-//! Change the appearance of a scrollable.
-use crate::container;
-use crate::core::{Background, Border, Color};
-
-/// The appearance of a scrolable.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`container::Appearance`] of a scrollable.
-    pub container: container::Appearance,
-    /// The [`Scrollbar`] appearance.
-    pub scrollbar: Scrollbar,
-    /// The [`Background`] of the gap between a horizontal and vertical scrollbar.
-    pub gap: Option<Background>,
-}
-
-/// The appearance of the scrollbar of a scrollable.
-#[derive(Debug, Clone, Copy)]
-pub struct Scrollbar {
-    /// The [`Background`] of a scrollbar.
-    pub background: Option<Background>,
-    /// The [`Border`] of a scrollbar.
-    pub border: Border,
-    /// The appearance of the [`Scroller`] of a scrollbar.
-    pub scroller: Scroller,
-}
-
-/// The appearance of the scroller of a scrollable.
-#[derive(Debug, Clone, Copy)]
-pub struct Scroller {
-    /// The [`Color`] of the scroller.
-    pub color: Color,
-    /// The [`Border`] of the scroller.
-    pub border: Border,
-}
-
-/// A set of rules that dictate the style of a scrollable.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the [`Appearance`] of an active scrollable.
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the [`Appearance`] of a scrollable when it is being hovered.
-    fn hovered(
-        &self,
-        style: &Self::Style,
-        is_mouse_over_scrollbar: bool,
-    ) -> Appearance;
-
-    /// Produces the [`Appearance`] of a scrollable when it is being dragged.
-    fn dragging(&self, style: &Self::Style) -> Appearance {
-        self.hovered(style, true)
-    }
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index c3260427..6fee19ff 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -4,7 +4,6 @@ pub mod palette;
 pub use palette::Palette;
 
 use crate::application;
-use crate::container;
 use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
@@ -13,7 +12,6 @@ use crate::progress_bar;
 use crate::qr_code;
 use crate::radio;
 use crate::rule;
-use crate::scrollable;
 use crate::slider;
 use crate::svg;
 use crate::text_editor;
@@ -793,91 +791,6 @@ impl svg::StyleSheet for fn(&Theme) -> svg::Appearance {
     }
 }
 
-/// The style of a scrollable.
-#[derive(Default)]
-pub enum Scrollable {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn scrollable::StyleSheet<Style = Theme>>),
-}
-
-impl Scrollable {
-    /// Creates a custom [`Scrollable`] theme.
-    pub fn custom<T: scrollable::StyleSheet<Style = Theme> + 'static>(
-        style: T,
-    ) -> Self {
-        Self::Custom(Box::new(style))
-    }
-}
-
-impl scrollable::StyleSheet for Theme {
-    type Style = Scrollable;
-
-    fn active(&self, style: &Self::Style) -> scrollable::Appearance {
-        match style {
-            Scrollable::Default => {
-                let palette = self.extended_palette();
-
-                scrollable::Appearance {
-                    container: container::Appearance::default(),
-                    scrollbar: scrollable::Scrollbar {
-                        background: Some(palette.background.weak.color.into()),
-                        border: Border::with_radius(2),
-                        scroller: scrollable::Scroller {
-                            color: palette.background.strong.color,
-                            border: Border::with_radius(2),
-                        },
-                    },
-                    gap: None,
-                }
-            }
-            Scrollable::Custom(custom) => custom.active(self),
-        }
-    }
-
-    fn hovered(
-        &self,
-        style: &Self::Style,
-        is_mouse_over_scrollbar: bool,
-    ) -> scrollable::Appearance {
-        match style {
-            Scrollable::Default => {
-                if is_mouse_over_scrollbar {
-                    let palette = self.extended_palette();
-
-                    scrollable::Appearance {
-                        scrollbar: scrollable::Scrollbar {
-                            background: Some(
-                                palette.background.weak.color.into(),
-                            ),
-                            border: Border::with_radius(2),
-                            scroller: scrollable::Scroller {
-                                color: palette.primary.strong.color,
-                                border: Border::with_radius(2),
-                            },
-                        },
-                        ..self.active(style)
-                    }
-                } else {
-                    self.active(style)
-                }
-            }
-            Scrollable::Custom(custom) => {
-                custom.hovered(self, is_mouse_over_scrollbar)
-            }
-        }
-    }
-
-    fn dragging(&self, style: &Self::Style) -> scrollable::Appearance {
-        match style {
-            Scrollable::Default => self.hovered(style, true),
-            Scrollable::Custom(custom) => custom.dragging(self),
-        }
-    }
-}
-
 impl text::StyleSheet for Theme {}
 
 /// The style of a text input.
-- 
cgit 


From 704ec9cb5cdc1d44f2df2f15de700b0af330b1d7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 15:53:59 +0100
Subject: Simplify theming for `TextInput` widget

---
 style/src/lib.rs        |   1 -
 style/src/text_input.rs |  45 -----------------
 style/src/theme.rs      | 125 ------------------------------------------------
 3 files changed, 171 deletions(-)
 delete mode 100644 style/src/text_input.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index da3c0676..5906fa0e 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -27,7 +27,6 @@ pub mod rule;
 pub mod slider;
 pub mod svg;
 pub mod text_editor;
-pub mod text_input;
 pub mod theme;
 pub mod toggler;
 
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
deleted file mode 100644
index 8ba9957f..00000000
--- a/style/src/text_input.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-//! Change the appearance of a text input.
-use iced_core::{Background, Border, Color};
-
-/// The appearance of a text input.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the text input.
-    pub background: Background,
-    /// The [`Border`] of the text input.
-    pub border: Border,
-    /// The icon [`Color`] of the text input.
-    pub icon_color: Color,
-}
-
-/// A set of rules that dictate the style of a text input.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the style of an active text input.
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the style of a focused text input.
-    fn focused(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the [`Color`] of the placeholder of a text input.
-    fn placeholder_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the value of a text input.
-    fn value_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the value of a disabled text input.
-    fn disabled_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the selection of a text input.
-    fn selection_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the style of an hovered text input.
-    fn hovered(&self, style: &Self::Style) -> Appearance {
-        self.focused(style)
-    }
-
-    /// Produces the style of a disabled text input.
-    fn disabled(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 6fee19ff..57dfe3c7 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -15,7 +15,6 @@ use crate::rule;
 use crate::slider;
 use crate::svg;
 use crate::text_editor;
-use crate::text_input;
 use crate::toggler;
 
 use crate::core::{Background, Border, Color};
@@ -793,130 +792,6 @@ impl svg::StyleSheet for fn(&Theme) -> svg::Appearance {
 
 impl text::StyleSheet for Theme {}
 
-/// The style of a text input.
-#[derive(Default)]
-pub enum TextInput {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn text_input::StyleSheet<Style = Theme>>),
-}
-
-impl text_input::StyleSheet for Theme {
-    type Style = TextInput;
-
-    fn active(&self, style: &Self::Style) -> text_input::Appearance {
-        if let TextInput::Custom(custom) = style {
-            return custom.active(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_input::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.strong.color,
-            },
-            icon_color: palette.background.weak.text,
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> text_input::Appearance {
-        if let TextInput::Custom(custom) = style {
-            return custom.hovered(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_input::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.base.text,
-            },
-            icon_color: palette.background.weak.text,
-        }
-    }
-
-    fn focused(&self, style: &Self::Style) -> text_input::Appearance {
-        if let TextInput::Custom(custom) = style {
-            return custom.focused(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_input::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.primary.strong.color,
-            },
-            icon_color: palette.background.weak.text,
-        }
-    }
-
-    fn placeholder_color(&self, style: &Self::Style) -> Color {
-        if let TextInput::Custom(custom) = style {
-            return custom.placeholder_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.background.strong.color
-    }
-
-    fn value_color(&self, style: &Self::Style) -> Color {
-        if let TextInput::Custom(custom) = style {
-            return custom.value_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.background.base.text
-    }
-
-    fn selection_color(&self, style: &Self::Style) -> Color {
-        if let TextInput::Custom(custom) = style {
-            return custom.selection_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.primary.weak.color
-    }
-
-    fn disabled(&self, style: &Self::Style) -> text_input::Appearance {
-        if let TextInput::Custom(custom) = style {
-            return custom.disabled(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_input::Appearance {
-            background: palette.background.weak.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.strong.color,
-            },
-            icon_color: palette.background.strong.color,
-        }
-    }
-
-    fn disabled_color(&self, style: &Self::Style) -> Color {
-        if let TextInput::Custom(custom) = style {
-            return custom.disabled_color(self);
-        }
-
-        self.placeholder_color(style)
-    }
-}
-
 /// The style of a text input.
 #[derive(Default)]
 pub enum TextEditor {
-- 
cgit 


From 330a6252054b729e4d4d3f5a5d09f32e06cec282 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 21:16:22 +0100
Subject: Simplify theming for `QRCode` widget

---
 style/src/lib.rs     |  1 -
 style/src/qr_code.rs | 20 --------------------
 style/src/theme.rs   | 41 -----------------------------------------
 3 files changed, 62 deletions(-)
 delete mode 100644 style/src/qr_code.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 5906fa0e..7a6be69a 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -21,7 +21,6 @@ pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
 pub mod progress_bar;
-pub mod qr_code;
 pub mod radio;
 pub mod rule;
 pub mod slider;
diff --git a/style/src/qr_code.rs b/style/src/qr_code.rs
deleted file mode 100644
index 02c4709a..00000000
--- a/style/src/qr_code.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! Change the appearance of a QR code.
-use crate::core::Color;
-
-/// The appearance of a QR code.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Appearance {
-    /// The color of the QR code data cells
-    pub cell: Color,
-    /// The color of the QR code background
-    pub background: Color,
-}
-
-/// A set of rules that dictate the style of a QR code.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the style of a QR code.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 57dfe3c7..9038d730 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -9,7 +9,6 @@ use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
 use crate::progress_bar;
-use crate::qr_code;
 use crate::radio;
 use crate::rule;
 use crate::slider;
@@ -662,46 +661,6 @@ impl<T: Fn(&Theme) -> progress_bar::Appearance> progress_bar::StyleSheet for T {
     }
 }
 
-/// The style of a QR Code.
-#[derive(Default)]
-pub enum QRCode {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn qr_code::StyleSheet<Style = Theme>>),
-}
-
-impl<T: Fn(&Theme) -> qr_code::Appearance + 'static> From<T> for QRCode {
-    fn from(f: T) -> Self {
-        Self::Custom(Box::new(f))
-    }
-}
-
-impl qr_code::StyleSheet for Theme {
-    type Style = QRCode;
-
-    fn appearance(&self, style: &Self::Style) -> qr_code::Appearance {
-        let palette = self.palette();
-
-        match style {
-            QRCode::Default => qr_code::Appearance {
-                cell: palette.text,
-                background: palette.background,
-            },
-            QRCode::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl<T: Fn(&Theme) -> qr_code::Appearance> qr_code::StyleSheet for T {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> qr_code::Appearance {
-        (self)(style)
-    }
-}
-
 /// The style of a rule.
 #[derive(Default)]
 pub enum Rule {
-- 
cgit 


From d735209fc32238185ea0f27f1f4d1d0044b90e06 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 21:23:14 +0100
Subject: Move style types of `slider` to `iced_widget`

---
 style/src/lib.rs    |  1 -
 style/src/slider.rs | 75 -----------------------------------------------------
 style/src/theme.rs  | 38 ---------------------------
 3 files changed, 114 deletions(-)
 delete mode 100644 style/src/slider.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 7a6be69a..6da84b4d 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -23,7 +23,6 @@ pub mod pick_list;
 pub mod progress_bar;
 pub mod radio;
 pub mod rule;
-pub mod slider;
 pub mod svg;
 pub mod text_editor;
 pub mod theme;
diff --git a/style/src/slider.rs b/style/src/slider.rs
deleted file mode 100644
index 0c19e47d..00000000
--- a/style/src/slider.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-//! Change the apperance of a slider.
-use crate::core::border;
-use crate::core::{Color, Pixels};
-
-/// The appearance of a slider.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The colors of the rail of the slider.
-    pub rail: Rail,
-    /// The appearance of the [`Handle`] of the slider.
-    pub handle: Handle,
-}
-
-impl Appearance {
-    /// Changes the [`HandleShape`] of the [`Appearance`] to a circle
-    /// with the given radius.
-    pub fn with_circular_handle(mut self, radius: impl Into<Pixels>) -> Self {
-        self.handle.shape = HandleShape::Circle {
-            radius: radius.into().0,
-        };
-        self
-    }
-}
-
-/// The appearance of a slider rail
-#[derive(Debug, Clone, Copy)]
-pub struct Rail {
-    /// The colors of the rail of the slider.
-    pub colors: (Color, Color),
-    /// The width of the stroke of a slider rail.
-    pub width: f32,
-    /// The border radius of the corners of the rail.
-    pub border_radius: border::Radius,
-}
-
-/// The appearance of the handle of a slider.
-#[derive(Debug, Clone, Copy)]
-pub struct Handle {
-    /// The shape of the handle.
-    pub shape: HandleShape,
-    /// The [`Color`] of the handle.
-    pub color: Color,
-    /// The border width of the handle.
-    pub border_width: f32,
-    /// The border [`Color`] of the handle.
-    pub border_color: Color,
-}
-
-/// The shape of the handle of a slider.
-#[derive(Debug, Clone, Copy)]
-pub enum HandleShape {
-    /// A circular handle.
-    Circle {
-        /// The radius of the circle.
-        radius: f32,
-    },
-    /// A rectangular shape.
-    Rectangle {
-        /// The width of the rectangle.
-        width: u16,
-        /// The border radius of the corners of the rectangle.
-        border_radius: border::Radius,
-    },
-}
-
-/// A set of rules that dictate the style of a slider.
-pub trait StyleSheet {
-    fn default() -> fn(&Self, Status) -> Appearance;
-}
-
-pub enum Status {
-    Active,
-    Hovered,
-    Dragging,
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 9038d730..2f8488c7 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -11,7 +11,6 @@ use crate::pick_list;
 use crate::progress_bar;
 use crate::radio;
 use crate::rule;
-use crate::slider;
 use crate::svg;
 use crate::text_editor;
 use crate::toggler;
@@ -279,43 +278,6 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     }
 }
 
-impl slider::StyleSheet for Theme {
-    fn default() -> fn(&Self, slider::Status) -> slider::Appearance {
-        slider
-    }
-}
-
-pub fn slider(theme: &Theme, status: slider::Status) -> slider::Appearance {
-    let palette = theme.extended_palette();
-
-    let handle = slider::Handle {
-        shape: slider::HandleShape::Rectangle {
-            width: 8,
-            border_radius: 4.0.into(),
-        },
-        color: Color::WHITE,
-        border_color: Color::WHITE,
-        border_width: 1.0,
-    };
-
-    slider::Appearance {
-        rail: slider::Rail {
-            colors: (palette.primary.base.color, palette.secondary.base.color),
-            width: 4.0,
-            border_radius: 2.0.into(),
-        },
-        handle: slider::Handle {
-            color: match status {
-                slider::Status::Active => palette.background.base.color,
-                slider::Status::Hovered => palette.primary.weak.color,
-                slider::Status::Dragging => palette.primary.base.color,
-            },
-            border_color: palette.primary.base.color,
-            ..handle
-        },
-    }
-}
-
 /// The style of a menu.
 #[derive(Clone, Default)]
 pub enum Menu {
-- 
cgit 


From 7d84c9c9c3619513519ac1ef7ea1c5f6e4e2cf5d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 21:55:24 +0100
Subject: Simplify theming for `Radio` widget

---
 style/src/lib.rs   |  1 -
 style/src/radio.rs | 29 ----------------------------
 style/src/theme.rs | 56 ------------------------------------------------------
 3 files changed, 86 deletions(-)
 delete mode 100644 style/src/radio.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 6da84b4d..45717d46 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -21,7 +21,6 @@ pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
 pub mod progress_bar;
-pub mod radio;
 pub mod rule;
 pub mod svg;
 pub mod text_editor;
diff --git a/style/src/radio.rs b/style/src/radio.rs
deleted file mode 100644
index 06c49029..00000000
--- a/style/src/radio.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Change the appearance of radio buttons.
-use iced_core::{Background, Color};
-
-/// The appearance of a radio button.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the radio button.
-    pub background: Background,
-    /// The [`Color`] of the dot of the radio button.
-    pub dot_color: Color,
-    /// The border width of the radio button.
-    pub border_width: f32,
-    /// The border [`Color`] of the radio button.
-    pub border_color: Color,
-    /// The text [`Color`] of the radio button.
-    pub text_color: Option<Color>,
-}
-
-/// A set of rules that dictate the style of a radio button.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the active [`Appearance`] of a radio button.
-    fn active(&self, style: &Self::Style, is_selected: bool) -> Appearance;
-
-    /// Produces the hovered [`Appearance`] of a radio button.
-    fn hovered(&self, style: &Self::Style, is_selected: bool) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 2f8488c7..b188e561 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -9,7 +9,6 @@ use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
 use crate::progress_bar;
-use crate::radio;
 use crate::rule;
 use crate::svg;
 use crate::text_editor;
@@ -381,61 +380,6 @@ impl pick_list::StyleSheet for Theme {
     }
 }
 
-/// The style of a radio button.
-#[derive(Default)]
-pub enum Radio {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn radio::StyleSheet<Style = Theme>>),
-}
-
-impl radio::StyleSheet for Theme {
-    type Style = Radio;
-
-    fn active(
-        &self,
-        style: &Self::Style,
-        is_selected: bool,
-    ) -> radio::Appearance {
-        match style {
-            Radio::Default => {
-                let palette = self.extended_palette();
-
-                radio::Appearance {
-                    background: Color::TRANSPARENT.into(),
-                    dot_color: palette.primary.strong.color,
-                    border_width: 1.0,
-                    border_color: palette.primary.strong.color,
-                    text_color: None,
-                }
-            }
-            Radio::Custom(custom) => custom.active(self, is_selected),
-        }
-    }
-
-    fn hovered(
-        &self,
-        style: &Self::Style,
-        is_selected: bool,
-    ) -> radio::Appearance {
-        match style {
-            Radio::Default => {
-                let active = self.active(style, is_selected);
-                let palette = self.extended_palette();
-
-                radio::Appearance {
-                    dot_color: palette.primary.strong.color,
-                    background: palette.primary.weak.color.into(),
-                    ..active
-                }
-            }
-            Radio::Custom(custom) => custom.hovered(self, is_selected),
-        }
-    }
-}
-
 /// The style of a toggler.
 #[derive(Default)]
 pub enum Toggler {
-- 
cgit 


From 5824ceb1fe8420b9337eee9a0e6db6cf7cb7f269 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 22:13:36 +0100
Subject: Simplify theming for `ProgressBar` widget

---
 style/src/lib.rs          |  1 -
 style/src/progress_bar.rs | 23 -------------------
 style/src/theme.rs        | 56 -----------------------------------------------
 3 files changed, 80 deletions(-)
 delete mode 100644 style/src/progress_bar.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 45717d46..c8fb9ffe 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -20,7 +20,6 @@ pub mod application;
 pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
-pub mod progress_bar;
 pub mod rule;
 pub mod svg;
 pub mod text_editor;
diff --git a/style/src/progress_bar.rs b/style/src/progress_bar.rs
deleted file mode 100644
index b62512d8..00000000
--- a/style/src/progress_bar.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Change the appearance of a progress bar.
-use crate::core::border;
-use crate::core::Background;
-
-/// The appearance of a progress bar.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the progress bar.
-    pub background: Background,
-    /// The [`Background`] of the bar of the progress bar.
-    pub bar: Background,
-    /// The border radius of the progress bar.
-    pub border_radius: border::Radius,
-}
-
-/// A set of rules that dictate the style of a progress bar.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the [`Appearance`] of the progress bar.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index b188e561..8ed15408 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,7 +8,6 @@ use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
-use crate::progress_bar;
 use crate::rule;
 use crate::svg;
 use crate::text_editor;
@@ -512,61 +511,6 @@ impl pane_grid::StyleSheet for Theme {
     }
 }
 
-/// The style of a progress bar.
-#[derive(Default)]
-pub enum ProgressBar {
-    /// The primary style.
-    #[default]
-    Primary,
-    /// The success style.
-    Success,
-    /// The danger style.
-    Danger,
-    /// A custom style.
-    Custom(Box<dyn progress_bar::StyleSheet<Style = Theme>>),
-}
-
-impl<T: Fn(&Theme) -> progress_bar::Appearance + 'static> From<T>
-    for ProgressBar
-{
-    fn from(f: T) -> Self {
-        Self::Custom(Box::new(f))
-    }
-}
-
-impl progress_bar::StyleSheet for Theme {
-    type Style = ProgressBar;
-
-    fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
-        if let ProgressBar::Custom(custom) = style {
-            return custom.appearance(self);
-        }
-
-        let palette = self.extended_palette();
-
-        let from_palette = |bar: Color| progress_bar::Appearance {
-            background: palette.background.strong.color.into(),
-            bar: bar.into(),
-            border_radius: 2.0.into(),
-        };
-
-        match style {
-            ProgressBar::Primary => from_palette(palette.primary.base.color),
-            ProgressBar::Success => from_palette(palette.success.base.color),
-            ProgressBar::Danger => from_palette(palette.danger.base.color),
-            ProgressBar::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl<T: Fn(&Theme) -> progress_bar::Appearance> progress_bar::StyleSheet for T {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
-        (self)(style)
-    }
-}
-
 /// The style of a rule.
 #[derive(Default)]
 pub enum Rule {
-- 
cgit 


From a43afc791e8f78b03d802f980a10f32dc932f0b2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 5 Mar 2024 22:38:27 +0100
Subject: Simplify theming for `Rule` widget

---
 style/src/lib.rs   |  1 -
 style/src/rule.rs  | 89 ------------------------------------------------------
 style/src/theme.rs | 43 --------------------------
 3 files changed, 133 deletions(-)
 delete mode 100644 style/src/rule.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index c8fb9ffe..09a943aa 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -20,7 +20,6 @@ pub mod application;
 pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
-pub mod rule;
 pub mod svg;
 pub mod text_editor;
 pub mod theme;
diff --git a/style/src/rule.rs b/style/src/rule.rs
deleted file mode 100644
index 12980da7..00000000
--- a/style/src/rule.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-//! Change the appearance of a rule.
-use crate::core::border;
-use crate::core::Color;
-
-/// The appearance of a rule.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The color of the rule.
-    pub color: Color,
-    /// The width (thickness) of the rule line.
-    pub width: u16,
-    /// The radius of the line corners.
-    pub radius: border::Radius,
-    /// The [`FillMode`] of the rule.
-    pub fill_mode: FillMode,
-}
-
-/// A set of rules that dictate the style of a rule.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the style of a rule.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
-
-/// The fill mode of a rule.
-#[derive(Debug, Clone, Copy)]
-pub enum FillMode {
-    /// Fill the whole length of the container.
-    Full,
-    /// Fill a percent of the length of the container. The rule
-    /// will be centered in that container.
-    ///
-    /// The range is `[0.0, 100.0]`.
-    Percent(f32),
-    /// Uniform offset from each end, length units.
-    Padded(u16),
-    /// Different offset on each end of the rule, length units.
-    /// First = top or left.
-    AsymmetricPadding(u16, u16),
-}
-
-impl FillMode {
-    /// Return the starting offset and length of the rule.
-    ///
-    /// * `space` - The space to fill.
-    ///
-    /// # Returns
-    ///
-    /// * (`starting_offset`, `length`)
-    pub fn fill(&self, space: f32) -> (f32, f32) {
-        match *self {
-            FillMode::Full => (0.0, space),
-            FillMode::Percent(percent) => {
-                if percent >= 100.0 {
-                    (0.0, space)
-                } else {
-                    let percent_width = (space * percent / 100.0).round();
-
-                    (((space - percent_width) / 2.0).round(), percent_width)
-                }
-            }
-            FillMode::Padded(padding) => {
-                if padding == 0 {
-                    (0.0, space)
-                } else {
-                    let padding = padding as f32;
-                    let mut line_width = space - (padding * 2.0);
-                    if line_width < 0.0 {
-                        line_width = 0.0;
-                    }
-
-                    (padding, line_width)
-                }
-            }
-            FillMode::AsymmetricPadding(first_pad, second_pad) => {
-                let first_pad = first_pad as f32;
-                let second_pad = second_pad as f32;
-                let mut line_width = space - first_pad - second_pad;
-                if line_width < 0.0 {
-                    line_width = 0.0;
-                }
-
-                (first_pad, line_width)
-            }
-        }
-    }
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 8ed15408..a7a95ab0 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,7 +8,6 @@ use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
-use crate::rule;
 use crate::svg;
 use crate::text_editor;
 use crate::toggler;
@@ -511,48 +510,6 @@ impl pane_grid::StyleSheet for Theme {
     }
 }
 
-/// The style of a rule.
-#[derive(Default)]
-pub enum Rule {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn rule::StyleSheet<Style = Theme>>),
-}
-
-impl<T: Fn(&Theme) -> rule::Appearance + 'static> From<T> for Rule {
-    fn from(f: T) -> Self {
-        Self::Custom(Box::new(f))
-    }
-}
-
-impl rule::StyleSheet for Theme {
-    type Style = Rule;
-
-    fn appearance(&self, style: &Self::Style) -> rule::Appearance {
-        let palette = self.extended_palette();
-
-        match style {
-            Rule::Default => rule::Appearance {
-                color: palette.background.strong.color,
-                width: 1,
-                radius: 0.0.into(),
-                fill_mode: rule::FillMode::Full,
-            },
-            Rule::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl<T: Fn(&Theme) -> rule::Appearance> rule::StyleSheet for T {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> rule::Appearance {
-        (self)(style)
-    }
-}
-
 /**
  * Svg
  */
-- 
cgit 


From 40af65c3aa4a96281db8f642cfa1641479314d27 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 11:24:51 +0100
Subject: Simplify theming for `Toggler` widget

---
 style/src/lib.rs     |  1 -
 style/src/theme.rs   | 70 ----------------------------------------------------
 style/src/toggler.rs | 35 --------------------------
 3 files changed, 106 deletions(-)
 delete mode 100644 style/src/toggler.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 09a943aa..3e439f07 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -23,6 +23,5 @@ pub mod pick_list;
 pub mod svg;
 pub mod text_editor;
 pub mod theme;
-pub mod toggler;
 
 pub use theme::Theme;
diff --git a/style/src/theme.rs b/style/src/theme.rs
index a7a95ab0..993e3d68 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -10,7 +10,6 @@ use crate::pane_grid;
 use crate::pick_list;
 use crate::svg;
 use crate::text_editor;
-use crate::toggler;
 
 use crate::core::{Background, Border, Color};
 
@@ -378,75 +377,6 @@ impl pick_list::StyleSheet for Theme {
     }
 }
 
-/// The style of a toggler.
-#[derive(Default)]
-pub enum Toggler {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn toggler::StyleSheet<Style = Theme>>),
-}
-
-impl toggler::StyleSheet for Theme {
-    type Style = Toggler;
-
-    fn active(
-        &self,
-        style: &Self::Style,
-        is_active: bool,
-    ) -> toggler::Appearance {
-        match style {
-            Toggler::Default => {
-                let palette = self.extended_palette();
-
-                toggler::Appearance {
-                    background: if is_active {
-                        palette.primary.strong.color
-                    } else {
-                        palette.background.strong.color
-                    },
-                    background_border_width: 0.0,
-                    background_border_color: Color::TRANSPARENT,
-                    foreground: if is_active {
-                        palette.primary.strong.text
-                    } else {
-                        palette.background.base.color
-                    },
-                    foreground_border_width: 0.0,
-                    foreground_border_color: Color::TRANSPARENT,
-                }
-            }
-            Toggler::Custom(custom) => custom.active(self, is_active),
-        }
-    }
-
-    fn hovered(
-        &self,
-        style: &Self::Style,
-        is_active: bool,
-    ) -> toggler::Appearance {
-        match style {
-            Toggler::Default => {
-                let palette = self.extended_palette();
-
-                toggler::Appearance {
-                    foreground: if is_active {
-                        Color {
-                            a: 0.5,
-                            ..palette.primary.strong.text
-                        }
-                    } else {
-                        palette.background.weak.color
-                    },
-                    ..self.active(style, is_active)
-                }
-            }
-            Toggler::Custom(custom) => custom.hovered(self, is_active),
-        }
-    }
-}
-
 /// The style of a pane grid.
 #[derive(Default)]
 pub enum PaneGrid {
diff --git a/style/src/toggler.rs b/style/src/toggler.rs
deleted file mode 100644
index 731e87ce..00000000
--- a/style/src/toggler.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//! Change the appearance of a toggler.
-use iced_core::Color;
-
-/// The appearance of a toggler.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The background [`Color`] of the toggler.
-    pub background: Color,
-    /// The width of the background border of the toggler.
-    pub background_border_width: f32,
-    /// The [`Color`] of the background border of the toggler.
-    pub background_border_color: Color,
-    /// The foreground [`Color`] of the toggler.
-    pub foreground: Color,
-    /// The width of the foreground border of the toggler.
-    pub foreground_border_width: f32,
-    /// The [`Color`] of the foreground border of the toggler.
-    pub foreground_border_color: Color,
-}
-
-/// A set of rules that dictate the style of a toggler.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Returns the active [`Appearance`] of the toggler for the provided [`Style`].
-    ///
-    /// [`Style`]: Self::Style
-    fn active(&self, style: &Self::Style, is_active: bool) -> Appearance;
-
-    /// Returns the hovered [`Appearance`] of the toggler for the provided [`Style`].
-    ///
-    /// [`Style`]: Self::Style
-    fn hovered(&self, style: &Self::Style, is_active: bool) -> Appearance;
-}
-- 
cgit 


From 69bc1df252382a662228c8b0da6f60358e90f376 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 11:36:33 +0100
Subject: Simplify theming for `Svg` widget

---
 style/src/lib.rs   |  1 -
 style/src/svg.rs   | 28 ----------------------------
 style/src/theme.rs | 47 -----------------------------------------------
 3 files changed, 76 deletions(-)
 delete mode 100644 style/src/svg.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 3e439f07..259ad793 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -20,7 +20,6 @@ pub mod application;
 pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
-pub mod svg;
 pub mod text_editor;
 pub mod theme;
 
diff --git a/style/src/svg.rs b/style/src/svg.rs
deleted file mode 100644
index 3fe5546b..00000000
--- a/style/src/svg.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-//! Change the appearance of a svg.
-
-use iced_core::Color;
-
-/// The appearance of an SVG.
-#[derive(Debug, Default, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Color`] filter of an SVG.
-    ///
-    /// Useful for coloring a symbolic icon.
-    ///
-    /// `None` keeps the original color.
-    pub color: Option<Color>,
-}
-
-/// The stylesheet of a svg.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the [`Appearance`] of the svg.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the hovered [`Appearance`] of a svg content.
-    fn hovered(&self, style: &Self::Style) -> Appearance {
-        self.appearance(style)
-    }
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 993e3d68..27d5b5e0 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,7 +8,6 @@ use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
-use crate::svg;
 use crate::text_editor;
 
 use crate::core::{Background, Border, Color};
@@ -440,52 +439,6 @@ impl pane_grid::StyleSheet for Theme {
     }
 }
 
-/**
- * Svg
- */
-#[derive(Default)]
-pub enum Svg {
-    /// No filtering to the rendered SVG.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn svg::StyleSheet<Style = Theme>>),
-}
-
-impl Svg {
-    /// Creates a custom [`Svg`] style.
-    pub fn custom_fn(f: fn(&Theme) -> svg::Appearance) -> Self {
-        Self::Custom(Box::new(f))
-    }
-}
-
-impl svg::StyleSheet for Theme {
-    type Style = Svg;
-
-    fn appearance(&self, style: &Self::Style) -> svg::Appearance {
-        match style {
-            Svg::Default => svg::Appearance::default(),
-            Svg::Custom(custom) => custom.appearance(self),
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> svg::Appearance {
-        self.appearance(style)
-    }
-}
-
-impl svg::StyleSheet for fn(&Theme) -> svg::Appearance {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> svg::Appearance {
-        (self)(style)
-    }
-
-    fn hovered(&self, style: &Self::Style) -> svg::Appearance {
-        self.appearance(style)
-    }
-}
-
 impl text::StyleSheet for Theme {}
 
 /// The style of a text input.
-- 
cgit 


From 68c8f23f02a55373db728b115c3a4360669e2b80 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 15:20:10 +0100
Subject: Simplify theming for `TextEditor` widget

---
 style/src/lib.rs         |   1 -
 style/src/text_editor.rs |  43 -----------------
 style/src/theme.rs       | 121 -----------------------------------------------
 3 files changed, 165 deletions(-)
 delete mode 100644 style/src/text_editor.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 259ad793..828f5871 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -20,7 +20,6 @@ pub mod application;
 pub mod menu;
 pub mod pane_grid;
 pub mod pick_list;
-pub mod text_editor;
 pub mod theme;
 
 pub use theme::Theme;
diff --git a/style/src/text_editor.rs b/style/src/text_editor.rs
deleted file mode 100644
index 87f481e3..00000000
--- a/style/src/text_editor.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-//! Change the appearance of a text editor.
-use crate::core::{Background, Border, Color};
-
-/// The appearance of a text input.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the text editor.
-    pub background: Background,
-    /// The [`Border`] of the text editor.
-    pub border: Border,
-}
-
-/// A set of rules that dictate the style of a text input.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Produces the style of an active text input.
-    fn active(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the style of a focused text input.
-    fn focused(&self, style: &Self::Style) -> Appearance;
-
-    /// Produces the [`Color`] of the placeholder of a text input.
-    fn placeholder_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the value of a text input.
-    fn value_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the value of a disabled text input.
-    fn disabled_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the [`Color`] of the selection of a text input.
-    fn selection_color(&self, style: &Self::Style) -> Color;
-
-    /// Produces the style of an hovered text input.
-    fn hovered(&self, style: &Self::Style) -> Appearance {
-        self.focused(style)
-    }
-
-    /// Produces the style of a disabled text input.
-    fn disabled(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 27d5b5e0..78995e23 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,7 +8,6 @@ use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
-use crate::text_editor;
 
 use crate::core::{Background, Border, Color};
 
@@ -440,123 +439,3 @@ impl pane_grid::StyleSheet for Theme {
 }
 
 impl text::StyleSheet for Theme {}
-
-/// The style of a text input.
-#[derive(Default)]
-pub enum TextEditor {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn text_editor::StyleSheet<Style = Theme>>),
-}
-
-impl text_editor::StyleSheet for Theme {
-    type Style = TextEditor;
-
-    fn active(&self, style: &Self::Style) -> text_editor::Appearance {
-        if let TextEditor::Custom(custom) = style {
-            return custom.active(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_editor::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.strong.color,
-            },
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> text_editor::Appearance {
-        if let TextEditor::Custom(custom) = style {
-            return custom.hovered(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_editor::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.base.text,
-            },
-        }
-    }
-
-    fn focused(&self, style: &Self::Style) -> text_editor::Appearance {
-        if let TextEditor::Custom(custom) = style {
-            return custom.focused(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_editor::Appearance {
-            background: palette.background.base.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.primary.strong.color,
-            },
-        }
-    }
-
-    fn placeholder_color(&self, style: &Self::Style) -> Color {
-        if let TextEditor::Custom(custom) = style {
-            return custom.placeholder_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.background.strong.color
-    }
-
-    fn value_color(&self, style: &Self::Style) -> Color {
-        if let TextEditor::Custom(custom) = style {
-            return custom.value_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.background.base.text
-    }
-
-    fn selection_color(&self, style: &Self::Style) -> Color {
-        if let TextEditor::Custom(custom) = style {
-            return custom.selection_color(self);
-        }
-
-        let palette = self.extended_palette();
-
-        palette.primary.weak.color
-    }
-
-    fn disabled(&self, style: &Self::Style) -> text_editor::Appearance {
-        if let TextEditor::Custom(custom) = style {
-            return custom.disabled(self);
-        }
-
-        let palette = self.extended_palette();
-
-        text_editor::Appearance {
-            background: palette.background.weak.color.into(),
-            border: Border {
-                radius: 2.0.into(),
-                width: 1.0,
-                color: palette.background.strong.color,
-            },
-        }
-    }
-
-    fn disabled_color(&self, style: &Self::Style) -> Color {
-        if let TextEditor::Custom(custom) = style {
-            return custom.disabled_color(self);
-        }
-
-        self.placeholder_color(style)
-    }
-}
-- 
cgit 


From 9b2fd6416775cb27af69e34fb20063d28b4314eb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 15:41:57 +0100
Subject: Simplify theming for `PaneGrid` widget

---
 style/src/lib.rs       |  1 -
 style/src/pane_grid.rs | 38 -----------------------------
 style/src/theme.rs     | 66 +-------------------------------------------------
 3 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 style/src/pane_grid.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 828f5871..695f8fb6 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -18,7 +18,6 @@ pub use iced_core as core;
 
 pub mod application;
 pub mod menu;
-pub mod pane_grid;
 pub mod pick_list;
 pub mod theme;
 
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
deleted file mode 100644
index 35570584..00000000
--- a/style/src/pane_grid.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-//! Change the appearance of a pane grid.
-use iced_core::{Background, Border, Color};
-
-/// The appearance of the hovered region of a pane grid.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The [`Background`] of the pane region.
-    pub background: Background,
-    /// The [`Border`] of the pane region.
-    pub border: Border,
-}
-
-/// A line.
-///
-/// It is normally used to define the highlight of something, like a split.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Line {
-    /// The [`Color`] of the [`Line`].
-    pub color: Color,
-
-    /// The width of the [`Line`].
-    pub width: f32,
-}
-
-/// A set of rules that dictate the style of a container.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// The [`Appearance`] to draw when a pane is hovered.
-    fn hovered_region(&self, style: &Self::Style) -> Appearance;
-
-    /// The [`Line`] to draw when a split is picked.
-    fn picked_split(&self, style: &Self::Style) -> Option<Line>;
-
-    /// The [`Line`] to draw when a split is hovered.
-    fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 78995e23..cac52acd 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -6,10 +6,9 @@ pub use palette::Palette;
 use crate::application;
 use crate::core::widget::text;
 use crate::menu;
-use crate::pane_grid;
 use crate::pick_list;
 
-use crate::core::{Background, Border, Color};
+use crate::core::Border;
 
 use std::fmt;
 use std::rc::Rc;
@@ -375,67 +374,4 @@ impl pick_list::StyleSheet for Theme {
     }
 }
 
-/// The style of a pane grid.
-#[derive(Default)]
-pub enum PaneGrid {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn pane_grid::StyleSheet<Style = Theme>>),
-}
-
-impl pane_grid::StyleSheet for Theme {
-    type Style = PaneGrid;
-
-    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Appearance {
-        match style {
-            PaneGrid::Default => {
-                let palette = self.extended_palette();
-
-                pane_grid::Appearance {
-                    background: Background::Color(Color {
-                        a: 0.5,
-                        ..palette.primary.base.color
-                    }),
-                    border: Border {
-                        width: 2.0,
-                        color: palette.primary.strong.color,
-                        radius: 0.0.into(),
-                    },
-                }
-            }
-            PaneGrid::Custom(custom) => custom.hovered_region(self),
-        }
-    }
-
-    fn picked_split(&self, style: &Self::Style) -> Option<pane_grid::Line> {
-        match style {
-            PaneGrid::Default => {
-                let palette = self.extended_palette();
-
-                Some(pane_grid::Line {
-                    color: palette.primary.strong.color,
-                    width: 2.0,
-                })
-            }
-            PaneGrid::Custom(custom) => custom.picked_split(self),
-        }
-    }
-
-    fn hovered_split(&self, style: &Self::Style) -> Option<pane_grid::Line> {
-        match style {
-            PaneGrid::Default => {
-                let palette = self.extended_palette();
-
-                Some(pane_grid::Line {
-                    color: palette.primary.base.color,
-                    width: 2.0,
-                })
-            }
-            PaneGrid::Custom(custom) => custom.hovered_split(self),
-        }
-    }
-}
-
 impl text::StyleSheet for Theme {}
-- 
cgit 


From 597a41cea73f078eda04eb3ff40cfda5d37d6135 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 17:08:28 +0100
Subject: Simplify theming for `PickList`, `ComboBox`, and `Menu` widgets

---
 style/src/lib.rs       |   2 -
 style/src/menu.rs      |  26 ------------
 style/src/pick_list.rs |  29 -------------
 style/src/theme.rs     | 108 -------------------------------------------------
 4 files changed, 165 deletions(-)
 delete mode 100644 style/src/menu.rs
 delete mode 100644 style/src/pick_list.rs

(limited to 'style')

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 695f8fb6..1aea2d80 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -17,8 +17,6 @@
 pub use iced_core as core;
 
 pub mod application;
-pub mod menu;
-pub mod pick_list;
 pub mod theme;
 
 pub use theme::Theme;
diff --git a/style/src/menu.rs b/style/src/menu.rs
deleted file mode 100644
index be60a3f8..00000000
--- a/style/src/menu.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-//! Change the appearance of menus.
-use iced_core::{Background, Border, Color};
-
-/// The appearance of a menu.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The text [`Color`] of the menu.
-    pub text_color: Color,
-    /// The [`Background`] of the menu.
-    pub background: Background,
-    /// The [`Border`] of the menu.
-    pub border: Border,
-    /// The text [`Color`] of a selected option in the menu.
-    pub selected_text_color: Color,
-    /// The background [`Color`] of a selected option in the menu.
-    pub selected_background: Background,
-}
-
-/// The style sheet of a menu.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default + Clone;
-
-    /// Produces the [`Appearance`] of a menu.
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
diff --git a/style/src/pick_list.rs b/style/src/pick_list.rs
deleted file mode 100644
index 8f008f4a..00000000
--- a/style/src/pick_list.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Change the appearance of a pick list.
-use iced_core::{Background, Border, Color};
-
-/// The appearance of a pick list.
-#[derive(Debug, Clone, Copy)]
-pub struct Appearance {
-    /// The text [`Color`] of the pick list.
-    pub text_color: Color,
-    /// The placeholder [`Color`] of the pick list.
-    pub placeholder_color: Color,
-    /// The handle [`Color`] of the pick list.
-    pub handle_color: Color,
-    /// The [`Background`] of the pick list.
-    pub background: Background,
-    /// The [`Border`] of the pick list.
-    pub border: Border,
-}
-
-/// A set of rules that dictate the style of a container.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default + Clone;
-
-    /// Produces the active [`Appearance`] of a pick list.
-    fn active(&self, style: &<Self as StyleSheet>::Style) -> Appearance;
-
-    /// Produces the hovered [`Appearance`] of a pick list.
-    fn hovered(&self, style: &<Self as StyleSheet>::Style) -> Appearance;
-}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index cac52acd..fd93f776 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -5,13 +5,8 @@ pub use palette::Palette;
 
 use crate::application;
 use crate::core::widget::text;
-use crate::menu;
-use crate::pick_list;
-
-use crate::core::Border;
 
 use std::fmt;
-use std::rc::Rc;
 use std::sync::Arc;
 
 /// A built-in theme.
@@ -271,107 +266,4 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     }
 }
 
-/// The style of a menu.
-#[derive(Clone, Default)]
-pub enum Menu {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Rc<dyn menu::StyleSheet<Style = Theme>>),
-}
-
-impl menu::StyleSheet for Theme {
-    type Style = Menu;
-
-    fn appearance(&self, style: &Self::Style) -> menu::Appearance {
-        match style {
-            Menu::Default => {
-                let palette = self.extended_palette();
-
-                menu::Appearance {
-                    text_color: palette.background.weak.text,
-                    background: palette.background.weak.color.into(),
-                    border: Border {
-                        width: 1.0,
-                        radius: 0.0.into(),
-                        color: palette.background.strong.color,
-                    },
-                    selected_text_color: palette.primary.strong.text,
-                    selected_background: palette.primary.strong.color.into(),
-                }
-            }
-            Menu::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl From<PickList> for Menu {
-    fn from(pick_list: PickList) -> Self {
-        match pick_list {
-            PickList::Default => Self::Default,
-            PickList::Custom(_, menu) => Self::Custom(menu),
-        }
-    }
-}
-
-/// The style of a pick list.
-#[derive(Clone, Default)]
-pub enum PickList {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(
-        Rc<dyn pick_list::StyleSheet<Style = Theme>>,
-        Rc<dyn menu::StyleSheet<Style = Theme>>,
-    ),
-}
-
-impl pick_list::StyleSheet for Theme {
-    type Style = PickList;
-
-    fn active(&self, style: &Self::Style) -> pick_list::Appearance {
-        match style {
-            PickList::Default => {
-                let palette = self.extended_palette();
-
-                pick_list::Appearance {
-                    text_color: palette.background.weak.text,
-                    background: palette.background.weak.color.into(),
-                    placeholder_color: palette.background.strong.color,
-                    handle_color: palette.background.weak.text,
-                    border: Border {
-                        radius: 2.0.into(),
-                        width: 1.0,
-                        color: palette.background.strong.color,
-                    },
-                }
-            }
-            PickList::Custom(custom, _) => custom.active(self),
-        }
-    }
-
-    fn hovered(&self, style: &Self::Style) -> pick_list::Appearance {
-        match style {
-            PickList::Default => {
-                let palette = self.extended_palette();
-
-                pick_list::Appearance {
-                    text_color: palette.background.weak.text,
-                    background: palette.background.weak.color.into(),
-                    placeholder_color: palette.background.strong.color,
-                    handle_color: palette.background.weak.text,
-                    border: Border {
-                        radius: 2.0.into(),
-                        width: 1.0,
-                        color: palette.primary.strong.color,
-                    },
-                }
-            }
-            PickList::Custom(custom, _) => custom.hovered(self),
-        }
-    }
-}
-
 impl text::StyleSheet for Theme {}
-- 
cgit 


From 34e7c6593a9e0f56cee5db18b7258717cf6bc11b Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 20:30:58 +0100
Subject: Use `Style` struct pattern instead of trait for all widgets

---
 style/src/theme.rs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'style')

diff --git a/style/src/theme.rs b/style/src/theme.rs
index fd93f776..41e76d99 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -4,7 +4,6 @@ pub mod palette;
 pub use palette::Palette;
 
 use crate::application;
-use crate::core::widget::text;
 
 use std::fmt;
 use std::sync::Arc;
@@ -265,5 +264,3 @@ impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
         (self)(style)
     }
 }
-
-impl text::StyleSheet for Theme {}
-- 
cgit 


From 7c4bf70023a8092faad9630c2c87fbf41bd6ab76 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Mar 2024 21:27:03 +0100
Subject: Simplify theming for `Application`

---
 style/src/application.rs | 23 -----------------------
 style/src/lib.rs         |  1 -
 style/src/theme.rs       | 45 ---------------------------------------------
 3 files changed, 69 deletions(-)
 delete mode 100644 style/src/application.rs

(limited to 'style')

diff --git a/style/src/application.rs b/style/src/application.rs
deleted file mode 100644
index e9a1f4ff..00000000
--- a/style/src/application.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Change the appearance of an application.
-use iced_core::Color;
-
-/// A set of rules that dictate the style of an application.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// Returns the [`Appearance`] of the application for the provided [`Style`].
-    ///
-    /// [`Style`]: Self::Style
-    fn appearance(&self, style: &Self::Style) -> Appearance;
-}
-
-/// The appearance of an application.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Appearance {
-    /// The background [`Color`] of the application.
-    pub background_color: Color,
-
-    /// The default text [`Color`] of the application.
-    pub text_color: Color,
-}
diff --git a/style/src/lib.rs b/style/src/lib.rs
index 1aea2d80..bc0e37e9 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -16,7 +16,6 @@
 )]
 pub use iced_core as core;
 
-pub mod application;
 pub mod theme;
 
 pub use theme::Theme;
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 41e76d99..21ba2a37 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -3,8 +3,6 @@ pub mod palette;
 
 pub use palette::Palette;
 
-use crate::application;
-
 use std::fmt;
 use std::sync::Arc;
 
@@ -221,46 +219,3 @@ impl fmt::Display for Custom {
         write!(f, "{}", self.name)
     }
 }
-
-/// The style of an application.
-#[derive(Default)]
-pub enum Application {
-    /// The default style.
-    #[default]
-    Default,
-    /// A custom style.
-    Custom(Box<dyn application::StyleSheet<Style = Theme>>),
-}
-
-impl Application {
-    /// Creates a custom [`Application`] style.
-    pub fn custom(
-        custom: impl application::StyleSheet<Style = Theme> + 'static,
-    ) -> Self {
-        Self::Custom(Box::new(custom))
-    }
-}
-
-impl application::StyleSheet for Theme {
-    type Style = Application;
-
-    fn appearance(&self, style: &Self::Style) -> application::Appearance {
-        let palette = self.extended_palette();
-
-        match style {
-            Application::Default => application::Appearance {
-                background_color: palette.background.base.color,
-                text_color: palette.background.base.text,
-            },
-            Application::Custom(custom) => custom.appearance(self),
-        }
-    }
-}
-
-impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> application::Appearance {
-        (self)(style)
-    }
-}
-- 
cgit 


From 905f2160e6eb7504f52d9bd62c7bfa42c8ec2902 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 7 Mar 2024 00:14:41 +0100
Subject: Move `Theme` type to `iced_core`

---
 style/Cargo.toml           |  18 --
 style/src/lib.rs           |  21 --
 style/src/theme.rs         | 221 ----------------
 style/src/theme/palette.rs | 625 ---------------------------------------------
 4 files changed, 885 deletions(-)
 delete mode 100644 style/Cargo.toml
 delete mode 100644 style/src/lib.rs
 delete mode 100644 style/src/theme.rs
 delete mode 100644 style/src/theme/palette.rs

(limited to 'style')

diff --git a/style/Cargo.toml b/style/Cargo.toml
deleted file mode 100644
index 3f00e787..00000000
--- a/style/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "iced_style"
-description = "The default set of styles of Iced"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-repository.workspace = true
-homepage.workspace = true
-categories.workspace = true
-keywords.workspace = true
-
-[dependencies]
-iced_core.workspace = true
-iced_core.features = ["palette"]
-
-palette.workspace = true
-once_cell.workspace = true
diff --git a/style/src/lib.rs b/style/src/lib.rs
deleted file mode 100644
index bc0e37e9..00000000
--- a/style/src/lib.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-//! The styling library of Iced.
-//!
-//! It contains a set of styles and stylesheets for most of the built-in
-//! widgets.
-//!
-//! ![The foundations of the Iced ecosystem](https://github.com/iced-rs/iced/blob/0525d76ff94e828b7b21634fa94a747022001c83/docs/graphs/foundations.png?raw=true)
-#![doc(
-    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
-)]
-#![forbid(unsafe_code, rust_2018_idioms)]
-#![deny(
-    unused_results,
-    // missing_docs,
-    unused_results,
-    rustdoc::broken_intra_doc_links
-)]
-pub use iced_core as core;
-
-pub mod theme;
-
-pub use theme::Theme;
diff --git a/style/src/theme.rs b/style/src/theme.rs
deleted file mode 100644
index 21ba2a37..00000000
--- a/style/src/theme.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-//! Use the built-in theme and styles.
-pub mod palette;
-
-pub use palette::Palette;
-
-use std::fmt;
-use std::sync::Arc;
-
-/// A built-in theme.
-#[derive(Debug, Clone, PartialEq, Default)]
-pub enum Theme {
-    /// The built-in light variant.
-    #[default]
-    Light,
-    /// The built-in dark variant.
-    Dark,
-    /// The built-in Dracula variant.
-    Dracula,
-    /// The built-in Nord variant.
-    Nord,
-    /// The built-in Solarized Light variant.
-    SolarizedLight,
-    /// The built-in Solarized Dark variant.
-    SolarizedDark,
-    /// The built-in Gruvbox Light variant.
-    GruvboxLight,
-    /// The built-in Gruvbox Dark variant.
-    GruvboxDark,
-    /// The built-in Catppuccin Latte variant.
-    CatppuccinLatte,
-    /// The built-in Catppuccin Frappé variant.
-    CatppuccinFrappe,
-    /// The built-in Catppuccin Macchiato variant.
-    CatppuccinMacchiato,
-    /// The built-in Catppuccin Mocha variant.
-    CatppuccinMocha,
-    /// The built-in Tokyo Night variant.
-    TokyoNight,
-    /// The built-in Tokyo Night Storm variant.
-    TokyoNightStorm,
-    /// The built-in Tokyo Night Light variant.
-    TokyoNightLight,
-    /// The built-in Kanagawa Wave variant.
-    KanagawaWave,
-    /// The built-in Kanagawa Dragon variant.
-    KanagawaDragon,
-    /// The built-in Kanagawa Lotus variant.
-    KanagawaLotus,
-    /// The built-in Moonfly variant.
-    Moonfly,
-    /// The built-in Nightfly variant.
-    Nightfly,
-    /// The built-in Oxocarbon variant.
-    Oxocarbon,
-    /// A [`Theme`] that uses a [`Custom`] palette.
-    Custom(Arc<Custom>),
-}
-
-impl Theme {
-    /// A list with all the defined themes.
-    pub const ALL: &'static [Self] = &[
-        Self::Light,
-        Self::Dark,
-        Self::Dracula,
-        Self::Nord,
-        Self::SolarizedLight,
-        Self::SolarizedDark,
-        Self::GruvboxLight,
-        Self::GruvboxDark,
-        Self::CatppuccinLatte,
-        Self::CatppuccinFrappe,
-        Self::CatppuccinMacchiato,
-        Self::CatppuccinMocha,
-        Self::TokyoNight,
-        Self::TokyoNightStorm,
-        Self::TokyoNightLight,
-        Self::KanagawaWave,
-        Self::KanagawaDragon,
-        Self::KanagawaLotus,
-        Self::Moonfly,
-        Self::Nightfly,
-        Self::Oxocarbon,
-    ];
-
-    /// Creates a new custom [`Theme`] from the given [`Palette`].
-    pub fn custom(name: String, palette: Palette) -> Self {
-        Self::custom_with_fn(name, palette, palette::Extended::generate)
-    }
-
-    /// Creates a new custom [`Theme`] from the given [`Palette`], with
-    /// a custom generator of a [`palette::Extended`].
-    pub fn custom_with_fn(
-        name: String,
-        palette: Palette,
-        generate: impl FnOnce(Palette) -> palette::Extended,
-    ) -> Self {
-        Self::Custom(Arc::new(Custom::with_fn(name, palette, generate)))
-    }
-
-    /// Returns the [`Palette`] of the [`Theme`].
-    pub fn palette(&self) -> Palette {
-        match self {
-            Self::Light => Palette::LIGHT,
-            Self::Dark => Palette::DARK,
-            Self::Dracula => Palette::DRACULA,
-            Self::Nord => Palette::NORD,
-            Self::SolarizedLight => Palette::SOLARIZED_LIGHT,
-            Self::SolarizedDark => Palette::SOLARIZED_DARK,
-            Self::GruvboxLight => Palette::GRUVBOX_LIGHT,
-            Self::GruvboxDark => Palette::GRUVBOX_DARK,
-            Self::CatppuccinLatte => Palette::CATPPUCCIN_LATTE,
-            Self::CatppuccinFrappe => Palette::CATPPUCCIN_FRAPPE,
-            Self::CatppuccinMacchiato => Palette::CATPPUCCIN_MACCHIATO,
-            Self::CatppuccinMocha => Palette::CATPPUCCIN_MOCHA,
-            Self::TokyoNight => Palette::TOKYO_NIGHT,
-            Self::TokyoNightStorm => Palette::TOKYO_NIGHT_STORM,
-            Self::TokyoNightLight => Palette::TOKYO_NIGHT_LIGHT,
-            Self::KanagawaWave => Palette::KANAGAWA_WAVE,
-            Self::KanagawaDragon => Palette::KANAGAWA_DRAGON,
-            Self::KanagawaLotus => Palette::KANAGAWA_LOTUS,
-            Self::Moonfly => Palette::MOONFLY,
-            Self::Nightfly => Palette::NIGHTFLY,
-            Self::Oxocarbon => Palette::OXOCARBON,
-            Self::Custom(custom) => custom.palette,
-        }
-    }
-
-    /// Returns the [`palette::Extended`] of the [`Theme`].
-    pub fn extended_palette(&self) -> &palette::Extended {
-        match self {
-            Self::Light => &palette::EXTENDED_LIGHT,
-            Self::Dark => &palette::EXTENDED_DARK,
-            Self::Dracula => &palette::EXTENDED_DRACULA,
-            Self::Nord => &palette::EXTENDED_NORD,
-            Self::SolarizedLight => &palette::EXTENDED_SOLARIZED_LIGHT,
-            Self::SolarizedDark => &palette::EXTENDED_SOLARIZED_DARK,
-            Self::GruvboxLight => &palette::EXTENDED_GRUVBOX_LIGHT,
-            Self::GruvboxDark => &palette::EXTENDED_GRUVBOX_DARK,
-            Self::CatppuccinLatte => &palette::EXTENDED_CATPPUCCIN_LATTE,
-            Self::CatppuccinFrappe => &palette::EXTENDED_CATPPUCCIN_FRAPPE,
-            Self::CatppuccinMacchiato => {
-                &palette::EXTENDED_CATPPUCCIN_MACCHIATO
-            }
-            Self::CatppuccinMocha => &palette::EXTENDED_CATPPUCCIN_MOCHA,
-            Self::TokyoNight => &palette::EXTENDED_TOKYO_NIGHT,
-            Self::TokyoNightStorm => &palette::EXTENDED_TOKYO_NIGHT_STORM,
-            Self::TokyoNightLight => &palette::EXTENDED_TOKYO_NIGHT_LIGHT,
-            Self::KanagawaWave => &palette::EXTENDED_KANAGAWA_WAVE,
-            Self::KanagawaDragon => &palette::EXTENDED_KANAGAWA_DRAGON,
-            Self::KanagawaLotus => &palette::EXTENDED_KANAGAWA_LOTUS,
-            Self::Moonfly => &palette::EXTENDED_MOONFLY,
-            Self::Nightfly => &palette::EXTENDED_NIGHTFLY,
-            Self::Oxocarbon => &palette::EXTENDED_OXOCARBON,
-            Self::Custom(custom) => &custom.extended,
-        }
-    }
-}
-
-impl fmt::Display for Theme {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Light => write!(f, "Light"),
-            Self::Dark => write!(f, "Dark"),
-            Self::Dracula => write!(f, "Dracula"),
-            Self::Nord => write!(f, "Nord"),
-            Self::SolarizedLight => write!(f, "Solarized Light"),
-            Self::SolarizedDark => write!(f, "Solarized Dark"),
-            Self::GruvboxLight => write!(f, "Gruvbox Light"),
-            Self::GruvboxDark => write!(f, "Gruvbox Dark"),
-            Self::CatppuccinLatte => write!(f, "Catppuccin Latte"),
-            Self::CatppuccinFrappe => write!(f, "Catppuccin Frappé"),
-            Self::CatppuccinMacchiato => write!(f, "Catppuccin Macchiato"),
-            Self::CatppuccinMocha => write!(f, "Catppuccin Mocha"),
-            Self::TokyoNight => write!(f, "Tokyo Night"),
-            Self::TokyoNightStorm => write!(f, "Tokyo Night Storm"),
-            Self::TokyoNightLight => write!(f, "Tokyo Night Light"),
-            Self::KanagawaWave => write!(f, "Kanagawa Wave"),
-            Self::KanagawaDragon => write!(f, "Kanagawa Dragon"),
-            Self::KanagawaLotus => write!(f, "Kanagawa Lotus"),
-            Self::Moonfly => write!(f, "Moonfly"),
-            Self::Nightfly => write!(f, "Nightfly"),
-            Self::Oxocarbon => write!(f, "Oxocarbon"),
-            Self::Custom(custom) => custom.fmt(f),
-        }
-    }
-}
-
-/// A [`Theme`] with a customized [`Palette`].
-#[derive(Debug, Clone, PartialEq)]
-pub struct Custom {
-    name: String,
-    palette: Palette,
-    extended: palette::Extended,
-}
-
-impl Custom {
-    /// Creates a [`Custom`] theme from the given [`Palette`].
-    pub fn new(name: String, palette: Palette) -> Self {
-        Self::with_fn(name, palette, palette::Extended::generate)
-    }
-
-    /// Creates a [`Custom`] theme from the given [`Palette`] with
-    /// a custom generator of a [`palette::Extended`].
-    pub fn with_fn(
-        name: String,
-        palette: Palette,
-        generate: impl FnOnce(Palette) -> palette::Extended,
-    ) -> Self {
-        Self {
-            name,
-            palette,
-            extended: generate(palette),
-        }
-    }
-}
-
-impl fmt::Display for Custom {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.name)
-    }
-}
diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs
deleted file mode 100644
index 15a964cd..00000000
--- a/style/src/theme/palette.rs
+++ /dev/null
@@ -1,625 +0,0 @@
-//! Define the colors of a theme.
-use crate::core::{color, Color};
-
-use once_cell::sync::Lazy;
-use palette::color_difference::Wcag21RelativeContrast;
-use palette::rgb::Rgb;
-use palette::{FromColor, Hsl, Mix};
-
-/// A color palette.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Palette {
-    /// The background [`Color`] of the [`Palette`].
-    pub background: Color,
-    /// The text [`Color`] of the [`Palette`].
-    pub text: Color,
-    /// The primary [`Color`] of the [`Palette`].
-    pub primary: Color,
-    /// The success [`Color`] of the [`Palette`].
-    pub success: Color,
-    /// The danger [`Color`] of the [`Palette`].
-    pub danger: Color,
-}
-
-impl Palette {
-    /// The built-in light variant of a [`Palette`].
-    pub const LIGHT: Self = Self {
-        background: Color::WHITE,
-        text: Color::BLACK,
-        primary: Color::from_rgb(
-            0x5E as f32 / 255.0,
-            0x7C as f32 / 255.0,
-            0xE2 as f32 / 255.0,
-        ),
-        success: Color::from_rgb(
-            0x12 as f32 / 255.0,
-            0x66 as f32 / 255.0,
-            0x4F as f32 / 255.0,
-        ),
-        danger: Color::from_rgb(
-            0xC3 as f32 / 255.0,
-            0x42 as f32 / 255.0,
-            0x3F as f32 / 255.0,
-        ),
-    };
-
-    /// The built-in dark variant of a [`Palette`].
-    pub const DARK: Self = Self {
-        background: Color::from_rgb(
-            0x20 as f32 / 255.0,
-            0x22 as f32 / 255.0,
-            0x25 as f32 / 255.0,
-        ),
-        text: Color::from_rgb(0.90, 0.90, 0.90),
-        primary: Color::from_rgb(
-            0x5E as f32 / 255.0,
-            0x7C as f32 / 255.0,
-            0xE2 as f32 / 255.0,
-        ),
-        success: Color::from_rgb(
-            0x12 as f32 / 255.0,
-            0x66 as f32 / 255.0,
-            0x4F as f32 / 255.0,
-        ),
-        danger: Color::from_rgb(
-            0xC3 as f32 / 255.0,
-            0x42 as f32 / 255.0,
-            0x3F as f32 / 255.0,
-        ),
-    };
-
-    /// The built-in [Dracula] variant of a [`Palette`].
-    ///
-    /// [Dracula]: https://draculatheme.com
-    pub const DRACULA: Self = Self {
-        background: color!(0x282A36), // BACKGROUND
-        text: color!(0xf8f8f2),       // FOREGROUND
-        primary: color!(0xbd93f9),    // PURPLE
-        success: color!(0x50fa7b),    // GREEN
-        danger: color!(0xff5555),     // RED
-    };
-
-    /// The built-in [Nord] variant of a [`Palette`].
-    ///
-    /// [Nord]: https://www.nordtheme.com/docs/colors-and-palettes
-    pub const NORD: Self = Self {
-        background: color!(0x2e3440), // nord0
-        text: color!(0xeceff4),       // nord6
-        primary: color!(0x8fbcbb),    // nord7
-        success: color!(0xa3be8c),    // nord14
-        danger: color!(0xbf616a),     // nord11
-    };
-
-    /// The built-in [Solarized] Light variant of a [`Palette`].
-    ///
-    /// [Solarized]: https://ethanschoonover.com/solarized
-    pub const SOLARIZED_LIGHT: Self = Self {
-        background: color!(0xfdf6e3), // base3
-        text: color!(0x657b83),       // base00
-        primary: color!(0x2aa198),    // cyan
-        success: color!(0x859900),    // green
-        danger: color!(0xdc322f),     // red
-    };
-
-    /// The built-in [Solarized] Dark variant of a [`Palette`].
-    ///
-    /// [Solarized]: https://ethanschoonover.com/solarized
-    pub const SOLARIZED_DARK: Self = Self {
-        background: color!(0x002b36), // base03
-        text: color!(0x839496),       // base0
-        primary: color!(0x2aa198),    // cyan
-        success: color!(0x859900),    // green
-        danger: color!(0xdc322f),     // red
-    };
-
-    /// The built-in [Gruvbox] Light variant of a [`Palette`].
-    ///
-    /// [Gruvbox]: https://github.com/morhetz/gruvbox
-    pub const GRUVBOX_LIGHT: Self = Self {
-        background: color!(0xfbf1c7), // light BG_0
-        text: color!(0x282828),       // light FG0_29
-        primary: color!(0x458588),    // light BLUE_4
-        success: color!(0x98971a),    // light GREEN_2
-        danger: color!(0xcc241d),     // light RED_1
-    };
-
-    /// The built-in [Gruvbox] Dark variant of a [`Palette`].
-    ///
-    /// [Gruvbox]: https://github.com/morhetz/gruvbox
-    pub const GRUVBOX_DARK: Self = Self {
-        background: color!(0x282828), // dark BG_0
-        text: color!(0xfbf1c7),       // dark FG0_29
-        primary: color!(0x458588),    // dark BLUE_4
-        success: color!(0x98971a),    // dark GREEN_2
-        danger: color!(0xcc241d),     // dark RED_1
-    };
-
-    /// The built-in [Catppuccin] Latte variant of a [`Palette`].
-    ///
-    /// [Catppuccin]: https://github.com/catppuccin/catppuccin
-    pub const CATPPUCCIN_LATTE: Self = Self {
-        background: color!(0xeff1f5), // Base
-        text: color!(0x4c4f69),       // Text
-        primary: color!(0x1e66f5),    // Blue
-        success: color!(0x40a02b),    // Green
-        danger: color!(0xd20f39),     // Red
-    };
-
-    /// The built-in [Catppuccin] Frappé variant of a [`Palette`].
-    ///
-    /// [Catppuccin]: https://github.com/catppuccin/catppuccin
-    pub const CATPPUCCIN_FRAPPE: Self = Self {
-        background: color!(0x303446), // Base
-        text: color!(0xc6d0f5),       // Text
-        primary: color!(0x8caaee),    // Blue
-        success: color!(0xa6d189),    // Green
-        danger: color!(0xe78284),     // Red
-    };
-
-    /// The built-in [Catppuccin] Macchiato variant of a [`Palette`].
-    ///
-    /// [Catppuccin]: https://github.com/catppuccin/catppuccin
-    pub const CATPPUCCIN_MACCHIATO: Self = Self {
-        background: color!(0x24273a), // Base
-        text: color!(0xcad3f5),       // Text
-        primary: color!(0x8aadf4),    // Blue
-        success: color!(0xa6da95),    // Green
-        danger: color!(0xed8796),     // Red
-    };
-
-    /// The built-in [Catppuccin] Mocha variant of a [`Palette`].
-    ///
-    /// [Catppuccin]: https://github.com/catppuccin/catppuccin
-    pub const CATPPUCCIN_MOCHA: Self = Self {
-        background: color!(0x1e1e2e), // Base
-        text: color!(0xcdd6f4),       // Text
-        primary: color!(0x89b4fa),    // Blue
-        success: color!(0xa6e3a1),    // Green
-        danger: color!(0xf38ba8),     // Red
-    };
-
-    /// The built-in [Tokyo Night] variant of a [`Palette`].
-    ///
-    /// [Tokyo Night]: https://github.com/enkia/tokyo-night-vscode-theme
-    pub const TOKYO_NIGHT: Self = Self {
-        background: color!(0x1a1b26), // Background (Night)
-        text: color!(0x9aa5ce),       // Text
-        primary: color!(0x2ac3de),    // Blue
-        success: color!(0x9ece6a),    // Green
-        danger: color!(0xf7768e),     // Red
-    };
-
-    /// The built-in [Tokyo Night] Storm variant of a [`Palette`].
-    ///
-    /// [Tokyo Night]: https://github.com/enkia/tokyo-night-vscode-theme
-    pub const TOKYO_NIGHT_STORM: Self = Self {
-        background: color!(0x24283b), // Background (Storm)
-        text: color!(0x9aa5ce),       // Text
-        primary: color!(0x2ac3de),    // Blue
-        success: color!(0x9ece6a),    // Green
-        danger: color!(0xf7768e),     // Red
-    };
-
-    /// The built-in [Tokyo Night] Light variant of a [`Palette`].
-    ///
-    /// [Tokyo Night]: https://github.com/enkia/tokyo-night-vscode-theme
-    pub const TOKYO_NIGHT_LIGHT: Self = Self {
-        background: color!(0xd5d6db), // Background
-        text: color!(0x565a6e),       // Text
-        primary: color!(0x166775),    // Blue
-        success: color!(0x485e30),    // Green
-        danger: color!(0x8c4351),     // Red
-    };
-
-    /// The built-in [Kanagawa] Wave variant of a [`Palette`].
-    ///
-    /// [Kanagawa]: https://github.com/rebelot/kanagawa.nvim
-    pub const KANAGAWA_WAVE: Self = Self {
-        background: color!(0x363646), // Sumi Ink 3
-        text: color!(0xCD7BA),        // Fuji White
-        primary: color!(0x2D4F67),    // Wave Blue 2
-        success: color!(0x76946A),    // Autumn Green
-        danger: color!(0xC34043),     // Autumn Red
-    };
-
-    /// The built-in [Kanagawa] Dragon variant of a [`Palette`].
-    ///
-    /// [Kanagawa]: https://github.com/rebelot/kanagawa.nvim
-    pub const KANAGAWA_DRAGON: Self = Self {
-        background: color!(0x181616), // Dragon Black 3
-        text: color!(0xc5c9c5),       // Dragon White
-        primary: color!(0x223249),    // Wave Blue 1
-        success: color!(0x8a9a7b),    // Dragon Green 2
-        danger: color!(0xc4746e),     // Dragon Red
-    };
-
-    /// The built-in [Kanagawa] Lotus variant of a [`Palette`].
-    ///
-    /// [Kanagawa]: https://github.com/rebelot/kanagawa.nvim
-    pub const KANAGAWA_LOTUS: Self = Self {
-        background: color!(0xf2ecbc), // Lotus White 3
-        text: color!(0x545464),       // Lotus Ink 1
-        primary: color!(0xc9cbd1),    // Lotus Violet 3
-        success: color!(0x6f894e),    // Lotus Green
-        danger: color!(0xc84053),     // Lotus Red
-    };
-
-    /// The built-in [Moonfly] variant of a [`Palette`].
-    ///
-    /// [Moonfly]: https://github.com/bluz71/vim-moonfly-colors
-    pub const MOONFLY: Self = Self {
-        background: color!(0x080808), // Background
-        text: color!(0xbdbdbd),       // Foreground
-        primary: color!(0x80a0ff),    // Blue (normal)
-        success: color!(0x8cc85f),    // Green (normal)
-        danger: color!(0xff5454),     // Red (normal)
-    };
-
-    /// The built-in [Nightfly] variant of a [`Palette`].
-    ///
-    /// [Nightfly]: https://github.com/bluz71/vim-nightfly-colors
-    pub const NIGHTFLY: Self = Self {
-        background: color!(0x011627), // Background
-        text: color!(0xbdc1c6),       // Foreground
-        primary: color!(0x82aaff),    // Blue (normal)
-        success: color!(0xa1cd5e),    // Green (normal)
-        danger: color!(0xfc514e),     // Red (normal)
-    };
-
-    /// The built-in [Oxocarbon] variant of a [`Palette`].
-    ///
-    /// [Oxocarbon]: https://github.com/nyoom-engineering/oxocarbon.nvim
-    pub const OXOCARBON: Self = Self {
-        background: color!(0x232323),
-        text: color!(0xd0d0d0),
-        primary: color!(0x00b4ff),
-        success: color!(0x00c15a),
-        danger: color!(0xf62d0f),
-    };
-}
-
-/// An extended set of colors generated from a [`Palette`].
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Extended {
-    /// The set of background colors.
-    pub background: Background,
-    /// The set of primary colors.
-    pub primary: Primary,
-    /// The set of secondary colors.
-    pub secondary: Secondary,
-    /// The set of success colors.
-    pub success: Success,
-    /// The set of danger colors.
-    pub danger: Danger,
-    /// Whether the palette is dark or not.
-    pub is_dark: bool,
-}
-
-/// The built-in light variant of an [`Extended`] palette.
-pub static EXTENDED_LIGHT: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::LIGHT));
-
-/// The built-in dark variant of an [`Extended`] palette.
-pub static EXTENDED_DARK: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::DARK));
-
-/// The built-in Dracula variant of an [`Extended`] palette.
-pub static EXTENDED_DRACULA: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::DRACULA));
-
-/// The built-in Nord variant of an [`Extended`] palette.
-pub static EXTENDED_NORD: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::NORD));
-
-/// The built-in Solarized Light variant of an [`Extended`] palette.
-pub static EXTENDED_SOLARIZED_LIGHT: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::SOLARIZED_LIGHT));
-
-/// The built-in Solarized Dark variant of an [`Extended`] palette.
-pub static EXTENDED_SOLARIZED_DARK: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::SOLARIZED_DARK));
-
-/// The built-in Gruvbox Light variant of an [`Extended`] palette.
-pub static EXTENDED_GRUVBOX_LIGHT: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::GRUVBOX_LIGHT));
-
-/// The built-in Gruvbox Dark variant of an [`Extended`] palette.
-pub static EXTENDED_GRUVBOX_DARK: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::GRUVBOX_DARK));
-
-/// The built-in Catppuccin Latte variant of an [`Extended`] palette.
-pub static EXTENDED_CATPPUCCIN_LATTE: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_LATTE));
-
-/// The built-in Catppuccin Frappé variant of an [`Extended`] palette.
-pub static EXTENDED_CATPPUCCIN_FRAPPE: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_FRAPPE));
-
-/// The built-in Catppuccin Macchiato variant of an [`Extended`] palette.
-pub static EXTENDED_CATPPUCCIN_MACCHIATO: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_MACCHIATO));
-
-/// The built-in Catppuccin Mocha variant of an [`Extended`] palette.
-pub static EXTENDED_CATPPUCCIN_MOCHA: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::CATPPUCCIN_MOCHA));
-
-/// The built-in Tokyo Night variant of an [`Extended`] palette.
-pub static EXTENDED_TOKYO_NIGHT: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT));
-
-/// The built-in Tokyo Night Storm variant of an [`Extended`] palette.
-pub static EXTENDED_TOKYO_NIGHT_STORM: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT_STORM));
-
-/// The built-in Tokyo Night variant of an [`Extended`] palette.
-pub static EXTENDED_TOKYO_NIGHT_LIGHT: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::TOKYO_NIGHT_LIGHT));
-
-/// The built-in Kanagawa Wave variant of an [`Extended`] palette.
-pub static EXTENDED_KANAGAWA_WAVE: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::KANAGAWA_WAVE));
-
-/// The built-in Kanagawa Dragon variant of an [`Extended`] palette.
-pub static EXTENDED_KANAGAWA_DRAGON: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::KANAGAWA_DRAGON));
-
-/// The built-in Kanagawa Lotus variant of an [`Extended`] palette.
-pub static EXTENDED_KANAGAWA_LOTUS: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::KANAGAWA_LOTUS));
-
-/// The built-in Moonfly variant of an [`Extended`] palette.
-pub static EXTENDED_MOONFLY: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::MOONFLY));
-
-/// The built-in Nightfly variant of an [`Extended`] palette.
-pub static EXTENDED_NIGHTFLY: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::NIGHTFLY));
-
-/// The built-in Oxocarbon variant of an [`Extended`] palette.
-pub static EXTENDED_OXOCARBON: Lazy<Extended> =
-    Lazy::new(|| Extended::generate(Palette::OXOCARBON));
-
-impl Extended {
-    /// Generates an [`Extended`] palette from a simple [`Palette`].
-    pub fn generate(palette: Palette) -> Self {
-        Self {
-            background: Background::new(palette.background, palette.text),
-            primary: Primary::generate(
-                palette.primary,
-                palette.background,
-                palette.text,
-            ),
-            secondary: Secondary::generate(palette.background, palette.text),
-            success: Success::generate(
-                palette.success,
-                palette.background,
-                palette.text,
-            ),
-            danger: Danger::generate(
-                palette.danger,
-                palette.background,
-                palette.text,
-            ),
-            is_dark: is_dark(palette.background),
-        }
-    }
-}
-
-/// A pair of background and text colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Pair {
-    /// The background color.
-    pub color: Color,
-
-    /// The text color.
-    ///
-    /// It's guaranteed to be readable on top of the background [`color`].
-    ///
-    /// [`color`]: Self::color
-    pub text: Color,
-}
-
-impl Pair {
-    /// Creates a new [`Pair`] from a background [`Color`] and some text [`Color`].
-    pub fn new(color: Color, text: Color) -> Self {
-        Self {
-            color,
-            text: readable(color, text),
-        }
-    }
-}
-
-/// A set of background colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Background {
-    /// The base background color.
-    pub base: Pair,
-    /// A weaker version of the base background color.
-    pub weak: Pair,
-    /// A stronger version of the base background color.
-    pub strong: Pair,
-}
-
-impl Background {
-    /// Generates a set of [`Background`] colors from the base and text colors.
-    pub fn new(base: Color, text: Color) -> Self {
-        let weak = mix(base, text, 0.15);
-        let strong = mix(base, text, 0.40);
-
-        Self {
-            base: Pair::new(base, text),
-            weak: Pair::new(weak, text),
-            strong: Pair::new(strong, text),
-        }
-    }
-}
-
-/// A set of primary colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Primary {
-    /// The base primary color.
-    pub base: Pair,
-    /// A weaker version of the base primary color.
-    pub weak: Pair,
-    /// A stronger version of the base primary color.
-    pub strong: Pair,
-}
-
-impl Primary {
-    /// Generates a set of [`Primary`] colors from the base, background, and text colors.
-    pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
-        let strong = deviate(base, 0.1);
-
-        Self {
-            base: Pair::new(base, text),
-            weak: Pair::new(weak, text),
-            strong: Pair::new(strong, text),
-        }
-    }
-}
-
-/// A set of secondary colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Secondary {
-    /// The base secondary color.
-    pub base: Pair,
-    /// A weaker version of the base secondary color.
-    pub weak: Pair,
-    /// A stronger version of the base secondary color.
-    pub strong: Pair,
-}
-
-impl Secondary {
-    /// Generates a set of [`Secondary`] colors from the base and text colors.
-    pub fn generate(base: Color, text: Color) -> Self {
-        let base = mix(base, text, 0.2);
-        let weak = mix(base, text, 0.1);
-        let strong = mix(base, text, 0.3);
-
-        Self {
-            base: Pair::new(base, text),
-            weak: Pair::new(weak, text),
-            strong: Pair::new(strong, text),
-        }
-    }
-}
-
-/// A set of success colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Success {
-    /// The base success color.
-    pub base: Pair,
-    /// A weaker version of the base success color.
-    pub weak: Pair,
-    /// A stronger version of the base success color.
-    pub strong: Pair,
-}
-
-impl Success {
-    /// Generates a set of [`Success`] colors from the base, background, and text colors.
-    pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
-        let strong = deviate(base, 0.1);
-
-        Self {
-            base: Pair::new(base, text),
-            weak: Pair::new(weak, text),
-            strong: Pair::new(strong, text),
-        }
-    }
-}
-
-/// A set of danger colors.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Danger {
-    /// The base danger color.
-    pub base: Pair,
-    /// A weaker version of the base danger color.
-    pub weak: Pair,
-    /// A stronger version of the base danger color.
-    pub strong: Pair,
-}
-
-impl Danger {
-    /// Generates a set of [`Danger`] colors from the base, background, and text colors.
-    pub fn generate(base: Color, background: Color, text: Color) -> Self {
-        let weak = mix(base, background, 0.4);
-        let strong = deviate(base, 0.1);
-
-        Self {
-            base: Pair::new(base, text),
-            weak: Pair::new(weak, text),
-            strong: Pair::new(strong, text),
-        }
-    }
-}
-
-fn darken(color: Color, amount: f32) -> Color {
-    let mut hsl = to_hsl(color);
-
-    hsl.lightness = if hsl.lightness - amount < 0.0 {
-        0.0
-    } else {
-        hsl.lightness - amount
-    };
-
-    from_hsl(hsl)
-}
-
-fn lighten(color: Color, amount: f32) -> Color {
-    let mut hsl = to_hsl(color);
-
-    hsl.lightness = if hsl.lightness + amount > 1.0 {
-        1.0
-    } else {
-        hsl.lightness + amount
-    };
-
-    from_hsl(hsl)
-}
-
-fn deviate(color: Color, amount: f32) -> Color {
-    if is_dark(color) {
-        lighten(color, amount)
-    } else {
-        darken(color, amount)
-    }
-}
-
-fn mix(a: Color, b: Color, factor: f32) -> Color {
-    let a_lin = Rgb::from(a).into_linear();
-    let b_lin = Rgb::from(b).into_linear();
-
-    let mixed = a_lin.mix(b_lin, factor);
-    Rgb::from_linear(mixed).into()
-}
-
-fn readable(background: Color, text: Color) -> Color {
-    if is_readable(background, text) {
-        text
-    } else if is_dark(background) {
-        Color::WHITE
-    } else {
-        Color::BLACK
-    }
-}
-
-fn is_dark(color: Color) -> bool {
-    to_hsl(color).lightness < 0.6
-}
-
-fn is_readable(a: Color, b: Color) -> bool {
-    let a_srgb = Rgb::from(a);
-    let b_srgb = Rgb::from(b);
-
-    a_srgb.has_enhanced_contrast_text(b_srgb)
-}
-
-fn to_hsl(color: Color) -> Hsl {
-    Hsl::from_color(Rgb::from(color))
-}
-
-fn from_hsl(hsl: Hsl) -> Color {
-    Rgb::from_color(hsl).into()
-}
-- 
cgit