Merge pull request #1362 from iced-rs/theming

Theming

3 files changed, 42 insertions, 31 deletions

diff --git a/graphics/src/widget/pure/canvas.rs b/graphics/src/widget/pure/canvas.rs
index b51d5853..0eeff3d1 100644
--- a/graphics/src/widget/pure/canvas.rs
+++ b/graphics/src/widget/pure/canvas.rs
@@ -30,10 +30,10 @@ use std::marker::PhantomData;
 /// #     pub mod pure {
 /// #         pub use iced_graphics::pure::canvas;
 /// #     }
-/// #     pub use iced_native::{Color, Rectangle};
+/// #     pub use iced_native::{Color, Rectangle, Theme};
 /// # }
 /// use iced::pure::canvas::{self, Canvas, Cursor, Fill, Frame, Geometry, Path, Program};
-/// use iced::{Color, Rectangle};
+/// use iced::{Color, Rectangle, Theme};
 ///
 /// // First, we define the data we need for drawing
 /// #[derive(Debug)]
@@ -45,7 +45,7 @@ use std::marker::PhantomData;
 /// impl Program<()> for Circle {
 ///     type State = ();
 ///
-///     fn draw(&self, _state: &(), bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
+///     fn draw(&self, _state: &(), _theme: &Theme, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
 ///         // We prepare a new `Frame`
 ///         let mut frame = Frame::new(bounds.size());
 ///
@@ -64,19 +64,20 @@ use std::marker::PhantomData;
 /// let canvas = Canvas::new(Circle { radius: 50.0 });
 /// ```
 #[derive(Debug)]
-pub struct Canvas<Message, P>
+pub struct Canvas<Message, Theme, P>
 where
-    P: Program<Message>,
+    P: Program<Message, Theme>,
 {
     width: Length,
     height: Length,
     program: P,
     message_: PhantomData<Message>,
+    theme_: PhantomData<Theme>,
 }
 
-impl<Message, P> Canvas<Message, P>
+impl<Message, Theme, P> Canvas<Message, Theme, P>
 where
-    P: Program<Message>,
+    P: Program<Message, Theme>,
 {
     const DEFAULT_SIZE: u16 = 100;
 
@@ -87,6 +88,7 @@ where
             height: Length::Units(Self::DEFAULT_SIZE),
             program,
             message_: PhantomData,
+            theme_: PhantomData,
         }
     }
 
@@ -103,9 +105,9 @@ where
     }
 }
 
-impl<Message, P, B> Widget<Message, Renderer<B>> for Canvas<Message, P>
+impl<Message, P, B, T> Widget<Message, Renderer<B, T>> for Canvas<Message, T, P>
 where
-    P: Program<Message>,
+    P: Program<Message, T>,
     B: Backend,
 {
     fn tag(&self) -> tree::Tag {
@@ -127,7 +129,7 @@ where
 
     fn layout(
         &self,
-        _renderer: &Renderer<B>,
+        _renderer: &Renderer<B, T>,
         limits: &layout::Limits,
     ) -> layout::Node {
         let limits = limits.width(self.width).height(self.height);
@@ -142,7 +144,7 @@ where
         event: iced_native::Event,
         layout: Layout<'_>,
         cursor_position: Point,
-        _renderer: &Renderer<B>,
+        _renderer: &Renderer<B, T>,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
@@ -182,7 +184,7 @@ where
         layout: Layout<'_>,
         cursor_position: Point,
         _viewport: &Rectangle,
-        _renderer: &Renderer<B>,
+        _renderer: &Renderer<B, T>,
     ) -> mouse::Interaction {
         let bounds = layout.bounds();
         let cursor = Cursor::from_window_position(cursor_position);
@@ -194,7 +196,8 @@ where
     fn draw(
         &self,
         tree: &Tree,
-        renderer: &mut Renderer<B>,
+        renderer: &mut Renderer<B, T>,
+        theme: &T,
         _style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -216,7 +219,7 @@ where
             renderer.draw_primitive(Primitive::Group {
                 primitives: self
                     .program
-                    .draw(state, bounds, cursor)
+                    .draw(state, theme, bounds, cursor)
                     .into_iter()
                     .map(Geometry::into_primitive)
                     .collect(),
@@ -225,14 +228,17 @@ where
     }
 }
 
-impl<'a, Message, P, B> From<Canvas<Message, P>>
-    for Element<'a, Message, Renderer<B>>
+impl<'a, Message, P, B, T> From<Canvas<Message, T, P>>
+    for Element<'a, Message, Renderer<B, T>>
 where
     Message: 'a,
-    P: Program<Message> + 'a,
+    P: Program<Message, T> + 'a,
     B: Backend,
+    T: 'a,
 {
-    fn from(canvas: Canvas<Message, P>) -> Element<'a, Message, Renderer<B>> {
+    fn from(
+        canvas: Canvas<Message, T, P>,
+    ) -> Element<'a, Message, Renderer<B, T>> {
         Element::new(canvas)
     }
 }
diff --git a/graphics/src/widget/pure/canvas/program.rs b/graphics/src/widget/pure/canvas/program.rs
index 058b364b..20c6406e 100644
--- a/graphics/src/widget/pure/canvas/program.rs
+++ b/graphics/src/widget/pure/canvas/program.rs
@@ -9,7 +9,7 @@ use crate::Rectangle;
 /// application.
 ///
 /// [`Canvas`]: crate::widget::Canvas
-pub trait Program<Message> {
+pub trait Program<Message, Theme = iced_native::Theme> {
     /// The internal state mutated by the [`Program`].
     type State: Default + 'static;
 
@@ -44,6 +44,7 @@ pub trait Program<Message> {
     fn draw(
         &self,
         state: &Self::State,
+        theme: &Theme,
         bounds: Rectangle,
         cursor: Cursor,
     ) -> Vec<Geometry>;
@@ -64,9 +65,9 @@ pub trait Program<Message> {
     }
 }
 
-impl<Message, T> Program<Message> for &T
+impl<Message, Theme, T> Program<Message, Theme> for &T
 where
-    T: Program<Message>,
+    T: Program<Message, Theme>,
 {
     type State = T::State;
 
@@ -83,10 +84,11 @@ where
     fn draw(
         &self,
         state: &Self::State,
+        theme: &Theme,
         bounds: Rectangle,
         cursor: Cursor,
     ) -> Vec<Geometry> {
-        T::draw(self, state, bounds, cursor)
+        T::draw(self, state, theme, bounds, cursor)
     }
 
     fn mouse_interaction(
diff --git a/graphics/src/widget/pure/qr_code.rs b/graphics/src/widget/pure/qr_code.rs
index 9d517374..23a8ceb6 100644
--- a/graphics/src/widget/pure/qr_code.rs
+++ b/graphics/src/widget/pure/qr_code.rs
@@ -9,24 +9,24 @@ use iced_native::{Length, Point, Rectangle};
 use iced_pure::widget::tree::Tree;
 use iced_pure::{Element, Widget};
 
-impl<'a, Message, B> Widget<Message, Renderer<B>> for QRCode<'a>
+impl<'a, Message, B, T> Widget<Message, Renderer<B, T>> for QRCode<'a>
 where
     B: Backend,
 {
     fn width(&self) -> Length {
-        <Self as iced_native::Widget<Message, Renderer<B>>>::width(self)
+        <Self as iced_native::Widget<Message, Renderer<B, T>>>::width(self)
     }
 
     fn height(&self) -> Length {
-        <Self as iced_native::Widget<Message, Renderer<B>>>::height(self)
+        <Self as iced_native::Widget<Message, Renderer<B, T>>>::height(self)
     }
 
     fn layout(
         &self,
-        renderer: &Renderer<B>,
+        renderer: &Renderer<B, T>,
         limits: &layout::Limits,
     ) -> layout::Node {
-        <Self as iced_native::Widget<Message, Renderer<B>>>::layout(
+        <Self as iced_native::Widget<Message, Renderer<B, T>>>::layout(
             self, renderer, limits,
         )
     }
@@ -34,15 +34,17 @@ where
     fn draw(
         &self,
         _tree: &Tree,
-        renderer: &mut Renderer<B>,
+        renderer: &mut Renderer<B, T>,
+        theme: &T,
         style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
         viewport: &Rectangle,
     ) {
-        <Self as iced_native::Widget<Message, Renderer<B>>>::draw(
+        <Self as iced_native::Widget<Message, Renderer<B, T>>>::draw(
             self,
             renderer,
+            theme,
             style,
             layout,
             cursor_position,
@@ -51,11 +53,12 @@ where
     }
 }
 
-impl<'a, Message, B> Into<Element<'a, Message, Renderer<B>>> for QRCode<'a>
+impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
+    for QRCode<'a>
 where
     B: Backend,
 {
-    fn into(self) -> Element<'a, Message, Renderer<B>> {
+    fn into(self) -> Element<'a, Message, Renderer<B, T>> {
         Element::new(self)
     }
 }