me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert Renderer::Theme to generic Widget type

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-21 17:56:01 +01:00
parent 545cc909c9
commit 7a50e9e8fb
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
88 changed files with 1219 additions and 1153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tiny_skia/src/lib.rs
View file

@ -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>;

18
tiny_skia/src/window/compositor.rs
View file

@ -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>>(