From 7a50e9e8fbb8d37e53a42c1dd5936b97463ead53 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 21 Jan 2024 17:56:01 +0100
Subject: Convert `Renderer::Theme` to generic `Widget` type

---
 core/src/overlay/element.rs | 35 ++++++++++++++++++++---------------
 core/src/overlay/group.rs   | 38 +++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 32 deletions(-)

(limited to 'core/src/overlay')

diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
index a279fe28..c34ab862 100644
--- a/core/src/overlay/element.rs
+++ b/core/src/overlay/element.rs
@@ -11,20 +11,20 @@ use std::any::Any;
 
 /// A generic [`Overlay`].
 #[allow(missing_debug_implementations)]
-pub struct Element<'a, Message, Renderer> {
+pub struct Element<'a, Message, Theme, Renderer> {
     position: Point,
     translation: Vector,
-    overlay: Box<dyn Overlay<Message, Renderer> + 'a>,
+    overlay: Box<dyn Overlay<Message, Theme, Renderer> + 'a>,
 }
 
-impl<'a, Message, Renderer> Element<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Element<'a, Message, Theme, Renderer>
 where
     Renderer: crate::Renderer,
 {
     /// Creates a new [`Element`] containing the given [`Overlay`].
     pub fn new(
         position: Point,
-        overlay: Box<dyn Overlay<Message, Renderer> + 'a>,
+        overlay: Box<dyn Overlay<Message, Theme, Renderer> + 'a>,
     ) -> Self {
         Self {
             position,
@@ -46,9 +46,13 @@ where
     }
 
     /// Applies a transformation to the produced message of the [`Element`].
-    pub fn map<B>(self, f: &'a dyn Fn(Message) -> B) -> Element<'a, B, Renderer>
+    pub fn map<B>(
+        self,
+        f: &'a dyn Fn(Message) -> B,
+    ) -> Element<'a, B, Theme, Renderer>
     where
         Message: 'a,
+        Theme: 'a,
         Renderer: 'a,
         B: 'a,
     {
@@ -104,7 +108,7 @@ where
     pub fn draw(
         &self,
         renderer: &mut Renderer,
-        theme: &Renderer::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
@@ -137,26 +141,27 @@ where
         &'b mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
-    ) -> Option<Element<'b, Message, Renderer>> {
+    ) -> Option<Element<'b, Message, Theme, Renderer>> {
         self.overlay.overlay(layout, renderer)
     }
 }
 
-struct Map<'a, A, B, Renderer> {
-    content: Box<dyn Overlay<A, Renderer> + 'a>,
+struct Map<'a, A, B, Theme, Renderer> {
+    content: Box<dyn Overlay<A, Theme, Renderer> + 'a>,
     mapper: &'a dyn Fn(A) -> B,
 }
 
-impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> {
+impl<'a, A, B, Theme, Renderer> Map<'a, A, B, Theme, Renderer> {
     pub fn new(
-        content: Box<dyn Overlay<A, Renderer> + 'a>,
+        content: Box<dyn Overlay<A, Theme, Renderer> + 'a>,
         mapper: &'a dyn Fn(A) -> B,
-    ) -> Map<'a, A, B, Renderer> {
+    ) -> Map<'a, A, B, Theme, Renderer> {
         Map { content, mapper }
     }
 }
 
-impl<'a, A, B, Renderer> Overlay<B, Renderer> for Map<'a, A, B, Renderer>
+impl<'a, A, B, Theme, Renderer> Overlay<B, Theme, Renderer>
+    for Map<'a, A, B, Theme, Renderer>
 where
     Renderer: crate::Renderer,
 {
@@ -269,7 +274,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        theme: &Renderer::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
@@ -290,7 +295,7 @@ where
         &'b mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
-    ) -> Option<Element<'b, B, Renderer>> {
+    ) -> Option<Element<'b, B, Theme, Renderer>> {
         self.content
             .overlay(layout, renderer)
             .map(|overlay| overlay.map(self.mapper))
diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
index e1e9727a..4e54a002 100644
--- a/core/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -11,14 +11,15 @@ use crate::{
 /// An [`Overlay`] container that displays multiple overlay [`overlay::Element`]
 /// children.
 #[allow(missing_debug_implementations)]
-pub struct Group<'a, Message, Renderer> {
-    children: Vec<overlay::Element<'a, Message, Renderer>>,
+pub struct Group<'a, Message, Theme, Renderer> {
+    children: Vec<overlay::Element<'a, Message, Theme, Renderer>>,
 }
 
-impl<'a, Message, Renderer> Group<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Group<'a, Message, Theme, Renderer>
 where
-    Renderer: 'a + crate::Renderer,
     Message: 'a,
+    Theme: 'a,
+    Renderer: 'a + crate::Renderer,
 {
     /// Creates an empty [`Group`].
     pub fn new() -> Self {
@@ -27,7 +28,7 @@ where
 
     /// Creates a [`Group`] with the given elements.
     pub fn with_children(
-        children: Vec<overlay::Element<'a, Message, Renderer>>,
+        children: Vec<overlay::Element<'a, Message, Theme, Renderer>>,
     ) -> Self {
         Group { children }
     }
@@ -35,30 +36,32 @@ where
     /// Adds an [`overlay::Element`] to the [`Group`].
     pub fn push(
         mut self,
-        child: impl Into<overlay::Element<'a, Message, Renderer>>,
+        child: impl Into<overlay::Element<'a, Message, Theme, Renderer>>,
     ) -> Self {
         self.children.push(child.into());
         self
     }
 
     /// Turns the [`Group`] into an overlay [`overlay::Element`].
-    pub fn overlay(self) -> overlay::Element<'a, Message, Renderer> {
+    pub fn overlay(self) -> overlay::Element<'a, Message, Theme, Renderer> {
         overlay::Element::new(Point::ORIGIN, Box::new(self))
     }
 }
 
-impl<'a, Message, Renderer> Default for Group<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Default
+    for Group<'a, Message, Theme, Renderer>
 where
-    Renderer: 'a + crate::Renderer,
     Message: 'a,
+    Theme: 'a,
+    Renderer: 'a + crate::Renderer,
 {
     fn default() -> Self {
         Self::with_children(Vec::new())
     }
 }
 
-impl<'a, Message, Renderer> Overlay<Message, Renderer>
-    for Group<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Overlay<Message, Theme, Renderer>
+    for Group<'a, Message, Theme, Renderer>
 where
     Renderer: crate::Renderer,
 {
@@ -106,7 +109,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        theme: &<Renderer as crate::Renderer>::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
@@ -166,7 +169,7 @@ where
         &'b mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
-    ) -> Option<overlay::Element<'b, Message, Renderer>> {
+    ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
         let children = self
             .children
             .iter_mut()
@@ -178,13 +181,14 @@ where
     }
 }
 
-impl<'a, Message, Renderer> From<Group<'a, Message, Renderer>>
-    for overlay::Element<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> From<Group<'a, Message, Theme, Renderer>>
+    for overlay::Element<'a, Message, Theme, Renderer>
 where
-    Renderer: 'a + crate::Renderer,
     Message: 'a,
+    Theme: 'a,
+    Renderer: 'a + crate::Renderer,
 {
-    fn from(group: Group<'a, Message, Renderer>) -> Self {
+    fn from(group: Group<'a, Message, Theme, Renderer>) -> Self {
         group.overlay()
     }
 }
-- 
cgit