summaryrefslogtreecommitdiffstats
path: root/renderer
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-25 15:38:25 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-02-25 15:38:25 +0100
commit8c373cd497e370d356b480380482779397bdb510 (patch)
treef640a1161e702cbb981d3b89f3e7a11ee390923c /renderer
parenta01bc865a0561ff1daf255c4746746acf67524f0 (diff)
downloadiced-8c373cd497e370d356b480380482779397bdb510.tar.gz
iced-8c373cd497e370d356b480380482779397bdb510.tar.bz2
iced-8c373cd497e370d356b480380482779397bdb510.zip
Scaffold `iced_tiny_skia` and connect it to `iced_renderer`
Diffstat (limited to 'renderer')
-rw-r--r--renderer/Cargo.toml8
-rw-r--r--renderer/src/backend.rs20
-rw-r--r--renderer/src/window/compositor.rs54
3 files changed, 70 insertions, 12 deletions
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 2a179f3a..5ba5d426 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"
[features]
-image = ["iced_wgpu/image"]
-svg = ["iced_wgpu/svg"]
+image = ["iced_wgpu/image", "iced_tiny_skia/image"]
+svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
tracing = ["iced_wgpu/tracing"]
[dependencies]
@@ -19,6 +19,10 @@ path = "../native"
version = "0.7"
path = "../graphics"
+[dependencies.iced_tiny_skia]
+version = "0.1"
+path = "../tiny_skia"
+
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
iced_wgpu = { version = "0.9", path = "../wgpu" }
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 7b09eea8..a46d6f9b 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -7,12 +7,14 @@ use std::borrow::Cow;
pub enum Backend {
Wgpu(iced_wgpu::Backend),
+ TinySkia(iced_tiny_skia::Backend),
}
impl iced_graphics::Backend for Backend {
fn trim_measurements(&mut self) {
match self {
Self::Wgpu(backend) => backend.trim_measurements(),
+ Self::TinySkia(backend) => backend.trim_measurements(),
}
}
}
@@ -25,12 +27,14 @@ impl backend::Text for Backend {
fn default_font(&self) -> Font {
match self {
Self::Wgpu(backend) => backend.default_font(),
+ Self::TinySkia(backend) => backend.default_font(),
}
}
fn default_size(&self) -> f32 {
match self {
Self::Wgpu(backend) => backend.default_size(),
+ Self::TinySkia(backend) => backend.default_size(),
}
}
@@ -45,6 +49,9 @@ impl backend::Text for Backend {
Self::Wgpu(backend) => {
backend.measure(contents, size, font, bounds)
}
+ Self::TinySkia(backend) => {
+ backend.measure(contents, size, font, bounds)
+ }
}
}
@@ -66,6 +73,14 @@ impl backend::Text for Backend {
position,
nearest_only,
),
+ Self::TinySkia(backend) => backend.hit_test(
+ contents,
+ size,
+ font,
+ bounds,
+ position,
+ nearest_only,
+ ),
}
}
@@ -74,6 +89,9 @@ impl backend::Text for Backend {
Self::Wgpu(backend) => {
backend.load_font(font);
}
+ Self::TinySkia(backend) => {
+ backend.load_font(font);
+ }
}
}
}
@@ -83,6 +101,7 @@ impl backend::Image for Backend {
fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
match self {
Self::Wgpu(backend) => backend.dimensions(handle),
+ Self::TinySkia(backend) => backend.dimensions(handle),
}
}
}
@@ -95,6 +114,7 @@ impl backend::Svg for Backend {
) -> Size<u32> {
match self {
Self::Wgpu(backend) => backend.viewport_dimensions(handle),
+ Self::TinySkia(backend) => backend.viewport_dimensions(handle),
}
}
}
diff --git a/renderer/src/window/compositor.rs b/renderer/src/window/compositor.rs
index ad78d8bf..42afddc4 100644
--- a/renderer/src/window/compositor.rs
+++ b/renderer/src/window/compositor.rs
@@ -6,10 +6,12 @@ pub use iced_graphics::window::compositor::{Information, SurfaceError};
pub enum Compositor<Theme> {
Wgpu(iced_wgpu::window::Compositor<Theme>),
+ TinySkia(iced_tiny_skia::window::Compositor<Theme>),
}
pub enum Surface {
Wgpu(iced_wgpu::window::Surface),
+ TinySkia(iced_tiny_skia::window::Surface),
}
impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
@@ -19,21 +21,31 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
settings: Self::Settings,
- compatible_window: Option<&W>,
+ _compatible_window: Option<&W>,
) -> Result<(Self, Self::Renderer), Error> {
- let (compositor, backend) = iced_wgpu::window::compositor::new(
- iced_wgpu::Settings {
+ //let (compositor, backend) = iced_wgpu::window::compositor::new(
+ // iced_wgpu::Settings {
+ // default_font: settings.default_font,
+ // default_text_size: settings.default_text_size,
+ // antialiasing: settings.antialiasing,
+ // ..iced_wgpu::Settings::from_env()
+ // },
+ // compatible_window,
+ //)?;
+
+ //Ok((
+ // Self::Wgpu(compositor),
+ // Renderer::new(Backend::Wgpu(backend)),
+ //))
+ let (compositor, backend) =
+ iced_tiny_skia::window::compositor::new(iced_tiny_skia::Settings {
default_font: settings.default_font,
default_text_size: settings.default_text_size,
- antialiasing: settings.antialiasing,
- ..iced_wgpu::Settings::from_env()
- },
- compatible_window,
- )?;
+ });
Ok((
- Self::Wgpu(compositor),
- Renderer::new(Backend::Wgpu(backend)),
+ Self::TinySkia(compositor),
+ Renderer::new(Backend::TinySkia(backend)),
))
}
@@ -45,6 +57,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
Self::Wgpu(compositor) => {
Surface::Wgpu(compositor.create_surface(window))
}
+ Self::TinySkia(compositor) => {
+ Surface::TinySkia(compositor.create_surface(window))
+ }
}
}
@@ -58,12 +73,17 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
(Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
compositor.configure_surface(surface, width, height);
}
+ (Self::TinySkia(compositor), Surface::TinySkia(surface)) => {
+ compositor.configure_surface(surface, width, height);
+ }
+ _ => unreachable!(),
}
}
fn fetch_information(&self) -> Information {
match self {
Self::Wgpu(compositor) => compositor.fetch_information(),
+ Self::TinySkia(compositor) => compositor.fetch_information(),
}
}
@@ -90,6 +110,20 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
background_color,
overlay,
),
+ (
+ Self::TinySkia(compositor),
+ Backend::TinySkia(backend),
+ Surface::TinySkia(surface),
+ ) => iced_tiny_skia::window::compositor::present(
+ compositor,
+ backend,
+ surface,
+ primitives,
+ viewport,
+ background_color,
+ overlay,
+ ),
+ _ => unreachable!(),
}
})
}
generated by cgit (git 2.34.1) at 2025-04-22 13:26:43 +0000