diff options
author | 2024-01-22 11:48:38 +0100 | |
---|---|---|
committer | 2024-01-22 11:48:38 +0100 | |
commit | 416e0026c021a8222c925979053d985553f947a6 (patch) | |
tree | beb8bb6fd28459d6a0b4c39fb5812f9c126a035e /renderer/src/compositor.rs | |
parent | 545cc909c9f356dd733d273173694db9b8c28594 (diff) | |
parent | e695f7a04c16f786154f25a486b649ddbfd62939 (diff) | |
download | iced-416e0026c021a8222c925979053d985553f947a6.tar.gz iced-416e0026c021a8222c925979053d985553f947a6.tar.bz2 iced-416e0026c021a8222c925979053d985553f947a6.zip |
Merge pull request #2209 from iced-rs/remove-associated-theme
`Themer` widget
Diffstat (limited to '')
-rw-r--r-- | renderer/src/compositor.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs index f10ed048..dc2c50ff 100644 --- a/renderer/src/compositor.rs +++ b/renderer/src/compositor.rs @@ -5,10 +5,10 @@ use crate::{Renderer, Settings}; use std::env; -pub enum Compositor<Theme> { - TinySkia(iced_tiny_skia::window::Compositor<Theme>), +pub enum Compositor { + TinySkia(iced_tiny_skia::window::Compositor), #[cfg(feature = "wgpu")] - Wgpu(iced_wgpu::window::Compositor<Theme>), + Wgpu(iced_wgpu::window::Compositor), } pub enum Surface { @@ -17,9 +17,9 @@ pub enum Surface { Wgpu(iced_wgpu::window::Surface<'static>), } -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: Window + Clone>( @@ -225,11 +225,11 @@ impl Candidate { ) } - fn build<Theme, W: Window>( + fn build<W: Window>( self, settings: Settings, _compatible_window: W, - ) -> Result<Compositor<Theme>, Error> { + ) -> Result<Compositor, Error> { match self { Self::TinySkia => { let compositor = iced_tiny_skia::window::compositor::new( |