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

---
 tiny_skia/src/lib.rs               |  2 +-
 tiny_skia/src/window/compositor.rs | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'tiny_skia/src')

diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index ec8012be..e7294f9b 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -28,4 +28,4 @@ pub use settings::Settings;
 ///
 /// [`tiny-skia`]: https://github.com/RazrFalcon/tiny-skia
 /// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme> = iced_graphics::Renderer<Backend, Theme>;
+pub type Renderer = iced_graphics::Renderer<Backend>;
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 781ed8a5..21ccf620 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -5,13 +5,11 @@ use crate::graphics::{Error, Viewport};
 use crate::{Backend, Primitive, Renderer, Settings};
 
 use std::collections::VecDeque;
-use std::marker::PhantomData;
 use std::num::NonZeroU32;
 
-pub struct Compositor<Theme> {
+pub struct Compositor {
     context: softbuffer::Context<Box<dyn compositor::Window>>,
     settings: Settings,
-    _theme: PhantomData<Theme>,
 }
 
 pub struct Surface {
@@ -25,9 +23,9 @@ pub struct Surface {
     max_age: u8,
 }
 
-impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
+impl crate::graphics::Compositor for Compositor {
     type Settings = Settings;
-    type Renderer = Renderer<Theme>;
+    type Renderer = Renderer;
     type Surface = Surface;
 
     fn new<W: compositor::Window>(
@@ -138,19 +136,15 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     }
 }
 
-pub fn new<W: compositor::Window, Theme>(
+pub fn new<W: compositor::Window>(
     settings: Settings,
     compatible_window: W,
-) -> Compositor<Theme> {
+) -> Compositor {
     #[allow(unsafe_code)]
     let context = softbuffer::Context::new(Box::new(compatible_window) as _)
         .expect("Create softbuffer context");
 
-    Compositor {
-        context,
-        settings,
-        _theme: PhantomData,
-    }
+    Compositor { context, settings }
 }
 
 pub fn present<T: AsRef<str>>(
-- 
cgit