From 833538ee7f3a60a839304762dfc29b0881d19094 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 7 Mar 2024 20:11:32 +0100
Subject: Leverage `DefaultStyle` traits instead of `Default`

---
 widget/src/pane_grid/content.rs   | 8 ++++----
 widget/src/pane_grid/title_bar.rs | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'widget/src/pane_grid')

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 {
-- 
cgit