From 664251f3f5c7b76f69a97683af1468094bba887f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 14 May 2022 01:47:55 +0200
Subject: Draft first-class `Theme` support

RFC: https://github.com/iced-rs/rfcs/pull/6
---
 graphics/src/renderer.rs            | 18 ++++++++++++------
 graphics/src/widget/canvas.rs       | 19 +++++++++++--------
 graphics/src/widget/pure/canvas.rs  | 19 +++++++++++--------
 graphics/src/widget/pure/qr_code.rs | 21 ++++++++++++---------
 graphics/src/widget/qr_code.rs      | 12 +++++++-----
 5 files changed, 53 insertions(+), 36 deletions(-)

(limited to 'graphics/src')

diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index cb31ea5f..3c19fbfb 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -10,19 +10,23 @@ use iced_native::{Background, Element, Font, Point, Rectangle, Size};
 
 pub use iced_native::renderer::Style;
 
+use std::marker::PhantomData;
+
 /// A backend-agnostic renderer that supports all the built-in widgets.
 #[derive(Debug)]
-pub struct Renderer<B: Backend> {
+pub struct Renderer<B: Backend, Theme> {
     backend: B,
     primitives: Vec<Primitive>,
+    theme: PhantomData<Theme>,
 }
 
-impl<B: Backend> Renderer<B> {
+impl<B: Backend, T> Renderer<B, T> {
     /// Creates a new [`Renderer`] from the given [`Backend`].
     pub fn new(backend: B) -> Self {
         Self {
             backend,
             primitives: Vec::new(),
+            theme: PhantomData,
         }
     }
 
@@ -43,10 +47,12 @@ impl<B: Backend> Renderer<B> {
     }
 }
 
-impl<B> iced_native::Renderer for Renderer<B>
+impl<B, T> iced_native::Renderer for Renderer<B, T>
 where
     B: Backend,
 {
+    type Theme = T;
+
     fn layout<'a, Message>(
         &mut self,
         element: &Element<'a, Message, Self>,
@@ -114,7 +120,7 @@ where
     }
 }
 
-impl<B> text::Renderer for Renderer<B>
+impl<B, T> text::Renderer for Renderer<B, T>
 where
     B: Backend + backend::Text,
 {
@@ -171,7 +177,7 @@ where
     }
 }
 
-impl<B> image::Renderer for Renderer<B>
+impl<B, T> image::Renderer for Renderer<B, T>
 where
     B: Backend + backend::Image,
 {
@@ -186,7 +192,7 @@ where
     }
 }
 
-impl<B> svg::Renderer for Renderer<B>
+impl<B, T> svg::Renderer for Renderer<B, T>
 where
     B: Backend + backend::Svg,
 {
diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs
index 23444b2b..0de08b01 100644
--- a/graphics/src/widget/canvas.rs
+++ b/graphics/src/widget/canvas.rs
@@ -127,7 +127,7 @@ impl<Message, P: Program<Message>> Canvas<Message, P> {
     }
 }
 
-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, P>
 where
     P: Program<Message>,
     B: Backend,
@@ -142,7 +142,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);
@@ -156,7 +156,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 {
@@ -193,7 +193,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);
@@ -203,7 +203,8 @@ where
 
     fn draw(
         &self,
-        renderer: &mut Renderer<B>,
+        renderer: &mut Renderer<B, T>,
+        _theme: &T,
         _style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -233,14 +234,16 @@ 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, P>>
+    for Element<'a, Message, Renderer<B, T>>
 where
     Message: 'static,
     P: Program<Message> + 'a,
     B: Backend,
 {
-    fn from(canvas: Canvas<Message, P>) -> Element<'a, Message, Renderer<B>> {
+    fn from(
+        canvas: Canvas<Message, P>,
+    ) -> Element<'a, Message, Renderer<B, T>> {
         Element::new(canvas)
     }
 }
diff --git a/graphics/src/widget/pure/canvas.rs b/graphics/src/widget/pure/canvas.rs
index 2e3e7ede..d53b20f6 100644
--- a/graphics/src/widget/pure/canvas.rs
+++ b/graphics/src/widget/pure/canvas.rs
@@ -103,7 +103,7 @@ 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, P>
 where
     P: Program<Message>,
     B: Backend,
@@ -126,7 +126,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);
@@ -141,7 +141,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 {
@@ -181,7 +181,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);
@@ -193,7 +193,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,
@@ -224,14 +225,16 @@ 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, P>>
+    for Element<'a, Message, Renderer<B, T>>
 where
     Message: 'a,
     P: Program<Message> + 'a,
     B: Backend,
 {
-    fn from(canvas: Canvas<Message, P>) -> Element<'a, Message, Renderer<B>> {
+    fn from(
+        canvas: Canvas<Message, P>,
+    ) -> Element<'a, Message, Renderer<B, T>> {
         Element::new(canvas)
     }
 }
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)
     }
 }
diff --git a/graphics/src/widget/qr_code.rs b/graphics/src/widget/qr_code.rs
index 907794b7..1eb862ba 100644
--- a/graphics/src/widget/qr_code.rs
+++ b/graphics/src/widget/qr_code.rs
@@ -47,7 +47,7 @@ impl<'a> QRCode<'a> {
     }
 }
 
-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,
 {
@@ -61,7 +61,7 @@ where
 
     fn layout(
         &self,
-        _renderer: &Renderer<B>,
+        _renderer: &Renderer<B, T>,
         _limits: &layout::Limits,
     ) -> layout::Node {
         let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
@@ -75,7 +75,8 @@ where
 
     fn draw(
         &self,
-        renderer: &mut Renderer<B>,
+        renderer: &mut Renderer<B, T>,
+        _theme: &T,
         _style: &renderer::Style,
         layout: Layout<'_>,
         _cursor_position: Point,
@@ -127,11 +128,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)
     }
 }
-- 
cgit 


From 396735b682433928f52ba777891e14f2fbc703c7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 7 Jun 2022 04:51:44 +0200
Subject: Implement theme styling for `PickList` and `Menu`

---
 graphics/src/overlay/menu.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'graphics/src')

diff --git a/graphics/src/overlay/menu.rs b/graphics/src/overlay/menu.rs
index c5ff093d..8b489e5e 100644
--- a/graphics/src/overlay/menu.rs
+++ b/graphics/src/overlay/menu.rs
@@ -1,3 +1,3 @@
 //! Build and show dropdown menus.
 
-pub use iced_style::menu::Style;
+pub use iced_style::menu::{Appearance, StyleSheet};
-- 
cgit 


From fc13bb3d65c85cfad9f231c0776d3a45f4fbf480 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 7 Jun 2022 05:24:43 +0200
Subject: Implement theme styling for `Canvas`

---
 graphics/src/widget/canvas.rs              | 33 +++++++++++++++++++-----------
 graphics/src/widget/canvas/program.rs      | 26 ++++++++++++++++-------
 graphics/src/widget/pure/canvas.rs         | 31 +++++++++++++++-------------
 graphics/src/widget/pure/canvas/program.rs | 10 +++++----
 4 files changed, 63 insertions(+), 37 deletions(-)

(limited to 'graphics/src')

diff --git a/graphics/src/widget/canvas.rs b/graphics/src/widget/canvas.rs
index 0de08b01..c3e28e8c 100644
--- a/graphics/src/widget/canvas.rs
+++ b/graphics/src/widget/canvas.rs
@@ -62,10 +62,10 @@ use std::marker::PhantomData;
 /// ```no_run
 /// # mod iced {
 /// #     pub use iced_graphics::canvas;
-/// #     pub use iced_native::{Color, Rectangle};
+/// #     pub use iced_native::{Color, Rectangle, Theme};
 /// # }
 /// use iced::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)]
@@ -75,7 +75,7 @@ use std::marker::PhantomData;
 ///
 /// // Then, we implement the `Program` trait
 /// impl Program<()> for Circle {
-///     fn draw(&self, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
+///     fn draw(&self, _theme: &Theme, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
 ///         // We prepare a new `Frame`
 ///         let mut frame = Frame::new(bounds.size());
 ///
@@ -94,14 +94,21 @@ use std::marker::PhantomData;
 /// let canvas = Canvas::new(Circle { radius: 50.0 });
 /// ```
 #[derive(Debug)]
-pub struct Canvas<Message, P: Program<Message>> {
+pub struct Canvas<Message, Theme, P>
+where
+    P: Program<Message, Theme>,
+{
     width: Length,
     height: Length,
     program: P,
     message_: PhantomData<Message>,
+    theme_: PhantomData<Theme>,
 }
 
-impl<Message, P: Program<Message>> Canvas<Message, P> {
+impl<Message, Theme, P> Canvas<Message, Theme, P>
+where
+    P: Program<Message, Theme>,
+{
     const DEFAULT_SIZE: u16 = 100;
 
     /// Creates a new [`Canvas`].
@@ -111,6 +118,7 @@ impl<Message, P: Program<Message>> Canvas<Message, P> {
             height: Length::Units(Self::DEFAULT_SIZE),
             program,
             message_: PhantomData,
+            theme_: PhantomData,
         }
     }
 
@@ -127,9 +135,9 @@ impl<Message, P: Program<Message>> Canvas<Message, P> {
     }
 }
 
-impl<Message, P, B, T> Widget<Message, Renderer<B, T>> 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 width(&self) -> Length {
@@ -204,7 +212,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer<B, T>,
-        _theme: &T,
+        theme: &T,
         _style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -225,7 +233,7 @@ where
             renderer.draw_primitive(Primitive::Group {
                 primitives: self
                     .program
-                    .draw(bounds, cursor)
+                    .draw(theme, bounds, cursor)
                     .into_iter()
                     .map(Geometry::into_primitive)
                     .collect(),
@@ -234,15 +242,16 @@ where
     }
 }
 
-impl<'a, Message, P, B, T> From<Canvas<Message, P>>
+impl<'a, Message, P, B, T> From<Canvas<Message, T, P>>
     for Element<'a, Message, Renderer<B, T>>
 where
     Message: 'static,
-    P: Program<Message> + 'a,
+    P: Program<Message, T> + 'a,
     B: Backend,
+    T: 'a,
 {
     fn from(
-        canvas: Canvas<Message, P>,
+        canvas: Canvas<Message, T, P>,
     ) -> Element<'a, Message, Renderer<B, T>> {
         Element::new(canvas)
     }
diff --git a/graphics/src/widget/canvas/program.rs b/graphics/src/widget/canvas/program.rs
index 85a2f67b..dddc387d 100644
--- a/graphics/src/widget/canvas/program.rs
+++ b/graphics/src/widget/canvas/program.rs
@@ -1,6 +1,8 @@
 use crate::canvas::event::{self, Event};
 use crate::canvas::{Cursor, Geometry};
-use iced_native::{mouse, Rectangle};
+
+use iced_native::mouse;
+use iced_native::Rectangle;
 
 /// The state and logic of a [`Canvas`].
 ///
@@ -8,7 +10,7 @@ use iced_native::{mouse, Rectangle};
 /// application.
 ///
 /// [`Canvas`]: crate::widget::Canvas
-pub trait Program<Message> {
+pub trait Program<Message, Theme = iced_native::Theme> {
     /// Updates the state of the [`Program`].
     ///
     /// When a [`Program`] is used in a [`Canvas`], the runtime will call this
@@ -36,7 +38,12 @@ pub trait Program<Message> {
     ///
     /// [`Frame`]: crate::widget::canvas::Frame
     /// [`Cache`]: crate::widget::canvas::Cache
-    fn draw(&self, bounds: Rectangle, cursor: Cursor) -> Vec<Geometry>;
+    fn draw(
+        &self,
+        theme: &Theme,
+        bounds: Rectangle,
+        cursor: Cursor,
+    ) -> Vec<Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
     ///
@@ -53,9 +60,9 @@ pub trait Program<Message> {
     }
 }
 
-impl<T, Message> Program<Message> for &mut T
+impl<T, Message, Theme> Program<Message, Theme> for &mut T
 where
-    T: Program<Message>,
+    T: Program<Message, Theme>,
 {
     fn update(
         &mut self,
@@ -66,8 +73,13 @@ where
         T::update(self, event, bounds, cursor)
     }
 
-    fn draw(&self, bounds: Rectangle, cursor: Cursor) -> Vec<Geometry> {
-        T::draw(self, bounds, cursor)
+    fn draw(
+        &self,
+        theme: &Theme,
+        bounds: Rectangle,
+        cursor: Cursor,
+    ) -> Vec<Geometry> {
+        T::draw(self, theme, bounds, cursor)
     }
 
     fn mouse_interaction(
diff --git a/graphics/src/widget/pure/canvas.rs b/graphics/src/widget/pure/canvas.rs
index d53b20f6..d9c7e66b 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, T> Widget<Message, Renderer<B, T>> 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 {
@@ -194,7 +196,7 @@ where
         &self,
         tree: &Tree,
         renderer: &mut Renderer<B, T>,
-        _theme: &T,
+        theme: &T,
         _style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -216,7 +218,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,15 +227,16 @@ where
     }
 }
 
-impl<'a, Message, P, B, T> From<Canvas<Message, P>>
+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>,
+        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(
-- 
cgit