summaryrefslogtreecommitdiffstats
path: root/tiny_skia/src
diff options
context:
space:
mode:
Diffstat (limited to 'tiny_skia/src')
-rw-r--r--tiny_skia/src/window/compositor.rs28
1 files changed, 8 insertions, 20 deletions
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 32095e23..87ded746 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -28,20 +28,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
settings: Self::Settings,
_compatible_window: Option<&W>,
- ) -> Result<(Self, Self::Renderer), Error> {
- let (compositor, backend) = new(settings);
-
- Ok((
- compositor,
- Renderer::new(
- backend,
- settings.default_font,
- settings.default_text_size,
- ),
- ))
+ ) -> Result<Self, Error> {
+ Ok(new(settings))
}
- fn renderer(&self) -> Self::Renderer {
+ fn create_renderer(&self) -> Self::Renderer {
Renderer::new(
Backend::new(),
self.settings.default_font,
@@ -130,14 +121,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
}
}
-pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
- (
- Compositor {
- settings,
- _theme: PhantomData,
- },
- Backend::new(),
- )
+pub fn new<Theme>(settings: Settings) -> Compositor<Theme> {
+ Compositor {
+ settings,
+ _theme: PhantomData,
+ }
}
pub fn present<T: AsRef<str>>(