Simplify theming for ProgressBar widget

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;

style/src/progress_bar.rs

@@ -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;
-}

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 {