Leverage `DefaultStyle` traits instead of `Default`

3 files changed, 22 insertions, 25 deletions

diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 5403b2f5..d60d5e3b 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -126,7 +126,7 @@ where
         view: impl Fn(Pane, &'a T, bool) -> Content<'a, Message, Theme, Renderer>,
     ) -> Self
     where
-        Style<Theme>: Default,
+        Theme: DefaultStyle,
     {
         let contents = if let Some((pane, pane_state)) =
             state.maximized.and_then(|pane| {
@@ -158,7 +158,7 @@ where
             on_click: None,
             on_drag: None,
             on_resize: None,
-            style: Style::default(),
+            style: Theme::default_style(),
         }
     }
 
@@ -219,7 +219,7 @@ where
 
     /// Sets the style of the [`PaneGrid`].
     pub fn style(mut self, style: fn(&Theme) -> Appearance) -> Self {
-        self.style = Style(style);
+        self.style = style;
         self
     }
 
@@ -677,7 +677,7 @@ where
             None
         };
 
-        let appearance = (self.style.0)(theme);
+        let appearance = (self.style)(theme);
 
         for ((id, (content, tree)), pane_layout) in
             contents.zip(layout.children())
@@ -1146,26 +1146,23 @@ pub struct Line {
 }
 
 /// The style of a [`PaneGrid`].
-#[derive(Debug, PartialEq, Eq)]
-pub struct Style<Theme>(fn(&Theme) -> Appearance);
+pub type Style<Theme> = fn(&Theme) -> Appearance;
 
-impl<Theme> Clone for Style<Theme> {
-    fn clone(&self) -> Self {
-        *self
-    }
+/// The default style of a [`PaneGrid`].
+pub trait DefaultStyle {
+    /// Returns the default style of a [`PaneGrid`].
+    fn default_style() -> Style<Self>;
 }
 
-impl<Theme> Copy for Style<Theme> {}
-
-impl Default for Style<Theme> {
-    fn default() -> Self {
-        Style(default)
+impl DefaultStyle for Theme {
+    fn default_style() -> Style<Self> {
+        default
     }
 }
 
-impl<Theme> From<fn(&Theme) -> Appearance> for Style<Theme> {
-    fn from(f: fn(&Theme) -> Appearance) -> Self {
-        Style(f)
+impl DefaultStyle for Appearance {
+    fn default_style() -> Style<Self> {
+        |appearance| *appearance
     }
 }
 
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index ce29e8d0..aecec777 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -34,12 +34,12 @@ where
     /// Creates a new [`Content`] with the provided body.
     pub fn new(body: impl Into<Element<'a, Message, Theme, Renderer>>) -> Self
     where
-        container::Style<Theme>: Default,
+        Theme: container::DefaultStyle,
     {
         Self {
             title_bar: None,
             body: body.into(),
-            style: container::Style::default(),
+            style: Theme::default_style(),
         }
     }
 
@@ -114,7 +114,7 @@ where
                     container::Status::Idle
                 };
 
-                self.style.resolve(theme, status)
+                (self.style)(theme, status)
             };
 
             container::draw_background(renderer, &style, bounds);
@@ -403,8 +403,8 @@ impl<'a, T, Message, Theme, Renderer> From<T>
     for Content<'a, Message, Theme, Renderer>
 where
     T: Into<Element<'a, Message, Theme, Renderer>>,
+    Theme: container::DefaultStyle,
     Renderer: crate::core::Renderer,
-    container::Style<Theme>: Default,
 {
     fn from(element: T) -> Self {
         Self::new(element)
diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index b1cdcde3..37f0f160 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -37,14 +37,14 @@ where
         content: impl Into<Element<'a, Message, Theme, Renderer>>,
     ) -> Self
     where
-        container::Style<Theme>: Default,
+        Theme: container::DefaultStyle,
     {
         Self {
             content: content.into(),
             controls: None,
             padding: Padding::ZERO,
             always_show_controls: false,
-            style: container::Style::default(),
+            style: Theme::default_style(),
         }
     }
 
@@ -138,7 +138,7 @@ where
                 container::Status::Idle
             };
 
-            self.style.resolve(theme, status)
+            (self.style)(theme, status)
         };
 
         let inherited_style = renderer::Style {