diff options
author | 2024-01-21 17:56:01 +0100 | |
---|---|---|
committer | 2024-01-21 17:56:01 +0100 | |
commit | 7a50e9e8fbb8d37e53a42c1dd5936b97463ead53 (patch) | |
tree | c0960018f287bcb2043a1752ae85ad0d45e00f21 /graphics | |
parent | 545cc909c9f356dd733d273173694db9b8c28594 (diff) | |
download | iced-7a50e9e8fbb8d37e53a42c1dd5936b97463ead53.tar.gz iced-7a50e9e8fbb8d37e53a42c1dd5936b97463ead53.tar.bz2 iced-7a50e9e8fbb8d37e53a42c1dd5936b97463ead53.zip |
Convert `Renderer::Theme` to generic `Widget` type
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/src/renderer.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs index 3ba41c3f..cb07c23b 100644 --- a/graphics/src/renderer.rs +++ b/graphics/src/renderer.rs @@ -12,19 +12,17 @@ use crate::text; use crate::Primitive; use std::borrow::Cow; -use std::marker::PhantomData; /// A backend-agnostic renderer that supports all the built-in widgets. #[derive(Debug)] -pub struct Renderer<B: Backend, Theme> { +pub struct Renderer<B: Backend> { backend: B, default_font: Font, default_text_size: Pixels, primitives: Vec<Primitive<B::Primitive>>, - theme: PhantomData<Theme>, } -impl<B: Backend, T> Renderer<B, T> { +impl<B: Backend> Renderer<B> { /// Creates a new [`Renderer`] from the given [`Backend`]. pub fn new( backend: B, @@ -36,7 +34,6 @@ impl<B: Backend, T> Renderer<B, T> { default_font, default_text_size, primitives: Vec::new(), - theme: PhantomData, } } @@ -93,9 +90,7 @@ impl<B: Backend, T> Renderer<B, T> { } } -impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> { - type Theme = T; - +impl<B: Backend> iced_core::Renderer for Renderer<B> { fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) { let current = self.start_layer(); @@ -134,7 +129,7 @@ impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> { } } -impl<B, T> core::text::Renderer for Renderer<B, T> +impl<B> core::text::Renderer for Renderer<B> where B: Backend + backend::Text, { @@ -210,7 +205,7 @@ where } } -impl<B, T> image::Renderer for Renderer<B, T> +impl<B> image::Renderer for Renderer<B> where B: Backend + backend::Image, { @@ -234,7 +229,7 @@ where } } -impl<B, T> svg::Renderer for Renderer<B, T> +impl<B> svg::Renderer for Renderer<B> where B: Backend + backend::Svg, { |