From b9a9576207ddfc7afd89da30b7cfc7ca0d7e335c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 6 Jan 2023 23:29:38 +0100
Subject: [PATCH 001/163] Remove `iced_glow`, `glyph-brush`, and `wgpu_glyph`
 dependencies

---
 Cargo.toml                                    |  11 +-
 .../.gitignore                                |   0
 .../Cargo.toml                                |   2 +-
 .../README.md                                 |   0
 .../index.html                                |   4 +-
 .../src/controls.rs                           |   0
 .../src/main.rs                               |   0
 .../src/scene.rs                              |   0
 .../src/shader/frag.wgsl                      |   0
 .../src/shader/vert.wgsl                      |   0
 examples/integration_opengl/Cargo.toml        |  12 -
 examples/integration_opengl/README.md         |  16 -
 examples/integration_opengl/src/controls.rs   | 101 ---
 examples/integration_opengl/src/main.rs       | 187 ------
 examples/integration_opengl/src/scene.rs      | 102 ---
 glow/Cargo.toml                               |  51 --
 glow/README.md                                |  51 --
 glow/src/backend.rs                           | 280 ---------
 glow/src/image.rs                             | 254 --------
 glow/src/image/storage.rs                     |  78 ---
 glow/src/lib.rs                               |  53 --
 glow/src/program.rs                           | 133 ----
 glow/src/quad.rs                              |  74 ---
 glow/src/quad/compatibility.rs                | 349 ----------
 glow/src/quad/core.rs                         | 244 -------
 glow/src/settings.rs                          |  61 --
 glow/src/shader/common/gradient.frag          |  59 --
 glow/src/shader/common/gradient.vert          |   9 -
 glow/src/shader/common/image.frag             |  22 -
 glow/src/shader/common/image.vert             |   9 -
 glow/src/shader/common/solid.frag             |  18 -
 glow/src/shader/common/solid.vert             |  11 -
 glow/src/shader/compatibility/quad.frag       |  83 ---
 glow/src/shader/compatibility/quad.vert       |  46 --
 glow/src/shader/core/quad.frag                |  95 ---
 glow/src/shader/core/quad.vert                |  52 --
 glow/src/text.rs                              | 257 --------
 glow/src/triangle.rs                          | 595 ------------------
 glow/src/window.rs                            |   4 -
 glow/src/window/compositor.rs                 | 111 ----
 graphics/Cargo.toml                           |   7 -
 graphics/src/font.rs                          |  35 --
 graphics/src/font/source.rs                   |  45 --
 graphics/src/lib.rs                           |   1 -
 wgpu/Cargo.toml                               |   4 -
 wgpu/src/backend.rs                           |  86 +--
 wgpu/src/text.rs                              | 264 +-------
 47 files changed, 30 insertions(+), 3846 deletions(-)
 rename examples/{integration_wgpu => integration}/.gitignore (100%)
 rename examples/{integration_wgpu => integration}/Cargo.toml (96%)
 rename examples/{integration_wgpu => integration}/README.md (100%)
 rename examples/{integration_wgpu => integration}/index.html (81%)
 rename examples/{integration_wgpu => integration}/src/controls.rs (100%)
 rename examples/{integration_wgpu => integration}/src/main.rs (100%)
 rename examples/{integration_wgpu => integration}/src/scene.rs (100%)
 rename examples/{integration_wgpu => integration}/src/shader/frag.wgsl (100%)
 rename examples/{integration_wgpu => integration}/src/shader/vert.wgsl (100%)
 delete mode 100644 examples/integration_opengl/Cargo.toml
 delete mode 100644 examples/integration_opengl/README.md
 delete mode 100644 examples/integration_opengl/src/controls.rs
 delete mode 100644 examples/integration_opengl/src/main.rs
 delete mode 100644 examples/integration_opengl/src/scene.rs
 delete mode 100644 glow/Cargo.toml
 delete mode 100644 glow/README.md
 delete mode 100644 glow/src/backend.rs
 delete mode 100644 glow/src/image.rs
 delete mode 100644 glow/src/image/storage.rs
 delete mode 100644 glow/src/lib.rs
 delete mode 100644 glow/src/program.rs
 delete mode 100644 glow/src/quad.rs
 delete mode 100644 glow/src/quad/compatibility.rs
 delete mode 100644 glow/src/quad/core.rs
 delete mode 100644 glow/src/settings.rs
 delete mode 100644 glow/src/shader/common/gradient.frag
 delete mode 100644 glow/src/shader/common/gradient.vert
 delete mode 100644 glow/src/shader/common/image.frag
 delete mode 100644 glow/src/shader/common/image.vert
 delete mode 100644 glow/src/shader/common/solid.frag
 delete mode 100644 glow/src/shader/common/solid.vert
 delete mode 100644 glow/src/shader/compatibility/quad.frag
 delete mode 100644 glow/src/shader/compatibility/quad.vert
 delete mode 100644 glow/src/shader/core/quad.frag
 delete mode 100644 glow/src/shader/core/quad.vert
 delete mode 100644 glow/src/text.rs
 delete mode 100644 glow/src/triangle.rs
 delete mode 100644 glow/src/window.rs
 delete mode 100644 glow/src/window/compositor.rs
 delete mode 100644 graphics/src/font.rs
 delete mode 100644 graphics/src/font/source.rs

diff --git a/Cargo.toml b/Cargo.toml
index d26ec2b6b8..42c9488cb6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,19 +14,15 @@ categories = ["gui"]
 [features]
 default = ["wgpu"]
 # Enables the `Image` widget
-image = ["iced_wgpu?/image", "iced_glow?/image", "image_rs"]
+image = ["iced_wgpu?/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_wgpu?/svg", "iced_glow?/svg"]
+svg = ["iced_wgpu?/svg"]
 # Enables the `Canvas` widget
 canvas = ["iced_graphics/canvas"]
 # Enables the `QRCode` widget
 qr_code = ["iced_graphics/qr_code"]
 # Enables the `iced_wgpu` renderer
 wgpu = ["iced_wgpu"]
-# Enables using system fonts
-default_system_font = ["iced_wgpu?/default_system_font", "iced_glow?/default_system_font"]
-# Enables the `iced_glow` renderer. Overrides `iced_wgpu`
-glow = ["iced_glow", "iced_glutin"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -44,7 +40,6 @@ chrome-trace = [
     "iced_winit/chrome-trace",
     "iced_glutin?/trace",
     "iced_wgpu?/tracing",
-    "iced_glow?/tracing",
 ]
 
 [badges]
@@ -55,7 +50,6 @@ members = [
     "core",
     "futures",
     "graphics",
-    "glow",
     "glutin",
     "lazy",
     "native",
@@ -72,7 +66,6 @@ iced_native = { version = "0.9", path = "native" }
 iced_graphics = { version = "0.7", path = "graphics" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
 iced_glutin = { version = "0.7", path = "glutin", optional = true }
-iced_glow = { version = "0.7", path = "glow", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]
diff --git a/examples/integration_wgpu/.gitignore b/examples/integration/.gitignore
similarity index 100%
rename from examples/integration_wgpu/.gitignore
rename to examples/integration/.gitignore
diff --git a/examples/integration_wgpu/Cargo.toml b/examples/integration/Cargo.toml
similarity index 96%
rename from examples/integration_wgpu/Cargo.toml
rename to examples/integration/Cargo.toml
index eaa1df7e17..200306aaa9 100644
--- a/examples/integration_wgpu/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "integration_wgpu"
+name = "integration"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
diff --git a/examples/integration_wgpu/README.md b/examples/integration/README.md
similarity index 100%
rename from examples/integration_wgpu/README.md
rename to examples/integration/README.md
diff --git a/examples/integration_wgpu/index.html b/examples/integration/index.html
similarity index 81%
rename from examples/integration_wgpu/index.html
rename to examples/integration/index.html
index 461e67a41c..920bc4a063 100644
--- a/examples/integration_wgpu/index.html
+++ b/examples/integration/index.html
@@ -8,8 +8,8 @@
     <h1>integration_wgpu</h1>
     <canvas id="iced_canvas"></canvas>
     <script type="module">
-      import init from "./integration_wgpu.js";
-      init('./integration_wgpu_bg.wasm');
+      import init from "./integration.js";
+      init('./integration_bg.wasm');
     </script>
     <style>
       body {
diff --git a/examples/integration_wgpu/src/controls.rs b/examples/integration/src/controls.rs
similarity index 100%
rename from examples/integration_wgpu/src/controls.rs
rename to examples/integration/src/controls.rs
diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration/src/main.rs
similarity index 100%
rename from examples/integration_wgpu/src/main.rs
rename to examples/integration/src/main.rs
diff --git a/examples/integration_wgpu/src/scene.rs b/examples/integration/src/scene.rs
similarity index 100%
rename from examples/integration_wgpu/src/scene.rs
rename to examples/integration/src/scene.rs
diff --git a/examples/integration_wgpu/src/shader/frag.wgsl b/examples/integration/src/shader/frag.wgsl
similarity index 100%
rename from examples/integration_wgpu/src/shader/frag.wgsl
rename to examples/integration/src/shader/frag.wgsl
diff --git a/examples/integration_wgpu/src/shader/vert.wgsl b/examples/integration/src/shader/vert.wgsl
similarity index 100%
rename from examples/integration_wgpu/src/shader/vert.wgsl
rename to examples/integration/src/shader/vert.wgsl
diff --git a/examples/integration_opengl/Cargo.toml b/examples/integration_opengl/Cargo.toml
deleted file mode 100644
index 6dac999c10..0000000000
--- a/examples/integration_opengl/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "integration_opengl"
-version = "0.1.0"
-authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2021"
-publish = false
-
-[dependencies]
-iced_glutin = { path = "../../glutin" }
-iced_glow = { path = "../../glow" }
-iced_winit = { path = "../../winit" }
-env_logger = "0.8"
diff --git a/examples/integration_opengl/README.md b/examples/integration_opengl/README.md
deleted file mode 100644
index b7c2c074dc..0000000000
--- a/examples/integration_opengl/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## OpenGL integration
-
-A demonstration of how to integrate Iced in an existing graphical OpenGL application.
-
-The __[`main`]__ file contains all the code of the example.
-
-<div align="center">
-  <a href="https://imgbox.com/9P9ETcod" target="_blank"><img src="https://images2.imgbox.com/2a/51/9P9ETcod_o.gif" alt="image host"/></a>
-</div>
-
-You can run it with `cargo run`:
-```
-cargo run --package integration_opengl
-```
-
-[`main`]: src/main.rs
diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs
deleted file mode 100644
index c3648f44b3..0000000000
--- a/examples/integration_opengl/src/controls.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use iced_glow::Renderer;
-use iced_glutin::widget::Slider;
-use iced_glutin::widget::{Column, Row, Text};
-use iced_glutin::{Alignment, Color, Command, Element, Length, Program};
-
-pub struct Controls {
-    background_color: Color,
-}
-
-#[derive(Debug, Clone)]
-pub enum Message {
-    BackgroundColorChanged(Color),
-}
-
-impl Controls {
-    pub fn new() -> Controls {
-        Controls {
-            background_color: Color::BLACK,
-        }
-    }
-
-    pub fn background_color(&self) -> Color {
-        self.background_color
-    }
-}
-
-impl Program for Controls {
-    type Renderer = Renderer;
-    type Message = Message;
-
-    fn update(&mut self, message: Message) -> Command<Message> {
-        match message {
-            Message::BackgroundColorChanged(color) => {
-                self.background_color = color;
-            }
-        }
-
-        Command::none()
-    }
-
-    fn view(&self) -> Element<Message, Renderer> {
-        let background_color = self.background_color;
-
-        let sliders = Row::new()
-            .width(500)
-            .spacing(20)
-            .push(
-                Slider::new(0.0..=1.0, background_color.r, move |r| {
-                    Message::BackgroundColorChanged(Color {
-                        r,
-                        ..background_color
-                    })
-                })
-                .step(0.01),
-            )
-            .push(
-                Slider::new(0.0..=1.0, background_color.g, move |g| {
-                    Message::BackgroundColorChanged(Color {
-                        g,
-                        ..background_color
-                    })
-                })
-                .step(0.01),
-            )
-            .push(
-                Slider::new(0.0..=1.0, background_color.b, move |b| {
-                    Message::BackgroundColorChanged(Color {
-                        b,
-                        ..background_color
-                    })
-                })
-                .step(0.01),
-            );
-
-        Row::new()
-            .width(Length::Fill)
-            .height(Length::Fill)
-            .align_items(Alignment::End)
-            .push(
-                Column::new()
-                    .width(Length::Fill)
-                    .align_items(Alignment::End)
-                    .push(
-                        Column::new()
-                            .padding(10)
-                            .spacing(10)
-                            .push(
-                                Text::new("Background color")
-                                    .style(Color::WHITE),
-                            )
-                            .push(sliders)
-                            .push(
-                                Text::new(format!("{background_color:?}"))
-                                    .size(14)
-                                    .style(Color::WHITE),
-                            ),
-                    ),
-            )
-            .into()
-    }
-}
diff --git a/examples/integration_opengl/src/main.rs b/examples/integration_opengl/src/main.rs
deleted file mode 100644
index f161c8a0e0..0000000000
--- a/examples/integration_opengl/src/main.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-mod controls;
-mod scene;
-
-use controls::Controls;
-use scene::Scene;
-
-use glow::*;
-use glutin::dpi::PhysicalPosition;
-use glutin::event::{Event, ModifiersState, WindowEvent};
-use glutin::event_loop::ControlFlow;
-use iced_glow::glow;
-use iced_glow::{Backend, Renderer, Settings, Viewport};
-use iced_glutin::conversion;
-use iced_glutin::glutin;
-use iced_glutin::renderer;
-use iced_glutin::{program, Clipboard, Color, Debug, Size};
-
-pub fn main() {
-    env_logger::init();
-    let (gl, event_loop, windowed_context, shader_version) = {
-        let el = glutin::event_loop::EventLoop::new();
-
-        let wb = glutin::window::WindowBuilder::new()
-            .with_title("OpenGL integration example")
-            .with_inner_size(glutin::dpi::LogicalSize::new(1024.0, 768.0));
-
-        let windowed_context = glutin::ContextBuilder::new()
-            .with_vsync(true)
-            .build_windowed(wb, &el)
-            .unwrap();
-
-        unsafe {
-            let windowed_context = windowed_context.make_current().unwrap();
-
-            let gl = glow::Context::from_loader_function(|s| {
-                windowed_context.get_proc_address(s) as *const _
-            });
-
-            // Enable auto-conversion from/to sRGB
-            gl.enable(glow::FRAMEBUFFER_SRGB);
-
-            // Enable alpha blending
-            gl.enable(glow::BLEND);
-            gl.blend_func(glow::SRC_ALPHA, glow::ONE_MINUS_SRC_ALPHA);
-
-            // Disable multisampling by default
-            gl.disable(glow::MULTISAMPLE);
-
-            (gl, el, windowed_context, "#version 410")
-        }
-    };
-
-    let physical_size = windowed_context.window().inner_size();
-    let mut viewport = Viewport::with_physical_size(
-        Size::new(physical_size.width, physical_size.height),
-        windowed_context.window().scale_factor(),
-    );
-
-    let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
-    let mut modifiers = ModifiersState::default();
-    let mut clipboard = Clipboard::connect(windowed_context.window());
-
-    let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
-
-    let mut debug = Debug::new();
-
-    let controls = Controls::new();
-    let mut state = program::State::new(
-        controls,
-        viewport.logical_size(),
-        &mut renderer,
-        &mut debug,
-    );
-    let mut resized = false;
-
-    let scene = Scene::new(&gl, shader_version);
-
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-
-        match event {
-            Event::WindowEvent { event, .. } => {
-                match event {
-                    WindowEvent::CursorMoved { position, .. } => {
-                        cursor_position = position;
-                    }
-                    WindowEvent::ModifiersChanged(new_modifiers) => {
-                        modifiers = new_modifiers;
-                    }
-                    WindowEvent::Resized(physical_size) => {
-                        viewport = Viewport::with_physical_size(
-                            Size::new(
-                                physical_size.width,
-                                physical_size.height,
-                            ),
-                            windowed_context.window().scale_factor(),
-                        );
-
-                        resized = true;
-                    }
-                    WindowEvent::CloseRequested => {
-                        scene.cleanup(&gl);
-                        *control_flow = ControlFlow::Exit
-                    }
-                    _ => (),
-                }
-
-                // Map window event to iced event
-                if let Some(event) = iced_winit::conversion::window_event(
-                    &event,
-                    windowed_context.window().scale_factor(),
-                    modifiers,
-                ) {
-                    state.queue_event(event);
-                }
-            }
-            Event::MainEventsCleared => {
-                // If there are events pending
-                if !state.is_queue_empty() {
-                    // We update iced
-                    let _ = state.update(
-                        viewport.logical_size(),
-                        conversion::cursor_position(
-                            cursor_position,
-                            viewport.scale_factor(),
-                        ),
-                        &mut renderer,
-                        &iced_glow::Theme::Dark,
-                        &renderer::Style {
-                            text_color: Color::WHITE,
-                        },
-                        &mut clipboard,
-                        &mut debug,
-                    );
-
-                    // and request a redraw
-                    windowed_context.window().request_redraw();
-                }
-            }
-            Event::RedrawRequested(_) => {
-                if resized {
-                    let size = windowed_context.window().inner_size();
-
-                    unsafe {
-                        gl.viewport(
-                            0,
-                            0,
-                            size.width as i32,
-                            size.height as i32,
-                        );
-                    }
-
-                    resized = false;
-                }
-
-                let program = state.program();
-                {
-                    // We clear the frame
-                    scene.clear(&gl, program.background_color());
-
-                    // Draw the scene
-                    scene.draw(&gl);
-                }
-
-                // And then iced on top
-                renderer.with_primitives(|backend, primitive| {
-                    backend.present(
-                        &gl,
-                        primitive,
-                        &viewport,
-                        &debug.overlay(),
-                    );
-                });
-
-                // Update the mouse cursor
-                windowed_context.window().set_cursor_icon(
-                    iced_winit::conversion::mouse_interaction(
-                        state.mouse_interaction(),
-                    ),
-                );
-
-                windowed_context.swap_buffers().unwrap();
-            }
-            _ => (),
-        }
-    });
-}
diff --git a/examples/integration_opengl/src/scene.rs b/examples/integration_opengl/src/scene.rs
deleted file mode 100644
index c1d05b659e..0000000000
--- a/examples/integration_opengl/src/scene.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use glow::*;
-use iced_glow::glow;
-use iced_glow::Color;
-
-pub struct Scene {
-    program: glow::Program,
-    vertex_array: glow::VertexArray,
-}
-
-impl Scene {
-    pub fn new(gl: &glow::Context, shader_version: &str) -> Self {
-        unsafe {
-            let vertex_array = gl
-                .create_vertex_array()
-                .expect("Cannot create vertex array");
-            gl.bind_vertex_array(Some(vertex_array));
-
-            let program = gl.create_program().expect("Cannot create program");
-
-            let (vertex_shader_source, fragment_shader_source) = (
-                r#"const vec2 verts[3] = vec2[3](
-                    vec2(0.5f, 1.0f),
-                    vec2(0.0f, 0.0f),
-                    vec2(1.0f, 0.0f)
-                );
-                out vec2 vert;
-                void main() {
-                    vert = verts[gl_VertexID];
-                    gl_Position = vec4(vert - 0.5, 0.0, 1.0);
-                }"#,
-                r#"precision highp float;
-                in vec2 vert;
-                out vec4 color;
-                void main() {
-                    color = vec4(vert, 0.5, 1.0);
-                }"#,
-            );
-
-            let shader_sources = [
-                (glow::VERTEX_SHADER, vertex_shader_source),
-                (glow::FRAGMENT_SHADER, fragment_shader_source),
-            ];
-
-            let mut shaders = Vec::with_capacity(shader_sources.len());
-
-            for (shader_type, shader_source) in shader_sources.iter() {
-                let shader = gl
-                    .create_shader(*shader_type)
-                    .expect("Cannot create shader");
-                gl.shader_source(
-                    shader,
-                    &format!("{shader_version}\n{shader_source}"),
-                );
-                gl.compile_shader(shader);
-                if !gl.get_shader_compile_status(shader) {
-                    panic!("{}", gl.get_shader_info_log(shader));
-                }
-                gl.attach_shader(program, shader);
-                shaders.push(shader);
-            }
-
-            gl.link_program(program);
-            if !gl.get_program_link_status(program) {
-                panic!("{}", gl.get_program_info_log(program));
-            }
-
-            for shader in shaders {
-                gl.detach_shader(program, shader);
-                gl.delete_shader(shader);
-            }
-
-            gl.use_program(Some(program));
-            Self {
-                program,
-                vertex_array,
-            }
-        }
-    }
-
-    pub fn clear(&self, gl: &glow::Context, background_color: Color) {
-        let [r, g, b, a] = background_color.into_linear();
-        unsafe {
-            gl.clear_color(r, g, b, a);
-            gl.clear(glow::COLOR_BUFFER_BIT);
-        }
-    }
-
-    pub fn draw(&self, gl: &glow::Context) {
-        unsafe {
-            gl.bind_vertex_array(Some(self.vertex_array));
-            gl.use_program(Some(self.program));
-            gl.draw_arrays(glow::TRIANGLES, 0, 3);
-        }
-    }
-
-    pub fn cleanup(&self, gl: &glow::Context) {
-        unsafe {
-            gl.delete_program(self.program);
-            gl.delete_vertex_array(self.vertex_array);
-        }
-    }
-}
diff --git a/glow/Cargo.toml b/glow/Cargo.toml
deleted file mode 100644
index 1a848ab75c..0000000000
--- a/glow/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "iced_glow"
-version = "0.7.0"
-authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2021"
-description = "A glow renderer for iced"
-license = "MIT AND OFL-1.1"
-repository = "https://github.com/iced-rs/iced"
-
-[features]
-svg = ["iced_graphics/svg"]
-image = ["iced_graphics/image"]
-png = ["iced_graphics/png"]
-jpeg = ["iced_graphics/jpeg"]
-jpeg_rayon = ["iced_graphics/jpeg_rayon"]
-gif = ["iced_graphics/gif"]
-webp = ["iced_graphics/webp"]
-pnm = ["iced_graphics/pnm"]
-ico = ["iced_graphics/ico"]
-bmp = ["iced_graphics/bmp"]
-hdr = ["iced_graphics/hdr"]
-dds = ["iced_graphics/dds"]
-farbfeld = ["iced_graphics/farbfeld"]
-canvas = ["iced_graphics/canvas"]
-qr_code = ["iced_graphics/qr_code"]
-default_system_font = ["iced_graphics/font-source"]
-
-[dependencies]
-glow = "0.11.1"
-glow_glyph = "0.5.0"
-glyph_brush = "0.7"
-euclid = "0.22"
-bytemuck = "1.4"
-log = "0.4"
-
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
-[dependencies.iced_graphics]
-version = "0.7"
-path = "../graphics"
-features = ["font-fallback", "font-icons", "opengl"]
-
-[dependencies.tracing]
-version = "0.1.6"
-optional = true
-
-[package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
-all-features = true
diff --git a/glow/README.md b/glow/README.md
deleted file mode 100644
index 95c9d62a92..0000000000
--- a/glow/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# `iced_glow`
-[![Documentation](https://docs.rs/iced_glow/badge.svg)][documentation]
-[![Crates.io](https://img.shields.io/crates/v/iced_glow.svg)](https://crates.io/crates/iced_glow)
-[![License](https://img.shields.io/crates/l/iced_glow.svg)](https://github.com/iced-rs/iced/blob/master/LICENSE)
-[![Discord Server](https://img.shields.io/discord/628993209984614400?label=&labelColor=6A7EC2&logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/3xZJ65GAhd)
-
-`iced_glow` is a [`glow`] renderer for [`iced_native`]. This renderer supports OpenGL 3.0+ and OpenGL ES 2.0.
-
-This renderer is mostly used as a fallback for hardware that doesn't support [`wgpu`] (Vulkan, Metal or DX12).
-
-Currently, `iced_glow` supports the following primitives:
-- Text, which is rendered using [`glow_glyph`]. No shaping at all.
-- Quads or rectangles, with rounded borders and a solid background color.
-- Clip areas, useful to implement scrollables or hide overflowing content.
-- Meshes of triangles, useful to draw geometry freely.
-
-<p align="center">
-  <img alt="The native target" src="../docs/graphs/native.png" width="80%">
-</p>
-
-[documentation]: https://docs.rs/iced_glow
-[`iced_native`]: ../native
-[`glow`]: https://github.com/grovesNL/glow
-[`wgpu`]: https://github.com/gfx-rs/wgpu
-[`glow_glyph`]: https://github.com/hecrj/glow_glyph
-
-## Installation
-Add `iced_glow` as a dependency in your `Cargo.toml`:
-
-```toml
-iced_glow = "0.7"
-```
-
-__Iced moves fast and the `master` branch can contain breaking changes!__ If
-you want to learn about a specific release, check out [the release list].
-
-[the release list]: https://github.com/iced-rs/iced/releases
-
-## Current limitations
-
-The current implementation is quite naive, it uses:
-
-- A different pipeline/shader for each primitive
-- A very simplistic layer model: every `Clip` primitive will generate new layers
-- _Many_ render passes instead of preparing everything upfront
-- A glyph cache that is trimmed incorrectly when there are multiple layers (a [`glyph_brush`] limitation)
-
-Some of these issues are already being worked on! If you want to help, [get in touch!]
-
-[get in touch!]: ../CONTRIBUTING.md
-[`glyph_brush`]: https://github.com/alexheretic/glyph-brush
diff --git a/glow/src/backend.rs b/glow/src/backend.rs
deleted file mode 100644
index 36a34eda97..0000000000
--- a/glow/src/backend.rs
+++ /dev/null
@@ -1,280 +0,0 @@
-#[cfg(any(feature = "image", feature = "svg"))]
-use crate::image;
-use crate::quad;
-use crate::text;
-use crate::{program, triangle};
-use crate::{Settings, Transformation, Viewport};
-
-use iced_graphics::backend;
-use iced_graphics::font;
-use iced_graphics::{Layer, Primitive};
-use iced_native::alignment;
-use iced_native::{Font, Size};
-
-/// A [`glow`] graphics backend for [`iced`].
-///
-/// [`glow`]: https://github.com/grovesNL/glow
-/// [`iced`]: https://github.com/iced-rs/iced
-#[derive(Debug)]
-pub struct Backend {
-    #[cfg(any(feature = "image", feature = "svg"))]
-    image_pipeline: image::Pipeline,
-    quad_pipeline: quad::Pipeline,
-    text_pipeline: text::Pipeline,
-    triangle_pipeline: triangle::Pipeline,
-    default_text_size: f32,
-}
-
-impl Backend {
-    /// Creates a new [`Backend`].
-    pub fn new(gl: &glow::Context, settings: Settings) -> Self {
-        let text_pipeline = text::Pipeline::new(
-            gl,
-            settings.default_font,
-            settings.text_multithreading,
-        );
-
-        let shader_version = program::Version::new(gl);
-
-        #[cfg(any(feature = "image", feature = "svg"))]
-        let image_pipeline = image::Pipeline::new(gl, &shader_version);
-        let quad_pipeline = quad::Pipeline::new(gl, &shader_version);
-        let triangle_pipeline = triangle::Pipeline::new(gl, &shader_version);
-
-        Self {
-            #[cfg(any(feature = "image", feature = "svg"))]
-            image_pipeline,
-            quad_pipeline,
-            text_pipeline,
-            triangle_pipeline,
-            default_text_size: settings.default_text_size,
-        }
-    }
-
-    /// Draws the provided primitives in the default framebuffer.
-    ///
-    /// The text provided as overlay will be rendered on top of the primitives.
-    /// This is useful for rendering debug information.
-    pub fn present<T: AsRef<str>>(
-        &mut self,
-        gl: &glow::Context,
-        primitives: &[Primitive],
-        viewport: &Viewport,
-        overlay_text: &[T],
-    ) {
-        let viewport_size = viewport.physical_size();
-        let scale_factor = viewport.scale_factor() as f32;
-        let projection = viewport.projection();
-
-        let mut layers = Layer::generate(primitives, viewport);
-        layers.push(Layer::overlay(overlay_text, viewport));
-
-        for layer in layers {
-            self.flush(
-                gl,
-                scale_factor,
-                projection,
-                &layer,
-                viewport_size.height,
-            );
-        }
-
-        #[cfg(any(feature = "image", feature = "svg"))]
-        self.image_pipeline.trim_cache(gl);
-    }
-
-    fn flush(
-        &mut self,
-        gl: &glow::Context,
-        scale_factor: f32,
-        transformation: Transformation,
-        layer: &Layer<'_>,
-        target_height: u32,
-    ) {
-        let mut bounds = (layer.bounds * scale_factor).snap();
-
-        if bounds.width < 1 || bounds.height < 1 {
-            return;
-        }
-
-        bounds.height = bounds.height.min(target_height);
-
-        if !layer.quads.is_empty() {
-            self.quad_pipeline.draw(
-                gl,
-                target_height,
-                &layer.quads,
-                transformation,
-                scale_factor,
-                bounds,
-            );
-        }
-
-        if !layer.meshes.is_empty() {
-            let scaled = transformation
-                * Transformation::scale(scale_factor, scale_factor);
-
-            self.triangle_pipeline.draw(
-                &layer.meshes,
-                gl,
-                target_height,
-                scaled,
-                scale_factor,
-            );
-        }
-
-        #[cfg(any(feature = "image", feature = "svg"))]
-        if !layer.images.is_empty() {
-            let scaled = transformation
-                * Transformation::scale(scale_factor, scale_factor);
-
-            self.image_pipeline.draw(
-                gl,
-                target_height,
-                scaled,
-                scale_factor,
-                &layer.images,
-                bounds,
-            );
-        }
-
-        if !layer.text.is_empty() {
-            for text in layer.text.iter() {
-                // Target physical coordinates directly to avoid blurry text
-                let text = glow_glyph::Section {
-                    // TODO: We `round` here to avoid rerasterizing text when
-                    // its position changes slightly. This can make text feel a
-                    // bit "jumpy". We may be able to do better once we improve
-                    // our text rendering/caching pipeline.
-                    screen_position: (
-                        (text.bounds.x * scale_factor).round(),
-                        (text.bounds.y * scale_factor).round(),
-                    ),
-                    // TODO: Fix precision issues with some scale factors.
-                    //
-                    // The `ceil` here can cause some words to render on the
-                    // same line when they should not.
-                    //
-                    // Ideally, `wgpu_glyph` should be able to compute layout
-                    // using logical positions, and then apply the proper
-                    // scaling when rendering. This would ensure that both
-                    // measuring and rendering follow the same layout rules.
-                    bounds: (
-                        (text.bounds.width * scale_factor).ceil(),
-                        (text.bounds.height * scale_factor).ceil(),
-                    ),
-                    text: vec![glow_glyph::Text {
-                        text: text.content,
-                        scale: glow_glyph::ab_glyph::PxScale {
-                            x: text.size * scale_factor,
-                            y: text.size * scale_factor,
-                        },
-                        font_id: self.text_pipeline.find_font(text.font),
-                        extra: glow_glyph::Extra {
-                            color: text.color,
-                            z: 0.0,
-                        },
-                    }],
-                    layout: glow_glyph::Layout::default()
-                        .h_align(match text.horizontal_alignment {
-                            alignment::Horizontal::Left => {
-                                glow_glyph::HorizontalAlign::Left
-                            }
-                            alignment::Horizontal::Center => {
-                                glow_glyph::HorizontalAlign::Center
-                            }
-                            alignment::Horizontal::Right => {
-                                glow_glyph::HorizontalAlign::Right
-                            }
-                        })
-                        .v_align(match text.vertical_alignment {
-                            alignment::Vertical::Top => {
-                                glow_glyph::VerticalAlign::Top
-                            }
-                            alignment::Vertical::Center => {
-                                glow_glyph::VerticalAlign::Center
-                            }
-                            alignment::Vertical::Bottom => {
-                                glow_glyph::VerticalAlign::Bottom
-                            }
-                        }),
-                };
-
-                self.text_pipeline.queue(text);
-            }
-
-            self.text_pipeline.draw_queued(
-                gl,
-                transformation,
-                glow_glyph::Region {
-                    x: bounds.x,
-                    y: target_height - (bounds.y + bounds.height),
-                    width: bounds.width,
-                    height: bounds.height,
-                },
-            );
-        }
-    }
-}
-
-impl iced_graphics::Backend for Backend {
-    fn trim_measurements(&mut self) {
-        self.text_pipeline.trim_measurement_cache()
-    }
-}
-
-impl backend::Text for Backend {
-    const ICON_FONT: Font = font::ICONS;
-    const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
-    const ARROW_DOWN_ICON: char = font::ARROW_DOWN_ICON;
-
-    fn default_size(&self) -> f32 {
-        self.default_text_size
-    }
-
-    fn measure(
-        &self,
-        contents: &str,
-        size: f32,
-        font: Font,
-        bounds: Size,
-    ) -> (f32, f32) {
-        self.text_pipeline.measure(contents, size, font, bounds)
-    }
-
-    fn hit_test(
-        &self,
-        contents: &str,
-        size: f32,
-        font: Font,
-        bounds: Size,
-        point: iced_native::Point,
-        nearest_only: bool,
-    ) -> Option<text::Hit> {
-        self.text_pipeline.hit_test(
-            contents,
-            size,
-            font,
-            bounds,
-            point,
-            nearest_only,
-        )
-    }
-}
-
-#[cfg(feature = "image")]
-impl backend::Image for Backend {
-    fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
-        self.image_pipeline.dimensions(handle)
-    }
-}
-
-#[cfg(feature = "svg")]
-impl backend::Svg for Backend {
-    fn viewport_dimensions(
-        &self,
-        handle: &iced_native::svg::Handle,
-    ) -> Size<u32> {
-        self.image_pipeline.viewport_dimensions(handle)
-    }
-}
diff --git a/glow/src/image.rs b/glow/src/image.rs
deleted file mode 100644
index d3a25b5ba7..0000000000
--- a/glow/src/image.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-mod storage;
-
-use storage::Storage;
-
-pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
-
-use crate::program::{self, Shader};
-use crate::Transformation;
-
-#[cfg(feature = "image")]
-use iced_graphics::image::raster;
-
-#[cfg(feature = "svg")]
-use iced_graphics::image::vector;
-
-use iced_graphics::layer;
-use iced_graphics::Rectangle;
-use iced_graphics::Size;
-
-use glow::HasContext;
-
-use std::cell::RefCell;
-
-#[cfg(feature = "tracing")]
-use tracing::info_span;
-
-#[derive(Debug)]
-pub(crate) struct Pipeline {
-    program: <glow::Context as HasContext>::Program,
-    vertex_array: <glow::Context as HasContext>::VertexArray,
-    vertex_buffer: <glow::Context as HasContext>::Buffer,
-    transform_location: <glow::Context as HasContext>::UniformLocation,
-    storage: Storage,
-    #[cfg(feature = "image")]
-    raster_cache: RefCell<raster::Cache<Storage>>,
-    #[cfg(feature = "svg")]
-    vector_cache: RefCell<vector::Cache<Storage>>,
-}
-
-impl Pipeline {
-    pub fn new(
-        gl: &glow::Context,
-        shader_version: &program::Version,
-    ) -> Pipeline {
-        let program = unsafe {
-            let vertex_shader = Shader::vertex(
-                gl,
-                shader_version,
-                include_str!("shader/common/image.vert"),
-            );
-            let fragment_shader = Shader::fragment(
-                gl,
-                shader_version,
-                include_str!("shader/common/image.frag"),
-            );
-
-            program::create(
-                gl,
-                &[vertex_shader, fragment_shader],
-                &[(0, "i_Position")],
-            )
-        };
-
-        let transform_location =
-            unsafe { gl.get_uniform_location(program, "u_Transform") }
-                .expect("Get transform location");
-
-        unsafe {
-            gl.use_program(Some(program));
-
-            let transform: [f32; 16] = Transformation::identity().into();
-            gl.uniform_matrix_4_f32_slice(
-                Some(&transform_location),
-                false,
-                &transform,
-            );
-
-            gl.use_program(None);
-        }
-
-        let vertex_buffer =
-            unsafe { gl.create_buffer().expect("Create vertex buffer") };
-        let vertex_array =
-            unsafe { gl.create_vertex_array().expect("Create vertex array") };
-
-        unsafe {
-            gl.bind_vertex_array(Some(vertex_array));
-            gl.bind_buffer(glow::ARRAY_BUFFER, Some(vertex_buffer));
-
-            let vertices = &[0u8, 0, 1, 0, 0, 1, 1, 1];
-            gl.buffer_data_size(
-                glow::ARRAY_BUFFER,
-                vertices.len() as i32,
-                glow::STATIC_DRAW,
-            );
-            gl.buffer_sub_data_u8_slice(
-                glow::ARRAY_BUFFER,
-                0,
-                bytemuck::cast_slice(vertices),
-            );
-
-            gl.enable_vertex_attrib_array(0);
-            gl.vertex_attrib_pointer_f32(
-                0,
-                2,
-                glow::UNSIGNED_BYTE,
-                false,
-                0,
-                0,
-            );
-
-            gl.bind_buffer(glow::ARRAY_BUFFER, None);
-            gl.bind_vertex_array(None);
-        }
-
-        Pipeline {
-            program,
-            vertex_array,
-            vertex_buffer,
-            transform_location,
-            storage: Storage::default(),
-            #[cfg(feature = "image")]
-            raster_cache: RefCell::new(raster::Cache::default()),
-            #[cfg(feature = "svg")]
-            vector_cache: RefCell::new(vector::Cache::default()),
-        }
-    }
-
-    #[cfg(feature = "image")]
-    pub fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
-        self.raster_cache.borrow_mut().load(handle).dimensions()
-    }
-
-    #[cfg(feature = "svg")]
-    pub fn viewport_dimensions(
-        &self,
-        handle: &iced_native::svg::Handle,
-    ) -> Size<u32> {
-        let mut cache = self.vector_cache.borrow_mut();
-        let svg = cache.load(handle);
-
-        svg.viewport_dimensions()
-    }
-
-    pub fn draw(
-        &mut self,
-        mut gl: &glow::Context,
-        target_height: u32,
-        transformation: Transformation,
-        _scale_factor: f32,
-        images: &[layer::Image],
-        layer_bounds: Rectangle<u32>,
-    ) {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("Glow::Image", "DRAW").entered();
-
-        unsafe {
-            gl.use_program(Some(self.program));
-            gl.bind_vertex_array(Some(self.vertex_array));
-            gl.bind_buffer(glow::ARRAY_BUFFER, Some(self.vertex_buffer));
-            gl.enable(glow::SCISSOR_TEST);
-        }
-
-        #[cfg(feature = "image")]
-        let mut raster_cache = self.raster_cache.borrow_mut();
-
-        #[cfg(feature = "svg")]
-        let mut vector_cache = self.vector_cache.borrow_mut();
-
-        for image in images {
-            let (entry, bounds) = match &image {
-                #[cfg(feature = "image")]
-                layer::Image::Raster { handle, bounds } => (
-                    raster_cache.upload(handle, &mut gl, &mut self.storage),
-                    bounds,
-                ),
-                #[cfg(not(feature = "image"))]
-                layer::Image::Raster { handle: _, bounds } => (None, bounds),
-
-                #[cfg(feature = "svg")]
-                layer::Image::Vector {
-                    handle,
-                    color,
-                    bounds,
-                } => {
-                    let size = [bounds.width, bounds.height];
-                    (
-                        vector_cache.upload(
-                            handle,
-                            *color,
-                            size,
-                            _scale_factor,
-                            &mut gl,
-                            &mut self.storage,
-                        ),
-                        bounds,
-                    )
-                }
-
-                #[cfg(not(feature = "svg"))]
-                layer::Image::Vector { bounds, .. } => (None, bounds),
-            };
-
-            unsafe {
-                gl.scissor(
-                    layer_bounds.x as i32,
-                    (target_height - (layer_bounds.y + layer_bounds.height))
-                        as i32,
-                    layer_bounds.width as i32,
-                    layer_bounds.height as i32,
-                );
-
-                if let Some(storage::Entry { texture, .. }) = entry {
-                    gl.bind_texture(glow::TEXTURE_2D, Some(*texture))
-                } else {
-                    continue;
-                }
-
-                let translate = Transformation::translate(bounds.x, bounds.y);
-                let scale = Transformation::scale(bounds.width, bounds.height);
-                let transformation = transformation * translate * scale;
-                let matrix: [f32; 16] = transformation.into();
-                gl.uniform_matrix_4_f32_slice(
-                    Some(&self.transform_location),
-                    false,
-                    &matrix,
-                );
-
-                gl.draw_arrays(glow::TRIANGLE_STRIP, 0, 4);
-
-                gl.bind_texture(glow::TEXTURE_2D, None);
-            }
-        }
-
-        unsafe {
-            gl.bind_buffer(glow::ARRAY_BUFFER, None);
-            gl.bind_vertex_array(None);
-            gl.use_program(None);
-            gl.disable(glow::SCISSOR_TEST);
-        }
-    }
-
-    pub fn trim_cache(&mut self, mut gl: &glow::Context) {
-        #[cfg(feature = "image")]
-        self.raster_cache
-            .borrow_mut()
-            .trim(&mut self.storage, &mut gl);
-
-        #[cfg(feature = "svg")]
-        self.vector_cache
-            .borrow_mut()
-            .trim(&mut self.storage, &mut gl);
-    }
-}
diff --git a/glow/src/image/storage.rs b/glow/src/image/storage.rs
deleted file mode 100644
index 9bc20641c7..0000000000
--- a/glow/src/image/storage.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use iced_graphics::image;
-use iced_graphics::Size;
-
-use glow::HasContext;
-
-#[derive(Debug, Default)]
-pub struct Storage;
-
-impl image::Storage for Storage {
-    type Entry = Entry;
-    type State<'a> = &'a glow::Context;
-
-    fn upload(
-        &mut self,
-        width: u32,
-        height: u32,
-        data: &[u8],
-        gl: &mut &glow::Context,
-    ) -> Option<Self::Entry> {
-        unsafe {
-            let texture = gl.create_texture().expect("create texture");
-            gl.bind_texture(glow::TEXTURE_2D, Some(texture));
-            gl.tex_image_2d(
-                glow::TEXTURE_2D,
-                0,
-                glow::SRGB8_ALPHA8 as i32,
-                width as i32,
-                height as i32,
-                0,
-                glow::RGBA,
-                glow::UNSIGNED_BYTE,
-                Some(data),
-            );
-            gl.tex_parameter_i32(
-                glow::TEXTURE_2D,
-                glow::TEXTURE_WRAP_S,
-                glow::CLAMP_TO_EDGE as _,
-            );
-            gl.tex_parameter_i32(
-                glow::TEXTURE_2D,
-                glow::TEXTURE_WRAP_T,
-                glow::CLAMP_TO_EDGE as _,
-            );
-            gl.tex_parameter_i32(
-                glow::TEXTURE_2D,
-                glow::TEXTURE_MIN_FILTER,
-                glow::LINEAR as _,
-            );
-            gl.tex_parameter_i32(
-                glow::TEXTURE_2D,
-                glow::TEXTURE_MAG_FILTER,
-                glow::LINEAR as _,
-            );
-            gl.bind_texture(glow::TEXTURE_2D, None);
-
-            Some(Entry {
-                size: Size::new(width, height),
-                texture,
-            })
-        }
-    }
-
-    fn remove(&mut self, entry: &Entry, gl: &mut &glow::Context) {
-        unsafe { gl.delete_texture(entry.texture) }
-    }
-}
-
-#[derive(Debug)]
-pub struct Entry {
-    size: Size<u32>,
-    pub(super) texture: glow::NativeTexture,
-}
-
-impl image::storage::Entry for Entry {
-    fn size(&self) -> Size<u32> {
-        self.size
-    }
-}
diff --git a/glow/src/lib.rs b/glow/src/lib.rs
deleted file mode 100644
index 9e7de0d91a..0000000000
--- a/glow/src/lib.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-//! A [`glow`] renderer for [`iced_native`].
-//!
-//! ![The native path of the Iced ecosystem](https://github.com/iced-rs/iced/blob/0525d76ff94e828b7b21634fa94a747022001c83/docs/graphs/native.png?raw=true)
-//!
-//! [`glow`]: https://github.com/grovesNL/glow
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
-#![doc(
-    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
-)]
-#![deny(
-    missing_debug_implementations,
-    missing_docs,
-    unused_results,
-    clippy::extra_unused_lifetimes,
-    clippy::from_over_into,
-    clippy::needless_borrow,
-    clippy::new_without_default,
-    clippy::useless_conversion
-)]
-#![forbid(rust_2018_idioms)]
-#![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
-
-pub use glow;
-
-mod backend;
-#[cfg(any(feature = "image", feature = "svg"))]
-mod image;
-mod program;
-mod quad;
-mod text;
-mod triangle;
-
-pub mod settings;
-pub mod window;
-
-pub use backend::Backend;
-pub use settings::Settings;
-
-pub(crate) use iced_graphics::Transformation;
-
-pub use iced_graphics::{Error, Viewport};
-pub use iced_native::Theme;
-
-pub use iced_native::alignment;
-pub use iced_native::{Alignment, Background, Color, Command, Length, Vector};
-
-/// A [`glow`] graphics renderer for [`iced`].
-///
-/// [`glow`]: https://github.com/grovesNL/glow
-/// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme = iced_native::Theme> =
-    iced_graphics::Renderer<Backend, Theme>;
diff --git a/glow/src/program.rs b/glow/src/program.rs
deleted file mode 100644
index 95437fcdff..0000000000
--- a/glow/src/program.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use glow::HasContext;
-
-/// The [`Version`] of a `Program`.
-pub struct Version {
-    vertex: String,
-    fragment: String,
-}
-
-impl Version {
-    pub fn new(gl: &glow::Context) -> Version {
-        let version = gl.version();
-
-        let (vertex, fragment) = match (
-            version.major,
-            version.minor,
-            version.is_embedded,
-        ) {
-            // OpenGL 3.0+
-            (3, 0 | 1 | 2, false) => (
-                format!("#version 1{}0\n#extension GL_ARB_explicit_attrib_location : enable", version.minor + 3),
-                format!(
-                    "#version 1{}0\n#extension GL_ARB_explicit_attrib_location : enable\n#define HIGHER_THAN_300 1",
-                    version.minor + 3
-                ),
-            ),
-            // OpenGL 3.3+
-            (3 | 4, _, false) => (
-                format!("#version {}{}0\n#extension GL_ARB_explicit_attrib_location : enable", version.major, version.minor),
-                format!(
-                    "#version {}{}0\n#extension GL_ARB_explicit_attrib_location : enable\n#define HIGHER_THAN_300 1",
-                    version.major, version.minor
-                ),
-            ),
-            // OpenGL ES 3.0+
-            (3, _, true) => (
-                format!("#version 3{}0 es", version.minor),
-                format!(
-                    "#version 3{}0 es\n#define HIGHER_THAN_300 1",
-                    version.minor
-                ),
-            ),
-            // OpenGL ES 2.0+
-            (2, _, true) => (
-                String::from(
-                    "#version 100\n#define in attribute\n#define out varying",
-                ),
-                String::from("#version 100\n#define in varying"),
-            ),
-            // OpenGL 2.1
-            (2, _, false) => (
-                String::from(
-                    "#version 120\n#define in attribute\n#define out varying",
-                ),
-                String::from("#version 120\n#define in varying"),
-            ),
-            // OpenGL 1.1+
-            _ => panic!("Incompatible context version: {version:?}"),
-        };
-
-        log::info!("Shader directive: {}", vertex.lines().next().unwrap());
-
-        Version { vertex, fragment }
-    }
-}
-
-pub struct Shader(<glow::Context as HasContext>::Shader);
-
-impl Shader {
-    fn compile(gl: &glow::Context, stage: u32, content: &str) -> Shader {
-        unsafe {
-            let shader = gl.create_shader(stage).expect("Cannot create shader");
-
-            gl.shader_source(shader, content);
-            gl.compile_shader(shader);
-
-            if !gl.get_shader_compile_status(shader) {
-                panic!("{}", gl.get_shader_info_log(shader));
-            }
-
-            Shader(shader)
-        }
-    }
-
-    /// Creates a vertex [`Shader`].
-    pub fn vertex(
-        gl: &glow::Context,
-        version: &Version,
-        content: &'static str,
-    ) -> Self {
-        let content = format!("{}\n{}", version.vertex, content);
-
-        Shader::compile(gl, glow::VERTEX_SHADER, &content)
-    }
-
-    /// Creates a fragment [`Shader`].
-    pub fn fragment(
-        gl: &glow::Context,
-        version: &Version,
-        content: &'static str,
-    ) -> Self {
-        let content = format!("{}\n{}", version.fragment, content);
-
-        Shader::compile(gl, glow::FRAGMENT_SHADER, &content)
-    }
-}
-
-pub unsafe fn create(
-    gl: &glow::Context,
-    shaders: &[Shader],
-    attributes: &[(u32, &str)],
-) -> <glow::Context as HasContext>::Program {
-    let program = gl.create_program().expect("Cannot create program");
-
-    for shader in shaders {
-        gl.attach_shader(program, shader.0);
-    }
-
-    for (i, name) in attributes {
-        gl.bind_attrib_location(program, *i, name);
-    }
-
-    gl.link_program(program);
-    if !gl.get_program_link_status(program) {
-        panic!("{}", gl.get_program_info_log(program));
-    }
-
-    for shader in shaders {
-        gl.detach_shader(program, shader.0);
-        gl.delete_shader(shader.0);
-    }
-
-    program
-}
diff --git a/glow/src/quad.rs b/glow/src/quad.rs
deleted file mode 100644
index 67d9a0982b..0000000000
--- a/glow/src/quad.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-mod compatibility;
-mod core;
-
-use crate::program;
-use crate::Transformation;
-use glow::HasContext;
-use iced_graphics::layer;
-use iced_native::Rectangle;
-
-#[cfg(feature = "tracing")]
-use tracing::info_span;
-
-#[derive(Debug)]
-pub enum Pipeline {
-    Core(core::Pipeline),
-    Compatibility(compatibility::Pipeline),
-}
-
-impl Pipeline {
-    pub fn new(
-        gl: &glow::Context,
-        shader_version: &program::Version,
-    ) -> Pipeline {
-        let gl_version = gl.version();
-
-        // OpenGL 3.0+ and OpenGL ES 3.0+ have instancing (which is what separates `core` from `compatibility`)
-        if gl_version.major >= 3 {
-            log::info!("Mode: core");
-            Pipeline::Core(core::Pipeline::new(gl, shader_version))
-        } else {
-            log::info!("Mode: compatibility");
-            Pipeline::Compatibility(compatibility::Pipeline::new(
-                gl,
-                shader_version,
-            ))
-        }
-    }
-
-    pub fn draw(
-        &mut self,
-        gl: &glow::Context,
-        target_height: u32,
-        instances: &[layer::Quad],
-        transformation: Transformation,
-        scale: f32,
-        bounds: Rectangle<u32>,
-    ) {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("Glow::Quad", "DRAW").enter();
-
-        match self {
-            Pipeline::Core(pipeline) => {
-                pipeline.draw(
-                    gl,
-                    target_height,
-                    instances,
-                    transformation,
-                    scale,
-                    bounds,
-                );
-            }
-            Pipeline::Compatibility(pipeline) => {
-                pipeline.draw(
-                    gl,
-                    target_height,
-                    instances,
-                    transformation,
-                    scale,
-                    bounds,
-                );
-            }
-        }
-    }
-}
diff --git a/glow/src/quad/compatibility.rs b/glow/src/quad/compatibility.rs
deleted file mode 100644
index e909162c3b..0000000000
--- a/glow/src/quad/compatibility.rs
+++ /dev/null
@@ -1,349 +0,0 @@
-use crate::program::{self, Shader};
-use crate::Transformation;
-use glow::HasContext;
-use iced_graphics::layer;
-use iced_native::Rectangle;
-
-// Only change `MAX_QUADS`, otherwise you could cause problems
-// by splitting a triangle into different render passes.
-const MAX_QUADS: usize = 100_000;
-const MAX_VERTICES: usize = MAX_QUADS * 4;
-const MAX_INDICES: usize = MAX_QUADS * 6;
-
-#[derive(Debug)]
-pub struct Pipeline {
-    program: <glow::Context as HasContext>::Program,
-    vertex_array: <glow::Context as HasContext>::VertexArray,
-    vertex_buffer: <glow::Context as HasContext>::Buffer,
-    index_buffer: <glow::Context as HasContext>::Buffer,
-    transform_location: <glow::Context as HasContext>::UniformLocation,
-    scale_location: <glow::Context as HasContext>::UniformLocation,
-    screen_height_location: <glow::Context as HasContext>::UniformLocation,
-    current_transform: Transformation,
-    current_scale: f32,
-    current_target_height: u32,
-}
-
-impl Pipeline {
-    pub fn new(
-        gl: &glow::Context,
-        shader_version: &program::Version,
-    ) -> Pipeline {
-        let program = unsafe {
-            let vertex_shader = Shader::vertex(
-                gl,
-                shader_version,
-                include_str!("../shader/compatibility/quad.vert"),
-            );
-            let fragment_shader = Shader::fragment(
-                gl,
-                shader_version,
-                include_str!("../shader/compatibility/quad.frag"),
-            );
-
-            program::create(
-                gl,
-                &[vertex_shader, fragment_shader],
-                &[
-                    (0, "i_Pos"),
-                    (1, "i_Scale"),
-                    (2, "i_Color"),
-                    (3, "i_BorderColor"),
-                    (4, "i_BorderRadius"),
-                    (5, "i_BorderWidth"),
-                ],
-            )
-        };
-
-        let transform_location =
-            unsafe { gl.get_uniform_location(program, "u_Transform") }
-                .expect("Get transform location");
-
-        let scale_location =
-            unsafe { gl.get_uniform_location(program, "u_Scale") }
-                .expect("Get scale location");
-
-        let screen_height_location =
-            unsafe { gl.get_uniform_location(program, "u_ScreenHeight") }
-                .expect("Get target height location");
-
-        unsafe {
-            gl.use_program(Some(program));
-
-            gl.uniform_matrix_4_f32_slice(
-                Some(&transform_location),
-                false,
-                Transformation::identity().as_ref(),
-            );
-
-            gl.uniform_1_f32(Some(&scale_location), 1.0);
-            gl.uniform_1_f32(Some(&screen_height_location), 0.0);
-
-            gl.use_program(None);
-        }
-
-        let (vertex_array, vertex_buffer, index_buffer) =
-            unsafe { create_buffers(gl, MAX_VERTICES) };
-
-        Pipeline {
-            program,
-            vertex_array,
-            vertex_buffer,
-            index_buffer,
-            transform_location,
-            scale_location,
-            screen_height_location,
-            current_transform: Transformation::identity(),
-            current_scale: 1.0,
-            current_target_height: 0,
-        }
-    }
-
-    pub fn draw(
-        &mut self,
-        gl: &glow::Context,
-        target_height: u32,
-        instances: &[layer::Quad],
-        transformation: Transformation,
-        scale: f32,
-        bounds: Rectangle<u32>,
-    ) {
-        // TODO: Remove this allocation (probably by changing the shader and removing the need of two `position`)
-        let vertices: Vec<Vertex> =
-            instances.iter().flat_map(Vertex::from_quad).collect();
-
-        // TODO: Remove this allocation (or allocate only when needed)
-        let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
-            .flat_map(|i| {
-                [i * 4, 1 + i * 4, 2 + i * 4, 2 + i * 4, 1 + i * 4, 3 + i * 4]
-            })
-            .cycle()
-            .take(instances.len() * 6)
-            .collect();
-
-        unsafe {
-            gl.enable(glow::SCISSOR_TEST);
-            gl.scissor(
-                bounds.x as i32,
-                (target_height - (bounds.y + bounds.height)) as i32,
-                bounds.width as i32,
-                bounds.height as i32,
-            );
-
-            gl.use_program(Some(self.program));
-            gl.bind_vertex_array(Some(self.vertex_array));
-            gl.bind_buffer(glow::ARRAY_BUFFER, Some(self.vertex_buffer));
-            gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, Some(self.index_buffer));
-        }
-
-        if transformation != self.current_transform {
-            unsafe {
-                gl.uniform_matrix_4_f32_slice(
-                    Some(&self.transform_location),
-                    false,
-                    transformation.as_ref(),
-                );
-
-                self.current_transform = transformation;
-            }
-        }
-
-        if scale != self.current_scale {
-            unsafe {
-                gl.uniform_1_f32(Some(&self.scale_location), scale);
-            }
-
-            self.current_scale = scale;
-        }
-
-        if target_height != self.current_target_height {
-            unsafe {
-                gl.uniform_1_f32(
-                    Some(&self.screen_height_location),
-                    target_height as f32,
-                );
-            }
-
-            self.current_target_height = target_height;
-        }
-
-        let passes = vertices
-            .chunks(MAX_VERTICES)
-            .zip(indices.chunks(MAX_INDICES));
-
-        for (vertices, indices) in passes {
-            unsafe {
-                gl.buffer_sub_data_u8_slice(
-                    glow::ARRAY_BUFFER,
-                    0,
-                    bytemuck::cast_slice(vertices),
-                );
-
-                gl.buffer_sub_data_u8_slice(
-                    glow::ELEMENT_ARRAY_BUFFER,
-                    0,
-                    bytemuck::cast_slice(indices),
-                );
-
-                gl.draw_elements(
-                    glow::TRIANGLES,
-                    indices.len() as i32,
-                    glow::UNSIGNED_INT,
-                    0,
-                );
-            }
-        }
-
-        unsafe {
-            gl.bind_vertex_array(None);
-            gl.use_program(None);
-            gl.disable(glow::SCISSOR_TEST);
-        }
-    }
-}
-
-unsafe fn create_buffers(
-    gl: &glow::Context,
-    size: usize,
-) -> (
-    <glow::Context as HasContext>::VertexArray,
-    <glow::Context as HasContext>::Buffer,
-    <glow::Context as HasContext>::Buffer,
-) {
-    let vertex_array = gl.create_vertex_array().expect("Create vertex array");
-    let vertex_buffer = gl.create_buffer().expect("Create vertex buffer");
-    let index_buffer = gl.create_buffer().expect("Create index buffer");
-
-    gl.bind_vertex_array(Some(vertex_array));
-
-    gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, Some(index_buffer));
-    gl.buffer_data_size(
-        glow::ELEMENT_ARRAY_BUFFER,
-        12 * size as i32,
-        glow::DYNAMIC_DRAW,
-    );
-
-    gl.bind_buffer(glow::ARRAY_BUFFER, Some(vertex_buffer));
-    gl.buffer_data_size(
-        glow::ARRAY_BUFFER,
-        (size * Vertex::SIZE) as i32,
-        glow::DYNAMIC_DRAW,
-    );
-
-    let stride = Vertex::SIZE as i32;
-
-    gl.enable_vertex_attrib_array(0);
-    gl.vertex_attrib_pointer_f32(0, 2, glow::FLOAT, false, stride, 0);
-
-    gl.enable_vertex_attrib_array(1);
-    gl.vertex_attrib_pointer_f32(1, 2, glow::FLOAT, false, stride, 4 * 2);
-
-    gl.enable_vertex_attrib_array(2);
-    gl.vertex_attrib_pointer_f32(2, 4, glow::FLOAT, false, stride, 4 * (2 + 2));
-
-    gl.enable_vertex_attrib_array(3);
-    gl.vertex_attrib_pointer_f32(
-        3,
-        4,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4),
-    );
-
-    gl.enable_vertex_attrib_array(4);
-    gl.vertex_attrib_pointer_f32(
-        4,
-        4,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4 + 4),
-    );
-
-    gl.enable_vertex_attrib_array(5);
-    gl.vertex_attrib_pointer_f32(
-        5,
-        1,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4 + 4 + 4),
-    );
-
-    gl.enable_vertex_attrib_array(6);
-    gl.vertex_attrib_pointer_f32(
-        6,
-        2,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4 + 4 + 4 + 1),
-    );
-
-    gl.bind_vertex_array(None);
-    gl.bind_buffer(glow::ARRAY_BUFFER, None);
-    gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, None);
-
-    (vertex_array, vertex_buffer, index_buffer)
-}
-
-/// The vertex of a colored rectangle with a border.
-///
-/// This type can be directly uploaded to GPU memory.
-#[derive(Debug, Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
-#[repr(C)]
-pub struct Vertex {
-    /// The position of the [`Vertex`].
-    pub position: [f32; 2],
-
-    /// The size of the [`Vertex`].
-    pub size: [f32; 2],
-
-    /// The color of the [`Vertex`], in __linear RGB__.
-    pub color: [f32; 4],
-
-    /// The border color of the [`Vertex`], in __linear RGB__.
-    pub border_color: [f32; 4],
-
-    /// The border radius of the [`Vertex`].
-    pub border_radius: [f32; 4],
-
-    /// The border width of the [`Vertex`].
-    pub border_width: f32,
-
-    /// The __quad__ position of the [`Vertex`].
-    pub q_position: [f32; 2],
-}
-
-impl Vertex {
-    const SIZE: usize = std::mem::size_of::<Self>();
-
-    fn from_quad(quad: &layer::Quad) -> [Vertex; 4] {
-        let base = Vertex {
-            position: quad.position,
-            size: quad.size,
-            color: quad.color,
-            border_color: quad.color,
-            border_radius: quad.border_radius,
-            border_width: quad.border_width,
-            q_position: [0.0, 0.0],
-        };
-
-        [
-            base,
-            Self {
-                q_position: [0.0, 1.0],
-                ..base
-            },
-            Self {
-                q_position: [1.0, 0.0],
-                ..base
-            },
-            Self {
-                q_position: [1.0, 1.0],
-                ..base
-            },
-        ]
-    }
-}
diff --git a/glow/src/quad/core.rs b/glow/src/quad/core.rs
deleted file mode 100644
index 890365301e..0000000000
--- a/glow/src/quad/core.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use crate::program::{self, Shader};
-use crate::Transformation;
-use glow::HasContext;
-use iced_graphics::layer;
-use iced_native::Rectangle;
-
-const MAX_INSTANCES: usize = 100_000;
-
-#[derive(Debug)]
-pub struct Pipeline {
-    program: <glow::Context as HasContext>::Program,
-    vertex_array: <glow::Context as HasContext>::VertexArray,
-    instances: <glow::Context as HasContext>::Buffer,
-    transform_location: <glow::Context as HasContext>::UniformLocation,
-    scale_location: <glow::Context as HasContext>::UniformLocation,
-    screen_height_location: <glow::Context as HasContext>::UniformLocation,
-    current_transform: Transformation,
-    current_scale: f32,
-    current_target_height: u32,
-}
-
-impl Pipeline {
-    pub fn new(
-        gl: &glow::Context,
-        shader_version: &program::Version,
-    ) -> Pipeline {
-        let program = unsafe {
-            let vertex_shader = Shader::vertex(
-                gl,
-                shader_version,
-                include_str!("../shader/core/quad.vert"),
-            );
-            let fragment_shader = Shader::fragment(
-                gl,
-                shader_version,
-                include_str!("../shader/core/quad.frag"),
-            );
-
-            program::create(
-                gl,
-                &[vertex_shader, fragment_shader],
-                &[
-                    (0, "i_Pos"),
-                    (1, "i_Scale"),
-                    (2, "i_Color"),
-                    (3, "i_BorderColor"),
-                    (4, "i_BorderRadius"),
-                    (5, "i_BorderWidth"),
-                ],
-            )
-        };
-
-        let transform_location =
-            unsafe { gl.get_uniform_location(program, "u_Transform") }
-                .expect("Get transform location");
-
-        let scale_location =
-            unsafe { gl.get_uniform_location(program, "u_Scale") }
-                .expect("Get scale location");
-
-        let screen_height_location =
-            unsafe { gl.get_uniform_location(program, "u_ScreenHeight") }
-                .expect("Get target height location");
-
-        unsafe {
-            gl.use_program(Some(program));
-
-            gl.uniform_matrix_4_f32_slice(
-                Some(&transform_location),
-                false,
-                Transformation::identity().as_ref(),
-            );
-
-            gl.uniform_1_f32(Some(&scale_location), 1.0);
-            gl.uniform_1_f32(Some(&screen_height_location), 0.0);
-
-            gl.use_program(None);
-        }
-
-        let (vertex_array, instances) =
-            unsafe { create_instance_buffer(gl, MAX_INSTANCES) };
-
-        Pipeline {
-            program,
-            vertex_array,
-            instances,
-            transform_location,
-            scale_location,
-            screen_height_location,
-            current_transform: Transformation::identity(),
-            current_scale: 1.0,
-            current_target_height: 0,
-        }
-    }
-
-    pub fn draw(
-        &mut self,
-        gl: &glow::Context,
-        target_height: u32,
-        instances: &[layer::Quad],
-        transformation: Transformation,
-        scale: f32,
-        bounds: Rectangle<u32>,
-    ) {
-        unsafe {
-            gl.enable(glow::SCISSOR_TEST);
-            gl.scissor(
-                bounds.x as i32,
-                (target_height - (bounds.y + bounds.height)) as i32,
-                bounds.width as i32,
-                bounds.height as i32,
-            );
-
-            gl.use_program(Some(self.program));
-            gl.bind_vertex_array(Some(self.vertex_array));
-            gl.bind_buffer(glow::ARRAY_BUFFER, Some(self.instances));
-        }
-
-        if transformation != self.current_transform {
-            unsafe {
-                gl.uniform_matrix_4_f32_slice(
-                    Some(&self.transform_location),
-                    false,
-                    transformation.as_ref(),
-                );
-
-                self.current_transform = transformation;
-            }
-        }
-
-        if scale != self.current_scale {
-            unsafe {
-                gl.uniform_1_f32(Some(&self.scale_location), scale);
-            }
-
-            self.current_scale = scale;
-        }
-
-        if target_height != self.current_target_height {
-            unsafe {
-                gl.uniform_1_f32(
-                    Some(&self.screen_height_location),
-                    target_height as f32,
-                );
-            }
-
-            self.current_target_height = target_height;
-        }
-
-        for instances in instances.chunks(MAX_INSTANCES) {
-            unsafe {
-                gl.buffer_sub_data_u8_slice(
-                    glow::ARRAY_BUFFER,
-                    0,
-                    bytemuck::cast_slice(instances),
-                );
-
-                gl.draw_arrays_instanced(
-                    glow::TRIANGLE_STRIP,
-                    0,
-                    4,
-                    instances.len() as i32,
-                );
-            }
-        }
-
-        unsafe {
-            gl.bind_vertex_array(None);
-            gl.use_program(None);
-            gl.disable(glow::SCISSOR_TEST);
-        }
-    }
-}
-
-unsafe fn create_instance_buffer(
-    gl: &glow::Context,
-    size: usize,
-) -> (
-    <glow::Context as HasContext>::VertexArray,
-    <glow::Context as HasContext>::Buffer,
-) {
-    let vertex_array = gl.create_vertex_array().expect("Create vertex array");
-    let buffer = gl.create_buffer().expect("Create instance buffer");
-
-    gl.bind_vertex_array(Some(vertex_array));
-    gl.bind_buffer(glow::ARRAY_BUFFER, Some(buffer));
-    gl.buffer_data_size(
-        glow::ARRAY_BUFFER,
-        (size * std::mem::size_of::<layer::Quad>()) as i32,
-        glow::DYNAMIC_DRAW,
-    );
-
-    let stride = std::mem::size_of::<layer::Quad>() as i32;
-
-    gl.enable_vertex_attrib_array(0);
-    gl.vertex_attrib_pointer_f32(0, 2, glow::FLOAT, false, stride, 0);
-    gl.vertex_attrib_divisor(0, 1);
-
-    gl.enable_vertex_attrib_array(1);
-    gl.vertex_attrib_pointer_f32(1, 2, glow::FLOAT, false, stride, 4 * 2);
-    gl.vertex_attrib_divisor(1, 1);
-
-    gl.enable_vertex_attrib_array(2);
-    gl.vertex_attrib_pointer_f32(2, 4, glow::FLOAT, false, stride, 4 * (2 + 2));
-    gl.vertex_attrib_divisor(2, 1);
-
-    gl.enable_vertex_attrib_array(3);
-    gl.vertex_attrib_pointer_f32(
-        3,
-        4,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4),
-    );
-    gl.vertex_attrib_divisor(3, 1);
-
-    gl.enable_vertex_attrib_array(4);
-    gl.vertex_attrib_pointer_f32(
-        4,
-        4,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4 + 4),
-    );
-    gl.vertex_attrib_divisor(4, 1);
-
-    gl.enable_vertex_attrib_array(5);
-    gl.vertex_attrib_pointer_f32(
-        5,
-        1,
-        glow::FLOAT,
-        false,
-        stride,
-        4 * (2 + 2 + 4 + 4 + 4),
-    );
-    gl.vertex_attrib_divisor(5, 1);
-
-    gl.bind_vertex_array(None);
-    gl.bind_buffer(glow::ARRAY_BUFFER, None);
-
-    (vertex_array, buffer)
-}
diff --git a/glow/src/settings.rs b/glow/src/settings.rs
deleted file mode 100644
index 6aaa0d5515..0000000000
--- a/glow/src/settings.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-//! Configure a renderer.
-pub use iced_graphics::Antialiasing;
-
-/// The settings of a [`Backend`].
-///
-/// [`Backend`]: crate::Backend
-#[derive(Clone, Copy, PartialEq)]
-pub struct Settings {
-    /// The bytes of the font that will be used by default.
-    ///
-    /// If `None` is provided, a default system font will be chosen.
-    pub default_font: Option<&'static [u8]>,
-
-    /// The default size of text.
-    ///
-    /// By default, it will be set to `20.0`.
-    pub default_text_size: f32,
-
-    /// If enabled, spread text workload in multiple threads when multiple cores
-    /// are available.
-    ///
-    /// By default, it is disabled.
-    pub text_multithreading: bool,
-
-    /// The antialiasing strategy that will be used for triangle primitives.
-    ///
-    /// By default, it is `None`.
-    pub antialiasing: Option<Antialiasing>,
-}
-
-impl Default for Settings {
-    fn default() -> Settings {
-        Settings {
-            default_font: None,
-            default_text_size: 20.0,
-            text_multithreading: false,
-            antialiasing: None,
-        }
-    }
-}
-
-impl std::fmt::Debug for Settings {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Settings")
-            // Instead of printing the font bytes, we simply show a `bool` indicating if using a default font or not.
-            .field("default_font", &self.default_font.is_some())
-            .field("default_text_size", &self.default_text_size)
-            .field("text_multithreading", &self.text_multithreading)
-            .field("antialiasing", &self.antialiasing)
-            .finish()
-    }
-}
-
-impl Settings {
-    /// Creates new [`Settings`] using environment configuration.
-    ///
-    /// Currently, this is equivalent to calling [`Settings::default`].
-    pub fn from_env() -> Self {
-        Self::default()
-    }
-}
diff --git a/glow/src/shader/common/gradient.frag b/glow/src/shader/common/gradient.frag
deleted file mode 100644
index 9af0cb6e36..0000000000
--- a/glow/src/shader/common/gradient.frag
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-#ifdef HIGHER_THAN_300
-layout (location = 0) out vec4 fragColor;
-#define gl_FragColor fragColor
-#endif
-
-in vec2 raw_position;
-
-uniform vec4 gradient_direction;
-uniform int color_stops_size;
-// GLSL does not support dynamically sized arrays without SSBOs so this is capped to 16 stops
-//stored as color(vec4) -> offset(vec4) sequentially;
-uniform vec4 color_stops[32];
-
-//TODO: rewrite without branching to make ALUs happy
-void main() {
-    vec2 start = gradient_direction.xy;
-    vec2 end = gradient_direction.zw;
-    vec2 gradient_vec = vec2(end - start);
-    vec2 current_vec = vec2(raw_position.xy - start);
-    vec2 unit = normalize(gradient_vec);
-    float coord_offset = dot(unit, current_vec) / length(gradient_vec);
-    //if a gradient has a start/end stop that is identical, the mesh will have a transparent fill
-    gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
-
-    float min_offset = color_stops[1].x;
-    float max_offset = color_stops[color_stops_size - 1].x;
-
-    for (int i = 0; i < color_stops_size - 2; i += 2) {
-        float curr_offset = color_stops[i+1].x;
-        float next_offset = color_stops[i+3].x;
-
-        if (coord_offset <= min_offset) {
-            //current coordinate is before the first defined offset, set it to the start color
-            gl_FragColor = color_stops[0];
-        }
-
-        if (curr_offset <= coord_offset && coord_offset <= next_offset) {
-            //current fragment is between the current offset processing & the next one, interpolate colors
-            gl_FragColor = mix(color_stops[i], color_stops[i+2], smoothstep(
-                curr_offset,
-                next_offset,
-                coord_offset
-            ));
-        }
-
-        if (coord_offset >= max_offset) {
-            //current coordinate is before the last defined offset, set it to the last color
-            gl_FragColor = color_stops[color_stops_size - 2];
-        }
-    }
-}
diff --git a/glow/src/shader/common/gradient.vert b/glow/src/shader/common/gradient.vert
deleted file mode 100644
index fe505997c6..0000000000
--- a/glow/src/shader/common/gradient.vert
+++ /dev/null
@@ -1,9 +0,0 @@
-uniform mat4 u_Transform;
-
-in vec2 i_Position;
-out vec2 raw_position;
-
-void main() {
-    gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0);
-    raw_position = i_Position;
-}
diff --git a/glow/src/shader/common/image.frag b/glow/src/shader/common/image.frag
deleted file mode 100644
index 5e05abdf2c..0000000000
--- a/glow/src/shader/common/image.frag
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-uniform sampler2D tex;
-in vec2 tex_pos;
-
-#ifdef HIGHER_THAN_300
-out vec4 fragColor;
-#define gl_FragColor fragColor
-#endif
-#ifdef GL_ES
-#define texture texture2D
-#endif
-
-void main() {
-    gl_FragColor = texture(tex, tex_pos);
-}
diff --git a/glow/src/shader/common/image.vert b/glow/src/shader/common/image.vert
deleted file mode 100644
index 93e541f2b3..0000000000
--- a/glow/src/shader/common/image.vert
+++ /dev/null
@@ -1,9 +0,0 @@
-uniform mat4 u_Transform;
-
-in vec2 i_Position;
-out vec2 tex_pos;
-
-void main() {
-    gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0);
-    tex_pos = i_Position;
-}
diff --git a/glow/src/shader/common/solid.frag b/glow/src/shader/common/solid.frag
deleted file mode 100644
index 174ffdd3e0..0000000000
--- a/glow/src/shader/common/solid.frag
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-#ifdef HIGHER_THAN_300
-out vec4 fragColor;
-#define gl_FragColor fragColor
-#endif
-
-in vec4 v_Color;
-
-void main() {
-    gl_FragColor = v_Color;
-}
diff --git a/glow/src/shader/common/solid.vert b/glow/src/shader/common/solid.vert
deleted file mode 100644
index 59ed88e596..0000000000
--- a/glow/src/shader/common/solid.vert
+++ /dev/null
@@ -1,11 +0,0 @@
-uniform mat4 u_Transform;
-
-in vec2 i_Position;
-in vec4 i_Color;
-
-out vec4 v_Color;
-
-void main() {
-    gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0);
-    v_Color = i_Color;
-}
diff --git a/glow/src/shader/compatibility/quad.frag b/glow/src/shader/compatibility/quad.frag
deleted file mode 100644
index bb9d8122d1..0000000000
--- a/glow/src/shader/compatibility/quad.frag
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-uniform float u_ScreenHeight;
-
-varying vec4 v_Color;
-varying vec4 v_BorderColor;
-varying vec2 v_Pos;
-varying vec2 v_Scale;
-varying vec4 v_BorderRadius;
-varying float v_BorderWidth;
-
-float _distance(vec2 frag_coord, vec2 position, vec2 size, float radius)
-{
-    // TODO: Try SDF approach: https://www.shadertoy.com/view/wd3XRN
-    vec2 inner_size = size - vec2(radius, radius) * 2.0;
-    vec2 top_left = position + vec2(radius, radius);
-    vec2 bottom_right = top_left + inner_size;
-
-    vec2 top_left_distance = top_left - frag_coord;
-    vec2 bottom_right_distance = frag_coord - bottom_right;
-
-    vec2 distance = vec2(
-        max(max(top_left_distance.x, bottom_right_distance.x), 0.0),
-        max(max(top_left_distance.y, bottom_right_distance.y), 0.0)
-    );
-
-    return sqrt(distance.x * distance.x + distance.y * distance.y);
-}
-
-float selectBorderRadius(vec4 radi, vec2 position, vec2 center)
-{
-    float rx = radi.x;
-    float ry = radi.y;
-    rx = position.x > center.x ? radi.y : radi.x;
-    ry = position.x > center.x ? radi.z : radi.w;
-    rx = position.y > center.y ? ry : rx;
-    return rx;
-}
-
-void main() {
-    vec2 fragCoord = vec2(gl_FragCoord.x, u_ScreenHeight - gl_FragCoord.y);
-
-    float border_radius = selectBorderRadius(
-        v_BorderRadius,
-        fragCoord,
-        (v_Pos + v_Scale * 0.5).xy
-    );
-
-    float internal_border = max(border_radius - v_BorderWidth, 0.0);
-
-    float internal_distance = _distance(
-        fragCoord,
-        v_Pos + vec2(v_BorderWidth),
-        v_Scale - vec2(v_BorderWidth * 2.0),
-        internal_border
-    );
-
-    float border_mix = smoothstep(
-        max(internal_border - 0.5, 0.0),
-        internal_border + 0.5,
-        internal_distance
-    );
-
-    vec4 mixed_color = mix(v_Color, v_BorderColor, border_mix);
-
-    float d = _distance(
-        fragCoord,
-        v_Pos,
-        v_Scale,
-        border_radius
-    );
-
-    float radius_alpha =
-        1.0 - smoothstep(max(border_radius - 0.5, 0.0), border_radius + 0.5, d);
-
-    gl_FragColor = vec4(mixed_color.xyz, mixed_color.w * radius_alpha);
-}
diff --git a/glow/src/shader/compatibility/quad.vert b/glow/src/shader/compatibility/quad.vert
deleted file mode 100644
index 89931f0671..0000000000
--- a/glow/src/shader/compatibility/quad.vert
+++ /dev/null
@@ -1,46 +0,0 @@
-uniform mat4 u_Transform;
-uniform float u_Scale;
-
-attribute vec2 i_Pos;
-attribute vec2 i_Scale;
-attribute vec4 i_Color;
-attribute vec4 i_BorderColor;
-attribute vec4 i_BorderRadius;
-attribute float i_BorderWidth;
-attribute vec2 q_Pos;
-
-varying vec4 v_Color;
-varying vec4 v_BorderColor;
-varying vec2 v_Pos;
-varying vec2 v_Scale;
-varying vec4 v_BorderRadius;
-varying float v_BorderWidth;
-
-
-void main() {
-    vec2 p_Pos = i_Pos * u_Scale;
-    vec2 p_Scale = i_Scale  * u_Scale;
-
-    vec4 i_BorderRadius = vec4(
-        min(i_BorderRadius.x, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.y, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.z, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.w, min(i_Scale.x, i_Scale.y) / 2.0)
-    );
-
-    mat4 i_Transform = mat4(
-        vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
-        vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
-        vec4(0.0, 0.0, 1.0, 0.0),
-        vec4(p_Pos - vec2(0.5, 0.5), 0.0, 1.0)
-    );
-
-    v_Color = i_Color;
-    v_BorderColor = i_BorderColor;
-    v_Pos = p_Pos;
-    v_Scale = p_Scale;
-    v_BorderRadius = i_BorderRadius * u_Scale;
-    v_BorderWidth = i_BorderWidth * u_Scale;
-
-    gl_Position = u_Transform * i_Transform * vec4(q_Pos, 0.0, 1.0);
-}
diff --git a/glow/src/shader/core/quad.frag b/glow/src/shader/core/quad.frag
deleted file mode 100644
index 71147aa51d..0000000000
--- a/glow/src/shader/core/quad.frag
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-#ifdef HIGHER_THAN_300
-out vec4 fragColor;
-#define gl_FragColor fragColor
-#endif
-
-uniform float u_ScreenHeight;
-
-in vec4 v_Color;
-in vec4 v_BorderColor;
-in vec2 v_Pos;
-in vec2 v_Scale;
-in vec4 v_BorderRadius;
-in float v_BorderWidth;
-
-float fDistance(vec2 frag_coord, vec2 position, vec2 size, float radius)
-{
-    // TODO: Try SDF approach: https://www.shadertoy.com/view/wd3XRN
-    vec2 inner_size = size - vec2(radius, radius) * 2.0;
-    vec2 top_left = position + vec2(radius, radius);
-    vec2 bottom_right = top_left + inner_size;
-
-    vec2 top_left_distance = top_left - frag_coord;
-    vec2 bottom_right_distance = frag_coord - bottom_right;
-
-    vec2 distance = vec2(
-        max(max(top_left_distance.x, bottom_right_distance.x), 0.0),
-        max(max(top_left_distance.y, bottom_right_distance.y), 0.0)
-    );
-
-    return sqrt(distance.x * distance.x + distance.y * distance.y);
-}
-
-float selectBorderRadius(vec4 radi, vec2 position, vec2 center)
-{
-    float rx = radi.x;
-    float ry = radi.y;
-    rx = position.x > center.x ? radi.y : radi.x;
-    ry = position.x > center.x ? radi.z : radi.w;
-    rx = position.y > center.y ? ry : rx;
-    return rx;
-}
-
-void main() {
-    vec4 mixed_color;
-
-    vec2 fragCoord = vec2(gl_FragCoord.x, u_ScreenHeight - gl_FragCoord.y);
-
-    float border_radius = selectBorderRadius(
-        v_BorderRadius,
-        fragCoord,
-        (v_Pos + v_Scale * 0.5).xy
-    );
-
-    // TODO: Remove branching (?)
-    if(v_BorderWidth > 0.0) {
-        float internal_border = max(border_radius - v_BorderWidth, 0.0);
-
-        float internal_distance = fDistance(
-            fragCoord,
-            v_Pos + vec2(v_BorderWidth),
-            v_Scale - vec2(v_BorderWidth * 2.0),
-            internal_border
-        );
-
-        float border_mix = smoothstep(
-            max(internal_border - 0.5, 0.0),
-            internal_border + 0.5,
-            internal_distance
-        );
-
-        mixed_color = mix(v_Color, v_BorderColor, border_mix);
-    } else {
-        mixed_color = v_Color;
-    }
-
-    float d = fDistance(
-        fragCoord,
-        v_Pos,
-        v_Scale,
-        border_radius
-    );
-
-    float radius_alpha =
-        1.0 - smoothstep(max(border_radius - 0.5, 0.0), border_radius + 0.5, d);
-
-    gl_FragColor = vec4(mixed_color.xyz, mixed_color.w * radius_alpha);
-}
diff --git a/glow/src/shader/core/quad.vert b/glow/src/shader/core/quad.vert
deleted file mode 100644
index 17c3e64191..0000000000
--- a/glow/src/shader/core/quad.vert
+++ /dev/null
@@ -1,52 +0,0 @@
-uniform mat4 u_Transform;
-uniform float u_Scale;
-
-in vec2 i_Pos;
-in vec2 i_Scale;
-in vec4 i_Color;
-in vec4 i_BorderColor;
-in vec4 i_BorderRadius;
-in float i_BorderWidth;
-
-out vec4 v_Color;
-out vec4 v_BorderColor;
-out vec2 v_Pos;
-out vec2 v_Scale;
-out vec4 v_BorderRadius;
-out float v_BorderWidth;
-
-vec2 positions[4] = vec2[](
-    vec2(0.0, 0.0),
-    vec2(0.0, 1.0),
-    vec2(1.0, 0.0),
-    vec2(1.0, 1.0)
-);
-
-void main() {
-    vec2 q_Pos = positions[gl_VertexID];
-    vec2 p_Pos = i_Pos * u_Scale;
-    vec2 p_Scale = i_Scale  * u_Scale;
-
-    vec4 i_BorderRadius = vec4(
-        min(i_BorderRadius.x, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.y, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.z, min(i_Scale.x, i_Scale.y) / 2.0),
-        min(i_BorderRadius.w, min(i_Scale.x, i_Scale.y) / 2.0)
-    );
-
-    mat4 i_Transform = mat4(
-        vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
-        vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
-        vec4(0.0, 0.0, 1.0, 0.0),
-        vec4(p_Pos - vec2(0.5, 0.5), 0.0, 1.0)
-    );
-
-    v_Color = i_Color;
-    v_BorderColor = i_BorderColor;
-    v_Pos = p_Pos;
-    v_Scale = p_Scale;
-    v_BorderRadius = i_BorderRadius * u_Scale;
-    v_BorderWidth = i_BorderWidth * u_Scale;
-
-    gl_Position = u_Transform * i_Transform * vec4(q_Pos, 0.0, 1.0);
-}
diff --git a/glow/src/text.rs b/glow/src/text.rs
deleted file mode 100644
index 37ccdece0d..0000000000
--- a/glow/src/text.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use crate::Transformation;
-
-use iced_graphics::font;
-
-use glow_glyph::ab_glyph;
-use std::{cell::RefCell, collections::HashMap};
-
-pub use iced_native::text::Hit;
-
-#[derive(Debug)]
-pub struct Pipeline {
-    draw_brush: RefCell<glow_glyph::GlyphBrush>,
-    draw_font_map: RefCell<HashMap<String, glow_glyph::FontId>>,
-    measure_brush: RefCell<glyph_brush::GlyphBrush<()>>,
-}
-
-impl Pipeline {
-    pub fn new(
-        gl: &glow::Context,
-        default_font: Option<&[u8]>,
-        multithreading: bool,
-    ) -> Self {
-        let default_font = default_font.map(|slice| slice.to_vec());
-
-        // TODO: Font customization
-        #[cfg(feature = "default_system_font")]
-        let default_font = {
-            default_font.or_else(|| {
-                font::Source::new()
-                    .load(&[font::Family::SansSerif, font::Family::Serif])
-                    .ok()
-            })
-        };
-
-        let default_font =
-            default_font.unwrap_or_else(|| font::FALLBACK.to_vec());
-
-        let font = ab_glyph::FontArc::try_from_vec(default_font)
-            .unwrap_or_else(|_| {
-                log::warn!(
-                    "System font failed to load. Falling back to \
-                    embedded font..."
-                );
-
-                ab_glyph::FontArc::try_from_slice(font::FALLBACK)
-                    .expect("Load fallback font")
-            });
-
-        let draw_brush_builder =
-            glow_glyph::GlyphBrushBuilder::using_font(font.clone())
-                .initial_cache_size((2048, 2048))
-                .draw_cache_multithread(multithreading);
-
-        #[cfg(target_arch = "wasm32")]
-        let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true);
-
-        let draw_brush = draw_brush_builder.build(gl);
-
-        let measure_brush =
-            glyph_brush::GlyphBrushBuilder::using_font(font).build();
-
-        Pipeline {
-            draw_brush: RefCell::new(draw_brush),
-            draw_font_map: RefCell::new(HashMap::new()),
-            measure_brush: RefCell::new(measure_brush),
-        }
-    }
-
-    pub fn queue(&mut self, section: glow_glyph::Section<'_>) {
-        self.draw_brush.borrow_mut().queue(section);
-    }
-
-    pub fn draw_queued(
-        &mut self,
-        gl: &glow::Context,
-        transformation: Transformation,
-        region: glow_glyph::Region,
-    ) {
-        self.draw_brush
-            .borrow_mut()
-            .draw_queued_with_transform_and_scissoring(
-                gl,
-                transformation.into(),
-                region,
-            )
-            .expect("Draw text");
-    }
-
-    pub fn measure(
-        &self,
-        content: &str,
-        size: f32,
-        font: iced_native::Font,
-        bounds: iced_native::Size,
-    ) -> (f32, f32) {
-        use glow_glyph::GlyphCruncher;
-
-        let glow_glyph::FontId(font_id) = self.find_font(font);
-
-        let section = glow_glyph::Section {
-            bounds: (bounds.width, bounds.height),
-            text: vec![glow_glyph::Text {
-                text: content,
-                scale: size.into(),
-                font_id: glow_glyph::FontId(font_id),
-                extra: glow_glyph::Extra::default(),
-            }],
-            ..Default::default()
-        };
-
-        if let Some(bounds) =
-            self.measure_brush.borrow_mut().glyph_bounds(section)
-        {
-            (bounds.width().ceil(), bounds.height().ceil())
-        } else {
-            (0.0, 0.0)
-        }
-    }
-
-    pub fn hit_test(
-        &self,
-        content: &str,
-        size: f32,
-        font: iced_native::Font,
-        bounds: iced_native::Size,
-        point: iced_native::Point,
-        nearest_only: bool,
-    ) -> Option<Hit> {
-        use glow_glyph::GlyphCruncher;
-
-        let glow_glyph::FontId(font_id) = self.find_font(font);
-
-        let section = glow_glyph::Section {
-            bounds: (bounds.width, bounds.height),
-            text: vec![glow_glyph::Text {
-                text: content,
-                scale: size.into(),
-                font_id: glow_glyph::FontId(font_id),
-                extra: glow_glyph::Extra::default(),
-            }],
-            ..Default::default()
-        };
-
-        let mut mb = self.measure_brush.borrow_mut();
-
-        // The underlying type is FontArc, so clones are cheap.
-        use ab_glyph::{Font, ScaleFont};
-        let font = mb.fonts()[font_id].clone().into_scaled(size);
-
-        // Implements an iterator over the glyph bounding boxes.
-        let bounds = mb.glyphs(section).map(
-            |glow_glyph::SectionGlyph {
-                 byte_index, glyph, ..
-             }| {
-                (
-                    *byte_index,
-                    iced_native::Rectangle::new(
-                        iced_native::Point::new(
-                            glyph.position.x - font.h_side_bearing(glyph.id),
-                            glyph.position.y - font.ascent(),
-                        ),
-                        iced_native::Size::new(
-                            font.h_advance(glyph.id),
-                            font.ascent() - font.descent(),
-                        ),
-                    ),
-                )
-            },
-        );
-
-        // Implements computation of the character index based on the byte index
-        // within the input string.
-        let char_index = |byte_index| {
-            let mut b_count = 0;
-            for (i, utf8_len) in
-                content.chars().map(|c| c.len_utf8()).enumerate()
-            {
-                if byte_index < (b_count + utf8_len) {
-                    return i;
-                }
-                b_count += utf8_len;
-            }
-
-            byte_index
-        };
-
-        if !nearest_only {
-            for (idx, bounds) in bounds.clone() {
-                if bounds.contains(point) {
-                    return Some(Hit::CharOffset(char_index(idx)));
-                }
-            }
-        }
-
-        let nearest = bounds
-            .map(|(index, bounds)| (index, bounds.center()))
-            .min_by(|(_, center_a), (_, center_b)| {
-                center_a
-                    .distance(point)
-                    .partial_cmp(&center_b.distance(point))
-                    .unwrap_or(std::cmp::Ordering::Greater)
-            });
-
-        nearest.map(|(idx, center)| {
-            Hit::NearestCharOffset(char_index(idx), point - center)
-        })
-    }
-
-    pub fn trim_measurement_cache(&mut self) {
-        // TODO: We should probably use a `GlyphCalculator` for this. However,
-        // it uses a lifetimed `GlyphCalculatorGuard` with side-effects on drop.
-        // This makes stuff quite inconvenient. A manual method for trimming the
-        // cache would make our lives easier.
-        loop {
-            let action = self
-                .measure_brush
-                .borrow_mut()
-                .process_queued(|_, _| {}, |_| {});
-
-            match action {
-                Ok(_) => break,
-                Err(glyph_brush::BrushError::TextureTooSmall { suggested }) => {
-                    let (width, height) = suggested;
-
-                    self.measure_brush
-                        .borrow_mut()
-                        .resize_texture(width, height);
-                }
-            }
-        }
-    }
-
-    pub fn find_font(&self, font: iced_native::Font) -> glow_glyph::FontId {
-        match font {
-            iced_native::Font::Default => glow_glyph::FontId(0),
-            iced_native::Font::External { name, bytes } => {
-                if let Some(font_id) = self.draw_font_map.borrow().get(name) {
-                    return *font_id;
-                }
-
-                let font = ab_glyph::FontArc::try_from_slice(bytes)
-                    .expect("Load font");
-
-                let _ = self.measure_brush.borrow_mut().add_font(font.clone());
-
-                let font_id = self.draw_brush.borrow_mut().add_font(font);
-
-                let _ = self
-                    .draw_font_map
-                    .borrow_mut()
-                    .insert(String::from(name), font_id);
-
-                font_id
-            }
-        }
-    }
-}
diff --git a/glow/src/triangle.rs b/glow/src/triangle.rs
deleted file mode 100644
index 42c8845526..0000000000
--- a/glow/src/triangle.rs
+++ /dev/null
@@ -1,595 +0,0 @@
-//! Draw meshes of triangles.
-use crate::program;
-use crate::Transformation;
-
-use iced_graphics::gradient::Gradient;
-use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle::{ColoredVertex2D, Vertex2D};
-
-use glow::HasContext;
-use std::marker::PhantomData;
-
-#[cfg(feature = "tracing")]
-use tracing::info_span;
-
-const DEFAULT_VERTICES: usize = 1_000;
-const DEFAULT_INDICES: usize = 1_000;
-
-#[derive(Debug)]
-pub(crate) struct Pipeline {
-    indices: Buffer<u32>,
-    solid: solid::Program,
-    gradient: gradient::Program,
-}
-
-impl Pipeline {
-    pub fn new(gl: &glow::Context, shader_version: &program::Version) -> Self {
-        let mut indices = unsafe {
-            Buffer::new(
-                gl,
-                glow::ELEMENT_ARRAY_BUFFER,
-                glow::DYNAMIC_DRAW,
-                DEFAULT_INDICES,
-            )
-        };
-
-        let solid = solid::Program::new(gl, shader_version);
-        let gradient = gradient::Program::new(gl, shader_version);
-
-        unsafe {
-            gl.bind_vertex_array(Some(solid.vertex_array));
-            indices.bind(gl, 0);
-
-            gl.bind_vertex_array(Some(gradient.vertex_array));
-            indices.bind(gl, 0);
-
-            gl.bind_vertex_array(None);
-        }
-
-        Self {
-            indices,
-            solid,
-            gradient,
-        }
-    }
-
-    pub fn draw(
-        &mut self,
-        meshes: &[Mesh<'_>],
-        gl: &glow::Context,
-        target_height: u32,
-        transformation: Transformation,
-        scale_factor: f32,
-    ) {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("Glow::Triangle", "DRAW").enter();
-
-        unsafe {
-            gl.enable(glow::MULTISAMPLE);
-            gl.enable(glow::SCISSOR_TEST);
-        }
-
-        // Count the total amount of vertices & indices we need to handle
-        let count = mesh::attribute_count_of(meshes);
-
-        // Then we ensure the current attribute buffers are big enough, resizing if necessary
-        unsafe {
-            self.indices.bind(gl, count.indices);
-        }
-
-        // We upload all the vertices and indices upfront
-        let mut solid_vertex_offset = 0;
-        let mut gradient_vertex_offset = 0;
-        let mut index_offset = 0;
-
-        for mesh in meshes {
-            let indices = mesh.indices();
-
-            unsafe {
-                gl.buffer_sub_data_u8_slice(
-                    glow::ELEMENT_ARRAY_BUFFER,
-                    (index_offset * std::mem::size_of::<u32>()) as i32,
-                    bytemuck::cast_slice(indices),
-                );
-
-                index_offset += indices.len();
-            }
-
-            match mesh {
-                Mesh::Solid { buffers, .. } => {
-                    unsafe {
-                        self.solid.vertices.bind(gl, count.solid_vertices);
-
-                        gl.buffer_sub_data_u8_slice(
-                            glow::ARRAY_BUFFER,
-                            (solid_vertex_offset
-                                * std::mem::size_of::<ColoredVertex2D>())
-                                as i32,
-                            bytemuck::cast_slice(&buffers.vertices),
-                        );
-                    }
-
-                    solid_vertex_offset += buffers.vertices.len();
-                }
-                Mesh::Gradient { buffers, .. } => {
-                    unsafe {
-                        self.gradient
-                            .vertices
-                            .bind(gl, count.gradient_vertices);
-
-                        gl.buffer_sub_data_u8_slice(
-                            glow::ARRAY_BUFFER,
-                            (gradient_vertex_offset
-                                * std::mem::size_of::<Vertex2D>())
-                                as i32,
-                            bytemuck::cast_slice(&buffers.vertices),
-                        );
-                    }
-
-                    gradient_vertex_offset += buffers.vertices.len();
-                }
-            }
-        }
-
-        // Then we draw each mesh using offsets
-        let mut last_solid_vertex = 0;
-        let mut last_gradient_vertex = 0;
-        let mut last_index = 0;
-
-        for mesh in meshes {
-            let indices = mesh.indices();
-            let origin = mesh.origin();
-
-            let transform =
-                transformation * Transformation::translate(origin.x, origin.y);
-
-            let clip_bounds = (mesh.clip_bounds() * scale_factor).snap();
-
-            unsafe {
-                gl.scissor(
-                    clip_bounds.x as i32,
-                    (target_height - (clip_bounds.y + clip_bounds.height))
-                        as i32,
-                    clip_bounds.width as i32,
-                    clip_bounds.height as i32,
-                );
-            }
-
-            match mesh {
-                Mesh::Solid { buffers, .. } => unsafe {
-                    gl.use_program(Some(self.solid.program));
-                    gl.bind_vertex_array(Some(self.solid.vertex_array));
-
-                    if transform != self.solid.uniforms.transform {
-                        gl.uniform_matrix_4_f32_slice(
-                            Some(&self.solid.uniforms.transform_location),
-                            false,
-                            transform.as_ref(),
-                        );
-
-                        self.solid.uniforms.transform = transform;
-                    }
-
-                    gl.draw_elements_base_vertex(
-                        glow::TRIANGLES,
-                        indices.len() as i32,
-                        glow::UNSIGNED_INT,
-                        (last_index * std::mem::size_of::<u32>()) as i32,
-                        last_solid_vertex as i32,
-                    );
-
-                    last_solid_vertex += buffers.vertices.len();
-                },
-                Mesh::Gradient {
-                    buffers, gradient, ..
-                } => unsafe {
-                    gl.use_program(Some(self.gradient.program));
-                    gl.bind_vertex_array(Some(self.gradient.vertex_array));
-
-                    if transform != self.gradient.uniforms.transform {
-                        gl.uniform_matrix_4_f32_slice(
-                            Some(&self.gradient.uniforms.locations.transform),
-                            false,
-                            transform.as_ref(),
-                        );
-
-                        self.gradient.uniforms.transform = transform;
-                    }
-
-                    if &self.gradient.uniforms.gradient != *gradient {
-                        match gradient {
-                            Gradient::Linear(linear) => {
-                                gl.uniform_4_f32(
-                                    Some(
-                                        &self
-                                            .gradient
-                                            .uniforms
-                                            .locations
-                                            .gradient_direction,
-                                    ),
-                                    linear.start.x,
-                                    linear.start.y,
-                                    linear.end.x,
-                                    linear.end.y,
-                                );
-
-                                gl.uniform_1_i32(
-                                    Some(
-                                        &self
-                                            .gradient
-                                            .uniforms
-                                            .locations
-                                            .color_stops_size,
-                                    ),
-                                    (linear.color_stops.len() * 2) as i32,
-                                );
-
-                                let mut stops = [0.0; 128];
-
-                                for (index, stop) in linear
-                                    .color_stops
-                                    .iter()
-                                    .enumerate()
-                                    .take(16)
-                                {
-                                    let [r, g, b, a] = stop.color.into_linear();
-
-                                    stops[index * 8] = r;
-                                    stops[(index * 8) + 1] = g;
-                                    stops[(index * 8) + 2] = b;
-                                    stops[(index * 8) + 3] = a;
-                                    stops[(index * 8) + 4] = stop.offset;
-                                    stops[(index * 8) + 5] = 0.;
-                                    stops[(index * 8) + 6] = 0.;
-                                    stops[(index * 8) + 7] = 0.;
-                                }
-
-                                gl.uniform_4_f32_slice(
-                                    Some(
-                                        &self
-                                            .gradient
-                                            .uniforms
-                                            .locations
-                                            .color_stops,
-                                    ),
-                                    &stops,
-                                );
-                            }
-                        }
-
-                        self.gradient.uniforms.gradient = (*gradient).clone();
-                    }
-
-                    gl.draw_elements_base_vertex(
-                        glow::TRIANGLES,
-                        indices.len() as i32,
-                        glow::UNSIGNED_INT,
-                        (last_index * std::mem::size_of::<u32>()) as i32,
-                        last_gradient_vertex as i32,
-                    );
-
-                    last_gradient_vertex += buffers.vertices.len();
-                },
-            }
-
-            last_index += indices.len();
-        }
-
-        unsafe {
-            gl.bind_vertex_array(None);
-            gl.disable(glow::SCISSOR_TEST);
-            gl.disable(glow::MULTISAMPLE);
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Buffer<T> {
-    raw: <glow::Context as HasContext>::Buffer,
-    target: u32,
-    usage: u32,
-    size: usize,
-    phantom: PhantomData<T>,
-}
-
-impl<T> Buffer<T> {
-    pub unsafe fn new(
-        gl: &glow::Context,
-        target: u32,
-        usage: u32,
-        size: usize,
-    ) -> Self {
-        let raw = gl.create_buffer().expect("Create buffer");
-
-        let mut buffer = Buffer {
-            raw,
-            target,
-            usage,
-            size: 0,
-            phantom: PhantomData,
-        };
-
-        buffer.bind(gl, size);
-
-        buffer
-    }
-
-    pub unsafe fn bind(&mut self, gl: &glow::Context, size: usize) {
-        gl.bind_buffer(self.target, Some(self.raw));
-
-        if self.size < size {
-            gl.buffer_data_size(
-                self.target,
-                (size * std::mem::size_of::<T>()) as i32,
-                self.usage,
-            );
-
-            self.size = size;
-        }
-    }
-}
-
-mod solid {
-    use crate::program;
-    use crate::triangle;
-    use glow::{Context, HasContext, NativeProgram};
-    use iced_graphics::triangle::ColoredVertex2D;
-    use iced_graphics::Transformation;
-
-    #[derive(Debug)]
-    pub struct Program {
-        pub program: <Context as HasContext>::Program,
-        pub vertex_array: <glow::Context as HasContext>::VertexArray,
-        pub vertices: triangle::Buffer<ColoredVertex2D>,
-        pub uniforms: Uniforms,
-    }
-
-    impl Program {
-        pub fn new(gl: &Context, shader_version: &program::Version) -> Self {
-            let program = unsafe {
-                let vertex_shader = program::Shader::vertex(
-                    gl,
-                    shader_version,
-                    include_str!("shader/common/solid.vert"),
-                );
-
-                let fragment_shader = program::Shader::fragment(
-                    gl,
-                    shader_version,
-                    include_str!("shader/common/solid.frag"),
-                );
-
-                program::create(
-                    gl,
-                    &[vertex_shader, fragment_shader],
-                    &[(0, "i_Position"), (1, "i_Color")],
-                )
-            };
-
-            let vertex_array = unsafe {
-                gl.create_vertex_array().expect("Create vertex array")
-            };
-
-            let vertices = unsafe {
-                triangle::Buffer::new(
-                    gl,
-                    glow::ARRAY_BUFFER,
-                    glow::DYNAMIC_DRAW,
-                    super::DEFAULT_VERTICES,
-                )
-            };
-
-            unsafe {
-                gl.bind_vertex_array(Some(vertex_array));
-
-                let stride = std::mem::size_of::<ColoredVertex2D>() as i32;
-
-                gl.enable_vertex_attrib_array(0);
-                gl.vertex_attrib_pointer_f32(
-                    0,
-                    2,
-                    glow::FLOAT,
-                    false,
-                    stride,
-                    0,
-                );
-
-                gl.enable_vertex_attrib_array(1);
-                gl.vertex_attrib_pointer_f32(
-                    1,
-                    4,
-                    glow::FLOAT,
-                    false,
-                    stride,
-                    4 * 2,
-                );
-
-                gl.bind_vertex_array(None);
-            };
-
-            Self {
-                program,
-                vertex_array,
-                vertices,
-                uniforms: Uniforms::new(gl, program),
-            }
-        }
-    }
-
-    #[derive(Debug)]
-    pub struct Uniforms {
-        pub transform: Transformation,
-        pub transform_location: <Context as HasContext>::UniformLocation,
-    }
-
-    impl Uniforms {
-        fn new(gl: &Context, program: NativeProgram) -> Self {
-            let transform = Transformation::identity();
-            let transform_location =
-                unsafe { gl.get_uniform_location(program, "u_Transform") }
-                    .expect("Solid - Get u_Transform.");
-
-            unsafe {
-                gl.use_program(Some(program));
-
-                gl.uniform_matrix_4_f32_slice(
-                    Some(&transform_location),
-                    false,
-                    transform.as_ref(),
-                );
-
-                gl.use_program(None);
-            }
-
-            Self {
-                transform,
-                transform_location,
-            }
-        }
-    }
-}
-
-mod gradient {
-    use crate::program;
-    use crate::triangle;
-    use glow::{Context, HasContext, NativeProgram};
-    use iced_graphics::gradient::{self, Gradient};
-    use iced_graphics::triangle::Vertex2D;
-    use iced_graphics::Transformation;
-
-    #[derive(Debug)]
-    pub struct Program {
-        pub program: <Context as HasContext>::Program,
-        pub vertex_array: <glow::Context as HasContext>::VertexArray,
-        pub vertices: triangle::Buffer<Vertex2D>,
-        pub uniforms: Uniforms,
-    }
-
-    impl Program {
-        pub fn new(gl: &Context, shader_version: &program::Version) -> Self {
-            let program = unsafe {
-                let vertex_shader = program::Shader::vertex(
-                    gl,
-                    shader_version,
-                    include_str!("shader/common/gradient.vert"),
-                );
-
-                let fragment_shader = program::Shader::fragment(
-                    gl,
-                    shader_version,
-                    include_str!("shader/common/gradient.frag"),
-                );
-
-                program::create(
-                    gl,
-                    &[vertex_shader, fragment_shader],
-                    &[(0, "i_Position")],
-                )
-            };
-
-            let vertex_array = unsafe {
-                gl.create_vertex_array().expect("Create vertex array")
-            };
-
-            let vertices = unsafe {
-                triangle::Buffer::new(
-                    gl,
-                    glow::ARRAY_BUFFER,
-                    glow::DYNAMIC_DRAW,
-                    super::DEFAULT_VERTICES,
-                )
-            };
-
-            unsafe {
-                gl.bind_vertex_array(Some(vertex_array));
-
-                let stride = std::mem::size_of::<Vertex2D>() as i32;
-
-                gl.enable_vertex_attrib_array(0);
-                gl.vertex_attrib_pointer_f32(
-                    0,
-                    2,
-                    glow::FLOAT,
-                    false,
-                    stride,
-                    0,
-                );
-
-                gl.bind_vertex_array(None);
-            };
-
-            Self {
-                program,
-                vertex_array,
-                vertices,
-                uniforms: Uniforms::new(gl, program),
-            }
-        }
-    }
-
-    #[derive(Debug)]
-    pub struct Uniforms {
-        pub gradient: Gradient,
-        pub transform: Transformation,
-        pub locations: Locations,
-    }
-
-    #[derive(Debug)]
-    pub struct Locations {
-        pub gradient_direction: <Context as HasContext>::UniformLocation,
-        pub color_stops_size: <Context as HasContext>::UniformLocation,
-        //currently the maximum number of stops is 16 due to lack of SSBO in GL2.1
-        pub color_stops: <Context as HasContext>::UniformLocation,
-        pub transform: <Context as HasContext>::UniformLocation,
-    }
-
-    impl Uniforms {
-        fn new(gl: &Context, program: NativeProgram) -> Self {
-            let gradient_direction = unsafe {
-                gl.get_uniform_location(program, "gradient_direction")
-            }
-            .expect("Gradient - Get gradient_direction.");
-
-            let color_stops_size =
-                unsafe { gl.get_uniform_location(program, "color_stops_size") }
-                    .expect("Gradient - Get color_stops_size.");
-
-            let color_stops = unsafe {
-                gl.get_uniform_location(program, "color_stops")
-                    .expect("Gradient - Get color_stops.")
-            };
-
-            let transform = Transformation::identity();
-            let transform_location =
-                unsafe { gl.get_uniform_location(program, "u_Transform") }
-                    .expect("Solid - Get u_Transform.");
-
-            unsafe {
-                gl.use_program(Some(program));
-
-                gl.uniform_matrix_4_f32_slice(
-                    Some(&transform_location),
-                    false,
-                    transform.as_ref(),
-                );
-
-                gl.use_program(None);
-            }
-
-            Self {
-                gradient: Gradient::Linear(gradient::Linear {
-                    start: Default::default(),
-                    end: Default::default(),
-                    color_stops: vec![],
-                }),
-                transform: Transformation::identity(),
-                locations: Locations {
-                    gradient_direction,
-                    color_stops_size,
-                    color_stops,
-                    transform: transform_location,
-                },
-            }
-        }
-    }
-}
diff --git a/glow/src/window.rs b/glow/src/window.rs
deleted file mode 100644
index aac5fb9ed8..0000000000
--- a/glow/src/window.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//! Display rendering results on windows.
-mod compositor;
-
-pub use compositor::Compositor;
diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs
deleted file mode 100644
index 2075603271..0000000000
--- a/glow/src/window/compositor.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
-
-use glow::HasContext;
-use iced_graphics::{compositor, Antialiasing, Size};
-
-use core::ffi::c_void;
-use std::marker::PhantomData;
-
-/// A window graphics backend for iced powered by `glow`.
-#[allow(missing_debug_implementations)]
-pub struct Compositor<Theme> {
-    gl: glow::Context,
-    theme: PhantomData<Theme>,
-}
-
-impl<Theme> iced_graphics::window::GLCompositor for Compositor<Theme> {
-    type Settings = Settings;
-    type Renderer = Renderer<Theme>;
-
-    unsafe fn new(
-        settings: Self::Settings,
-        loader_function: impl FnMut(&str) -> *const c_void,
-    ) -> Result<(Self, Self::Renderer), Error> {
-        let gl = glow::Context::from_loader_function(loader_function);
-
-        log::info!("{:#?}", settings);
-
-        let version = gl.version();
-        log::info!(
-            "OpenGL version: {:?} (Embedded: {})",
-            version,
-            version.is_embedded
-        );
-
-        let renderer = gl.get_parameter_string(glow::RENDERER);
-        log::info!("Renderer: {}", renderer);
-
-        // Enable auto-conversion from/to sRGB
-        gl.enable(glow::FRAMEBUFFER_SRGB);
-
-        // Enable alpha blending
-        gl.enable(glow::BLEND);
-        gl.blend_func_separate(
-            glow::SRC_ALPHA,
-            glow::ONE_MINUS_SRC_ALPHA,
-            glow::ONE,
-            glow::ONE_MINUS_SRC_ALPHA,
-        );
-
-        // Disable multisampling by default
-        gl.disable(glow::MULTISAMPLE);
-
-        let renderer = Renderer::new(Backend::new(&gl, settings));
-
-        Ok((
-            Self {
-                gl,
-                theme: PhantomData,
-            },
-            renderer,
-        ))
-    }
-
-    fn sample_count(settings: &Settings) -> u32 {
-        settings
-            .antialiasing
-            .map(Antialiasing::sample_count)
-            .unwrap_or(0)
-    }
-
-    fn resize_viewport(&mut self, physical_size: Size<u32>) {
-        unsafe {
-            self.gl.viewport(
-                0,
-                0,
-                physical_size.width as i32,
-                physical_size.height as i32,
-            );
-        }
-    }
-
-    fn fetch_information(&self) -> compositor::Information {
-        let adapter = unsafe { self.gl.get_parameter_string(glow::RENDERER) };
-
-        compositor::Information {
-            backend: format!("{:?}", self.gl.version()),
-            adapter,
-        }
-    }
-
-    fn present<T: AsRef<str>>(
-        &mut self,
-        renderer: &mut Self::Renderer,
-        viewport: &Viewport,
-        color: Color,
-        overlay: &[T],
-    ) {
-        let gl = &self.gl;
-
-        let [r, g, b, a] = color.into_linear();
-
-        unsafe {
-            gl.clear_color(r, g, b, a);
-            gl.clear(glow::COLOR_BUFFER_BIT);
-        }
-
-        renderer.with_primitives(|backend, primitive| {
-            backend.present(gl, primitive, viewport, overlay);
-        });
-    }
-}
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 13ab61d80b..19d6af0cfa 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -26,9 +26,6 @@ dds = ["image_rs/dds"]
 farbfeld = ["image_rs/farbfeld"]
 canvas = ["lyon"]
 qr_code = ["qrcode", "canvas"]
-font-source = ["font-kit"]
-font-fallback = []
-font-icons = []
 opengl = []
 image_rs = ["kamadak-exif"]
 
@@ -60,10 +57,6 @@ version = "0.12"
 optional = true
 default-features = false
 
-[dependencies.font-kit]
-version = "0.10"
-optional = true
-
 [dependencies.image_rs]
 version = "0.24"
 package = "image"
diff --git a/graphics/src/font.rs b/graphics/src/font.rs
deleted file mode 100644
index d55d0faf5f..0000000000
--- a/graphics/src/font.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//! Find system fonts or use the built-in ones.
-#[cfg(feature = "font-source")]
-mod source;
-
-#[cfg(feature = "font-source")]
-#[cfg_attr(docsrs, doc(cfg(feature = "font-source")))]
-pub use source::Source;
-
-#[cfg(feature = "font-source")]
-#[cfg_attr(docsrs, doc(cfg(feature = "font-source")))]
-pub use font_kit::{
-    error::SelectionError as LoadError, family_name::FamilyName as Family,
-};
-
-/// A built-in fallback font, for convenience.
-#[cfg(feature = "font-fallback")]
-#[cfg_attr(docsrs, doc(cfg(feature = "font-fallback")))]
-pub const FALLBACK: &[u8] = include_bytes!("../fonts/Lato-Regular.ttf");
-
-/// A built-in icon font, for convenience.
-#[cfg(feature = "font-icons")]
-#[cfg_attr(docsrs, doc(cfg(feature = "font-icons")))]
-pub const ICONS: iced_native::Font = iced_native::Font::External {
-    name: "iced_wgpu icons",
-    bytes: include_bytes!("../fonts/Icons.ttf"),
-};
-
-/// The `char` representing a ✔ icon in the built-in [`ICONS`] font.
-#[cfg(feature = "font-icons")]
-#[cfg_attr(docsrs, doc(cfg(feature = "font-icons")))]
-pub const CHECKMARK_ICON: char = '\u{F00C}';
-
-/// The `char` representing a ▼ icon in the built-in [`ICONS`] font.
-#[cfg(feature = "font-icons")]
-pub const ARROW_DOWN_ICON: char = '\u{E800}';
diff --git a/graphics/src/font/source.rs b/graphics/src/font/source.rs
deleted file mode 100644
index c0b50e1dda..0000000000
--- a/graphics/src/font/source.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::font::{Family, LoadError};
-
-/// A font source that can find and load system fonts.
-#[allow(missing_debug_implementations)]
-pub struct Source {
-    raw: font_kit::source::SystemSource,
-}
-
-impl Source {
-    /// Creates a new [`Source`].
-    pub fn new() -> Self {
-        Source {
-            raw: font_kit::source::SystemSource::new(),
-        }
-    }
-
-    /// Finds and loads a font matching the set of provided family priorities.
-    pub fn load(&self, families: &[Family]) -> Result<Vec<u8>, LoadError> {
-        let font = self.raw.select_best_match(
-            families,
-            &font_kit::properties::Properties::default(),
-        )?;
-
-        match font {
-            font_kit::handle::Handle::Path { path, .. } => {
-                use std::io::Read;
-
-                let mut buf = Vec::new();
-                let mut reader = std::fs::File::open(path).expect("Read font");
-                let _ = reader.read_to_end(&mut buf);
-
-                Ok(buf)
-            }
-            font_kit::handle::Handle::Memory { bytes, .. } => {
-                Ok(bytes.as_ref().clone())
-            }
-        }
-    }
-}
-
-impl Default for Source {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index d39dd90ce6..41bef2c368 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -28,7 +28,6 @@ mod transformation;
 mod viewport;
 
 pub mod backend;
-pub mod font;
 pub mod gradient;
 pub mod image;
 pub mod layer;
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f1e22cf682..5badeae69b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -23,14 +23,11 @@ dds = ["iced_graphics/dds"]
 farbfeld = ["iced_graphics/farbfeld"]
 canvas = ["iced_graphics/canvas"]
 qr_code = ["iced_graphics/qr_code"]
-default_system_font = ["iced_graphics/font-source"]
 spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
 [dependencies]
 wgpu = "0.14"
-wgpu_glyph = "0.18"
-glyph_brush = "0.7"
 raw-window-handle = "0.5"
 log = "0.4"
 guillotiere = "0.6"
@@ -48,7 +45,6 @@ path = "../native"
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
-features = ["font-fallback", "font-icons"]
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 6a29942587..e9e23e80ba 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -4,10 +4,8 @@ use crate::triangle;
 use crate::{Settings, Transformation};
 
 use iced_graphics::backend;
-use iced_graphics::font;
 use iced_graphics::layer::Layer;
 use iced_graphics::{Primitive, Viewport};
-use iced_native::alignment;
 use iced_native::{Font, Size};
 
 #[cfg(feature = "tracing")]
@@ -173,83 +171,11 @@ impl Backend {
         }
 
         if !layer.text.is_empty() {
-            for text in layer.text.iter() {
-                // Target physical coordinates directly to avoid blurry text
-                let text = wgpu_glyph::Section {
-                    // TODO: We `round` here to avoid rerasterizing text when
-                    // its position changes slightly. This can make text feel a
-                    // bit "jumpy". We may be able to do better once we improve
-                    // our text rendering/caching pipeline.
-                    screen_position: (
-                        (text.bounds.x * scale_factor).round(),
-                        (text.bounds.y * scale_factor).round(),
-                    ),
-                    // TODO: Fix precision issues with some scale factors.
-                    //
-                    // The `ceil` here can cause some words to render on the
-                    // same line when they should not.
-                    //
-                    // Ideally, `wgpu_glyph` should be able to compute layout
-                    // using logical positions, and then apply the proper
-                    // scaling when rendering. This would ensure that both
-                    // measuring and rendering follow the same layout rules.
-                    bounds: (
-                        (text.bounds.width * scale_factor).ceil(),
-                        (text.bounds.height * scale_factor).ceil(),
-                    ),
-                    text: vec![wgpu_glyph::Text {
-                        text: text.content,
-                        scale: wgpu_glyph::ab_glyph::PxScale {
-                            x: text.size * scale_factor,
-                            y: text.size * scale_factor,
-                        },
-                        font_id: self.text_pipeline.find_font(text.font),
-                        extra: wgpu_glyph::Extra {
-                            color: text.color,
-                            z: 0.0,
-                        },
-                    }],
-                    layout: wgpu_glyph::Layout::default()
-                        .h_align(match text.horizontal_alignment {
-                            alignment::Horizontal::Left => {
-                                wgpu_glyph::HorizontalAlign::Left
-                            }
-                            alignment::Horizontal::Center => {
-                                wgpu_glyph::HorizontalAlign::Center
-                            }
-                            alignment::Horizontal::Right => {
-                                wgpu_glyph::HorizontalAlign::Right
-                            }
-                        })
-                        .v_align(match text.vertical_alignment {
-                            alignment::Vertical::Top => {
-                                wgpu_glyph::VerticalAlign::Top
-                            }
-                            alignment::Vertical::Center => {
-                                wgpu_glyph::VerticalAlign::Center
-                            }
-                            alignment::Vertical::Bottom => {
-                                wgpu_glyph::VerticalAlign::Bottom
-                            }
-                        }),
-                };
-
-                self.text_pipeline.queue(text);
+            for _text in layer.text.iter() {
+                // TODO: Queue text sections
             }
 
-            self.text_pipeline.draw_queued(
-                device,
-                staging_belt,
-                encoder,
-                target,
-                transformation,
-                wgpu_glyph::Region {
-                    x: bounds.x,
-                    y: bounds.y,
-                    width: bounds.width,
-                    height: bounds.height,
-                },
-            );
+            // TODO: Draw queued
         }
     }
 }
@@ -261,9 +187,9 @@ impl iced_graphics::Backend for Backend {
 }
 
 impl backend::Text for Backend {
-    const ICON_FONT: Font = font::ICONS;
-    const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
-    const ARROW_DOWN_ICON: char = font::ARROW_DOWN_ICON;
+    const ICON_FONT: Font = Font::Default; // TODO
+    const CHECKMARK_ICON: char = '✓';
+    const ARROW_DOWN_ICON: char = '▼';
 
     fn default_size(&self) -> f32 {
         self.default_text_size
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index e17b84c15d..125e6be0a5 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,265 +1,39 @@
-use crate::Transformation;
-
-use iced_graphics::font;
-
-use std::{cell::RefCell, collections::HashMap};
-use wgpu_glyph::ab_glyph;
-
 pub use iced_native::text::Hit;
 
 #[derive(Debug)]
-pub struct Pipeline {
-    draw_brush: RefCell<wgpu_glyph::GlyphBrush<()>>,
-    draw_font_map: RefCell<HashMap<String, wgpu_glyph::FontId>>,
-    measure_brush: RefCell<glyph_brush::GlyphBrush<()>>,
-}
+pub struct Pipeline;
 
 impl Pipeline {
     pub fn new(
-        device: &wgpu::Device,
-        format: wgpu::TextureFormat,
-        default_font: Option<&[u8]>,
-        multithreading: bool,
+        _device: &wgpu::Device,
+        _format: wgpu::TextureFormat,
+        _default_font: Option<&[u8]>,
+        _multithreading: bool,
     ) -> Self {
-        let default_font = default_font.map(|slice| slice.to_vec());
-
-        // TODO: Font customization
-        #[cfg(not(target_os = "ios"))]
-        #[cfg(feature = "default_system_font")]
-        let default_font = {
-            default_font.or_else(|| {
-                font::Source::new()
-                    .load(&[font::Family::SansSerif, font::Family::Serif])
-                    .ok()
-            })
-        };
-
-        let default_font =
-            default_font.unwrap_or_else(|| font::FALLBACK.to_vec());
-
-        let font = ab_glyph::FontArc::try_from_vec(default_font)
-            .unwrap_or_else(|_| {
-                log::warn!(
-                    "System font failed to load. Falling back to \
-                    embedded font..."
-                );
-
-                ab_glyph::FontArc::try_from_slice(font::FALLBACK)
-                    .expect("Load fallback font")
-            });
-
-        let draw_brush_builder =
-            wgpu_glyph::GlyphBrushBuilder::using_font(font.clone())
-                .initial_cache_size((2048, 2048))
-                .draw_cache_multithread(multithreading);
-
-        #[cfg(target_arch = "wasm32")]
-        let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true);
-
-        let draw_brush = draw_brush_builder.build(device, format);
-
-        let measure_brush =
-            glyph_brush::GlyphBrushBuilder::using_font(font).build();
-
-        Pipeline {
-            draw_brush: RefCell::new(draw_brush),
-            draw_font_map: RefCell::new(HashMap::new()),
-            measure_brush: RefCell::new(measure_brush),
-        }
-    }
-
-    pub fn queue(&mut self, section: wgpu_glyph::Section<'_>) {
-        self.draw_brush.borrow_mut().queue(section);
-    }
-
-    pub fn draw_queued(
-        &mut self,
-        device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
-        encoder: &mut wgpu::CommandEncoder,
-        target: &wgpu::TextureView,
-        transformation: Transformation,
-        region: wgpu_glyph::Region,
-    ) {
-        self.draw_brush
-            .borrow_mut()
-            .draw_queued_with_transform_and_scissoring(
-                device,
-                staging_belt,
-                encoder,
-                target,
-                transformation.into(),
-                region,
-            )
-            .expect("Draw text");
+        Pipeline
     }
 
     pub fn measure(
         &self,
-        content: &str,
-        size: f32,
-        font: iced_native::Font,
-        bounds: iced_native::Size,
+        _content: &str,
+        _size: f32,
+        _font: iced_native::Font,
+        _bounds: iced_native::Size,
     ) -> (f32, f32) {
-        use wgpu_glyph::GlyphCruncher;
-
-        let wgpu_glyph::FontId(font_id) = self.find_font(font);
-
-        let section = wgpu_glyph::Section {
-            bounds: (bounds.width, bounds.height),
-            text: vec![wgpu_glyph::Text {
-                text: content,
-                scale: size.into(),
-                font_id: wgpu_glyph::FontId(font_id),
-                extra: wgpu_glyph::Extra::default(),
-            }],
-            ..Default::default()
-        };
-
-        if let Some(bounds) =
-            self.measure_brush.borrow_mut().glyph_bounds(section)
-        {
-            (bounds.width().ceil(), bounds.height().ceil())
-        } else {
-            (0.0, 0.0)
-        }
+        (0.0, 0.0)
     }
 
     pub fn hit_test(
         &self,
-        content: &str,
-        size: f32,
-        font: iced_native::Font,
-        bounds: iced_native::Size,
-        point: iced_native::Point,
-        nearest_only: bool,
+        _content: &str,
+        _size: f32,
+        _font: iced_native::Font,
+        _bounds: iced_native::Size,
+        _point: iced_native::Point,
+        _nearest_only: bool,
     ) -> Option<Hit> {
-        use wgpu_glyph::GlyphCruncher;
-
-        let wgpu_glyph::FontId(font_id) = self.find_font(font);
-
-        let section = wgpu_glyph::Section {
-            bounds: (bounds.width, bounds.height),
-            text: vec![wgpu_glyph::Text {
-                text: content,
-                scale: size.into(),
-                font_id: wgpu_glyph::FontId(font_id),
-                extra: wgpu_glyph::Extra::default(),
-            }],
-            ..Default::default()
-        };
-
-        let mut mb = self.measure_brush.borrow_mut();
-
-        // The underlying type is FontArc, so clones are cheap.
-        use wgpu_glyph::ab_glyph::{Font, ScaleFont};
-        let font = mb.fonts()[font_id].clone().into_scaled(size);
-
-        // Implements an iterator over the glyph bounding boxes.
-        let bounds = mb.glyphs(section).map(
-            |wgpu_glyph::SectionGlyph {
-                 byte_index, glyph, ..
-             }| {
-                (
-                    *byte_index,
-                    iced_native::Rectangle::new(
-                        iced_native::Point::new(
-                            glyph.position.x - font.h_side_bearing(glyph.id),
-                            glyph.position.y - font.ascent(),
-                        ),
-                        iced_native::Size::new(
-                            font.h_advance(glyph.id),
-                            font.ascent() - font.descent(),
-                        ),
-                    ),
-                )
-            },
-        );
-
-        // Implements computation of the character index based on the byte index
-        // within the input string.
-        let char_index = |byte_index| {
-            let mut b_count = 0;
-            for (i, utf8_len) in
-                content.chars().map(|c| c.len_utf8()).enumerate()
-            {
-                if byte_index < (b_count + utf8_len) {
-                    return i;
-                }
-                b_count += utf8_len;
-            }
-
-            byte_index
-        };
-
-        if !nearest_only {
-            for (idx, bounds) in bounds.clone() {
-                if bounds.contains(point) {
-                    return Some(Hit::CharOffset(char_index(idx)));
-                }
-            }
-        }
-
-        let nearest = bounds
-            .map(|(index, bounds)| (index, bounds.center()))
-            .min_by(|(_, center_a), (_, center_b)| {
-                center_a
-                    .distance(point)
-                    .partial_cmp(&center_b.distance(point))
-                    .unwrap_or(std::cmp::Ordering::Greater)
-            });
-
-        nearest.map(|(idx, center)| {
-            Hit::NearestCharOffset(char_index(idx), point - center)
-        })
+        None
     }
 
-    pub fn trim_measurement_cache(&mut self) {
-        // TODO: We should probably use a `GlyphCalculator` for this. However,
-        // it uses a lifetimed `GlyphCalculatorGuard` with side-effects on drop.
-        // This makes stuff quite inconvenient. A manual method for trimming the
-        // cache would make our lives easier.
-        loop {
-            let action = self
-                .measure_brush
-                .borrow_mut()
-                .process_queued(|_, _| {}, |_| {});
-
-            match action {
-                Ok(_) => break,
-                Err(glyph_brush::BrushError::TextureTooSmall { suggested }) => {
-                    let (width, height) = suggested;
-
-                    self.measure_brush
-                        .borrow_mut()
-                        .resize_texture(width, height);
-                }
-            }
-        }
-    }
-
-    pub fn find_font(&self, font: iced_native::Font) -> wgpu_glyph::FontId {
-        match font {
-            iced_native::Font::Default => wgpu_glyph::FontId(0),
-            iced_native::Font::External { name, bytes } => {
-                if let Some(font_id) = self.draw_font_map.borrow().get(name) {
-                    return *font_id;
-                }
-
-                let font = ab_glyph::FontArc::try_from_slice(bytes)
-                    .expect("Load font");
-
-                let _ = self.measure_brush.borrow_mut().add_font(font.clone());
-
-                let font_id = self.draw_brush.borrow_mut().add_font(font);
-
-                let _ = self
-                    .draw_font_map
-                    .borrow_mut()
-                    .insert(String::from(name), font_id);
-
-                font_id
-            }
-        }
-    }
+    pub fn trim_measurement_cache(&mut self) {}
 }

From baf51a8fcffc78e4ca20f7dcbba18ca3655f2840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 31 Jan 2023 06:29:21 +0100
Subject: [PATCH 002/163] Draft `glyphon` implementation of text pipeline for
 `iced_wgpu`

---
 examples/integration/src/main.rs |   9 +-
 graphics/src/layer.rs            |   9 +-
 graphics/src/layer/text.rs       |   4 +-
 src/settings.rs                  |   4 +-
 wgpu/Cargo.toml                  |   5 +
 wgpu/src/backend.rs              |  19 +++-
 wgpu/src/text.rs                 | 160 +++++++++++++++++++++++++++++--
 wgpu/src/window/compositor.rs    |   3 +-
 8 files changed, 187 insertions(+), 26 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 2a56b6fa4f..69f6961e00 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -134,8 +134,12 @@ pub fn main() {
 
     // Initialize iced
     let mut debug = Debug::new();
-    let mut renderer =
-        Renderer::new(Backend::new(&device, Settings::default(), format));
+    let mut renderer = Renderer::new(Backend::new(
+        &device,
+        &queue,
+        Settings::default(),
+        format,
+    ));
 
     let mut state = program::State::new(
         controls,
@@ -247,6 +251,7 @@ pub fn main() {
                         renderer.with_primitives(|backend, primitive| {
                             backend.present(
                                 &device,
+                                &queue,
                                 &mut staging_belt,
                                 &mut encoder,
                                 &view,
diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs
index 1d453caa39..cc8f299c4a 100644
--- a/graphics/src/layer.rs
+++ b/graphics/src/layer.rs
@@ -12,7 +12,8 @@ pub use text::Text;
 
 use crate::alignment;
 use crate::{
-    Background, Font, Point, Primitive, Rectangle, Size, Vector, Viewport,
+    Background, Color, Font, Point, Primitive, Rectangle, Size, Vector,
+    Viewport,
 };
 
 /// A group of primitives that should be clipped together.
@@ -60,7 +61,7 @@ impl<'a> Layer<'a> {
                     Point::new(11.0, 11.0 + 25.0 * i as f32),
                     Size::INFINITY,
                 ),
-                color: [0.9, 0.9, 0.9, 1.0],
+                color: Color::new(0.9, 0.9, 0.9, 1.0),
                 size: 20.0,
                 font: Font::Default,
                 horizontal_alignment: alignment::Horizontal::Left,
@@ -71,7 +72,7 @@ impl<'a> Layer<'a> {
 
             overlay.text.push(Text {
                 bounds: text.bounds + Vector::new(-1.0, -1.0),
-                color: [0.0, 0.0, 0.0, 1.0],
+                color: Color::BLACK,
                 ..text
             });
         }
@@ -136,7 +137,7 @@ impl<'a> Layer<'a> {
                     content,
                     bounds: *bounds + translation,
                     size: *size,
-                    color: color.into_linear(),
+                    color: *color,
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
                     vertical_alignment: *vertical_alignment,
diff --git a/graphics/src/layer/text.rs b/graphics/src/layer/text.rs
index 74f7a67665..38d626168a 100644
--- a/graphics/src/layer/text.rs
+++ b/graphics/src/layer/text.rs
@@ -1,4 +1,4 @@
-use crate::{alignment, Font, Rectangle};
+use crate::{alignment, Color, Font, Rectangle};
 
 /// A paragraph of text.
 #[derive(Debug, Clone, Copy)]
@@ -10,7 +10,7 @@ pub struct Text<'a> {
     pub bounds: Rectangle,
 
     /// The color of the [`Text`], in __linear RGB_.
-    pub color: [f32; 4],
+    pub color: Color,
 
     /// The size of the [`Text`].
     pub size: f32,
diff --git a/src/settings.rs b/src/settings.rs
index 0eb3e62da3..266ad40453 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -28,7 +28,7 @@ pub struct Settings<Flags> {
 
     /// The text size that will be used by default.
     ///
-    /// The default value is `20.0`.
+    /// The default value is `16.0`.
     pub default_text_size: f32,
 
     /// If enabled, spread text workload in multiple threads when multiple cores
@@ -97,7 +97,7 @@ where
             window: Default::default(),
             flags: Default::default(),
             default_font: Default::default(),
-            default_text_size: 20.0,
+            default_text_size: 16.0,
             text_multithreading: false,
             antialiasing: false,
             exit_on_close_request: true,
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 5badeae69b..d29c112922 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -33,6 +33,7 @@ log = "0.4"
 guillotiere = "0.6"
 futures = "0.3"
 bitflags = "1.2"
+once_cell = "1.0"
 
 [dependencies.bytemuck]
 version = "1.9"
@@ -46,6 +47,10 @@ path = "../native"
 version = "0.7"
 path = "../graphics"
 
+[dependencies.glyphon]
+version = "0.2"
+path = "../../glyphon"
+
 [dependencies.tracing]
 version = "0.1.6"
 optional = true
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index e9e23e80ba..7778576042 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -18,7 +18,7 @@ use crate::image;
 ///
 /// [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
 /// [`iced`]: https://github.com/iced-rs/iced
-#[derive(Debug)]
+#[allow(missing_debug_implementations)]
 pub struct Backend {
     quad_pipeline: quad::Pipeline,
     text_pipeline: text::Pipeline,
@@ -34,11 +34,13 @@ impl Backend {
     /// Creates a new [`Backend`].
     pub fn new(
         device: &wgpu::Device,
+        queue: &wgpu::Queue,
         settings: Settings,
         format: wgpu::TextureFormat,
     ) -> Self {
         let text_pipeline = text::Pipeline::new(
             device,
+            queue,
             format,
             settings.default_font,
             settings.text_multithreading,
@@ -70,6 +72,7 @@ impl Backend {
     pub fn present<T: AsRef<str>>(
         &mut self,
         device: &wgpu::Device,
+        queue: &wgpu::Queue,
         staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         frame: &wgpu::TextureView,
@@ -91,6 +94,7 @@ impl Backend {
         for layer in layers {
             self.flush(
                 device,
+                queue,
                 scale_factor,
                 transformation,
                 &layer,
@@ -108,6 +112,7 @@ impl Backend {
     fn flush(
         &mut self,
         device: &wgpu::Device,
+        queue: &wgpu::Queue,
         scale_factor: f32,
         transformation: Transformation,
         layer: &Layer<'_>,
@@ -171,11 +176,15 @@ impl Backend {
         }
 
         if !layer.text.is_empty() {
-            for _text in layer.text.iter() {
-                // TODO: Queue text sections
-            }
+            self.text_pipeline.prepare(
+                device,
+                queue,
+                &layer.text,
+                scale_factor,
+                target_size,
+            );
 
-            // TODO: Draw queued
+            self.text_pipeline.render(encoder, target);
         }
     }
 }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 125e6be0a5..ccb627cdcc 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,26 +1,166 @@
 pub use iced_native::text::Hit;
 
-#[derive(Debug)]
-pub struct Pipeline;
+use iced_graphics::layer::Text;
+use iced_native::{Font, Size};
+
+#[allow(missing_debug_implementations)]
+pub struct Pipeline {
+    renderer: glyphon::TextRenderer,
+    atlas: glyphon::TextAtlas,
+    cache: glyphon::SwashCache<'static>,
+}
+
+// TODO: Share with `iced_graphics`
+static FONT_SYSTEM: once_cell::sync::Lazy<glyphon::FontSystem> =
+    once_cell::sync::Lazy::new(glyphon::FontSystem::new);
 
 impl Pipeline {
     pub fn new(
-        _device: &wgpu::Device,
-        _format: wgpu::TextureFormat,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        format: wgpu::TextureFormat,
         _default_font: Option<&[u8]>,
         _multithreading: bool,
     ) -> Self {
-        Pipeline
+        Pipeline {
+            renderer: glyphon::TextRenderer::new(device, queue),
+            atlas: glyphon::TextAtlas::new(device, queue, format),
+            cache: glyphon::SwashCache::new(&FONT_SYSTEM),
+        }
+    }
+
+    pub fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        sections: &[Text<'_>],
+        scale_factor: f32,
+        target_size: Size<u32>,
+    ) {
+        let buffers: Vec<_> = sections
+            .iter()
+            .map(|section| {
+                let metrics = glyphon::Metrics::new(
+                    (section.size * scale_factor) as i32,
+                    (section.size * 1.2 * scale_factor) as i32,
+                );
+
+                let mut buffer = glyphon::Buffer::new(&FONT_SYSTEM, metrics);
+
+                buffer.set_size(
+                    (section.bounds.width * scale_factor).ceil() as i32,
+                    (section.bounds.height * scale_factor).ceil() as i32,
+                );
+
+                buffer.set_text(
+                    section.content,
+                    glyphon::Attrs::new()
+                        .color({
+                            let [r, g, b, a] = section.color.into_rgba8();
+                            glyphon::Color::rgba(r, g, b, a)
+                        })
+                        .family(match section.font {
+                            Font::Default => glyphon::Family::SansSerif,
+                            Font::External { name, .. } => {
+                                glyphon::Family::Name(name)
+                            }
+                        }),
+                );
+
+                buffer.shape_until_scroll();
+
+                buffer
+            })
+            .collect();
+
+        let text_areas: Vec<_> = sections
+            .iter()
+            .zip(buffers.iter())
+            .map(|(section, buffer)| glyphon::TextArea {
+                buffer,
+                left: (section.bounds.x * scale_factor) as i32,
+                top: (section.bounds.y * scale_factor) as i32,
+                bounds: glyphon::TextBounds {
+                    left: (section.bounds.x * scale_factor) as i32,
+                    top: (section.bounds.y * scale_factor) as i32,
+                    right: ((section.bounds.x + section.bounds.width)
+                        * scale_factor) as i32,
+                    bottom: ((section.bounds.y + section.bounds.height)
+                        * scale_factor) as i32,
+                },
+            })
+            .collect();
+
+        self.renderer
+            .prepare(
+                device,
+                queue,
+                &mut self.atlas,
+                glyphon::Resolution {
+                    width: target_size.width,
+                    height: target_size.height,
+                },
+                &text_areas,
+                glyphon::Color::rgb(0, 0, 0),
+                &mut self.cache,
+            )
+            .expect("Prepare text sections");
+    }
+
+    pub fn render(
+        &mut self,
+        encoder: &mut wgpu::CommandEncoder,
+        target: &wgpu::TextureView,
+    ) {
+        let mut render_pass =
+            encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: None,
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: target,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Load,
+                        store: true,
+                    },
+                })],
+                depth_stencil_attachment: None,
+            });
+
+        self.renderer
+            .render(&self.atlas, &mut render_pass)
+            .expect("Render text");
     }
 
     pub fn measure(
         &self,
-        _content: &str,
-        _size: f32,
-        _font: iced_native::Font,
-        _bounds: iced_native::Size,
+        content: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
     ) -> (f32, f32) {
-        (0.0, 0.0)
+        let attrs = match font {
+            Font::Default => glyphon::Attrs::new(),
+            Font::External { name, .. } => glyphon::Attrs {
+                family: glyphon::Family::Name(name),
+                ..glyphon::Attrs::new()
+            },
+        };
+
+        let mut paragraph =
+            glyphon::BufferLine::new(content, glyphon::AttrsList::new(attrs));
+
+        // TODO: Cache layout
+        let layout = paragraph.layout(
+            &FONT_SYSTEM,
+            size as i32,
+            bounds.width as i32,
+            glyphon::Wrap::Word,
+        );
+
+        (
+            layout.iter().fold(0.0, |max, line| line.w.max(max)),
+            size * 1.2 * layout.len() as f32,
+        )
     }
 
     pub fn hit_test(
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6d0c36f6d3..50231f7c08 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -114,7 +114,7 @@ impl<Theme> Compositor<Theme> {
 
     /// Creates a new rendering [`Backend`] for this [`Compositor`].
     pub fn create_backend(&self) -> Backend {
-        Backend::new(&self.device, self.settings, self.format)
+        Backend::new(&self.device, &self.queue, self.settings, self.format)
     }
 }
 
@@ -227,6 +227,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 renderer.with_primitives(|backend, primitives| {
                     backend.present(
                         &self.device,
+                        &self.queue,
                         &mut self.staging_belt,
                         &mut encoder,
                         view,

From ba258f8fbcf72eaabefe193b6fbee6484b44e569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Feb 2023 03:24:14 +0100
Subject: [PATCH 003/163] Implement support for multiple text layers in
 `iced_wgpu`

---
 wgpu/src/backend.rs |  3 +++
 wgpu/src/text.rs    | 45 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 7778576042..9bf464b3af 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -105,6 +105,8 @@ impl Backend {
             );
         }
 
+        self.text_pipeline.end_frame();
+
         #[cfg(any(feature = "image", feature = "svg"))]
         self.image_pipeline.trim_cache(device, encoder);
     }
@@ -180,6 +182,7 @@ impl Backend {
                 device,
                 queue,
                 &layer.text,
+                layer.bounds,
                 scale_factor,
                 target_size,
             );
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ccb627cdcc..2b18299f87 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,13 +1,14 @@
 pub use iced_native::text::Hit;
 
 use iced_graphics::layer::Text;
-use iced_native::{Font, Size};
+use iced_native::{Font, Rectangle, Size};
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
-    renderer: glyphon::TextRenderer,
+    renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
     cache: glyphon::SwashCache<'static>,
+    layer: usize,
 }
 
 // TODO: Share with `iced_graphics`
@@ -23,9 +24,10 @@ impl Pipeline {
         _multithreading: bool,
     ) -> Self {
         Pipeline {
-            renderer: glyphon::TextRenderer::new(device, queue),
+            renderers: Vec::new(),
             atlas: glyphon::TextAtlas::new(device, queue, format),
             cache: glyphon::SwashCache::new(&FONT_SYSTEM),
+            layer: 0,
         }
     }
 
@@ -34,9 +36,17 @@ impl Pipeline {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         sections: &[Text<'_>],
+        bounds: Rectangle,
         scale_factor: f32,
         target_size: Size<u32>,
     ) {
+        if self.renderers.len() <= self.layer {
+            self.renderers
+                .push(glyphon::TextRenderer::new(device, queue));
+        }
+
+        let renderer = &mut self.renderers[self.layer];
+
         let buffers: Vec<_> = sections
             .iter()
             .map(|section| {
@@ -73,6 +83,13 @@ impl Pipeline {
             })
             .collect();
 
+        let bounds = glyphon::TextBounds {
+            left: (bounds.x * scale_factor) as i32,
+            top: (bounds.y * scale_factor) as i32,
+            right: ((bounds.x + bounds.width) * scale_factor) as i32,
+            bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
+        };
+
         let text_areas: Vec<_> = sections
             .iter()
             .zip(buffers.iter())
@@ -80,18 +97,11 @@ impl Pipeline {
                 buffer,
                 left: (section.bounds.x * scale_factor) as i32,
                 top: (section.bounds.y * scale_factor) as i32,
-                bounds: glyphon::TextBounds {
-                    left: (section.bounds.x * scale_factor) as i32,
-                    top: (section.bounds.y * scale_factor) as i32,
-                    right: ((section.bounds.x + section.bounds.width)
-                        * scale_factor) as i32,
-                    bottom: ((section.bounds.y + section.bounds.height)
-                        * scale_factor) as i32,
-                },
+                bounds,
             })
             .collect();
 
-        self.renderer
+        renderer
             .prepare(
                 device,
                 queue,
@@ -126,9 +136,18 @@ impl Pipeline {
                 depth_stencil_attachment: None,
             });
 
-        self.renderer
+        let renderer = &mut self.renderers[self.layer];
+
+        renderer
             .render(&self.atlas, &mut render_pass)
             .expect("Render text");
+
+        self.layer += 1;
+    }
+
+    pub fn end_frame(&mut self) {
+        self.renderers.truncate(self.layer);
+        self.layer = 0;
     }
 
     pub fn measure(

From 98a16fd670d501a0072fee13b023be686ff30cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Feb 2023 03:39:15 +0100
Subject: [PATCH 004/163] Implement proper text alignment support in
 `iced_wgpu`

---
 wgpu/src/text.rs | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 2b18299f87..19d0782add 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,7 @@
 pub use iced_native::text::Hit;
 
 use iced_graphics::layer::Text;
+use iced_native::alignment;
 use iced_native::{Font, Rectangle, Size};
 
 #[allow(missing_debug_implementations)]
@@ -93,11 +94,37 @@ impl Pipeline {
         let text_areas: Vec<_> = sections
             .iter()
             .zip(buffers.iter())
-            .map(|(section, buffer)| glyphon::TextArea {
-                buffer,
-                left: (section.bounds.x * scale_factor) as i32,
-                top: (section.bounds.y * scale_factor) as i32,
-                bounds,
+            .map(|(section, buffer)| {
+                let x = section.bounds.x * scale_factor;
+                let y = section.bounds.y * scale_factor;
+
+                let max_width = buffer
+                    .layout_runs()
+                    .fold(0.0f32, |max, run| max.max(run.line_w));
+
+                let total_height = buffer.visible_lines() as f32
+                    * section.size
+                    * 1.2
+                    * scale_factor;
+
+                let left = match section.horizontal_alignment {
+                    alignment::Horizontal::Left => x,
+                    alignment::Horizontal::Center => x - max_width / 2.0,
+                    alignment::Horizontal::Right => x - max_width,
+                };
+
+                let top = match section.vertical_alignment {
+                    alignment::Vertical::Top => y,
+                    alignment::Vertical::Center => y - total_height / 2.0,
+                    alignment::Vertical::Bottom => y - total_height,
+                };
+
+                glyphon::TextArea {
+                    buffer,
+                    left: left as i32,
+                    top: top as i32,
+                    bounds,
+                }
             })
             .collect();
 

From c68edb3278fdfa3c5ea6b29b9e2213fed56d4e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Feb 2023 04:05:51 +0100
Subject: [PATCH 005/163] Fix `TextInput` line height

---
 native/src/widget/text_input.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index ee0473ea78..5e198b8f96 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -387,7 +387,11 @@ where
     let text_size = size.unwrap_or_else(|| renderer.default_size());
 
     let padding = padding.fit(Size::ZERO, limits.max());
-    let limits = limits.width(width).pad(padding).height(text_size);
+
+    let limits = limits
+        .width(width)
+        .pad(padding)
+        .height(text_size as f32 * 1.2);
 
     let mut text = layout::Node::new(limits.resolve(Size::ZERO));
     text.move_to(Point::new(padding.left, padding.top));

From bb27982009d89a1cf4874697f7c17ff0af71d93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Feb 2023 04:06:29 +0100
Subject: [PATCH 006/163] Convert sRGB to linear RGB for text in `iced_wgpu`

---
 wgpu/src/text.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 19d0782add..3f828da194 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -67,8 +67,14 @@ impl Pipeline {
                     section.content,
                     glyphon::Attrs::new()
                         .color({
-                            let [r, g, b, a] = section.color.into_rgba8();
-                            glyphon::Color::rgba(r, g, b, a)
+                            let [r, g, b, a] = section.color.into_linear();
+
+                            glyphon::Color::rgba(
+                                (r * 255.0) as u8,
+                                (g * 255.0) as u8,
+                                (b * 255.0) as u8,
+                                (a * 255.0) as u8,
+                            )
                         })
                         .family(match section.font {
                             Font::Default => glyphon::Family::SansSerif,

From 032e860f13a562719faf128238abe7ffb7f2a610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Feb 2023 04:14:11 +0100
Subject: [PATCH 007/163] Fix `PickList` line height

---
 native/src/widget/pick_list.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs
index 17528db40b..a128d1ae96 100644
--- a/native/src/widget/pick_list.rs
+++ b/native/src/widget/pick_list.rs
@@ -384,7 +384,7 @@ where
 
     let size = {
         let intrinsic =
-            Size::new(max_width + text_size + padding.left, text_size);
+            Size::new(max_width + text_size + padding.left, text_size * 1.2);
 
         limits.resolve(intrinsic).pad(padding)
     };
@@ -620,12 +620,12 @@ pub fn draw<'a, T, Renderer>(
             color: style.handle_color,
             bounds: Rectangle {
                 x: bounds.x + bounds.width - padding.horizontal(),
-                y: bounds.center_y() - size / 2.0,
-                height: size,
+                y: bounds.center_y(),
+                height: size * 1.2,
                 ..bounds
             },
             horizontal_alignment: alignment::Horizontal::Right,
-            vertical_alignment: alignment::Vertical::Top,
+            vertical_alignment: alignment::Vertical::Center,
         });
     }
 
@@ -645,12 +645,12 @@ pub fn draw<'a, T, Renderer>(
             },
             bounds: Rectangle {
                 x: bounds.x + padding.left,
-                y: bounds.center_y() - text_size / 2.0,
+                y: bounds.center_y(),
                 width: bounds.width - padding.horizontal(),
-                height: text_size,
+                height: text_size * 1.2,
             },
             horizontal_alignment: alignment::Horizontal::Left,
-            vertical_alignment: alignment::Vertical::Top,
+            vertical_alignment: alignment::Vertical::Center,
         });
     }
 }

From 1d0c44fb255f5fbf5a03e7c737e40ab66d39de9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 01:24:27 +0100
Subject: [PATCH 008/163] Implement basic text caching in `iced_wgpu`

---
 core/src/font.rs |  16 ++++
 wgpu/Cargo.toml  |   2 +
 wgpu/src/text.rs | 201 +++++++++++++++++++++++++++++++++--------------
 3 files changed, 159 insertions(+), 60 deletions(-)

diff --git a/core/src/font.rs b/core/src/font.rs
index 3f9ad2b5a4..130e378e2f 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,3 +1,5 @@
+use std::hash::{Hash, Hasher};
+
 /// A font.
 #[derive(Debug, Clone, Copy)]
 pub enum Font {
@@ -22,3 +24,17 @@ impl Default for Font {
         Font::Default
     }
 }
+
+impl Hash for Font {
+    fn hash<H: Hasher>(&self, hasher: &mut H) {
+        match self {
+            Self::Default => {
+                0.hash(hasher);
+            }
+            Self::External { name, .. } => {
+                1.hash(hasher);
+                name.hash(hasher);
+            }
+        }
+    }
+}
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index d29c112922..1a94c6a35f 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -34,6 +34,8 @@ guillotiere = "0.6"
 futures = "0.3"
 bitflags = "1.2"
 once_cell = "1.0"
+rustc-hash = "1.1"
+twox-hash = "1.6"
 
 [dependencies.bytemuck]
 version = "1.9"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 3f828da194..a1d621d49a 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -2,16 +2,107 @@ pub use iced_native::text::Hit;
 
 use iced_graphics::layer::Text;
 use iced_native::alignment;
-use iced_native::{Font, Rectangle, Size};
+use iced_native::{Color, Font, Rectangle, Size};
+
+use rustc_hash::{FxHashMap, FxHashSet};
+use std::cell::RefCell;
+use std::hash::{BuildHasher, Hash, Hasher};
+use twox_hash::RandomXxHashBuilder64;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
     renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
     cache: glyphon::SwashCache<'static>,
+    measurement_cache: RefCell<Cache>,
+    render_cache: Cache,
     layer: usize,
 }
 
+struct Cache {
+    entries: FxHashMap<KeyHash, glyphon::Buffer<'static>>,
+    recently_used: FxHashSet<KeyHash>,
+    hasher: RandomXxHashBuilder64,
+}
+
+impl Cache {
+    fn new() -> Self {
+        Self {
+            entries: FxHashMap::default(),
+            recently_used: FxHashSet::default(),
+            hasher: RandomXxHashBuilder64::default(),
+        }
+    }
+
+    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer<'static>> {
+        self.entries.get(key)
+    }
+
+    fn allocate(
+        &mut self,
+        key: Key<'_>,
+    ) -> (KeyHash, &mut glyphon::Buffer<'static>) {
+        let hash = {
+            let mut hasher = self.hasher.build_hasher();
+
+            key.content.hash(&mut hasher);
+            (key.size as i32).hash(&mut hasher);
+            key.font.hash(&mut hasher);
+            (key.bounds.width as i32).hash(&mut hasher);
+            (key.bounds.height as i32).hash(&mut hasher);
+            key.color.into_rgba8().hash(&mut hasher);
+
+            hasher.finish()
+        };
+
+        if !self.entries.contains_key(&hash) {
+            let metrics =
+                glyphon::Metrics::new(key.size as i32, (key.size * 1.2) as i32);
+
+            let mut buffer = glyphon::Buffer::new(&FONT_SYSTEM, metrics);
+
+            buffer.set_size(key.bounds.width as i32, key.bounds.height as i32);
+            buffer.set_text(
+                key.content,
+                glyphon::Attrs::new().family(to_family(key.font)).color({
+                    let [r, g, b, a] = key.color.into_linear();
+
+                    glyphon::Color::rgba(
+                        (r * 255.0) as u8,
+                        (g * 255.0) as u8,
+                        (b * 255.0) as u8,
+                        (a * 255.0) as u8,
+                    )
+                }),
+            );
+
+            let _ = self.entries.insert(hash, buffer);
+        }
+
+        let _ = self.recently_used.insert(hash);
+
+        (hash, self.entries.get_mut(&hash).unwrap())
+    }
+
+    fn trim(&mut self) {
+        self.entries
+            .retain(|key, _| self.recently_used.contains(key));
+
+        self.recently_used.clear();
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct Key<'a> {
+    content: &'a str,
+    size: f32,
+    font: Font,
+    bounds: Size,
+    color: Color,
+}
+
+type KeyHash = u64;
+
 // TODO: Share with `iced_graphics`
 static FONT_SYSTEM: once_cell::sync::Lazy<glyphon::FontSystem> =
     once_cell::sync::Lazy::new(glyphon::FontSystem::new);
@@ -28,6 +119,8 @@ impl Pipeline {
             renderers: Vec::new(),
             atlas: glyphon::TextAtlas::new(device, queue, format),
             cache: glyphon::SwashCache::new(&FONT_SYSTEM),
+            measurement_cache: RefCell::new(Cache::new()),
+            render_cache: Cache::new(),
             layer: 0,
         }
     }
@@ -48,48 +141,29 @@ impl Pipeline {
 
         let renderer = &mut self.renderers[self.layer];
 
-        let buffers: Vec<_> = sections
+        let keys: Vec<_> = sections
             .iter()
             .map(|section| {
-                let metrics = glyphon::Metrics::new(
-                    (section.size * scale_factor) as i32,
-                    (section.size * 1.2 * scale_factor) as i32,
-                );
-
-                let mut buffer = glyphon::Buffer::new(&FONT_SYSTEM, metrics);
-
-                buffer.set_size(
-                    (section.bounds.width * scale_factor).ceil() as i32,
-                    (section.bounds.height * scale_factor).ceil() as i32,
-                );
-
-                buffer.set_text(
-                    section.content,
-                    glyphon::Attrs::new()
-                        .color({
-                            let [r, g, b, a] = section.color.into_linear();
-
-                            glyphon::Color::rgba(
-                                (r * 255.0) as u8,
-                                (g * 255.0) as u8,
-                                (b * 255.0) as u8,
-                                (a * 255.0) as u8,
-                            )
-                        })
-                        .family(match section.font {
-                            Font::Default => glyphon::Family::SansSerif,
-                            Font::External { name, .. } => {
-                                glyphon::Family::Name(name)
-                            }
-                        }),
-                );
-
-                buffer.shape_until_scroll();
-
-                buffer
+                let (key, _) = self.render_cache.allocate(Key {
+                    content: section.content,
+                    size: section.size * scale_factor,
+                    font: section.font,
+                    bounds: Size {
+                        width: section.bounds.width * scale_factor,
+                        height: section.bounds.height * scale_factor,
+                    },
+                    color: section.color,
+                });
+
+                key
             })
             .collect();
 
+        let buffers: Vec<_> = keys
+            .iter()
+            .map(|key| self.render_cache.get(key).expect("Get cached buffer"))
+            .collect();
+
         let bounds = glyphon::TextBounds {
             left: (bounds.x * scale_factor) as i32,
             top: (bounds.y * scale_factor) as i32,
@@ -190,29 +264,27 @@ impl Pipeline {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        let attrs = match font {
-            Font::Default => glyphon::Attrs::new(),
-            Font::External { name, .. } => glyphon::Attrs {
-                family: glyphon::Family::Name(name),
-                ..glyphon::Attrs::new()
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
+
+        let (_, paragraph) = measurement_cache.allocate(Key {
+            content,
+            size: size,
+            font,
+            bounds: Size {
+                width: bounds.width,
+                height: f32::INFINITY,
             },
-        };
+            color: Color::BLACK,
+        });
+
+        let (total_lines, max_width) = paragraph
+            .layout_runs()
+            .enumerate()
+            .fold((0, 0.0), |(_, max), (i, buffer)| {
+                (i + 1, buffer.line_w.max(max))
+            });
 
-        let mut paragraph =
-            glyphon::BufferLine::new(content, glyphon::AttrsList::new(attrs));
-
-        // TODO: Cache layout
-        let layout = paragraph.layout(
-            &FONT_SYSTEM,
-            size as i32,
-            bounds.width as i32,
-            glyphon::Wrap::Word,
-        );
-
-        (
-            layout.iter().fold(0.0, |max, line| line.w.max(max)),
-            size * 1.2 * layout.len() as f32,
-        )
+        (max_width, size * 1.2 * total_lines as f32)
     }
 
     pub fn hit_test(
@@ -227,5 +299,14 @@ impl Pipeline {
         None
     }
 
-    pub fn trim_measurement_cache(&mut self) {}
+    pub fn trim_measurement_cache(&mut self) {
+        self.measurement_cache.borrow_mut().trim();
+    }
+}
+
+fn to_family(font: Font) -> glyphon::Family<'static> {
+    match font {
+        Font::Default => glyphon::Family::SansSerif,
+        Font::External { name, .. } => glyphon::Family::Name(name),
+    }
 }

From 02fc7e6e89e0a098a2a8cae8490f36d3bdf8126c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 01:30:49 +0100
Subject: [PATCH 009/163] Trim text `render_cache` after rendering in
 `iced_wgpu`

---
 wgpu/src/text.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index a1d621d49a..cca00435ac 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -254,6 +254,8 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.renderers.truncate(self.layer);
+        self.render_cache.trim();
+
         self.layer = 0;
     }
 

From 6b707711469c7298bb363029a0c3d12a7834278c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 01:34:25 +0100
Subject: [PATCH 010/163] Avoid unnecessary `Vec` allocation in text pipeline

---
 wgpu/src/text.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index cca00435ac..1e2bf5c2d4 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -159,11 +159,6 @@ impl Pipeline {
             })
             .collect();
 
-        let buffers: Vec<_> = keys
-            .iter()
-            .map(|key| self.render_cache.get(key).expect("Get cached buffer"))
-            .collect();
-
         let bounds = glyphon::TextBounds {
             left: (bounds.x * scale_factor) as i32,
             top: (bounds.y * scale_factor) as i32,
@@ -173,8 +168,11 @@ impl Pipeline {
 
         let text_areas: Vec<_> = sections
             .iter()
-            .zip(buffers.iter())
-            .map(|(section, buffer)| {
+            .zip(keys.iter())
+            .map(|(section, key)| {
+                let buffer =
+                    self.render_cache.get(key).expect("Get cached buffer");
+
                 let x = section.bounds.x * scale_factor;
                 let y = section.bounds.y * scale_factor;
 

From c8e8b1a7ba47ab13cef2dc7f300fbfcefe1e8a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 01:51:08 +0100
Subject: [PATCH 011/163] Use `bounds` directly for `measure` in text pipeline

---
 wgpu/src/text.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 1e2bf5c2d4..026a6d27b3 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -270,10 +270,7 @@ impl Pipeline {
             content,
             size: size,
             font,
-            bounds: Size {
-                width: bounds.width,
-                height: f32::INFINITY,
-            },
+            bounds,
             color: Color::BLACK,
         });
 

From 0a324f0aebdee06c9cce8ef107b44b847dace05b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 02:02:41 +0100
Subject: [PATCH 012/163] Implement `hit_test` for `text::Pipeline` in
 `iced_wgpu`

---
 wgpu/src/text.rs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 026a6d27b3..417871366e 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -286,14 +286,26 @@ impl Pipeline {
 
     pub fn hit_test(
         &self,
-        _content: &str,
-        _size: f32,
-        _font: iced_native::Font,
-        _bounds: iced_native::Size,
-        _point: iced_native::Point,
+        content: &str,
+        size: f32,
+        font: iced_native::Font,
+        bounds: iced_native::Size,
+        point: iced_native::Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        None
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
+
+        let (_, paragraph) = measurement_cache.allocate(Key {
+            content,
+            size: size,
+            font,
+            bounds,
+            color: Color::BLACK,
+        });
+
+        let cursor = paragraph.hit(point.x as i32, point.y as i32)?;
+
+        Some(Hit::CharOffset(cursor.index))
     }
 
     pub fn trim_measurement_cache(&mut self) {

From a7580e0696a1a0ba76a89db3f78bc99ba3fbb361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 06:50:38 +0100
Subject: [PATCH 013/163] Count `layout_runs` instead of using `visible_lines`
 in `text::Pipeline::prepare`

---
 wgpu/src/text.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 417871366e..fa7fd5dfea 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -176,14 +176,15 @@ impl Pipeline {
                 let x = section.bounds.x * scale_factor;
                 let y = section.bounds.y * scale_factor;
 
-                let max_width = buffer
+                let (total_lines, max_width) = buffer
                     .layout_runs()
-                    .fold(0.0f32, |max, run| max.max(run.line_w));
+                    .enumerate()
+                    .fold((0, 0.0), |(_, max), (i, buffer)| {
+                        (i + 1, buffer.line_w.max(max))
+                    });
 
-                let total_height = buffer.visible_lines() as f32
-                    * section.size
-                    * 1.2
-                    * scale_factor;
+                let total_height =
+                    total_lines as f32 * section.size * 1.2 * scale_factor;
 
                 let left = match section.horizontal_alignment {
                     alignment::Horizontal::Left => x,

From b29de28d1f0f608f8029c93d154cfd1b0f8b8cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 07:33:33 +0100
Subject: [PATCH 014/163] Overhaul `Font` type to allow font family selection

---
 core/src/font.rs                              |  53 ++++------
 examples/todos/fonts/icons.ttf                | Bin 5596 -> 5732 bytes
 examples/todos/src/main.rs                    |   5 +-
 graphics/fonts/Lato-Regular.ttf               | Bin 75136 -> 0 bytes
 graphics/fonts/OFL.txt                        |  93 ------------------
 graphics/src/backend.rs                       |   3 +
 graphics/src/layer.rs                         |   2 +-
 graphics/src/renderer.rs                      |   4 +
 graphics/src/widget/canvas/text.rs            |   2 +-
 native/src/overlay/menu.rs                    |  12 +--
 native/src/renderer/null.rs                   |   8 +-
 native/src/text.rs                            |   5 +-
 native/src/widget/checkbox.rs                 |  13 +--
 native/src/widget/pick_list.rs                |  25 ++---
 native/src/widget/radio.rs                    |  11 ++-
 native/src/widget/text.rs                     |  20 ++--
 native/src/widget/text_input.rs               |  39 ++++----
 native/src/widget/toggler.rs                  |  13 +--
 src/application.rs                            |   1 -
 src/settings.rs                               |  18 +---
 .../Icons.ttf => wgpu/fonts/Iced-Icons.ttf    | Bin 5032 -> 5108 bytes
 wgpu/src/backend.rs                           |  21 ++--
 wgpu/src/lib.rs                               |   4 +-
 wgpu/src/settings.rs                          |  37 ++-----
 wgpu/src/text.rs                              |  10 +-
 25 files changed, 145 insertions(+), 254 deletions(-)
 delete mode 100644 graphics/fonts/Lato-Regular.ttf
 delete mode 100644 graphics/fonts/OFL.txt
 rename graphics/fonts/Icons.ttf => wgpu/fonts/Iced-Icons.ttf (62%)

diff --git a/core/src/font.rs b/core/src/font.rs
index 130e378e2f..1f774a70ea 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,40 +1,29 @@
-use std::hash::{Hash, Hasher};
+use std::hash::Hash;
 
 /// A font.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Font {
-    /// The default font.
-    ///
-    /// This is normally a font configured in a renderer or loaded from the
-    /// system.
-    Default,
+    /// The name of a font family of choice.
+    Name(&'static str),
 
-    /// An external font.
-    External {
-        /// The name of the external font
-        name: &'static str,
+    /// Serif fonts represent the formal text style for a script.
+    Serif,
 
-        /// The bytes of the external font
-        bytes: &'static [u8],
-    },
-}
+    /// Glyphs in sans-serif fonts, as the term is used in CSS, are generally low
+    /// contrast and have stroke endings that are plain — without any flaring,
+    /// cross stroke, or other ornamentation.
+    SansSerif,
 
-impl Default for Font {
-    fn default() -> Font {
-        Font::Default
-    }
-}
+    /// Glyphs in cursive fonts generally use a more informal script style, and
+    /// the result looks more like handwritten pen or brush writing than printed
+    /// letterwork.
+    Cursive,
+
+    /// Fantasy fonts are primarily decorative or expressive fonts that contain
+    /// decorative or expressive representations of characters.
+    Fantasy,
 
-impl Hash for Font {
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        match self {
-            Self::Default => {
-                0.hash(hasher);
-            }
-            Self::External { name, .. } => {
-                1.hash(hasher);
-                name.hash(hasher);
-            }
-        }
-    }
+    /// The sole criterion of a monospace font is that all glyphs have the same
+    /// fixed width.
+    Monospace,
 }
diff --git a/examples/todos/fonts/icons.ttf b/examples/todos/fonts/icons.ttf
index 4498299db26811ff8490001ea6f681529a4118f4..7b65fd3634a48b1afc3bebe7b3bb83a6c4f508d7 100644
GIT binary patch
delta 1263
zcma)6O=uHA6#iy6-8M#>)}JC6a6wTaO&ep?QnVt}XvH6}Au1GQ*=&<)l3kNk^pu;5
zCuLFbCjOx4N%SNhJqV)oQcw^Tj3R;u1yK~K-)yH<@#4VS_q{joe`fYYvf15$0MNlt
z1juG{J1;%GdJE{<Mr~s2(3UJ#Vlm}al+E2Ey_sxxP6Nbg%6YqDd7tOMdqepfX^(x(
zH;u_DMv4zf`!TOrIdkspen8&=#Jr+a_o(k+Jd?bwSU%AhyRdO|2_1Yun<zO}A@L+N
z$Y676u&zXf@m=3XSq5BQs`$s_r$8)TQ(jzlZA)B6ll}$D?G@{|CnACgM2WIlwJOfC
z^T$}geER5@Jh$%Ow0G?W7D@j>uh#E)Z#O3&(3gah;WRjmdz<c09E@-Hf~ER<>hb*3
zpdtBd{q{v*>W+Rr7&MlyzaHAljhSVH8Uv$f2~`>r=tiA*oYCbHx)<a`u75f(<(;hT
zJ%;p7a#qTvD@v&FJE)Pzl;9zygJ&Yq7ysHmcb@iVcES3jja-5!1WA7`5p-(JyUpmg
zSg=6r3?`%TuG#H=G{b=jj#k{=u0Pfq92s8DMqG=s!h*;5P+<+Nc&o6Eq}ZZxgcmAM
zxCJrsKw*RW4+_sgQX5e?h6UOU*<&Qik`9sd1EC;b;)>eP(2hxkb>#6;;RsA|MBx^6
ziE9cQ)IU;q4)WrM!ZEDS8bNQ{VS(UG>smHC3>yv#NFfK8+~s+tLamFcJiB4rDWr04
z!L6r;ZMRCz9y%0plvA-#qv#ZmmMwxTovZLeUZaJ>1~TYDntXsXlggY;)u=1=bgpT$
zKIYGalqO%pxNg<Yy0xNXW_r@*fGI07!-@!55mkMuOe&Mk(D>gZf9DAMneiT-ZYa-E
zYwUGAY{10ouxR9+T7BHDnyY)#zvKS@oPwWidpYJ$tx0}IqN^5`eBT@B?Hyw~PPy#%
z*lq>EiRf}$zAgbxXhIhe%{|=W*Q|QU@SLhWUJm!f)D+_3g^|C84*r$o4Udo{7mCy)
Nc=i0gwEFAa{sQaH*{A>j

delta 1080
zcmZ8fOK1~O6g_WdGHo-`RMQkGmByl0N$d|>v^0fEs4h~KHbz9DjBzrFon*#jDzykL
z2wiCLH_(+L2!ab;NVlRJH{xffA_{IQ)SX3yB0{`x`U2WF+_~qRd*{60ti->>=D+}i
zFb^5dk%^Osqt|!OlJbWleSD(3Z#16X39u8yGufi<d^mbFLHrTL-Rvbds=lu(K*LL_
zM{|x@ymtH6Y2qt@=9qfLA-#$CGs^X*bvd^*bmk)<CjseQ-q7dHw|sx`1W=o)VIWUR
zT|&+fPZ8ghFS;|0gM^^^MwXq`*?o|?I!|J-sLwb|(tZ<PBpxm4MdQuAc3QCdm?n7Z
z*cEr|d1{;%aE0m#r))UiMq;#>NSgQp7)^yBdN2$rIhsnN(bC-#TA`562S1&EF|!J$
zj(SmHRO3}f3WHix<(u9jOZN~BP{<T<3Tk9|-w-%QDz}bP4*I%+0dKq1)=DBD+>t*V
zN!)^|-bLxNH!tlyw8if@;J<zQAEfZ$mTT)9L0{n~eaAyghUMANYiS>!mtqMEO_QOa
zU(n=LZuMzxm~TMj>Qi~u8({6JRo?sGP<X!|TPf3J`{N*1m`R9tD>&=#oUQ<Ew8si*
z1<ipsvaNY;qlLfg(J#y;)FC0TOnOpag>XvX05qfpR!N@}IEWZbfi;A2hwoNtpeZll
zp}-7HEVO}-(V7}ryC}$1*e|d`I3aKVEo@9+mGrE@L1b7(U=4fNEAK|Qzb|K(T*I>L
zal@Rp^m2{Xa>giE3U(>l+tpK(yy-|RoOfMku)Djab!F|M*Abq|=3t`)7X~bPY>X2!
zF-=%U8Jnw{d4{^nbmRr!C5m2j(f_@v%i9q-<voaWdS4?QoeGnf%oG-YWKRX$vR=un
Zj#0`MEILFQ46Is3$V-Nz%PDzX`wQ*nwd()?

diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 6408f09c0b..5509cf0e3a 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -466,10 +466,7 @@ fn empty_message(message: &str) -> Element<'_, Message> {
 }
 
 // Fonts
-const ICONS: Font = Font::External {
-    name: "Icons",
-    bytes: include_bytes!("../../todos/fonts/icons.ttf"),
-};
+const ICONS: Font = Font::Name("Iced-Todos-Icons");
 
 fn icon(unicode: char) -> Text<'static> {
     text(unicode.to_string())
diff --git a/graphics/fonts/Lato-Regular.ttf b/graphics/fonts/Lato-Regular.ttf
deleted file mode 100644
index 33eba8b192384487f04951539f13bf1f8dd9f9cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 75136
zcmc${2Yg)Bl|TOOd-JAfil&cdB+Y0v(x}%N^)`|$S(ao=vRvfe<X*9jF*Y3o4q#Ig
zFac8op@s!gD4PTb$tIiKB!uL%8#a~nWCKYy31Dgb`=0yW8;xYS!0!L^50Pi)y<5*c
z{hWKRzyv|C;~$+M%pD#Y9bUesUto5lAh<7^JG!`Qv2D@a0xLLzQWHa?Rki>5^r5YS
z@Q?TLd+mmu>-PN9fn$#d!uw-_!1ixAus=`#kF19UMvV%UoAzwpxp(>AgdlwIZ9&lg
zYV*2%djzMDC9up1yti!Lap|V}6F03uU5g;RXWO!I-T1`4e~AdfU&ryjehVICe!=h=
z^!FBi7i`(N|6pSEs_)?ay%=!gj@=v9Jw5*49zpnXt00KQJJ%iDBU%g};CBwn=j~dz
zb7NVs?FNjeS`f_J_Uzub{|U!t7rH}zY4x7H8}~eF_@qx@!V4%r02ox@`6>B?P$<+1
zO+uTHOnBQ`Tbi318|ve=rNssLp<I_!ugfr$4LrMMcr4K^Fi~JZK@yoLv08!YM5aS$
zf+z_h6QXERHtJ;hW-{q92SKklhXkY1K;I1piy_aHJ@D)fG}SqKQ+mN9=uH9|n61%N
zLz#v=V|D^dH`{Q|(}ux-<&LBVMPmz_mMwd>vCP#j#cG41$8FPPvPe<1T~`;6M)GZ9
zB)`ZNuUFsUSCoYv;RgJD=x>@cRN1k4UP-W`zB;0F9J1&F6%EyS^O{N;i*w9=%ZB!9
zZ*i`}kz4GoZcjca{rg01t+Zj{KHbIMXs#oYSkc%p+)@@T^liO3KUP*;*<2iJb$XrN
ziBnYxN3g`_D-Jq3bdP+vxn3?8MBzuL|IEIR6|)Lq;fjP!5P~^wCw^HCdRbegY`_jE
zS)gN#0s11A3ecA%r<A8tq3_2#0GJRrI#s|U<w@Cz{AuqbtTmveH9~ELbsSpE;kJo}
zNTpQgkmBv)6m%*@_Kc)A=`Y2fROSj-1_G7&E>}K%hF$WB$*)x`S-K(~U$Jyah1mMx
z5AfFQ#@p-)Dpi45-YuOFufi-d1ds6Pgwt#WK6}g_M<$+R=ym$kOx+d}(*fawG!>e&
zEa@c7TEIjGp8YNGtSD84zv87LN-0z*Kt1{|tjkVR@RFEd5CD*<wTO&Qk+5Be5-_O(
zHGuN63Ic<T0UfHCBkV|hWih*y6AI+&?d-SOH~B>JC!fxXMDjk(@~6IG350sk_6X+M
zE_AV`1n|DAGtq%x?Tz(yvFfVQ;-Y9_Brlj9@Mk&gnbr)G#2niED{K}~XSYgN6dlGJ
zH8F$19Lh9{vP{&MVHEXxTZmv|5%Oep?aNR~Z-~=NDyh@Uf*76A5LL+(IJyuJ8<i>?
zSaoMsWLN_sLQT*p3iyENTUei+SSuJzhPYtTo8p9TAlO<UT}&_vnPy`qdd8BP<qR{!
zH@(0|1C+E`8E`uySnSLyS*(PmIzeJsTY71uUIa!TVaqaQB_u3EUA(@*6_ISLjJcGb
z9W3UGG_<o8=AwV3m@8K6^|%dE469X!-}FnL$qG?S@-7<j<uNw*A9IZrxkHO@_XQX;
ze!KIxR=J?)WS_n)IK1c|i-!DRHt#K~To}Ev^Z6{4Fiqb3kIsLv$CAtPvvmfUEl=K8
z7-En4a%79XiS_p9=CDn{{N!@>XfVqtC+{1`%}&1L%azUgrfXR*7_hMIv{P50-z+o=
z-NFL4IALo9t0~CO3HZE5J;!wu)}SwoF|ofmFBd?V*Ir@;JUT3rq!R#FSto-j1G*AH
z7oZ1I7Dap(2s)iJB*-$57Z76(InMwzAYT5l+w+{+9x?Quk2pRi$PALAaB83)T^<l-
z=%cnH(d59P1f5J%j$)c<w?Jt=Y*6q+u4F~P17cD>7g!b;RtF=LFa(*;ppWENibYaT
z0_ztufmmgX#py}A#N1TFCb7R<`i;IiL%`;$?p-&hu=j@TolQF**peXzyj`}fcej?g
z1GbXp!J2U2&3k%U_dT}VB4&HK*xiMRB{lh-8+#&?Kge$#t_pUpX$xA+>joB@ZPA)a
zqv-O~Exvl)yqk9P=x%idziwUF+!geP!-iyzH@@)j%H<~y4(OkC<%-wU_Qj+2q)lJZ
zyGs0S_1yYmJ9}MU+&Ul#ve0+>UHNVKF~KDi2{l5Gu#Bxtc$X|1?C(l6*4I>(mlos)
zvg|fhlILKxs)2Wcfw){$FbGDI!ARdkk?@3Aog)MZPGHnCS+>Ynn1N^WQ7?Y}dMHno
z^|S_hy;GmUxW-xQ>U3O2X$VTlHKV>!Wn4|bZ0H*z^bRN-_=*wFHVawKOdEiQ29W4U
z)s?}DWc~TtKoJvRl{OEWPS^-sB0YftO9*2KiwL6(z!g#xJiwJ$ZM(=3OTnV^loVf&
zFWuiUXWx?Q>LvT;bYHx<=BAvQ&cedZ>g?=l`mD(jud?Q5U3Kbr89A;aa$S7szNzB-
zmsH<4v$(Ef(RC}Tt5;mNXvy^}tE*RDzoctrOCZp)va54Nli%O8f?eWpeR#xbXA2h{
zp@K&iExCaT-ms)=RdXQFysE2nITc(EiduO3J^7&gxX>XCutdVmgx)z-6~)o~JV&O<
zAat+}BT1ql@S+<;C^j;%roOVmY*{Z!LGXG=PN^1Hg#{}xfLjBrz_IW{W;z{KS+7t1
z&_SV77*pp*YYH5Wx1`X#?38&!#F0AA-VhB2_@kf@9}$`X*68(WGah1;iQWrqL9dg6
z9uXj;4w?m_rPdBLr?DVLyoXp#w5Sr&N<kMNaD~e!8#6GjNsvOJpjJaABMc)B6sxUo
z078j(4qdaRLAP7hS$(o0RMS&gJKPj<<kv^pz0nGz=yvWBd%IZqQ@I7+TUY<>j^TSQ
z?XMc$JEyI=Zv2+yx2qS7$M-xpC%J6fcKPwxqTQ`tW^)D_D}#AW^D82W&Yoy;RrekJ
zF7LjdtV@2^=Dlsjw))L?uIjyf+oIt7+ZW8cYE8qbcRDxBi7cGMo@~0GR3T_;EXFmp
zkwgXrJJ-)7O+WFPNI{3epeSeHE{bZF$Wvbszd<WPgkBMrsOpuDli6%4Rk|XD3fCv!
z7MVU%$Po+)ojZe>L7Yxska4N5@c9P*)1Vhwc-I!a&SoAO*xDHkc5WRQGTSn??i4Tn
zVRGje&32>BX{g@!i(mfc(51h9=NJ2H3{G37>kG*p=%qjTHhV+s#pI%1;$ji$8y!p$
z8ipcTtonv}CoA2#HDh`wI{lVi=!M<+1y?3IsoDRFcYb^6q2K)S7yGKwiP3KUBD({<
ztd-V?ugJd;s)a2ameoRamXE{I4{Xk_C@C(;3uU|PP@D`pC_kk268s2if|Zf(UN%c1
zfRqZs&O{%i@e-f~DDlL}Xw1-miW=&HZB?wn=k-;xHWq`9)Xq8}8iAKV7GgBNB5y8Z
z>t%yG{8af<1%>X2^Xc-ZBVLnX%x2DZ;F%-rbcP*x=*%(Or8RH3^6h^2hJkU9B$_Q7
z2gcob&O-Os-zW)Xdd+xjwuqwHjOS*rJzVs4jA~qXMwhQUE|`Uj6HbiRESNJ)Mwm7_
za1sMy6=|b|kV(*aFeT6$w0&YPLX-rRNU#v;gDdo@a;ox3Y9xR#Yk670xUeVeh&aM^
zVTX7VyDPc%_T+Z<N!{_};v13+*)un=C(+mH<e%BF@JAsitV!sz{d%3K;kz@FF>ZYk
zCNpNCHBrpn8E-QAYGo_M`GWA};nirlR1>Qq&8{*KzBRN<4a6Q+J3{4wU{%N-sGeI9
zwAwO4dD(hvpfuz->?;X5y+yHL#kw`iqq!El)n+cNZVo%cF!ljq(IPGs9|o%`Oz6q5
z!PpbN87P8sgdq}{!~n=R`%}^>K71F|AA|ilg1Nhd(S)8fiqzbpuhYnB-cFV$s`E~J
z>Y=A<U&Jl7;(Wdm7p&>?rD=}MG#+=&v=!Ou|2h4r_;>kL_zfx&dXqsX@(~>ap1{k(
z;Miacw1J*8Xj*Y}TPD(4`?!`zD&T{*hTH*hnYB7R;ECkR|CyH$;UKi0{<CfnvX6AC
zOA;BH2Bp*1I-qJxXrGHUv`%#BRIDbFKk)oa=_#aY(R&Y>ripO+E7$;BdZ<O{Lo>16
zA{Pe?s)mzmugp19+0YG+-29cDyZ-s+;o+PAdDqUb+&uDP!>U7FU58dSG_0i0RSn{|
zUrGM=3u9w1FxM-uF!$%j#y+3?<13H+^k_@V(Vsr@$WQ3=Cj_i-!FUMC_hJ(Nny@$>
z_Dq}A1W}ptEJQ4D_=w==pdsK6iFR`cg9m+yWNKJ+DJwHiD~bwnG|l2^<ua9WM9ihL
zmDA|}smN3XYM+eBsxu0c%oU_kfRI-~HDxHghN}A)h8^(+SvAyI%mI`JM~h3Rg$%bT
zGfUsdp16$#CWWKY_sT2YHX5v^`Rt+(|9F%jvIPwm01INm7ZUIrk|ynT*{wp1#Zq2~
ziYgeUFkqP&6kwb|1E__XgUV2IxXwc?3X3m-_P8QV$WeA?B`S?+VA^EEs8upWfHV<5
zPid~WM^d$@a#*kEs)|EPG(gdag=@jW!^HDhJ8U3DYt{S~?UJ}`#mRkL)eE<`CT}QS
z7-c`p&7YW)>0tlbw7R>XxOa7Z{mQvD8OFSTY&NX24IjQ=ejNJ2>fxi8U)+|w!fegY
z-qGeNcCdeI-o9gZN5`7>P+rr5s$3Y!_Vssdsv~&rIQ^ck67cLNUn3K`J6oD+s;era
z1=)U=L+EGyCXK$jd*P<YU^>~yBoW#qq=4Qa1Lbs*PJ~t|3p&`nin2wph5@7Kms3ng
zGaNe4-4xZ-8w99u(X>|KR3VCG415c!VE@NzgFz!E#ZYaFKFEq7$*Zjk=_-mj0U->3
z1hf@j5RQp<&^#8XZq|j`vErWH?UBxvO*bDKxaR2%dmq}<=O6TV+##c=6K%zFHVzD2
zG!PAq+_GoI)e8%Y=B%QntF{>P{8LL8Uwd?P&i0W;N8vNqZaBHSrD^;V!+9o$Q)iNM
z=OxN(7ObsmUfWxIHH&twY;0fI3N3M{a%wR}p%}EW7P_BZ@Cx5d*t{NSCM2z~C@I<q
z!f4R3AW&No)C6PI;sY^g?#R4ZOHEM#l_O?RqLd@z2D!sMH?38rypC`mBvUiJELK)x
zGN&!zA!((2Bx!X(FMMI3`{>IUX#wQeV=;-yB`n?WpDy=v_f1~s&eb`^7azS(k|+NG
zl9xBxy~!Kcr9Q_B>AvL4f!4gq76s3xBw$l1{48OwtSBi8<p$utGm^m6Fua8vAmwGE
zBzqaK8Xg?@aU>m?rWhzDN7@Sc@nBBCM%ID%axUT&xk*i2r0Hx;pc>PoA#jpZW2pu_
z#D)@GAE_>PCq+_&ps|o)LzwK=N5WE?cN~rr!eqr3R=AAbP~-|rZ&o)Y+q?Fx+4JQ7
zmf@RT+1aswd`Y<88Fa<^)^!gYTwGZ+bYQ4{fBT;O;$!kav?h5pt84$sReQg5ZLhzy
zJ~$W%MMKrgE}P%IW3bfe4vQyAP7_C|1*8Lj_5H-7%Syr_pT}$x0xXci!-6cPgThQK
zRtJ$mfFaqHqD<0RGzY0#7Hy01^a>gk6Gs4oRVYoKS!_0<pU#XG3y-)k)DQfln0PA1
z!!i_aTyoF;Iek}uVdsv|UDmy51>0_`%{!UQj9r%eVe$OkbNlv>R+JC#>F(P<QYP(c
z+Ijz`4NqLr*K_6P_pE;F5c{3eKY3H6C^^`(cVR{4!aZHR7Y&uxjP4}<y9@Jg1+<*P
zHqwvq>CA+TPiZx75C+i%+$#hg?l?~Auy}|j$bcZsgnt-X6>K{wS>%nOdXU+Q4+$hj
zyiSc2fT9eFKLpk;$f}L$S~HE4pR-mLT`4ZNW;-U`j%@kFaDI8_snI~8?xeremF>6`
z!hJ1PHwt+Xf&`u`d@T{Ei-+@=(9ss3TQ|3?Brg_@Au14Jp_JUH%rc4)!9gPyTmo6q
zV5j__Ap-`85yP*=bv5#95h0bUweSi;g=jCWetI3~Z&>^K^ArbSg72r*qdrxMEOYao
z>@CfIMBq`xK#|7wRri2v#&5BE`*T<I-g^B-``Y*3zkb~Vd)xQ#x&GF<S3bABclZ2~
zn$aCCEjvbQO6KqG?cLCx6YgA>NUZA&=d^FIH*LFX^^MO*OCQ@mbmOMx=1n&a?SHH^
z`uvTn@7mUMylC!**8Z(sp-|V>{?-k1i^ONk=B})%9qWolyT)p3R?aOWO1l%dQ?IVY
zeMD*1klTJAC=KwRqO@Gj@!<*qs(|JI{uJRrQRYgJMrrwKS@3ZkNlM6usam24-G|~b
zY9Wv#l=-QW7!Ao*=!#fQRHIK#=}|o>#Dqw?P9dL-J9ahi3rShAaOAdKoxN8)vt{#V
z4|e*>+lrD8TdPBluot{hN5hTGUpBb4qig5<(xQ1=JNtGI7K?-RTTg6Q{m7x-IftIu
z+`fC;*2bjK<r7<S<AL%@_Hg&k!IHAUZ5?yA_eZN1Y$C{A1*_>&=||j_xO;{zQ2^`<
z07NQtw-M2SbPDhfcoIoI^44de6~v-6`IUOF(dMl0!Kb*bkyaHg6VS9Ss3#&);^Q-o
zFGrg3Net_%na0@6-!qLf$u!ei10-NO6C{E#9zL7MsH!N8kOj^84?!ZxP2yRh0c)D@
zhM<wdOQlUqgBZ$aI>lMb!1e}K70zs8Hpn2#Hxn|`%<!3U&+E@>mg{E%>l}8vI587$
z47B%q=^ouu@N4+Fm;)Xt7x}mhFl#7+AqN?JGj~dQyF1z8uJHRS-0W4ied0s$>+H5G
z9sZ18nltsXJ>#8>fc+|VJK^M~*cYWgOUHm!1|gQnP@OCSRw5Brk&XLH02lCe!Why-
z2z`JtKo{~1kSX;kX~o26=ud3Ff&CEK2g08)*1u|FwF?+)1DPC!;QeqS6_S66dH!Ul
z5tjM=Wi(>DB>(;@djR9J%ZN(;GQ;n<GP%2-#+iTm&*J;wI>kb(@b!ePsiCT(s4zc|
z@)A-!Cq^2b8*&#G7zhbulFCg`xIKms-lHS#g1`_ti75<5jKAjWRna?0j&migBHY5z
zoSHAFj!f1G@h7EI`cO5d8F>Z}14uMbj4_^RphOikvmie-uxxYd&<*PwD|!~rjp>|+
zEEPRNJr()QLltdHTMI3I+b3sYm+a4t7yBv~9UK_kHQH8RA3pJ@xwNyXsb{RUthXi*
zEC~8eJunl?L}AHkhdxIh5=Mk|h(+g(E@Z-rWeeAhuAAG_(u8O<_<c^mk!g^H5jJ8a
zJ+>Pl9Con`aSTRUMgxQAKS*(0K@U^S2ouey=vqRCBxV4V784f7EDCzEk0F>1h?oLM
zvJ5u^GDPSjOlI3R(C$*TUDG++H7V^flO*tn&3T(QWhcfyTFV%!31k34W`=2Vj*%;A
zB!%$sPkHglq?7boXh>UUkJ}kUG!hQuSZ#>ub&>pnD8-X>5Lr4}`9g@M1{cph@wmOZ
zTNbRhHXmKkI@XfgdDT}g@7`Fk%H<4|_-e+wi<W)*`-iUo{WIg+U;N;fyMMPh)8fhS
zZ%@Aa^wY^7zI}Pa_{~p!eaFgY?>n-lu5J5mNio#XQsWpbsvNj{d93TDfdwPICG*Cc
z7e9T|n8%&GYoMl}Dm$Zb(=AJH{O(OXn_l?)ZBHamKQq=9Gi7!4E!_1TR{rIk-}>Bb
zo12Ok?EB;wx9|Ak^@9i9wM#l#k*Q<Tk)FP#pjgBK<ay9Bt#EdIC1HUR$znF?;gwDK
zk#e0B%7?cEkOh7q^e;(fEl)vX;94PMbi}7hf*#W|6N=TAs1RO}zYpO{G7dp_Xc-)f
zKFE1gnO2m@8Z4t0d?7Y_1=V*Hrf`iE<~ao{1~ZVB)*#ROR3OiI{p97>8}j|165HNL
z-Y)un?nR19M!<~>fJdD<@`;JV;@tX?lAZv(I>Iy1RvrLM+|Xo8g%=ZEk4F$ni}Uk5
zAx|*Ni{~zh@n{;!w{i=4kpLe9SemB7VsZr-Zz@`<XWYZAX|Sbg9RMF$Se$E3)mD^p
zssZT-{WW&Z!cgUjC{vZVDz8{D@SbTpmFl=a>I+v=qme@GOZXY~%_Cnq+!F5IIOo0x
zy03ouVDcNRe)N+01^3;b{8uI{JUA4+`+?*K@`?D`o0itCU)1FZJ#zhuPwi+Ck0q_q
zo;6LoufDM$v7-Kp10;5qBMNDP1gI4LE#YJW+0t2F&V?#jWy+e4y8tto%>u~)9a(v`
z(D4Zt)j$PIh#YVb0x4Sn+La~*YR^#@c?DPl&a4m(L@V4Q1bk|_uu41|fjFE}nLaeb
z8I(We-mNbnPQjgVm0$-`(d34D-2-;(;Ml2u`t-ze>$iTHnI1U#t7RPqr^A|CT;IPw
zvF|H4&YyqX7q%ugEggtDSh00<)86f`GTTEBG23g~*DqR@VRhx?<+z4!fAgB_-@I)w
zGp{BenKy)!@=@TVMevh{+v|2YOz_^MY{4`SH@B2k1Vk#4MxwKNxM3H5Bo8;39~6mN
zomX*f)Ax2!KDz0p<iyFz--=l$neL@c-{?E?%D&{2Z1KKVj`WG&elYp|E1TsLoBuia
z{)0!pd+Xq-2M2HYF5wE%Sr~IN3lAimL@j4TkchqtQ4(?p1}hn|h$Qhe2R=!#jv1cp
z2!)XZ`a|iddX##@i^7==eX{&4rF1|<(2`b~Drw1MivC18ltUMu92P4kzb`&JaZEmO
zGFfnU(svTmNSl#KxG7=B7)(McB9_vB;E+$74~>fg?0i0!sieOgJVcB5n=z40iB_x#
zs*_YVtqeE-4PJ9b6ToH+KB5eLaPo!MY24<MlXqj-3e6@!vvJ{9ls8abS{TXAb~!9&
zqh5%!c#6}tgrPEkTOmdx2~Ztmy$DGGFE7oA%UmT#03_^y?G9E-B*=3aHR5eLOA|Wi
zAUf{UO*NL*0CF8c!`&aLE_dp~s@FzAgHdUji)#mjMH^B>Z3ypkaqc9dR-^uDL4T>D
zdEJu1=ucce_NDrZue*EMy~&AJwr>6k%lz!(+b`c%+2F{wyZr6TE*-t}Yd7}Kzxk`j
z%-)cjwR-KlCVy1aT;$@^{Rp$Yy3JqJT{@O+wiOo!hVJ;@HAjDN=K=+1<VH>f&n0YW
zA=D|qY?dZbg(#97r-ZL&PX?yH2g(!>E^yjbe6c_=ATvj9Rg5c5sYUTZpdf4+XTe+^
zL*jyuk{X5Ol{oRqL{$Zx1UY7rwH1cv72a1!8b?fSe0^f#_17ic>*CFm`;j_&wRk1w
z_a@NzPRvgdMp98s#WJ)2S%LT5Z#5Nz1S0WnRG$^4K-2#Tvy~V05msW5=sw2oeC;)b
z`dUxFCw>!OeZtd;3?HP9&7yM10Qg7%xIpO*3INd<A!jNENSr2&5<FlA+G4<KDhW9>
zRZw$<1l59wA0b>OB2bwsrMR4m&MW`}MUm4=bDEDyamrFmp@=7!K(6p`f+Hq=vt{3B
zcdpwiBJ}I=I9qGGHqR}5mA!lL%h&ei<Tm9vJkH`p*DjZyL4&VhRhlvLeBoOOTYfk%
z6wD#{0M%XdUk8b1F?)~$))NvEvJJpTk`@KJG#QaMTPYI9RE~Ri6nrXG%8`5|!jDXE
zR;@sa33u+RjWRh^Rt=mfVIj`ps4#>+uak1_Qz8xbx+;b<BhN+=tCYCMKgO<|7lrBk
zV{b{`XC{B*DfHx&`o!kXx&kh{G3hY7{Nb#zS6`J1;qJ-tdnWJl<z<)(vL~16Gwdd@
z$>OlclY0O&E{CN5!Z%qMPZ)Xnf{@CJabamWj$)>yPQYoQksV&a>5QqXuarE29Q7&3
zRsxLjmOfMuYat1d7~3Q6n0WKGhaX1A${6%l<7-6tYQmBi%+2w-NE1(K;W;D$v3?4B
ztR>o{Xf7X+wtB%c%b-{RmEwLBW$lX3C<V}C4XH`BIDOK}RiP-UwptjE^nY4yT0Rn$
zB#@~J{-GM$y1~Z*T;?kW-aru<#Ax!17?e=r70{fRwA<#%$ne_OudF$NTb>Zbq{m;8
zQ{hi$NYWFx1ahqGT~VJ^mz@&}NEi7sKHRL!^;G*OuBxbzt_{?BPQ4?a$nZ@ZS0Tsw
zr&qW=VL^tl%Yrl%D3coIX99N>U~yE}7>$EJCal9G3AgD5#jSGa1?U+pC%p)fZ<tG7
zf$8AjKyD-E%wYlWkXghvaSex6Zxo}+!g&l1Nydo=0_F_(?MPS^pIGk;Wlp><icgHo
zC#>#M{}QP2N&on8v)!d@@K?JhB*G3+Sb6%-^3Nfm|9{SJNSVG|R%%LMn))mM9Gc*%
zlP8lCFKycN64RYL$z(+z+`sRY>-zexdu88#RVV!GYumTK#;gxM$gHpL*ztPuuMZx1
z^R@*GZhP~{k?-9$fBtRXqj`g`>8=C_Y|whSM&<V*f?yM@GCW69ybZxPtQmP_DPRf8
zBTCgIi$)zez){#7Kw${Asq(6vghqw_$Y-4@!?#h8Hb_W<3iPRIR1|SkZL3I;690`N
z5Bb_x*<(k)d8D)VhJU&G*S{XUa!L8)PySlWn*6PNqGSIf8^<3#*nLm=(5|je+{0Hj
z`5$`9SI9vY*{Ou3qAU{j`!cOYWp@bWkw?wonM8pYSDiW%;3jvEsndjIL{_CIy>!YY
zJFOr|TD!nYleD|=w#oHYFl{6NHsbozz^%sF&Q^>O;JKa8SBDmf^9xP>@r24EnC|J?
z*sK^<vS3dy+w(v{qi>?=aQFF9ZQ~d2yQ(U=&+TVUr~5o8r(oQ#fN@zE>`%!miG;KL
z_~mms2<K83Y@rPr6&40ct3)URq|&TLU>>oCv|St#wJ@2uO00OQ8Wm03y-}$Y#Z!r6
zW2yqr#U%iuFIYfiJ_CZtHc{J#`xBDA7HbR#>r_9pR#W{YJZ`Re2*9VHgMe4fz~@gM
z{rc7I)hn(YEy!UHJyqvV-s~tYzT;mPU%j;a@yFg0mrOn(pJ>=}$BMxtTl-y};>mB6
zh(ea<SjoVaj;pRAylp=Hp7b`byp24<EltJINH`}zxnC*zjlstZr#MV^LUhav86yC$
zgpCn+LHHue9FqYRatx%!)N9UORVFY1&4?wa6_r?e^99v8M+{x@7pi7IyoIE_MYSCZ
z3NxtGEAc|O6K^)T?T(6`bv>Qq-T5u+4qttET}$Hd^Lual)kve!XY<sL>>KUbF;LvH
z7O&Q}wCwrJ_Jd#V*S(mTnO~A0X&tF*9cnBoZ&-9_+3L?6>fN|xr8%>rz9QPQwxx5l
zv8bee$<=EHkMHUl?8AJqw@`Nlu-72mNBhn2sfG$t($GWr2GI?Tj;puRH5xp`dtkJp
zlR<0Hq+$rIvpT%zwILZ{U!fJ0rcW{+usH-@#Zs*xc!VIP3i4{4eR7J21_TaTr@JCq
z^IEb>KJoCW4Bg)!M%4$fJHmq*_-O`AaJy_4gI@46|I`dfpCQc^ou%+W)5$z|iS)I!
zmsoRpNs^uPCFLbo*D*G&2`=0*2N)R=w0V#cH8E=`Rj`u{Nm5-+2jX9YqWJc*o7cr&
z9lGPKBS+r4bLiFBx?}gW?)cPlY4gO1%ij9**x0Avx(wg%S^lXVZA2SJ=<RbcTPJ)v
zM&$6>05nZ+aT&SBhaoF&M5yW7ET>+Hw4;c$7j2G?R4wII8B`Vzp7F$PhSK;-Rm#*r
zBJHvAK`lvXY%F5@H2kIPlQsm4JvMd+yr%a~e(7`aiGX{;nm=4tHk>d0)sg$*W{e*=
zX7~-pUo6~_uoM@O-QmC-QfuXlc#UL;Bl(%@V1zbsa%l6I_F57Eb4lX<4Q0JN>9y6@
zG@md%2TgOasLe<RRUFx7SUjmrRYcF28%@=lHdDqO#4KWaFp#fj#YU^%U^B51eZ=1w
zfH64awCOX9tVE9Z?@D$)ll&y~ag&_9;~5T%ob2}e{EmS1OGhpslN0X_x8jF02fAuc
zsKi~EdFo{aLb|^LLfOJYiHvN&BhzYz4x+8G$HtK?s4OxmqG_w_OM6L}uIj1UN{6Rj
zD~L*ssO2<#E=Cz3JzP$pYm&bpL!cNj#o4q~6QUddk!p3B7*|=fY>-pQqE|g`BRc@M
z=Q@)o^TlK#`@>hgeq-_~gE@Jl$>(`N{F(To%{uv-$1hrJj>+LkpU);P^SCCzV<R&j
z*sl8}VBr?7Oc>pW31Y`d3KA9&9R|hI<Tcez!xK;1OC>Eh&9~t?<0avUk3Ut?UkTwA
zOHIRil6=Zs(=cEB;j5E>eIgJvvp#pW*^J=8TvN#Zl-NA^b+K7m6L3v_Khhoywdac!
z_FSUgC72I+Hmu6-UVOr2BZiy8|7<KTn4-pPsS?*s(?Z|a-8<!CNfl6R$^2>WXnpw-
zDveNEQ#m^Z2CEV|=g1h<-RYV5fmD0yyDq7G0@T@;A3SyJ<X|vcci<!{9Z&w0CFMzs
zwvo#Sj5@<;fS!p_C-Tt+u^qw?k*krBsVUG@lyEZqpgivm=#tBhvpw0~#~=4*Cx2=P
z_Imvv{F~p`i)K#$5!v4F%4)VZdZ7IEfoGL$Z;~eH%PJ_@-WV4MnJL-cw9}Kck!X>7
zFkEdFmks1LTIE;s^FA!f2Zt7xV+P;iGe9gHAkQ$!I#G*-gKhKCgAbr6$9RG{VV5#^
zU%b8r>#unK!poJRvpvaM-*)HdW7+QB_kV$kCncBkW2~)1SdlO~GD(9-;i@YGJ#b7_
zCXu#-*`d6mbwr2@6C(DT!5KM-lbAKnux5mal#UnU)07Zu*Bf};O4RLRo33_b8NX(A
z8En4Sj6OHq{*#B?Hn!GR<|!{rK45dBbs_nV<UYLuvnu2JPcT1DO$k3up9(~%e}EWH
zF8bg*1Z3cd<evEBXAU03!>H~i_B=E*6Xg^jSgJ$h)RdZ~6(v|5<_#FoBAM|ueU)6b
z-jFi-?}YPgpWNgL*nTfR?(zM_nu+<6&HA2nNM{gAgeF#-@RpU<RF^iDH5EpJIewqp
zWj2Wd&jX_!X>becq$(LIAy3OjP8fG9V;>M4X%ui&wLs*|GQA$dD4?l9!`3#)wq0-o
z0ELCOf)>b3g#DzY9>c$V<|vSgibPLN4^XC*@jzowZvv(dl8*aktBpiu43`q1&u9fR
z5g1(F5t@=R82aEF7rAGZGFr(yt!^+&9dCfg%H~)PqquXO4Lf0jqI75|kSDu~2N$hr
zZrMCo(RIh4p4zyfb6IDV&zWt^TlCt2#YdJ`CTpt}^mGIdKeeMKP~K_}tS)FOa)-M%
z_O$L^(x4kUaA~+C?6NhD3^$G+Up)CMSEM%Y`?^r=oYLavLI+{+-KYPe^Ma<mLLpm|
z@Md8<N+{P?m{o`;*z-?(gvSfWdM(QixG-&QzY11F1X8xSn?idetKi$@`n<Mf^+Ky~
zO<wULSDm95*hvyL94dW*k)fIviKv*WhTVKf_<+Jk{w!;VDq(wJdL<ej@vZV%E71lg
zOa@z>6s4G2k$C3e?8PM!=nT$;@~SY_`l4nOvzWL;4Em+I(yEPt9f>SoZ*cH*1WHf1
z`}vNCw~iejuW!BR;Z5s55i=R1Y-H)R4b>O-9ltx$wN`$0@}YUlx~_foiaoC$8yTFl
zGAdm%JTK|(s{hu@8;-9aWxfCOU!*H_vQWyzgsnIl%*pbS?^w0ZXdPpvFv9}m07<jY
zz-`1d`wS~OwTWGqqRWq372C?S1*$oFuT!R7s!wG<dh-R<;r1ZOH7q&ehx9>_A<mGe
z*>-$`Fy(wGPg5pckI|l)8L6M&*uQsvQR(2$Ih~6d3!FZ4ZP(X#t$FxhPsgRt?c4T9
zhtz4d_=Ens@#AAFZ&?>ZLbRiEWT5xD*Dky0t2coRiJtlZ{Wny4Y9V@JDm{7JJZkP`
zUQSQ6pS#ip7kYL8CcR8?bIF>9q;5`LoHOd7YJ)Wr&XS)8@$z%jqSRVTI%#rdrlea{
zPpb*F9-BB6c1%P<OfZe4QBR|is@dzIumCFKgreA>GzWnQrTLsSKr0gZV<ga{Q(aE;
zA%*k7EFq4xjow}#h^G(%1V<&F@{}HFMKr_S`Ph!7oLnB-yy{5&xnvuNrRL(f$M4SX
zT3dK{XifJuuYpvKk90JNwI6m|Gdz#|zN-$jatyR0a$5NYXr(}?VD>~-v=A8%#f25o
zikyI(=Vn7N6>zCWbQ8x`0m__#;tpb|MXD9UJTM0%wm;HRLAVKLA)Jp~H;r;?r}v9q
z&>`}?XzfyCNTI(@A)S^Bt8^~f;jSd?FHm;GaJor}FCW-e7z|5{thi@S2a?`bi`9$v
z_jRx9t#WuRwc(Xp_cUz%r>pxq4?Vm0>N}lcQGVANo!qwX@g1c(Ymcv~3Kf8Oid&+t
zxu5vfwcEaQ!~APMd8B>wKnW=~NZJwal%ElTtdQps1O>!TvI8C``3|_pt`@6N2DJnl
z5s(-G4N{Uw`g6Au_%)0xL9hX<QwJyz>6A=Wq4!vL#N)M-7kF*8f)*GonyP?tL5~JM
zkET_n;+ZlJw~<34HdP#NbTYZ0rz)jytRp@}os-9}X{r_`P9g-!Gt+BB+n6Plfq0xE
zSFk}C`-T;MMrkYv&)7ulHiKK{r9GbP2WnPaH9V(T$MSMRl>_y;tT6d=X_Zy>xaX~3
zdc&$}_cFIJtA4C=)zuRZKm)B!-XZ-&rx%)p`NAr;Hjy*5fC)<%FIY9Ss=qJMPF`)h
z4dZEIO=hwHXoqx<kr|A&4r~DJEEQ#(K#;)<n2dn{h9;4k$kCNC<X9VxL@Y=cBw|UW
z7<iRa2<D-&zL|}oJn9&0XK(bJ?a{iQF}QQLr-v69GNdqlphi*&ht4)GnhVadqH{cE
zA0pz`q#CAXOYLi#A;pwne`PWRyLjN(hV0^?>W3u$r)^hIcP-#_6de-bw5&!_8o4gX
znIij5*S;#|D&3dgwDG3VxgB}o=Cy~eJhZkMgt&Y6W4jvGjF!dh;p)7B#Z8-zv0F>~
zR&Uu+(=<2Ix3j-*?@(#-YxSdzIT!8Neo=1YLY+Q0rz>o-cMkVox}?(KuJjfZ+I1#x
z?O1Q;p*2nA{p;!mwuao@jozxtQhVu5tNJfpTzTsCXr<pG>y6n9>hoL5{DJB&aY3+t
zpkmdoU8^bv>M395cF2n#LrQvtzwx{pkKl3ItrpTYQ(ok-8@eR1ThiemSyT#lhd}Yu
zHZp{?f-vd8m<i#i3NNO{xJlPbwU;W!OAxc5@?wgLOSSgMawZEsRRO>7q=4$t7YeCX
zqA*<d6jQ|x3CKgO226crBzQs@K?=2}C^n@D!gE3AoIwe^{khJQn@6u)T>jkF9YddJ
zhN|~e&uGKO<4YzFi`VVDa<FsKOZ{JiUapd#2T}Qi*T~{`J2Q;<g}HM-1xYGDI3l`-
znJhWrS>;s6l?V!+5k;gGu%1zX;zQiip|qeBz`O`fYG{K1nneN|z!5+xsqO$rn8*<D
zu#7Pxes&ix1n(>rr$*?5Z+zey8UWzZysql52R8QHk310^SymBoyCW4ix-8<6{x)Hj
z{>Iu<&#LHM6(Dl@Uy^rnh`5Df#t5HiUjw{SZU-=m;}gLI2XukOlb)rhiO6X}5Ksg^
z!nkOr0!$vR^AHO<qcjj|_R<8-h}t%X2XT&6Cu%j3Z=WEjsSQ*7kpM&+4)Oo#b-1xn
zt+Y8+5K($HAC;;QH_--8^{1k5iVs^2U?BUXzHSx(=k@Fy4A*BHMO&uPX<g7Y3%pN#
zwQcKyij0i4Rs)+iqD#yIdz?W6N`4=d9Au6(S?wpBl%}F<6fm2XtwMqmR85G9pgeg=
zHIYk!xY>&Wo8Wlk-f=2Sz${h^D^4Qr98xSWDu?tY1lG`x%o`^GU89u8Q*0hpNSic=
zw2By#+7Eq_c&<IO56YL|hhFe)&`NBDYLPc++Dh=FW2R@kAZefy@|hf#1C{Q8oh34Z
z{)dt`*|HtZTr0cz0dL5bd_FT6tbJa7b>cp=gDu6rl6{Uqh9%@qS{zPxzsH))0m!lF
zkK&&(e3gXV)4WCsky}YW0+c!BYk3k=4?)WGkl>h!GC(SXe^7xQpTq5>8dfxcvFGGh
zKkPvNoTJO{a;q~t0XBs^>r(6#L1d8fwoC?zrF=u-5;ODzI1%*lAD|{W1uwOQ;Iou?
zG(qE0g<3&0N2;9SZJ;5-ZKM@Wp^a7;?@?6E3sB4wr7!{!)H0z#rB)a^AdpRnoUIZ7
z%ej1lDj3M|AsZxgO}S(-82kpRj6aBTh<9j`$Qmc}lOzxwy9s@PK2wKR!2<y6lY9UO
zTPWvUs{9`*$Lcqd1lyt+*2bGwZoV?d)3an<?eOJGE1%o4p?s({^4$8>T^ChJe=FS5
zGq!hK!*Dz+w*HotBq1(29BN(BO5YA0oZB{Or4{9J7OUbD{>tU7Pw>I6vC(>PzDT~h
zT(7LiS?*vh0675KnvB)fBCHjnmzX?Ck-B}RFisVmO=wO_IZL$&jaPvp*dfssV0VU;
zMd36li`+-G#`&bI3T^B}oDN-E*TdVVL@mI%Yu@r1qL$n8Ivb$p!WuuBaC(qSo9%Z;
zJQ3`=bTL;-vg80D7!a5fX|yCJRPewTsR8h;WngDh8IrjHYCv@%rL}?*5UITNsh6Bh
zMW#wom)d4R?RW#tdUinsC}*jX&M21ee*W_A?#rLwz5Dqq=FGX``Q4wo^UhBV?ina7
z9N43i`;WeQ$-%E4oj333R}WtD>e2p*gWr7N^WTcEzh(LI<LfB!a(nV|T_*g%<T1Q>
zhR2Y5n$*1%By%gX12Q(&d%$f)Bv~r-u3*@dKhDWLbau)K9(a~AJ1?k~C%qO)?Ar9c
zILnxFEdWuc`b*W+oXzp{n&+%Ut4vKxDX$j1l~Xem(mjvx1`_)yOzW7WT%u`O4V3|<
z*M$2~BF7;S0ve#?5YC4v3d-$0SBi@$J8UVk;+XD7Bo30<`PfeG8`<;lrq$QQn1j1U
z`i_wwG5NSWSa@(~ZTGe09yvDB-jqz}{(YJ!5%`~cTzW%Y=>s!XdZur9x-Tou8LT+6
zG=fOWS>h`_%};c;S~&DFmFdJ+8nq<NZ$?g9uq4gnDo*Q9tC?Eq^qS|Y13pA>muyN%
zf~b?cV5wd~2Vjw8($ebC@(6`#m;;hky<n*tC`YGYfR&`Gq5=?#v}kID+5mFV$CS&M
z^n~edFl<_5)7@ZiJePQQtL6k-|A~4_Ml|^t`HT-JZZPR@AHKl;yMMXn3hPY_6;2!@
zPgtTs^@MRrA%4i$`sZ9ycm>e1-9}m*=X11LVGAU+M-NL!q|{Vm+nTrlY2*AMjoHx_
zDy<-pnfCD1Vp=mKhf;@#p1?b6opd3h19)IZf%gz>>t^j@N-(5EiCQgXekp!<ighVs
zm>&wL*k7A+y*f+$#OBgDxjsXdtvSBx@>1z<-t3dxE^#@o^SgFzo;*xawH=YLOvnYk
zC$_nfcEo1;jd~SQWDmqz8IyC7Y@6<3hpbA^fC5WOB{HRFK%Kqnl$$(NQO$t5pgQNs
zfZ}JcUSI;0_(O|7Gukj1ujq?qSM;ymu)4pZcKz{H+n#DIHF}-S;--<d_=32<qJPbX
zHT@NI3g-Cz&C&v|Hya0P*M*AW(cExx>(aK~OP1F5)X%Zna`JPsD_iqR8;WxCO4?U+
zHg6xP?r0!LmtzOOOLDsqW<#`-B{v(f3_2Riir8kDg}Eo4e1S1+5tTy74<lcogv=4r
z@UaUPv_<4eb};7=u;{sy76*lCETQHsRpD}D3~LJF1fxi+s3Gh}tB8FBRFSmL<_qZ&
ziA2OJQa#fM!f-()aOU>3nKJTK;Yd~5Z-d=-NL~b*kx2skW|k(jV^n3F*sKK28~EwW
zd?%Ef?^RF&B<ziYS0A!_A1x8Rj^%W2c6&`uNzh}ond6n$*ss4r+~IQ1^{}Q)SMuSj
zCm%?(XF4+-i_5U3TQ~&zctiRdw9fZ6t<!0zEN)qv(mHL}%>Z*8TvYW=kO8G;%xHWh
zJfjc{MG^(XoUx)fQeD&jBk2VdOH4$_FI5y9j;JU>zf>&>C6lZEGyr_%p50Uh>Vj`|
zpu$l5c{CB+8eB}Ng;~y8hs$V61aJ^65v`y+@l+(k!OFL7UvOjdbCAxqu1B^Zp}0)?
z+vK5rSM+y@f0!^A?wq%*Vf^?K@p`oH#OVJUP&`jA8Sr{qmeK#Wxn$1UJvj(@*z5+Q
z(+1SbcHflT@F19E=H&i@zDT66K)l)RnJ{Dg@Jz|?O8>yl(a$F=mF4+)q1@@YWJSKT
zTr%<lOwT1te?2{yjP|E{W_gX|3}ub|+Di-rhlN6lD7k25NC^znJFGdmA(2P~X$+-y
zX0jPMrg*lQOUWnVBm$c){U<|uEhTzjFN=iz5Vo7WIr3{pn{0HOe<=H1^W6dYduE4G
zwwt~#=eVv<e(6{s<7dVUS<W!NV-8-g!mK+#zq>%ZHPh|RoZJ(c6At%<6bR;vpYv7u
zeAT|mh4~mNGC`#`feqQh6SL%<`P?=*twB&c^UQ|C$Z0s?pY~cKw6rY4NP2;@W}lVv
zQXe`0%!PyD$p@n3pMeGN#29vE^2sN?ZsYqV$B#1HnU7$9>4qnfeRkSl`(uXBeLpfY
z{$#TzkL2XAgw2u6nS2+AMjp%cB_HFtXEx}j?*SfO;c&u;W{`ZwGhIkOblZ@dq^6#M
zJh<*is6mohdq>g*$uK}=mddqsPSxY6AyBrDmmZ!q?~Fn%t}`;v*vqEuoFgwLSKs3c
z=vk)8DpMY!L7(e5p8SD3i`_20<g-m)<1P33%6;PHb`OoF7c0CNGs>j>z_f3lGS5<(
zg|r`dN|I4|@W5%ig|dL<aDKsbCc{B}ujHMD(_cZNk>^V*LM64dGdd}Xr=1~VFkBaw
z7Te5||0R}8%2tb5H2G8UJ?U{*#5Nhdsoxs0i$A>?b<2}Kg+4neB!s#A?ELC1c=Bn_
z6*zsOrT{cXzH#tV@<&IhGZ?w_O*h*S9eScWn5uPTu_~e876dwIyAh9WP=Le`<R``B
zV1^b%PI5tpO2N<fc6ayMUG|dE!wc(jEbjTsY)+fEq#+z`DDmR!viWXHPTj)8qa`TB
z9`6|0KAfmszkWR4vwu<LklVR&N#m9c>uaN(u|kunFrFx^UB6*V<I-`bd$?-R{+{@T
z4eK%RUnd`DdoW)~XieMwNLUAcN7JKKu`_a^o$X{-g}FE)zrOKCdGh_IsMZ*uSgt{_
zqrI&a=f;;fY&f}rpqPtjAfSll1zb7oAlZ@OqQDdD2^SOr71jfNgb9jtsu@9xpE3+U
zrQq419Lx-d0Dy`ev)VCDfM?8utl5VFozjKp2I0a|6e4i5#{r}b1i`9dw{v_chhSkM
zP7sWBMmYqRY;?MZDhYz)>(|#NhPRK<F!!^QIwuf18+e0r1+u(Oq|#;>;f~8@*@*Eb
zDg>x-NC6ggb#SezJ|b992rgpccm$%vjEOeY8AII0)Ib91^AR<eApWCs9=o-$XHz1+
zY0Z)X<;TWO`XO#y+}pipxIC{Yyl5`IRD_GdXz@o_<F}yS(>*Vj)4I;M=Y>`~8w!Xr
z09c&r%9FN<rPs8VEW&kK5FQWE3QOe7$tRK^4T5MDWu^#Ht)WpQodeYn1IC|u&5J&D
z&C3sPaZ7fff-Z8Y;1{_h9~W~g7B5{HkFQ+1xMK1h-A~o)U9#0<XGrYbc-jNt{u=VR
zft|oPiRC552=(K12fF8kN7+r7XAe$YVX+*S9nz&X3R@0o6W~j#^n`K*q^u<;hE9U=
zN&B#9cL(flC9MxLbL)9Rp7~=phC4K7Hb$KM|7>JreRh46X~OXf1B0)sHeY^X{oqGx
zL`3QaC|6Qq<JfOV31q-%-ge4kEGy)ic3+0#4xsBX;6<iXCgsiy$qn_yCW$pGKYdY0
z*A-v7gx`T-UwEXx(uj@I;fjvZc*o+FsNL+8t6N`GuE_Y!4VT6T_bn(gXAB+r!rt94
z-#8*Y@6P?5rK6_ZY<6U287B3*P=1cd(9zd#_#AG+_|-#S^@;E6n>HN9;GsR~R>+?f
z+F4b?-QHFo=chx#=kIo!O*%1kDj+2|NDXBo(k;n6BVwivuTx1ZDStB3H*o0+L4n^_
zrKOHF%+dh*SN+A)no3p2EmfMqmG}tN4F)U%#p#t%&<B}aedlZfOJ|fR9Ufv0%c-zt
zWU8Fm6q#RK#!=3)%Ak~UM^YCP@LcQ&5(4x%1wMvP<OGE2Bw9x#o|k)l{jNuLEx2@b
zPgY-sC&T79yGvqS6&-66dF;iYH+i_JHn%A#K4Ny~I44^3+pBY57as@|FnRT74$m!`
zvpim@m(4bRRm4-eVAq`F2Yt@qUk7$p$c8~%w$HXNBR|$t$%qFY5q_rA>DB@i4Z<fA
z8FV9AP5}H_%kOXGd+{Y9?8&69gE&TqM10T+Who~w<dbj|J9IGeN>eZtiv{5%xcRvc
zUFWX~Rfu#3z!NQibHZsxO+mKO2a@{~7&a6&VD|?FQyP5y5J$biXMjRZ4pBo9(j^-B
z^$nCCQHecWHu0z7+!HJAD&NxFw5jaGvb#e0;oQ4d++Dt<scB<5eh2f9MA}EHsz%!i
z3fe}isz%x);sf+*`Q0cQJb|K{sp?%T?+&7>^1E_`N{>`lEo_fO+81J~<)DjE<eKL*
zXCf<~cJEXAl0VBwyP2Kfq)gy>GsMNpkf;q633H|6mWiDrKrADL7?Eq>6Q)ZWUpX~s
z#;#h0Ai)pzp0y&XfC4n5w?XMese-g;0}c(H)*<f9fDA&<{O&4rPoISN{ir!z`=#1g
z%M2aPngZ7X=f}CZ^bME0@R+JeFzQX57?jrFnxMuqRMZcjsV+n3r2pXSgw|OXzMa)3
zw|p`X%D`POZUb&<U@l|W|Ec6=7E3<G7A2p0UilC&l8XKA$!|rPb8}nr#d=51#D8qs
zx;gm<YuUUN=r^US8H7dCPT3oHmSi{tG!P04MtG)a*N8(vK!?*`LDG|e){0O`$Y(-9
zSodV%Lz5$2ZsOO;pHKXXWb5A3*Gf0Yj|qLka^bFot#?jES#dNRn&u;H=!1`NY(ZNV
zgl9xKgIJ*W*VJZ7lC8j%LLdl~J-%y_k}?yW=dB5E5mZE?ANXp)A0sJOBQ>bd51Zli
z(~dzU;%OkNN}VB$y^mT7644sJm8l&EsPZ%<sYZ1NR?n}?sTta|b<<GIf<-m$wd-zK
z3724r(dTd$H!tp}9jec%UASe}mW8!TR@HW>Zo$bf_U=5=USA!I_YN&8?yA@QncRf_
z(#BA<sj959VeZPdkt?Hx>wBi0g^?V8MSHZOD^^+_>s^&taCs!Ub)b3saCLjb<Rh`U
zO?9EbKvh9wWi%3T2j|gh*mU=ZOXS0Rw>{$I({2;U10L7`6Tq0<PoOq|N5#oi6d>;(
zy@=2Y;$bLA|IxVtVJsGZM~WPYA^=+{gep`<*%2}`wMAAnR3%q0D8B2=EAe@YLr!O?
z*y}6FbF$5Jw4ARb=ycKzgt$;bHsKyZ{3`bON~v5a-AkDM8{ATubNVmx2av^;INg0c
zTb}T)Sv5M+)7?-<Co<;*JlLP16Zu_|q}9#!F`R|X5NU#0fz%{^b(wNp7gRd9>uEMX
zBBO#t+C@xy$Y)#wNw^5IRPK``CiZ{PoJVPnl(C+(j}F&Mih3l*@KF01<4lbWjp2&Q
z1s}T|TvJIzqqRp<rfVvR=9RF)%oK9uT#_BCy3m!2sHP4S#F1i^I>;g%Fvw*QKVnR$
zH=6Z0lBuof(f#Wm+}F`_=&|)X?ry4-?G{_8cCZBpN0;F!+xF_N>cWYI@io^!^wP$S
zFF$nsnmB!bdE>^H==*s2!o4>?G<M`SPj0AKxbNnN$Bz8^iS_I|vO%v;bj_P{=(FP+
zAHTGFPD7{O0>Y}mp_KD4U07y;6T-Cd<%h3Z8;`HO?%|g=j=%hn@*SNld*l`zaXtR@
z@2+3==q(3ED>r`b4@5;Pr4DhC`~>#@)CvDX`+t!0S65bd#{QprtRVLPNOA=UG2}+z
zWGSH3^esS;Fd!DvfJr^jxSJ9JCX7m)r2(kOs6<Cpse5<OkigrT-VP+!z<HX0Eje=|
zklNU6TX<;Y!5PoLgQs5Ez~dDcwK|<fOIBrVV}2A@ibcn6+uqz1tu4&8+uX7@e(AjW
zMa{wF&tv@sz3W;7ajDPjtnuXepwP9J<agIa#KMkNC&H{5r8SlLt&3vGA4VfvMMpMN
zw|s8D30EV7>>=d2l?bMU-d7^JMVw4q=Tfd*f}f51D=D#b)`vHK&}_41+;6jGTJM+T
zoaU+-zeT-|U6*6<S{?S}sVu9_n>=N78gr~U?7FkOAjWqmYmwd)-vRSjIPL5m;ySsI
zwjx7{H$03aP-zxmB}y(OT(daQL!@1Vv%co?ma7PNN-OW0Y!Tl{jxjJ{;eU6ljxNPH
zvvJVEJYfkto(RO_bbnubUc7HkS5rfMU3FzaKKU5A)<!dFZ%4K>&tNi$*jYpS!4Tcx
ze94FeU>z|G+UADgk=_fosp+rU{xm}J|3xbZFl)QqT4#<0;sCg<aPV11l^O}!AOnje
zUC&2tV>YcE9Ctuz2Z>QS9A*f=070i35SV>LdIe5UOCdgI==j8L6*WI~F6*ppR3@#F
z-y}+BG2`k{a>{FGUR1*WHRq$T&R^fl@}7Eh`!<K){L4GT_HUZ}f#LlP^Q%0rvflU+
z@!KDPYyK>GQo8K&L#vPYGlK5qbADE7we9s3H%AMxy9lV^)_q4@D9?fPzVQ2?++zFW
zYx10niFSIWBJoXdWI9D?bcS9-_~k<xZZHvV)KD>{-k#IKQq)`3KvmMxE5(`CRB!Fr
zB|SZtjMZwNR|f0nm6rC^2ZQx}rKR)ggSsu<2bR{>E<MoQb@9?zZ0W_Fcp3^(ss4sg
zsG%Pt92bUh@7QxVEiw~l0wH&heBaa0j^v&M!qZA9CeXzcogMxI@<oA%U>gjKZDJ{~
z+li&XMiB%G;MK#TN;})?0xRmdpywe`Zjw02E1q^IS#rDd<%urcbIGGelee-xN7=!N
z!W)SDEtHOkBl?ZF+xsdyqn~bT<Tn;ounHdeq*W;^Lj-sFjYW`uq=s>tO_8UKXA8y8
zU0TUCi$L>KSSfuVdxWHwdJs$|6c)u%PInK%kA%C2c)mF|lWFTITOMEB8m3D=9`aRr
zUibKtEW`3+e|es(wW6}gW^_4lE6v=@8}%E5_4BKWd)k|WpV1@cGQZ54V|m*judB<B
zHB^_{><C9}+Xg5sk}eY$0t#)yb9B#8eZ0D|w4|7y9Ba1;ZLE#2=Kx^Q*+kbN!|-(@
z7aDp3LLTY&49$Ky5F;z804R;n4Oyrkrwt$x8iDtXRD8G<=mS2t6x`G+AxNj=_o+<3
z6$rM^G!RN`eQaS%-X&c<r9CUEn-;Z|Wj18ma?N^Yuq-cBm1lPpbyh8%+gx4UWTDOH
zCb`>C-nmG>F*i1+_^Jxmg7$_*O}YM>zN##}&x+Gx-JxPnuq?;6l(oid<5k6W9GGvZ
z8>-6&biby%NnEV$@&;>#xsAkG%`d~#K6zlv!6*oUUEZ)p=u|spFFxbJH?r@<#lN#<
zd$!$a3+Ks?CzF}hzxX_a!-pvA3vsAiwv1<V=L-Dx93_6w{la8BM|l|C4SW-Wpuw3j
ze9CRHQ=-nmv-459IIT2>0&cH_`l%Rjzd&h0DNi&~u9k;sMf*S0^+xcYX8=sEqvc~%
zrq|KY_TT)es+l3)1$B%z5c$-6gSF|k(39eJqQWq~Ni0QqMYM(;Thu6Vl}4&WI7^cU
z7lPvkxRk05AZm5tP*JMVM|xV<8R-GhB7U46rDd@49b2_5f$n2V`}Y(X^vj|p$Q0PM
z^PrX~&^ISmS-Lcu{9SPYdPkR~ryFE1yiP9RA---d!8zmpMuKcE7$W7I)dJ&z0{}iL
z-;^c~!<Ql##Ab`86`~pPR1zwMuE+|ePl5y`L?ALy%8f>f08pHdwh_lr7%BLmF{-67
zC;Cv2Y-OGZ$!+{;J3M9Y+xI2^aNm|kFYf5L_|Yx$i4z|-$lv_1L0Z+e_4vq=V;dVW
z?#tLev&Y2WVvdlQ>J5l$oQ<d%V4!sZ!UNd+2E`c?>@r_TeK6EmoRwAF7z);x_{5R)
zUwBK9Jd%8ny$kPFuJAgYS%fp(aMvQ}Avd+ZCTzC?@v}JsK!gcmG3;r=Q<3-*Tu1~-
zI>Ie)dO<NhOF1GZ+}o}+NcY&`8y#0f4t564q_qifSDdXF=VK%Wl;ZTku?-B(#~nF5
z{#VoxOEES$dFr3i+r4?7(lT#JYqV@n*7A|Ors3+6{*Xie4_q7{4!8nNi+pU@-BX_z
zD{wh%4WzXkgp8Y`Uju3Vkb1s6&g%e15C@`LM8YP1+$x2Awc7_l<%BmNWB6iHPRX(}
z3!(%s3Wp1Pr~+mV=Y)W%WGAZ6EKR=0bKO6P$-_g}KpB3xT@|_ap77Im=(byIK2y<8
zc3hL(D*Y$>QrVcv*7)VgLyNJBLZ8$s{u6ks3n#^|O=WzCJfXCVZ=xbU;y%+=E3B8`
z;JVd?C2FT64ej_-0@zxbHX_|#c17<+!{z0}7xm8FJ5pXgvUl#H(a}XqM@Qwy%ZB&i
z4yuu|vXT9LbN3CGO-^ndAK$WNe0(d-;8U;)t*{E6Fsxw}7JBRgtilF<e<>0%aGpMH
zGVNe49Iq<PeE7%aoQ(UeHcRIH89B`#u;LHWe_svD&*5Nlmc<-kvcrL&$-_RMFM0UP
z7g&}}U>TRm_Xs$k5b9Yq`+Op&y0WY!TBvx#Dc(DEV;#TEg5a76xLq(@3vlNH=m4q!
z6oOjP^GxtA!^aF~H24-k558={_9D2(l~hRRQ?!Xl3mCPfw}XOu15yHIef%s<r8NT4
zK#eTGV0zEeh@dm^8}QEC827cpO#6~VOtqgkXHn;7uwY0Qy+s+<Ih%xQJvB+*Brefd
zbFRj4=B;cj6-dW4!!}iiOE#(kMX)xBWq?IQiDM#H3(%x4NOLA`E`%+r@kMtLBl*G;
zsS7Lj@fFUXCmEh$DTa%1a9AeknR4b%n|0yN<i9&TxEf^1Wv6bQMsV02BmMc0lXh2m
z?x0lbtjwFw%$?@UXP>oOn%G+{Y1H_-tK64-@rNO=yfQZrgiiRh3iwn3t#U5=bt1@w
zxjkKpw$_&BrpCHhRb{%aox-PqhMH>1IaD=nx*kQrDab2^1WyIGB#v7aP_U|mn-$ao
zra_$Gv>!q(&D`#r*(3^U=ymQ^0cWi}U>UVXST^#%Xph?pT=`eVN$rPC8p18+E#tau
z#oQqE+6<(F(@{gZv%>(Wk!D(?wVsikSfAc*20OD|#6k)GR1hQ1B;t-5?jxB2Y3e0|
z6x108ObY!j*oK*jm#!2>>NZ`Nbu)4AG)(=&6pD&JzYx18mWI5O2UNU;cL{iVx%>e5
z-~wThuv%P~h&mmsS1wz+XmoB*X9r<#b!ACWIOJI1TrkBE9VAWZexEh{%wmSKHlq;d
z@Zd@yJyI`lLYCQ*Q7afsMiVyOgPcu<48{2bm#Ps_=cqNsC;?-$nRL8Ny9gyuW0<(l
zp0GLtSV)X_!~a1ynVD!^>B~;~<czM&=!(4i<Fj;?DVya?bM4HTp&7w!k&#vrJ?|tH
z7D>|ranZDh=kEO9_NBva2h#10vjR5NCuhs%?8Idk-k*S>GMiXC`y9{c7s*HxvuZrs
zHVe<To{eWKo`96%cYzk|OvY}X&e$iqK90pJUBmgmdy2Ty`M>y$k8BT5tehq%MC2ph
zi?EOkpLm<_M#9z%>Z1J_sT<2k*^a?-BlQ~FSde6f=mUjZkyi#!rDm?_kkmzau+TvH
zws6u3h)$}{UX{!MR47bqL%Fc*>{XB~qUP~YWnzO`pVX3SD#@uc!*m@i=7Td1cT_2{
zSssm@Vd6+)Xkcv1*{>{%;v`2y@}ilSmc2!HmX$9&Ffh1nu)ew`e9vQ+^7h)Q*5Q`&
z9)4$;#jLZ>ytM2zZt(_xo2UOfxC}wcz>I9WAk6aIJni{^rOI2_fwb~(rk*>dJ^xGU
zxheg*p(6F%&i0{y@$_$zMfD?C!A>EI1ru({x1bXRQ`fdAXVlSB)_EX!l;l)gT1rkt
z5V;Olq~IIgkTS$iYE|x#L$Fk~P?nd%#A0e?=ucQGsshKs8O=;p#UU}8$D#GYssa;<
z@uZrdq#{bl=vJ#6a1a|^$$g#?;3!448JZ9jLuhwu5)wHz=^{b;lhj+b=))lXSel%4
zwTe}fziboNO-$5GzV*DhFmNaP5&Pb1ORg<-Ne(-j{EXX=xYM6YdXNN3CpkXIZ;Kib
zFH2;RhSt{FSYK0BRG1g^`(Q&4uz^$zdI09Lt{DdzwcD(?2XP+5jdc`_*6XCH?JNq1
z1z8}3qTN$x@Prr+8>G`#3J{{T8}p#@JZr_0e*7k#vo%Qu{Ks!{)=?7sS$M|8*%=du
zG&eBpE{FC`vW1*h(;)y9otnQU#fLsp%annKHVV(u#Z)|g{zqzdDuE!?!PLs}xct(O
z*`AEO^mIuf=+kIawMGR9G!Gu2S7JtTy2}G+RMo}#1qWxj;Y-=?lu36v@Z=2gjEL8!
zxkd_Z`o;ZA&U^Ql9ruKd{_Y|B>|T@umW#i_gcIkw70f!iZjZhp-Pr;@`V9OaVa{KR
zLF&X`u`zCz=jLh8iN7l4Evzf8Jn>QGxk-6``r9DeS9tr#T0?Z*_&&8x*BRWH_S8&I
zPrr+&hxOF9Qr05T)4$;9K|QssJSEaZf+ys{_rQnkLRk2D!WmQ&;BZU5%|ZyxckU4v
z#=SM@RWiWD!@9z=OUSO~ys3x}HC0P}Bi|nUmvFXBuV<ihrie(O`;qI7bU!4J&t4X1
zRFSCF>QGg3W%9csl(u0i<Gd;^31AbdV>8TFFLg4ta*3M9E%F=HB88N2h}+bV)J8X|
z)xIJ6_|+NwI*rNSy`lRL+^M!7dtNS2UdtBK9U78FJjSn7<JYT+_tetWYDxRvq(rx?
zDJw2F>PbS@a7=KpAMustcZu+|B4I!n^3JT!&C{OKDk|kI>`!UsseR?SW7>0CU*)-p
zo&&a52yf$j?lDB_3<*RuaMP?wG?;J~C2KG->4W5F+4?oflgUr7VdKfi*05!4O!|BB
zv&s9{vh~S(*RpZ8Y;E#UHim^?dHN3AhVmm|N`=sfoJm_<th6|o<MUX}>OHe`PDO(s
zzSG*8XkiGV(Po4L9+oF0INhUxLr$jiNxUHOowm<&*6Q$7!pBN&oU1xnEp@Z?K2;q|
z4<}R*YoZ;Syl=kaGtqv*^*}I$mRfykhBQDPlj3MaNv(Xp5nWcQGBgBoTA0D>l#%_7
zb7d(1NRH!(8NQKIR&H<E@ygJ+w>fvgSN0s{cew2Pm(hjpyu9(JHt#vrInX2C(R$}n
zy3Iv;zq57nqW$-#-RM$NeKa?~bn98(^ZZ_y=K9^)zCWx_{{G1uzCTa8wzQ1yce&!5
zeG^A|>4q0zDL?O@V`HO=jrVcvn)%$!(w`GHD&;NgvuWiC>y+mv^|=xJ@Rz*(R^Gmu
zHQ{sWW*Iwnl-!$eVq=Nl<pB4=3AVIphR3al--J<C-MOEB*9Ye~sS~nj!J&)KUJ%_8
zYVm`x66LD?cb?LuPNrQoL&w0VM>kBnZ06NppK;j?vnSt^PbA-;dEE>XUON4r?tuIZ
za!mhBJ7~JQ+FA-Dq-P0ztdGx^sHQZV!PtQ>9<(aL&QXrwfQx{VQk3W?a{MSOh4fQ`
zP-Ql3qO;Y260B7Nmqsm3AugX@i#mWOQKblM#nl3>3|S}e<~L3+4q8US7^6!=Q`N{W
zBZAOs@(`^?5DNIn5aJj1o|&_XOP!}KcIJn_;I{b(H{Z3ssw^>(D61P@HC)#;e#6kZ
zlWK};!$4g*Zf9;>w0==zMfZa43V-9Wjyb!B%AW7J>IM0k)>XS=txLLUt7CaZ@rtV6
zO$!zrT3j);eLYdw*c&Tt9_^|d>Zos>Tb<V#50@^wV$noY`q`Ez4s{W2@DsG<$AQyx
zfDZ<tTllfcd2zCK+Vca`o}WmSe|y^VPo$pzV%qb=sps3KJ^xAS`Ok!(pnu}K@9F6z
zmu}oSy;6E85v4n)$CfT!Il6NGK+l|xw#NEcO(kxL&&^g(L+xhWcJfS_fG2&OEuzs7
z@*yo6cC-;rP$TqqcqkCcueCCL1`v;*j+$u^4RlaafeBYh;D8+R)dMm3VGd5^(8rwr
ztM+jADLGat=Dg_Rjt^>tHazTOGMiIBbSZb)x(jZbS#T?2YU)rr(tn-3BMT-$Txi+3
zI?7}gg8;X6gag)KgzzWN-xTD}Gm~4;!K(jd2WHadB7zw=p7Ku(TJ#wvyM#7tkI&vo
zhKP&FYiFGW{KAAg5zGd+mt#hdtl~NQBKIQs(>I-~FGO>-?xKi>7~nspmS^eAtRuH0
zv2{(bE1pdOo=VINzP`;fI<gv!R^Y!fsk3y1Gx#&Cm=_Y3QqwwLPvq94|D_^^dTi6f
z-mi9K8PonR9LbAoPf`c-HmFBE@nltHa|}{^Y}hl)b%HuN8J3^it2@5%*ya|yfAW~F
za{kuNo|SD;yUnSu3NPKTEq?J=8nTyeyQHOO@8}sP&wu`+gSUt4pH6;(PMsegY1%Na
zl)cinwx`6vCPJ-Cb#mg+=k}E3uDD@&d2T_j$=F86{9d%beXP+R>D|`Xx_@PhuJ*tc
zk<ti1nSRrXvCWe|mm`gRrAvnk`girScj-#7&fUYL!S^R0<fobUvCWiAG^Z<GTLq4!
z`V%1OcrFoH>b=>}4;$c5Xd!=s+za#h46_=FJv<<3cT&4U44Nbe2aZ02!A|C>vNvS#
zjMmOH($&^rdoma$(^`daoNANY6C_#ZeT+7_AAr1yDFxL{EG{wnG1^MA%nb&juGA=L
zuv&uqbmJM>VjR)b%dw|rxGVUF{fFt6GrKj-axNS_wy9Y?J-uqyL)Og>eQnDV>m0LN
z&6k?7FYzMfboIo{!`Ds5&c1$QbDF^n8B3?%e}l`?K2^s450|kspC1s?pOcJL%D+AB
zImuGx`8MVG=?`G~T+iG87qqVzy1!47{Vu4W#c59u(9_dz;%U81Z7XHpev_X598XJR
zYFT-@?fay^4xauicEn$gl#f2zb6j7SXs_$5@2e~?$mf|ABn(QMt08PzFdp-}oSDd*
zqbm@h+(J!?(t(#GS}-W(%G&t33!_gUz*H@&jEoUtGPvFn83H)jLivKM+6LOWhGpg(
z@3nLVaz3Mw!39o)P379w2lk*&_HC}%*yQxf?zJzBJQgu}*R^iwEowjf#e?ggxV*1@
z|7W(0|5K;?;?-YTGk4!erDTr}Y-k_2Xt1bqc&o0&VAXpw``r09IU9L5?e^B{Lrqq*
z$KG9Y*{5IJb;~awSkiU)xjm~NyP|)|(xYEa+%R!-{m#$qE*t46tX+D^oRKS+RA4=B
zhkEm4nKUG9HixG53wUX1op3t8&c@eip^6=+W_^A@NPkW%sFZ(u+H-1OdH#!O&uMLy
z=iBHxG_7&rpONEw6~6g|GNDtsmw}&=idCRJ{$)S`N!t+4*$H=t@Nk6Y1San-7D=YG
z7C08z49CB=om9)#9j6>sw%!#^-y0rw&HOFCa|3&HhGTznbjAakL*n!cx(eMqA&eQ+
zv9g4-qP)DWqK@{p1+wfoQ!=$@yfp`$I36pc9c!c(z)(lx2+IYoo?&jg`5Emh=E7Vj
z{!6^_W48h9r#6UQn$JIulz8X4Z7KSJpMB0ptE^b>|F60;fseAt7JYrarPJB>J?W&g
z09goONq_($ge^oi0mC9B5M+^USVB~WaX~=Fab?s|#|2Tr1zSW#T*g5}#zDuCxjrxB
zb#l2QD*DC|9q-eD^!uOsx;vc^6yLqS_j^w~sjt7U>QvP^r%vtXbYjud_rOAXr+(BE
zc)uNQX+V1ZZX~7{oF|RO8n9dsV)kymWmv6PXl%G{P-XJatWmetjuAtRleSdVF>{}F
z=66GledAX)tew=$sGP87Qm+9Wlg3!r*8QecEH~!4>$B1hjXt<R%r_Q#W@n_FefoiB
z%fzZdEw^^$4{W)4)}2jfpD&m8pe;4&_R#2W5C72Zq5Jz*75ZM<gBkzNUEYh_o9~zU
z-)k!^8vh)Pzg7K}&~HQ1{#)*@c#MrT$;n9y+g`Yb^YBLd$q4Z}Q<0X+4Ix{CwjoLC
zo*mCH)D7B^lsTy^v|n(_b1g!K<{4tw?_4vI6i9R~{$T<$;jX!cScD9kC^WO{Oer&O
zvBFy(nrn|1Av?_k`aRMN?vg|qtfES{E=Q{MDk(#hA2uf0%_&WHQ<8f}>@>{_Vn=e`
zrtWqm!&1*aSReFAGkQcv|E_i<kup;XL^@0<Sn8JoSI1-a+gKwmQhkjlWWT6)ulziH
zQ93C;E*ihNs>mqP`$aOoD=*<XqO1?gY!g-DL|@8sTSN}Fe>lvL6DBLqe3$iO%y0-*
zMG7kY>2O8Gu8M_|yI~bQBVYvBnOxW@ifF+1Cucq<iDcI|P!RKQu_&OBw48{s59lfX
z00LbJmahZbgteXd>a_CRG@T%OLu{Cphg5<h_}8?}3P_Q1<pyLoBrI#QyQVMZupCq_
zosLC`q46L>he_5R5y}m2JrA*)h9{U}$jxA;AA#*d+@A$!8b+>FyJNJsz?jVJOZzu2
zoK&6Wc5XiV)6Mvxyu&i=b<41V#6Ee+{raS2Cq|taVM+P-<fMos*D<HPHYICP?U03q
zIPII&@ko58{a4>DipVMIn_gJVsTa$~ma&7T^d2paLe!j&$E=^|Rg8;`k809K*G;Ie
zyLj})ovRl~_#6%A=o9M}B1aR4a=U$ej>Q>{Yj>+Nj-dhb1Z<jMxPkRCE^^r*h)5PB
zm03X|7tx*A!Q=-<=W-yeKERH~iM8mhN0GAW-;0%YN%{-HPWxp@AX^zA5A5qr{gKFp
zEMO6#?6D43U2Kui$rpr~Z8v?DlMR|6c>;Na&;~1e$lR>|Q<PwWN<!#DkjsG76QqVz
z$K2p!^phKuG5-ui3nHV?3%H&c>R_!?_Uu6sO)eUklj`c(?OJ+x&u-T`1=BCMSylZ@
z6T;j-${8Daa+dG!*iewO6cB(pX@v1<aPIOm-HVQq_o`KWMQEr!9go=tpg#+ZcWTn1
zR&LP71ZQit{wy>KgK|Gun-;=?xtxJ?n7eIs7b4Ug)nYe{XB^9-NW)!S6lq{eTmyn|
z1II4PBEJ6QK;I8xQsLOTBnz#O1JmGP=f@MS$Uy{GySq8JXr0F}hjvH8S#YsKAq_WJ
ztRTA1+M!`Zv&#nI=nFx?HBUMW=)roCR3DiP)JaMzN_K*Yhb2&p#o4EmJUx{NpE%!#
zO<#JHNmy46>)%L}&BUZm1#5EzrFK&F*;&>#XD3@q&mOaQXLkyAh$;=9+UOKl3R92v
z6c1R{YP9iEP4@6%2Gf&aqlb?kT*+zed^d(&v?Ns<)sX=WI=Ylq7Ah@0F~)ANJ6geF
zn#~c;nqOf=r>^WeS_<nbRU!?dI2-)P#8adnnUK)zrhgb~mp(h7FUMaHPFj-Lcb~7w
zrgj%KIrjSya+%K=Ze<lnmK6O|2;xQs`}H}ddJ&c>KN=GwIPBUA_8vRsz&+Wn5@TA8
zGIyCm)(gdKL0C|GS_3}3J`D;|?SMs3Zp68dcSVnGy((^>npl*ZXm;2y2mE>kglyoY
z1(tE!j$9+|yt;Y%sva91k%M0#-F@4pcl!Ez1Vz@!Z8NKyS;JW}LRrudNt3~sc2=QH
zIN|^=;K3q>6T|eus1>~n_XEx<WJQB(M);~QJ;<OpIj3L~pX71sdVImg%Gt1Bj@dC0
zE;*7whr_0s1<fd$meoNn;2HXCfyhJGSf(#xe=IC6a+STP3mP3kmsxr=Gol26Ey04M
z#4x))ED$D3FLC{i-Nw}!9rsw4oq6}gv>gYn1&6N5ihijh?;%T{dDo{$&9EF5G+b7)
zOkfrjtM1XXi&fMmSd&zW5QaY`O0JzS2ONO}oG|zJ-S3B4W+Uk#>2;}9z7QVwAXq=i
z5BVquxG9bHqT%O@1Y!V1uP4P-a)}^Dm|)h<_|@LXm^=4Aopu*4jt*XQS!`0+sIzv<
z3k^%MBI+zZlX)qpUO4L@J)wElA;Ne^_k_10ApfR&LUUcGmFmerWRCB&v&g<1E2-s{
ziW-K6rNy3He&Lx`tl7a}y$h`SLfIAV&#ox<Bdq!as4TmPf~N&*3v5u$fu$1;F>ph`
z+@`{|xs1!jY2%3ROUnJ@I6TQpCoLBT<bp~!G}4)tfQEBr=P$we(1^@qXkFt(NM(H`
z$*xC<<)CDF`COD7kYiI7t8!wy<(zVzAEC6qu|EnS;|RK6vw-xGUCSqpW>g3|j;Sk$
zs7!H}h8m`5Y{LXN(TR$k<4{y6(E1C<5^fWd4D28WhXw&$QaaPbo++ZbXVtyzKyApy
zkP{Z>=E*>--*#Bw(5<s5(9fRPIj!Ttn@;VTGiTSSn;z_#mQu5R_u|F7+eVITlW=`a
zu*>~>+vdxEYeYS$4^eEn;_qksZ#uSp(xmOjHf=g~`^1U2AES({O*+=;-H94C!O~Kb
zUpum*A7?1XjGRzAVMtZKnu?l|K6&n-XUcM;JUXx!JG{(rIkS_^tyupSEJt$<E1R%v
z35Hut7kQ2d<UBDal7UKai<2E#84!upmj414zqd+}nhD=u79*Td88=SNq9C3jzq%9*
zlrl!plG6jqC<7Z~!d{KZ>C(>kI_umWmDEwT2PgiYq0+lAo=~JhKt_N5%U#ocJX*#$
zdhe9$X_)z?B66Y4uW%&fB2Ufq9?-I&8mPN$BRXBW9d*_`1TQPbay65!Q_XIUR%pC>
z8n0EeK1R`Xe857!Oxr_O`Pn}-?Z=vH{K=hLh+lWvLL4@;rZhe&vcKLzT>qQOLBGAB
zW#_t@n)Q!fcHJujD_%VN=+C$2)h!-9cJb)E8>|c2GVF8imSNB_=$iGbt_(P#xnjkV
zjpB%A*3I(=h%1_Xzq8tdn}qZiL$EmiXU8|xls-|<oah&LuRS&B{$hq!ey!?J{oaf(
zr;g0{QATV?d|BT#<9{GKJK%9LV)&~*<7l2b3ODNXdt%wP>wapOKi`S^{TTWw?&yQ(
zQh&btI^%~W@ZO9c!}&MCZ^l0mjQ<z)Y-fCZ;?j&C)g``^)5QOQ0zVCDX~zTB)0_$N
zsBdc$dE-$Y(+5{VJQlL8`qZTix=YxEc8FPfjzT&NERjMvrd-ldh{r&N44i9{@fFuM
zrQ?%!-Mfc0^mGza&)58kZNdA!{mlfTezE?97<S1{l8SN;WF>gyp6?KUDlT#0V1*6!
zKx#Sq%lf)5YmbQoXM;Gx?in~hHpnXzOvk8V?tn3fh;Iz1-YpN#O#9-!>e4AAN}MzA
zNlN;cq}0!jXXcbmsVNOlHfpWvY~fok%pIIQWKNysofu16!uVZ>e=|QTC4I=Hbvv$+
zDl6NqmKH{kQEGOLllukChlAs;1X>(}N9tw4QWir<OVGf0ocW0lTm%P;*cVUY_>~@O
z1}{tV-n1P@BkW6o^_jo^mX`HN30KF(UgJoPyy`EH*lvy97#FvZ4o(zkpgeI>9`TP6
zS|0Xx&3g`(fs$#24B*TeaGd!`7Zoe`7F{0RiOp`Xax~I{=?LDN<>AyC2M+LDW|-z^
zt)8nQlO0z_IP78es~ss3>;LkI{Z}sgPs3eym+hyH@D6>J*l*<qA^VAzQMc_zOC7XJ
zQdib+Od<}?5ZH}OGLrN@r$|~nr`3ddECh&^f(RpMkq<kWW|0{5iSU?vp8m+WjJxyb
z^C+_3Xriy{A(Gwf@#W5S|A2K+F&k}ET(o#(=Emr}!NtXc^P)Fqj$C59v3UIa%G|*i
z-s?3uw{rgYVxh`D+snq&_5<7z&+N285G_@c7N7^n7MXN(GxTRXZF;mctu%{AOZ$+3
z&F1u=FH5!5cDeCS`-l1lIyQa8d%M^<&~{hllvGbPeb{{Po2+CtS1+HzL4VcFLdg)_
zZ?dx6u3@D%L}A)9S?aDF*Q@vVD!038eD7Z4D%~xE`j%E!mi8TF_w=c&$jGRu>(jfg
zJR_sLu6IdQRY_@;*kst;@tE-?Eg@5Ft>G|IS_<p-nMS5Av8=ad$V!2c9UFsXSn+Ng
zpc6~<a#UN?k$51b4d^J8U%O<GBKsGPIGo+9hZsH8k@MKyR!`6ZDZv@9@mg@En^rtD
zZ_c?3B{@R}^-YKhSt6l^@wPpdnf4p-OMOgETBamP3)8mB(~We!>sdx6u=LM)NB_cW
z=gG<lVUBqst$-L10KpZrivEpz-ierEH9#jth$nbgfsT`<b~zC&XClo+ENpeNejZ2z
zf%*rcizN=Rwbvz?Y3MGHmFOSj!GCsLyh(N1O%Iw)Hy+F{GM1(F9ofq>Y*2a1ILk^L
z`4;iq*IwGEr0=AvoUFX8#_~ynC8P>!E_P`?W)6mLJat`7yo=eqE5U^qb>0L#zv$LY
z-dYA&uA@1}sm|7|-{_AX^CPrk(#c<ni-;G=kx+fUP%<2dOh81)$%Du{tL72}X4OGU
zH|E_Y=>&`?--yggs^1osn`?N#iq1%!u`f0|SIpnUMq>U(Tfs?ArUa_o_qFXQ)+KU{
zJl&J#DtAUYZZ;zIWYX+Od%>oBtR9Jj7&MWdJkm!wSg<fJGKltK)j)19NX>io9G5tf
zz~B3_h%P;@40{XB_@ET@IONuoB!f9oXzYNEUv830Nfg(;ZQN+=nu<4QNl!4L<R-oC
zaDO7Z17j_Hpel!U`-Gr?%noYC=%6PAvcIjzk=jatHs~U~tk{p`fEs>h>4!NzWP2(*
zYwO;QHCJ4dSDO=NamJ=6)((C-JT5)X`j2rb`Dbpju0DJ1`WqtSCWLdiZg{O_Lrp|#
z0%zsay_P8JOO~4%1YEd<w0o`YGwqg}uN5wm-v0KFO>eLGjx;*`5bM`Qk^Nhhs={iZ
zKX)7w<WS6@O4G)o)+=&0CTw+9#>~l;PP;2MJ2g5XB`m}Gb$N67tcOSE*&`j%uEdgl
zgR<Rqg%OddGz;#@S^r{;vH#V?i`;NYU(N_P!t|LNsE0z<);Wxrtn`_aLJ`~lTHaJX
zJAgQ$)Q>nKRebKu>iFCkqrMEmTX3OxzdSEmWB@u?F41)8Cssvr(pVomFD*C~bU`F~
z?ZRnRa$aIugqD_8O-o(2G)%}-w)4>Qg2`e0`oalca$eF=x{l8+t(qgDr8`eC&hz?Q
zAvm{m=Vjmd3x~Y4cHC`?w;xnF#)_Kgoa~IWWW2XTx@_XTWrBAYI;fb%17&dC#;P(?
zxkMm$Zty9LBDRuVl(V??v)Pi(aliEDz0XNPEE3pg#%K~rZYGefZbOfGbV(4r6c%OE
zBL<nq4>%_eN<%jwi;!LNLhG?4C1)YH<K>^M4-F=^1nXobMgdB-7+6YqdDi6(!GX%G
z4y3l9o0_9e^wK0^9M)rUJ@saUk}zP9EY7D`2~w=XjY{!klN*<S_AE+>%WdsloYydU
za#3opft7_R6CWI1(yOB_rLb~fuhfq9);n^_!(EY9;}fj!q=uy%<vG<IO=tcyCB+(U
zJP^XwzQ$i`lKYmGmh>+2<l;LIO=WUdpQ#Y;2J3=?&9T^R`EKpp!)dS}5%6Om{E|h?
z5OzBp$qwC13A={`=+PAid?1y{^K<aA90>;LxrG1cDaCm)IOJ%!9%`F7L?A}@TnY-U
z&yk-Om&}8~g;`<UA^IhxA&AWqN|yk(PBD=xYBA|n#So;NC7T{V7cS_+oPIKQqEq2k
zMoC@dhSU6Z(>y9x0{ku|x)fG-zS8@iN0#s$;qY)k)08RpeZ<=jYn(mGma(;0$>;|s
znj$uF$LQkT#tl77+Sy&zIps!LSVvk)it%w+nn<6ek*d6-+O5x9k1+bH4$g}vcvIkw
zwpJljMpqb&_L#)T08rYQet?zoJJ)K~M$Q}iZ$~jpduM3NmWGSAE*v^^;ns^9wzLej
zTpajy5x@9~T50rsX`i7!C+{LPRQ*~!QOU_!IhW|aL8wQb9HB8Y#MXnpy%g9|itqX*
zNlIx>k+bBBS=cUd%mQa{a8t(8QWe;QL21KeqL{(ssY~^kc}fK<yUoA~e&BawcT){E
zd-pfo*3T_V=gek8LY{=V2`joC;0!qa(e8n?yPz_eh?WI@vtcpL_l5HX`=gqM{nThR
zQ!Q857=NzG-ne1y>ZOaD=88?^+8VjfU(zQ)TfG7;^HS#AEWC-5U<WuXk{wYop)M<r
z(pF`F9+$(irQQ~BIj}^7F@?aEO4S9VWve4nBaoKmVvrs0(CgO1*Xr}6=T1t9;bnb)
z{u~^Ev!cW304y9^t)K?7A0%b(xkh$-OqYTrnFWy(1@%EBoZ|?$a~<jjkU<f<n6u}e
zi)mw@nuUudVxwbbC$cD4lpT9NJs@K>C(;?gw42>w6`*-|l*Y-N+~tVUS7!nS{59_2
zF|O`Q6k*+VI<!SEz5Mh;F$=mac67&Nd2PTYYe&?rnNeOoV@=(tb<_L(JhR`(f&%QK
zXOv6WFVk{;cxLL=|NPXInXt(|aKI&NI-{?hQNFEvbnD_D#Aq8a?fTi}<+HD!He>Ug
za&b6OJ7;Km`p`MGBWDjzOB+1f_-Rz!cblSOjj7W%NyJUlW^9p&TV~W=IwYOdzS@zq
zB;u@*KkyySY@@CGtG33@Ou>>UGliZkv3EDReqJN%Xb!REXMCh>`GGSYV{TYtJI83B
z@lh8ueHJ_<_GFRI@UdcT^|0<1u4-!>;p{zF0=w+oP!lIJ`ub}?Bg(Bc7SaMc?Cd3(
zKd~Y!N{k%>zs0u@TRsE*R<8_|=ljyO8eKBh_(e_j*fBM@v>RMmQC{2|TRgck%EXvt
zq-;%S{UL3*Asm%C5VgTE5IR&=JUCMl=H#%SxQdFBbzjk~k%j~Hf?GV@KAB(ZaR5!*
ziQRRcU9NanaNDT<{5YwOfBogW*n=38T>3=0H1Lc6YZzTFbRx#2{AHCuc6k<D2v%4T
zB`)b`>74@t>|}>UM#wt{*1$}vID5(^!t8qz`fIOYotJqWVS1R58*L<I8Y$*;HojlP
z=DKz+rY#_Q2KFx;AagoT-tCF=ezAYq=2ylHbH+x;6%22laNBR)7EeZMhv<0YSY~R+
z(#%(H8#J}L*qs*XjC4*I^Ulp{4{W_8_NL8z-(tOP<L_^7Xlbkqk18xHJo0K~d{$zw
zq}c43s<^DT-%fHDxRb)d#$5K3Nw*)n?y{Kd*u>t645n+W<L$kX-E3<5aZPGYPEKJ?
zVL?8d8|;Usr6$J78oVCWiYyIGNsfuO+8M(mOLpwg8mxwx_v$&^iB{*Nu3k7oV*D@6
z<HEw?0p}*xalpVi97t`ZVBV82NDw5MS=2OyBnxwL?h-$FcGhjglntgNFpY~kCo(>k
zoE+!DM4o13h;4G&J2%mBq=zQP43?F4zjtO&T%|af#khS6%Pewpph#QL^$fJW=HLdQ
z)44l5Hg@TX@aLm);&USRJ69~ledO2sHtw@ck4}r`f1_`d^Q_lcKB2>lOVx|Ub=+>5
z?2JlU(vfC-jO9>6cD(Ex?Yr^!bwcjX6EZjHRhWs-?MRni<rLZ$_RC75o0JU&^ocY%
z*)XE-)cw4+mF!>fk`=7{&e)J$&#m-LC26-hu0Abej<m{pj?2m(`&gkFNKV>dM-K^P
z=Ro4KTE>kN|8PtfP4+TK=U?>9jgvK&PKPZiaTvH{cswxl;1m}naZAN0+FCbd>w?PB
zSM6?T*?raM%K0};>2PM}8xJ+zvux;sr%vB|^XaD+3|)Rtld&^D+juT!<f5A|z5Jo&
zRaMI$y8P0c7mbYRsP|;H>`7_bx@Y0l@7+CP#@+8-y>QRgrj$J`nM^e~z4Dc<!oG`z
zx8dr8n#7XgK?911mkjS!$caupf(=?rVZGg|$}^EH)MTeq6_GPjA;L!)X2<1-!27i$
zqgmPg7JdxsDLs5-nkMO4>@zWSP0ggY=E4&i;;hQki9w1Hu=*_8M~3#6?i<XVmsX3q
z-zS?>G=AcY{<F3(9z6c`f7?Fe*2O~_w!XA#@!jPXW7~#4W2^c^MI=PD)vj+Eo9HSW
ze#ww&*EW{AtEbxsXY|R8uD|iktKaN+>Z>h-FTZQvnm4!4m^q_hRQloHC#EGv#{ct%
z%2ki8DY>|&aQO0HUNZ8sF$Kt|Vk^f!A6;Wrk*c+e4-=99G<3Bo{N~v5oTFjE2>x9R
zGlF?4EH98)e={XpM#wsj1c9aN{zh&=u3W(rYg|oFSuXzW31;9IbzB{u7#^MwE~nw|
zwf-h$NM7DhnM<kR9lPymlsQ5@r`v9X3Nd-6+pf&iQ}hf5&12g8#!Iw5mm6@6jMF~!
z&%mycRB*E}*ZfSof<QDeeb)(G5})5nw%<76&Qdi#LTT%=kjy~3(;PV4xysUmIdHA)
zg7&~Y1MO)q?(c}${~{*9zuoP)MBrD{aT;~BQpb38Q;j~-CE8c-GD+RIFDQ0CP)k%o
zRH?SzCRZl3iozs!U==<m7?VXB`Cbr`ME0a=dIw`bTevN%+R~E~ICC#iU&c!kYiiO(
zhQqdj(`-+jS!fw{_BHE0|D3{c>UC#-9^s@uXNL|rJM>p0qq8D8dUiG{i<z<7ZkeM!
z=KPp7Zd~A;*~!g4;e8oB%l~kAxmkE!jf*9ogfKcPO&5{Z%qTR5^n>R1vb1wkQ$$+z
zVwz}$^TvshI5kC~C>WZFp(G)hNB(GiBY|jE>9tt?M~~7$`F*9ElL(KI{di_?V-h~n
z?}&`#Zhg4nwPz--Is4u(EqCVj9-JK0vCv(Ymr<2v9~+zW?POZt5Y=IKTOZIf`bp~H
zn(SfKy?cpGx#~&7CiU;vYiRGGIa%V@Ol}G3lYP4To=}>G+ibdiWDg~T&{1EPBODzk
zJ+MbV+N9ia^IIOIFR2YCBj+%?RgW)`YkzWC9pZmFZ%M#NM-Hx;PH7p@u`wVTj@lQn
zU=eZ`UoY_mbY8TjpzBRpF$@*xgK%nXJykXPqLG<dBOB&a4*$vYii+t!8D2T3VPsb3
z$ctuI4PP~*qGHCXvy<|NS5~B@Ra6eo&mU2qnOQ!<a!dY*zL}YQN95-ZuaZwy!#nbZ
zHuUM!Ff^}x=7xrb4UPQ*zxy@H@0sPdWe*%(R5W@(PHNwA<>k1Y2!uHU<o!Tek?)R<
z9o9LF2Rv$fjVmWJIWY?R3&Hk=3c+hL&6|!WAO@yM8Cs?P`bwb1<%Y!N(w4Ma-R89H
zs5sr`ibLWcUC68!Q@QU<2?D;BC22rMvYm&Nahh42JzGsP2zuX%9bcn0Y2R&yquox6
zGd?@DWo68@Q6m>zGr?1z?Xrd^y3>YSGOWO98?|SDbnJ}qXqSC?>p#D{?6!HOQLzn?
zQ4S+x=%uyv1YTpK^?mE>SQM%>5^B=3GC2}aA*bRqE3+!KpJb<as}5Q;oR~<<vnDub
zYvs9+s&5`0wb&q_^-0O~2~*BGO4X1g&ZJ7+!sv9xQ>?s_0Sl)(CBW9Bd0%N%&sdQ=
zIX9`v6pF%3T|l?uAD!Vxh7SC{xol=z7kN%GyK*^O6ILWV$+qYoyodMJgseejdEsfE
zRl^1>S~#yXyNX{~o}bhXT--9R^n1QpXGJHaMy&2zmfI^gDk&{;dH;U7y>mPEMDg|~
z<z+la```A;r7hl}UbKE`+sI1RA8V2m#Lzq*g+e++r8y=Jsbx(?8NJ|u-O(Ek`B$th
za7z5s)64N7HZ$`@l@PLLYK~U%aUm08jLPF|<$}`HjOa{4@6>I@m!n)Zt~Zh+hs|W=
zSI-Z0*1}P8X1x~;laPxK2OJqNZ_5qyRN^hQGWQPS)796k{<7npdB)8h73;5A-|@9E
zVP3}!>o30ia?6n|XU=Rnf;4YeldX5#ZsF8>k}9pi$v{FpD*!b)aj}S!o#PuKOOihi
z(rJoPSGhLH(~zx6u7EKkv1c1utmTpWcB>;ky<==y|MZF^<At<@Gv8SqK#Fn2m9ZI-
zf53A@jO&k)8L?LyS9Q4PsVwSml;G>0N)QeS?b@1w<f;1=-GxhebP2E;C4FmwxFIbn
zC^Lo`4Apb3U!VCdA<cN9cU4Beq>i!a@wxyGYf62`^-_jECPc9J`iF?j*en0}sxHCR
zz8j$OX{wv3%4=wVG*xJj7Z>evSVhCjwC4O|=pSx)u)m<^W#NXt-FUUJd4sXJ<H`-E
zjYMaR-5wooq;`A~@3O}@EiYRKp85Tmqt*duUrZ^Ck1tHIjJAv^_QV&;2?Jk8$8M&G
zzePK+9wX{OugAz(CX#BiN2Uj7vK}L+@%4JlK>46#1zqnVi+d3NdW;n>v=$`wxBu%C
zVIL>pt-rVbM&%mI{ihfFUWik<3mJynHFozZz*-s?D-$<_U6x(^^Ca1yW3~(j&>-yY
z;c1aW=jI7`8B!F7B$60NEwKYjy_AU?+WsWc1IP&DLX*UpyNHLoB@uLXoA@m5Av4oD
zr1bp*Lki|k0xcN8LEJ(T>q@~uJ$^;aO0ne-#7KWSCO@!WMy}@Z3IB~y8)s_*Sa4*=
z79S$Ym2?qNMx@{fZpHMEGY=egF`80H2PK<(;_v3bs-%nuhOB*ZP2r?0hb1u~A~oje
z2Q4joJEmDLjj|^tj<34(o>jwLu1llBjN7;OKa*o^I`cq)qo?ir*s0wiKGN_{qP<F|
z(u(7-sTszK9y~3C3cU@nyT$ZShAC{&>it&6DioJ)1%7f*&1z-%C#p;ffj@yZG26M>
zDz4biO(eaN76LPoV3d|)@}G6Mko2MXh!B*Xn<ON*bXXKoCt}<wh1*G@KIbOF>KHuI
z1NYAKrr_uiV4ylO9}s0CgFJd#u^1Xs)<9;0NQ9u4E7U?ZW-!Pzjv=@d#JB=iquuc!
zHi3JOf%%0-VoHH1>26|xt9MUa86#s61FjlqAsDdu-o+RHYFx|SLCbqxd!ym(=<rLx
zplNrms*U<?roE5F@ypGFuF?GW{RtabhaBIqdYe_lvLUvV!;NsxoQi`ls%WYL(bckS
zCr5A!e(iQA9{YJxYFx*^I=+cY{C!yDzhWQz?~Y_ktK+oZ<(bjVXP{8;zv}Z?iqLH{
zpu5ZCqvF^&sYqNH7bS_KW8*QL8z<w`I4%w+$H_Q1c3hiWB)^JqiEKJT?)IB1*ExzT
zd5&ArpBH{MsLuGXgEUK}MeT67EVn_?2%#u~9-&;?k6IU(X;jD1-c4j=X}PWAcwBnY
zwqvfi_~bapH}6L}fA5Oq!aUmibFj5JKH$Lgh#CwXMMt7Uq(ur%IcCcU5Ct20?3c@Y
zJskU${NP?+Iv1`?$s&7Ye@okz$jtC-oi?ZK+VITCEr0VmTw#uRHhcukbA-JcntQzD
zZhDyS%pGwtuYmbi@a51k?<9AM!1-SD{u+mTb?#WCM1*uFXCCu4wt4@iOJEIS&%mn7
z;BdVg=9p`7Sgj7rTyeH&s7(8RTI!)dl$s~!dLvwN;+&QHD1EM1=<wfidRNMb-GTn*
zxz+xO4x|4KH?5gCW5&caH{1Vn&FZ1Uh7Db^f%5Ek<QPwcB_Qd@N2jkalmL3M+uT)r
zg>~QKGM-4xD@{u+5tBJ3scEHoiH^JYm6#~MN@Vx61k$zI-!i@oD<zj4)xXPm-I`p4
zO8OF155$&Eh{ZmCA1i@5w(7R~8+snMHK%`Fq0Gi)wpLizKWAp(Jg(!aqT0Uc>3wU9
z3TtG;x2CXo@Ze(eJZ`$fX_?`8msyKfPOFNiCI4wv<|=wEXg0j~fA1`+u%OFPR7dAo
z)W<yq#{A?y!+UvZh7L&0D==D8iboWAYK9DO{H%9D@wkCm={f1e`NiW0Wb+_n&55+f
z?;M|@FB8<_^PEQ2GWp+j=2XgWn)hKAlpB09cD*6zOmB)U%r)NlDlRLj>6wIHZpUYb
zqobZpOg$VG&0hpX#4<r$%WQBy{gp-KVGCI-+uq{%h+lkF|7!j-8jORM*Q|fF$2xKy
z&5rGkH^Rn+-4ph$GtD{Qc@rLCZgmZg$ccC|a(?8uQB$H*qW8rNj`^3Ej@aVZsd3Ku
z;`nD1E>7?zE=hbhsWj>H<T=T=rbMSanes*Ijj0`JSEhZM{!GT4%=pYTnWwVqv;Lgj
zoc%j)<jl;uKIeINn7g;TF?Up6N#19kgZaNGxTtVrQD)J@y%zM&>%FK?MV~(w&ncNw
zI=1xR%5LksygasiRlk&e_g6S87F7JXzoY-p`oGoxtpPOyn+HuA^gk<~uKZiovxAF<
zG!AtSy?p4-p@(n_nmcUMuv5dAkH{R+P}8gC?wYqo&Kdb;ZE@|&QFqpTHRkcL3&yS-
zd)3%2V{adO|JcXJEv-+e&#5o2udE+cKe2vheM|ky38@qECzMa9o-l60v<XcUu5Y-!
zVSU4O4L3L3)9~m;?u)*iXrCB2F>7M)i32B&oP7I~$EQ3$<+Uk)nDXZ-C#QTl<;>Ku
zse7g#n0k2XyHh`$dTQ!77dK9;oi=gWtZA1`TRm;#^mWs(nX$7myfLXUcjl;B*Ufr)
zcJAz(X5T&gkxQL(ADO#%?kjWOocrF~6LbGI_q%zHdGYhI=k=NQVN+q#+NKRnA2dfa
zw>1CD{KfPCu;8`@dl$UBprfTv%Z!$tEnh9Hy{vT6;zf@v9=GJ<rEyEEmae$`j%DMP
z+m|0*QMlr+m9~}nD{omfdDS0(^5p8O)mN-Outu#ZTbr^jW!=zq53GB2-N&tkt&3Z|
zt^cvUWc^cZtOtlJr9bd>^iTgdFQ)n*DlLqgvr4^r``lGJ{7c#OzPgUvoiCuX#CIs0
zCGwxG2zm4WXIx7I+M|wJ)74$Jt!fak)RC{o**B`G#!+<_r+qd9^;WlP;#&)rnde%b
z(_y3K6z8V5s%qd(U@@=^=;aUPc?BTpwj2LTT`eHbz#YKfteGm$u}sadPo_7HR(tHT
z)GYf6wa2y%SjO*{`2C66W4TPdYi(22_NnS1CXM%C4QG$McT}r6w!`Y6gmx$2^3@RA
zz4T4{)C1sjhJB-=*-DPKol;I)yP82gZnFH%_c`G#^1si@ttoI9TE79$Ty>ZA5miq(
z&X%g`Ejv`YwL?{4^ZYi*cCB&7cZBzM@%)Hmsk%+x1LJIy2}xruRJU1M)NsowRl@r#
zncT<Q&!}kY-&H2h(bjv_81gLvP6CbOzcxU7p0@!5fK7moWBr?2P1&NUTb<<zEcV`~
z<7^k&>vxx_M0hra_$`*Z)Kp*^@efJf_93c|B~NYO_a@%AS-zuu_o+MVx2VfB+@|WF
zeTk;K(7qdl)%rdWUT8iDFZ^J+%y$%=cN2aAoObk46#+g74?=-*ZIs`d7s3xeXkNfG
z+d*|e=-v}Jns_g~fDfTyQNC}X|DA;I0{?ECsv4-T$p_&@C_oo}*8o>`0eGQ#Mkw``
z{H3lszn#=ocn^<l!{NiVYLL{A^tU;0p?-(SV;twB;j_q^4*jxag})+WT|(Lt^b#2p
zNCe!#K0w}Y2I7Iawm+$I^0*hdx|jAf1ehgYd0!0yBoujV^}{>d`D^5$?l?=E+6LSK
zFY5S~XMaG|*xyq#c%EZlMg1Dpa9|q0x7)5%WjqhDx_#32ynuw#7XJoZ%?-p3+gg=w
z+o{sQ_b1=qv0J^v_qp$Lm8te)g(e-JX6T!+=Q`Ls4!8K~e50H%XblulC4@#e+l%qW
zEi&1*x7lf5MyeTF52!ZdYp2x`!=91MvaDqJRE=t?4<uiE#pDK6qtrhwj{1%(ja$N=
zGahp*b-R4G{)4?BrQBMB!5-!TN+t4FG+-iY^i71*NG)qUvTU+Z`7rm9X7n@ajEjxg
zMzgWexXtp0<#)KddDWfhPIqU!^W25*a`zB-o%@O0yxhV(CK!1!dGUGadD(fzdE@e$
z@)j1nS-9k%7Vd1ye=NqR2bf%@f_0=Z)tF^88Es%a4A%F-n&3`#XS&@Q>)>u!<3g~u
zXsiZU4c|X}|KU66d&RfMcc*Ww?<(Iq-%otAed9WkIubh^XY<?NZU002+wE_)zuErV
z_7~c{?c@LQr@#F1!*4$P>ch`IJoVv!eAxcspFZ6G;e#LE_vazU@8xEl(Br@TKd&lr
zw|L!6mwCKua^u38rCx&<Ztts;y|%(xUfbx|jk%uOjBSl>@8rpix!#(Y8E$WtJXOt{
z>Gp<?Zf^1RlAqzD-Cm3r<a)~`#;cPX-IuwyZEJRWU6UJ|c;l9DE_vdHdaid+Q$`a<
zSu(t;c;-xh-ehhm@rHS7y$(PLjPg20O=<LojVj(t{YN#`dXpDs63<$~H#b>YMlbLh
zqvto(m3nP~cdFR)w8K`=<Q~1v(=3(Id8-U5pVys19RfLetp%RuI?~!pyhf9o`i!a<
zI`H7Bo#}PSuc`cU@vGG9kPN(*f?9uBp5_#A?b9y)c#UL_8)V=ohOMA>+cr0Od+mL4
zJzk?Z@JwxWdT{7(Gs$l(xr}Y{UOm6FE>A0!;HmQ(qr7VPUY32RcBwb4M7f*5^-Ki!
z#%s4VJ?*d*mwKHgyo_jak0P5U!Oj0u8a?i6etNv|3o|ovb18XviPu@|b@nOsx=P&c
zu~albH&1hw$GvTOWA~RCk}RTxt&?Q0tB==6Dlhd$mbeFkx6~WOd#g!!_!qz>k1Bbe
z7SX!lo~oxKjU;l6E^$|bJrJu28Z=jxdSgn;QmRY6u|0gH<_m}sSMsz)B^S8M++(#c
zSPI5(+cwrS*3&%SYj|q+a^oo}kqqKtOEN^~fBn^K6ffLX=5f2Lw}B<0^Q*f|e|LNB
zh?Y_8_BIKpYo;_l!}h2<;~8tAEq!KfEu3_Yf@M0gXH1jVJ_`0Uxv8Hi(biE-Egr9J
zRC5dbwvKAf;JIlg>?c|?`O<PcW16cnJm484JaLZFxIkf|A_ruY9}uJ1YZqaVw4|fG
zAh=++@|Sj!;mMuZi4m40N_9{~UVEXxI-Y83nWSHPot|30jqyORVmMpsP1d!iWEMYd
z)U?JjcQq~Al$8KMI*I2fpfKb4+Uzw(FYwGao0rE=Pl{9OP4Q<oDnQUCQ6N+xK=afR
zkGo82K8D6qJ+tiTa3c|6O$)w;?wzmGgRgb$K+-O8GRQK?lmi+cd`~FzM#KBe^SsY0
zd0H8X3EmjuWS4m32s|a;_~HQaF6AmL@g@{+LtaEMw$UEWDLbqx^M+G}d`(Z0wE+1M
zB$}JM40$(enOpL-6AciQ$pDdlQ0m71I6)KgO5?5eRAuCbFg<sszaVZJJ%XM?vGb(v
z0X7s!b#sMRQY3%5gEh>N8jgkr?lEYvK&6UGyoo^sz2t{C6}-LmQyNcwG+}t1&X3{}
zZ&EOJiTu#9OZAh)F4IpEwQq?xIT*EEe(0$E^pixb&`%Pze~C9G7<GXB&`}5KCy6>p
zKS|We68=<`cq>iKg-UwCshnzo8^uwFqV}xvCXS{N^=hJ%n%>wc?Ouzg?wN4B85BPg
z5i5V=lKDGxudSD3^wc`u*(_WX==^WL`Z*&g`Fo>`V(bUFX{tEivKtG42W)oV>5lC>
za*R44BN`ibLkt<kn9t%@O^<YV&v_*_&dm2#HO=76jgD_)bAF@$*{&uVcle(jyg%uG
z4pU7=hyU4$<)pd(=Wvy6xyk?RvhQcEVd9KX<<1uWbEIl<ZudV&8Jln$X2ywD16&)_
zD78|pQdg+eYKdB;7OS<4lX|HIc;$4f3RSN90j2(@e!QDcTsN_<P?JfyOf{<&s)aWV
zYMr{AUu)Er{Ho*c619*o5-#A)dcw8fcVlmRA+Z*cW2=tgR%5`lLgzdY49j`zW>uwu
z=e2yv<J^qk7d#7zCut?ebvkFkBjs7FQ(dga6Vt6GQ74HTin}WYI$O?BO6oOWmi*n+
zwM;`GXDR6-@{wAuCXcRl4y|$b`VIkG0E=1UPCW9>q-?+Q#_73a<!l}dCG{ngYYpX*
z(yzeAx5<emyc7BgKTSHVr0lCT)dFQH)zt4SOW?g58mu90Gq9F4%}{tDoRE57u5mK^
zIfnv2#PzZtog$Q`=SoperCmcAO_>l04wO<Ta2a1jV%+*^IbWA)*_E0J&li!-l%yq^
z`<*hhj+%=Uiev@aKtS>@(KL}<*V8WM69(k5D_%+a{k4&H7Aoa#ou^qFk^hU~UZ5O#
zU^7b@%In^`WsHZ)CfB6J2^Xc+xT(8vPv{^LY}Q@My9`+2r_35+n(b{BPa;v$4wvXy
zW{L&8UjdF~yj`Hbt$=cFWK8J2Qva0{lCwy*v~oAki}@z`N=p?Ai8Q&fE3!_<Fk84O
zX~Ml#{<2E$QrGpmJxiNhr&9|Sv;OnJ+v3+j3ssxWZ9cIi*YzQJwh&+NN^M1Bb=K4@
z^CFE;s1cBODY;PZ{CNwm)zsdU43VKLb-hJDP4jD@1v*ET{`e{!5d1<bX_b<*&`Kz}
z2HS@6#ndbkH=t)sy0;QfaLfmTP^+tqt|O($xU_Cl0tK7YNpz~z$kd0Db}j!T=4Cqn
z<+_g2Hp~_wycStqti$EHY(lSqUSFv5U!;FaYm&N-1Y>6&(iTh^lDf&0lqEpTH9Gx5
ztwqjltINo5rT!+m=5o>s2NqI`C0YZSy+WWiW{VEwExkjimR%19N!_&_c1lj5B}?ff
z2eW?=+#;#c_XVW4g*RqNR`4Xb2<@Z|twcIZ+6aw=XRG;Vwi;88<heytDIgId{X*+f
zVoFZ(-PAi0uBFtXnWW?^$)}U9p}do?o!srzgQBl51B-A;Bt%-KiAAWfntY{xQe%;7
z$tP4gqz{oYnd!`5>!{UQT`!4gN^XD~QVNOHj8qCP;c=*}NKH+xAgxxktF(hMauyj}
zg?{MEzxDc`**8d=F!hnpOmxk1V*J?nT{$j2dfzU(ciuVUk-q=e#y!1$bZunh_5aUk
zNqVua{8|GaMG98IbK$;dv1Np!{T9KQNsRXz7+-dmiwjG~Vyrnh_pL?y_wXNkb8MCq
z%gXK?=Rf4OCA%jsxqrzjU^MO^V>wwD&u(KP=j)O=jh(8}SRu_|tu%{!OF7U#mtM%j
zp`ij*sEVjzZ%)V;(~e3hbzeOyu2B6MjSW<TxP4Q_{@)NrX4Pt#8m>mLk~vb<B4Ksh
z%^jo0s&R};>(vBmeG%)hlNhf}VH|cbea3XgpqJo@W2Ty=X5(|=QZ-l2Q%$Pbu&RgD
zCUw1fS>2&NQJd9G%s_svcB`F+jT?-|)pe|`p2oWPFR**JRlTM@#B#-b>M^`|e67Aw
zJJgfvcj^tSv(ASbx1e!;Pis7)-c)~3N7Y;EZS^U7<CuC!{ZTyySN^VURqv@ksegf&
zpQ-<;Zct0%+U2yyWwhf5;N4HOE?9$RSc~pluTDYzD{1{#sh_G1%#R*aKV#kYYITkJ
zoYR8`xLM**XH^I5xK8yy)Cu(;SmbsouX-9IVUc*1_(;8IL~(2)#)wrX)yL`)^}hOd
zBToHUeSj~-c6LzzqV7?9)idfj^}ITS)x2lb>+HH7R9n>J>aco6{YJfH#H$<C{pv2Y
z3qQ!eQeUWt@h5aImIH6*4COD?3&_H&>bFKBhZ2*G6xM#zjC3Qz$mC#Twr%3{hK8_p
zE0&a(k1Y3xbzvh{E?T)_;pJh?{&2KETxf=liOmbvtzGC?VFnkQ!5TA|Wd>L3z%{F7
z<=W;23l^?e>$)=dsPm~9HP|+K-RhO{qhipY!LCKCn_Cx_Eofe|FsfzA!qp4cELo#}
zMJ#V#uzKYR{p`|M^<&I}C94;#TYlNHg>B}i1<k=&^H(qQqlyk@sw0K3Ub1458GY@N
zWi4iQaf{cjSk%0F-STD4>(=UzG$=Vi7q7xt;f~QO(k|q^PFd>4G)z;`%bM4&pslbe
zrmY?t1f9>MynNy66)M{Nt8ocF*(H}y?B9K(<G04=$LB{Zj?a&MCvJ1>JC4T4jR{ku
z@*_7ICnKxFODy{%H(Ec8+-SSYb}F*k(dcx9mqag)jgDAMtaqZ5qm#o=N4?|P6!nhz
z%T?`q&$ZgM$@QM#jN2TyIdUWTPe+`N+Z=IP-Xu)z{3rQ@{Hu=C|DqR1ZWMfhf0B#&
z&&(t6D>_-q5S1UD95qpYp<MD$a+O-ezGMEC-|{A5Dz$D!6Nv_j3ThwGE}~m{`*lh{
zpPZ{rM2m<9nSkyHXpZSYjWL%NDx)^(siohR7P)~oc`X`3^v7n}%MG*&X%BaxEAFCI
z-HRr<k9P9_dg39qlUDNxZDtqR<8k!_n&TPW+N9m>XI0}>+T3fjz&Fq+N6{R|&=c>`
zT0he5_7gP8DRjo?v_8>C->7fVi{ZWvD#q8K;(&ObvwVkCHjsyY&F6QiZ-^S>JD|n_
z<ABM0n*vPb`C`IpgwqKdf%U+(q`3~*1Y8en2DSiOf!)M?40s%P0(cVG3p_)*eT2^f
z&jHT^`+)<%i+p<tco}#FI0&BCdH)7*l;3X?eoEOt2fpRocxCVSP`Q98AO@`;OAX=(
z^L%eBkI$<Lfj&S5FaW6ZO;dw?_1HUItg3w_Y6Q<?d>>Hb52*16)bs;t`GK10+m1I0
zFE<Oft7YI`4&If(YM$5n2B~$x75u)6a0Bmt%JU7x-wyl|xC6KoxC^)&xSzasgZDAu
zao`EyNnkIq4|o=M4tO5e4;%mvk?wWEH-NWzew*+Zcs?SplfcL1`w8$V^*u%S8SpvJ
zU-0cT@D=b4@5<nND|~mtcPD&rh1ad{x?a^mr7^w})cypuKSAwJQ2P_`wH3a$!q-;#
z+6rG=;cF{=ZDs%RZS@ea6L=VS1b7tK1?(p6W5DCU6Tp+eUSJ>aEbtugJg^@)02~D0
zYovRf=Qn`2fln#p=fJmo!@Cte01JUWKm{-WsPr9GRlfJ2_q)*hUFiKT^nMq5zYD$J
zh2HO~d-#4Y@N3{c;1KWL0%ix>Kx~(G&_p|EBDec=J18XV1C;uz$n`#Qy$@PBpj8>P
zDuY&K_(`mzeKgTNnxI=5?V}0WmC-($)C}KT+DH>p)PNMNRkMAokfa86sc$Qi)PN*4
z(0-bbpavwT;d|TB4dlHY_$6=$a3^pVa5u1nGCc(B1Re$+0UiZ*0lO*7W5DCU6Tp+e
zUf>z>-ADK=@Eq_wupc-8yvVngfR}++0BL`(f$I=?z0UVHfTO&Bi{Eea{1Ih82?W~Y
z7d)Q^z5=9uUXFe(hvIE$*>bdOIZ{|d8|4lKVLb1%e7m6hE;LX%)ISRK+u-+6sDBjd
zFNXR@q5e^*e<Ret5$fLv^>0+;k(7GkPA2UXU@Gq}CY(k%op6Tl4s{89Z{&HV?;SXB
z6b`%t2lk+u%i+Q;aN!oTb2<8X2pW0_9N7g&Zb4HIL06Z<nOopY8!e%Yme58^Xrm>x
z(GuEd32n&VQ8;rH&K!j^N8t=-dw{!v9hBoCU?=b}@CfiIunX7?JO(@tJOMlj>;;}7
z|9ynd0?z@@1N(skz>9o)33wTJ1vp6lukrp6dA&~f25^-3Z}IzWo<E}OCxMTt$0xw2
z(EAkOXTaw?f5ErYz*oRGy!#e>Xj7iTeLF(9wHa=;!>!G5YX@A)gF`#u%-wKg7aVDa
zBkgdc9d6tQ7uw+fCpKtlCY9Tva=V|(<xsgC3b#YyazBOJq3{kUyaNjFfWkYV@D3=v
z0}Aheio2lVE~vN*D(-@cyP)DOsJII%wnN2ssMrn_+o57RRBVTW?NG2C3bsSRb|}~m
z1>2$64k)$@YPCbHcBs@2mD-_FdkB>_hfrxVRBDGx?NF)RPo*8KM92CLBC98m(-X+)
z31svHGI|1PboL|T;X|M=xdfS;>3aoDa0D5A1=%|YRSrUlgUHxH<md!)bOJd#fgGJc
zj!qy)Cy=8P)bhvn87HV=pwAGE`T?~(NG%Uin}gKmAhkKjNYc*e(FH^SF}{uPcq2Tk
zgI9I5h!%L&0-svoQyuiFLyGE<qK(j}4k@ZbiZ((MNgqQ?j|1v_$Klv<ICdP49fxDb
z;n;CFb{vi!hx*6Cuz{2t7;VN-ia6j?;Bz1m`W-@=4k1l4;*inCA?kk!E+2x+hv4!d
zxO@mM%Lw8STs{Ps55eU_aQP5iK1AIa5dm)l`N;B~VCmv{&IiW$PLj(>aydyZC&}d`
zGPnmB+=C46K?e6AgL{y{J;>l5N^p`AoTLONDZxofaFP<7qy#4^!AVMRk`kPx1ScuM
zN#tw~r8r3`PEv}K!5V+dduFe`_mP|Tk(>9CoA;5M_q(*BKnuEo_uGMA0(Ss+0(Sv-
z13y;s50NGy^>6Vkk{=Ik#?hw7L6dQMo;(DtSIwMy1mU&3yAId{Tn}spwg6j!`-yXq
z@EGB@gt1^c0+ru}n{R{h2pErm;RqOxfZ+%jj)36^7><D92&s=imAB#g+h91tSlf=i
z2uEAH2qP(B6k!Zs;(&PG=L41Km%+5Ep|px>Mnl6G3y$D-4e^_RWu#dRYyhq${&m16
z;Cf&)um#u(+)vtrgvSW~1djKB_koW|_X+SRd7dKt4EUVqZwS97zKeFhl(xH+w!4(J
zyOg%Ol(w~$wzZVDwUoBCl(w~$bqYIuz6*!~VtrRr?zxOOH&gD#lzA@NKs3P-%Dfhg
zSA+3t%Fb#WEn^*U1;4K%+`zk^@_aw(jsYL>d=mJW_n!c#fX{$0cy}833iyWKag<;`
zCD>01_LEz?ct#_~c5>WLPW#DeKRN9um;L0jAB_9KxF3xB!MGnR`)QGO-%haXgeUD_
z+DScbq#o_m;YR4*4(5~etcSpS5*`TlonYSy#+_i?3C5jZ+zG~=VBE>tg`Js3xNi>B
z%tmu$!{x<Ls0mIlhSPHx4{T;UuvzysGJenJU0@7vj>gP!d>u6%L%OlRIG~<!{bbTj
z0jBc%V!~;J(+Ot~w~=tB?_TJzlM-*B#P_1@vY~zx)NexTWux^f(0Ub&12)5fCbVA#
z+AkXpG$B!Qkf=FG)Ep#g4iYs7iJF5%&H3JO{|@qg2-pcc3_Jon3hV-QgZDAuao`Ey
zNnkJV4EgUPd=_{Pcplgf8~|SA+e^U9z$?H(@_!9n=3Jo(t<%IfV6%U|(1gS^Au&y8
z@N6`AHqyNq4W5k#&qlfzBRNe-P7{*Tgf`Dc(&x}O$I>38ulM*4L;b^OtHWrk!)U9+
zQ2jVmKMvK8L+RsC`8X8*E7W}-s=g0J4?xiaQ1AehI{<YKqsb1V$qu8*4x`Bqqsb1V
z$qqw-<51u@6gUnAjzfXtP~bSVKThqBQ~Tr8{y4QiPVJ9V%fo20<J9svH9U+aJ5CJ`
zP{RY%<N!4}Kur!Xcend8k=#tAHj~=4QIjLo<Onr6LQRfPlOt%91|+&6q-8cxiw(%g
zL29xAY0jiJZPca>sm`QEZAf+|wUV*l5o&dWS{<QQN2t{iYITHK9nr1z5aC;Z*=pM;
zVH+(XlNOOli^!x!WK!ZbO58??+h`q`tUB0z6KNesDfvW7K9SbZM$2fUWyr|*sK3Ow
z=r%Z%QdYyYVd$q3jN+CNe>JcHxR$ur0h@s9fz7}cU@LGxX$}$|Bm5I--vizUJ|^8K
zz^CMQitsbwb6v8DNX1dsIl`GS#!${!zQhs6^IPU;`Gno)XoHcWAwV@UHG;6t_bQUJ
z6Uo_$<m^Opb|N`Dq3=ZKI}zGWgsxKZdP-hT$?GY3JteQF<n@%i9-5zjzIQ+Q>>!Va
zfStg@z$3t;z%F1nc|8U^4m<%o3G4;-0nY-@0nY>bfdjxn@_UVRGH-mH-){gie|($p
z7<qj}Sx*9=LWj?RFL*u;d<A?<+ClKL9zNE?$9gDslog31Q0qM?^&V3A9x_^iB)*3v
zO5e7D8SN3Iu?^ln0bl39(>A1W50c1?1su!4u@YF#^IH1db-)$;zKU=I?|#bj4dB`i
z{1UhWxD&VwxEr_!{PzOC2JQpyCyztCe+xLq^GBpV349E$Pk>XvXTTS{I}LmVe8X>9
zTXeCuzN*XGBe!LFFP>QB6tS2E>HLkQIP|_l7E)EA`FGipMa`<j{JUn|sx_*@{7YKF
zFMlPJHBT$+lVe!zHh(*LlZoRor>tAcnss2c+K4mai4(#4{!&)OTlI?dhpbk&%PO}n
ojk(g9PAtLVP?*9aY%s*7<Rso2%z!#`i6rN%^xB=2U++o$Z-}lNRR910

diff --git a/graphics/fonts/OFL.txt b/graphics/fonts/OFL.txt
deleted file mode 100644
index dfca0da4bc..0000000000
--- a/graphics/fonts/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 256b7ab578..7bbdee95dd 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -31,6 +31,9 @@ pub trait Text {
     /// [`ICON_FONT`]: Self::ICON_FONT
     const ARROW_DOWN_ICON: char;
 
+    /// Returns the default [`Font`].
+    fn default_font(&self) -> Font;
+
     /// Returns the default size of text.
     fn default_size(&self) -> f32;
 
diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs
index cc8f299c4a..f6eb2fdd00 100644
--- a/graphics/src/layer.rs
+++ b/graphics/src/layer.rs
@@ -63,7 +63,7 @@ impl<'a> Layer<'a> {
                 ),
                 color: Color::new(0.9, 0.9, 0.9, 1.0),
                 size: 20.0,
-                font: Font::Default,
+                font: Font::Monospace,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
             };
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 34b6eb1d3e..7ad53dec35 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -130,6 +130,10 @@ where
     const CHECKMARK_ICON: char = B::CHECKMARK_ICON;
     const ARROW_DOWN_ICON: char = B::ARROW_DOWN_ICON;
 
+    fn default_font(&self) -> Self::Font {
+        self.backend().default_font()
+    }
+
     fn default_size(&self) -> f32 {
         self.backend().default_size()
     }
diff --git a/graphics/src/widget/canvas/text.rs b/graphics/src/widget/canvas/text.rs
index 056f8204c7..8c0b2dfb31 100644
--- a/graphics/src/widget/canvas/text.rs
+++ b/graphics/src/widget/canvas/text.rs
@@ -34,7 +34,7 @@ impl Default for Text {
             position: Point::ORIGIN,
             color: Color::BLACK,
             size: 16.0,
-            font: Font::Default,
+            font: Font::SansSerif,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
         }
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 50f741efd0..9c3a8a442c 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -31,7 +31,7 @@ where
     width: f32,
     padding: Padding,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -58,7 +58,7 @@ where
             width: 0.0,
             padding: Padding::ZERO,
             text_size: None,
-            font: Default::default(),
+            font: None,
             style: Default::default(),
         }
     }
@@ -82,8 +82,8 @@ where
     }
 
     /// Sets the font of the [`Menu`].
-    pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
         self
     }
 
@@ -311,7 +311,7 @@ where
     last_selection: &'a mut Option<T>,
     padding: Padding,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -491,7 +491,7 @@ where
                     ..bounds
                 },
                 size: text_size,
-                font: self.font.clone(),
+                font: self.font.unwrap_or_else(|| renderer.default_font()),
                 color: if is_selected {
                     appearance.selected_text_color
                 } else {
diff --git a/native/src/renderer/null.rs b/native/src/renderer/null.rs
index 9376d5408f..50d7d6d627 100644
--- a/native/src/renderer/null.rs
+++ b/native/src/renderer/null.rs
@@ -40,12 +40,16 @@ impl Renderer for Null {
 impl text::Renderer for Null {
     type Font = Font;
 
-    const ICON_FONT: Font = Font::Default;
+    const ICON_FONT: Font = Font::SansSerif;
     const CHECKMARK_ICON: char = '0';
     const ARROW_DOWN_ICON: char = '0';
 
+    fn default_font(&self) -> Self::Font {
+        Font::SansSerif
+    }
+
     fn default_size(&self) -> f32 {
-        20.0
+        16.0
     }
 
     fn measure(
diff --git a/native/src/text.rs b/native/src/text.rs
index 55c3cfd3cf..b7915a5563 100644
--- a/native/src/text.rs
+++ b/native/src/text.rs
@@ -57,7 +57,7 @@ impl Hit {
 /// A renderer capable of measuring and drawing [`Text`].
 pub trait Renderer: crate::Renderer {
     /// The font type used.
-    type Font: Default + Clone;
+    type Font: Copy;
 
     /// The icon font of the backend.
     const ICON_FONT: Self::Font;
@@ -72,6 +72,9 @@ pub trait Renderer: crate::Renderer {
     /// [`ICON_FONT`]: Self::ICON_FONT
     const ARROW_DOWN_ICON: char;
 
+    /// Returns the default [`Font`].
+    fn default_font(&self) -> Self::Font;
+
     /// Returns the default size of [`Text`].
     fn default_size(&self) -> f32;
 
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 9b69e574f0..138c458cf8 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -55,7 +55,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     icon: Icon<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -91,7 +91,7 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING,
             text_size: None,
-            font: Renderer::Font::default(),
+            font: None,
             icon: Icon {
                 font: Renderer::ICON_FONT,
                 code_point: Renderer::CHECKMARK_ICON,
@@ -128,8 +128,8 @@ where
     /// Sets the [`Font`] of the text of the [`Checkbox`].
     ///
     /// [`Font`]: crate::text::Renderer::Font
-    pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
         self
     }
 
@@ -175,7 +175,7 @@ where
             .push(Row::new().width(self.size).height(self.size))
             .push(
                 Text::new(&self.label)
-                    .font(self.font.clone())
+                    .font(self.font.unwrap_or_else(|| renderer.default_font()))
                     .width(self.width)
                     .size(
                         self.text_size
@@ -288,6 +288,7 @@ where
 
         {
             let label_layout = children.next().unwrap();
+            let font = self.font.unwrap_or_else(|| renderer.default_font());
 
             widget::text::draw(
                 renderer,
@@ -295,7 +296,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
-                self.font.clone(),
+                font,
                 widget::text::Appearance {
                     color: custom_style.text_color,
                 },
diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs
index a128d1ae96..c1ff000449 100644
--- a/native/src/widget/pick_list.rs
+++ b/native/src/widget/pick_list.rs
@@ -35,7 +35,7 @@ where
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     handle: Handle<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -70,7 +70,7 @@ where
             width: Length::Shrink,
             padding: Self::DEFAULT_PADDING,
             text_size: None,
-            font: Default::default(),
+            font: None,
             handle: Default::default(),
             style: Default::default(),
         }
@@ -101,8 +101,8 @@ where
     }
 
     /// Sets the font of the [`PickList`].
-    pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
         self
     }
 
@@ -163,7 +163,7 @@ where
             self.width,
             self.padding,
             self.text_size,
-            &self.font,
+            self.font.unwrap_or_else(|| renderer.default_font()),
             self.placeholder.as_deref(),
             &self.options,
         )
@@ -212,6 +212,7 @@ where
         cursor_position: Point,
         _viewport: &Rectangle,
     ) {
+        let font = self.font.unwrap_or_else(|| renderer.default_font());
         draw(
             renderer,
             theme,
@@ -219,7 +220,7 @@ where
             cursor_position,
             self.padding,
             self.text_size,
-            &self.font,
+            font,
             self.placeholder.as_deref(),
             self.selected.as_ref(),
             &self.handle,
@@ -232,7 +233,7 @@ where
         &'b mut self,
         tree: &'b mut Tree,
         layout: Layout<'_>,
-        _renderer: &Renderer,
+        renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
         let state = tree.state.downcast_mut::<State<T>>();
 
@@ -241,7 +242,7 @@ where
             state,
             self.padding,
             self.text_size,
-            self.font.clone(),
+            self.font.unwrap_or_else(|| renderer.default_font()),
             &self.options,
             self.style.clone(),
         )
@@ -343,7 +344,7 @@ pub fn layout<Renderer, T>(
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
-    font: &Renderer::Font,
+    font: Renderer::Font,
     placeholder: Option<&str>,
     options: &[T],
 ) -> layout::Node
@@ -362,7 +363,7 @@ where
                 let (width, _) = renderer.measure(
                     label,
                     text_size,
-                    font.clone(),
+                    font,
                     Size::new(f32::INFINITY, f32::INFINITY),
                 );
 
@@ -560,7 +561,7 @@ pub fn draw<'a, T, Renderer>(
     cursor_position: Point,
     padding: Padding,
     text_size: Option<f32>,
-    font: &Renderer::Font,
+    font: Renderer::Font,
     placeholder: Option<&str>,
     selected: Option<&T>,
     handle: &Handle<Renderer::Font>,
@@ -637,7 +638,7 @@ pub fn draw<'a, T, Renderer>(
         renderer.fill_text(Text {
             content: label,
             size: text_size,
-            font: font.clone(),
+            font,
             color: if is_selected {
                 style.text_color
             } else {
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index 9daddfbc75..bd803910c9 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -53,7 +53,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -95,7 +95,7 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING, //15
             text_size: None,
-            font: Default::default(),
+            font: None,
             style: Default::default(),
         }
     }
@@ -125,8 +125,8 @@ where
     }
 
     /// Sets the text font of the [`Radio`] button.
-    pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
         self
     }
 
@@ -268,6 +268,7 @@ where
 
         {
             let label_layout = children.next().unwrap();
+            let font = self.font.unwrap_or(renderer.default_font());
 
             widget::text::draw(
                 renderer,
@@ -275,7 +276,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
-                self.font.clone(),
+                font,
                 widget::text::Appearance {
                     color: custom_style.text_color,
                 },
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index 3fee48f25b..235a027e07 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -37,7 +37,7 @@ where
     height: Length,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -51,7 +51,7 @@ where
         Text {
             content: content.into(),
             size: None,
-            font: Default::default(),
+            font: None,
             width: Length::Shrink,
             height: Length::Shrink,
             horizontal_alignment: alignment::Horizontal::Left,
@@ -70,7 +70,7 @@ where
     ///
     /// [`Font`]: crate::text::Renderer::Font
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
-        self.font = font.into();
+        self.font = Some(font.into());
         self
     }
 
@@ -138,8 +138,12 @@ where
 
         let bounds = limits.max();
 
-        let (width, height) =
-            renderer.measure(&self.content, size, self.font.clone(), bounds);
+        let (width, height) = renderer.measure(
+            &self.content,
+            size,
+            self.font.unwrap_or_else(|| renderer.default_font()),
+            bounds,
+        );
 
         let size = limits.resolve(Size::new(width, height));
 
@@ -156,13 +160,15 @@ where
         _cursor_position: Point,
         _viewport: &Rectangle,
     ) {
+        let font = self.font.unwrap_or_else(|| renderer.default_font());
+
         draw(
             renderer,
             style,
             layout,
             &self.content,
             self.size,
-            self.font.clone(),
+            font,
             theme.appearance(self.style),
             self.horizontal_alignment,
             self.vertical_alignment,
@@ -242,7 +248,7 @@ where
             height: self.height,
             horizontal_alignment: self.horizontal_alignment,
             vertical_alignment: self.vertical_alignment,
-            font: self.font.clone(),
+            font: self.font,
             style: self.style,
         }
     }
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 5e198b8f96..e6b70db24c 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -61,7 +61,7 @@ where
     placeholder: String,
     value: Value,
     is_secure: bool,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     width: Length,
     padding: Padding,
     size: Option<f32>,
@@ -92,7 +92,7 @@ where
             placeholder: String::from(placeholder),
             value: Value::new(value),
             is_secure: false,
-            font: Default::default(),
+            font: None,
             width: Length::Fill,
             padding: Padding::new(5.0),
             size: None,
@@ -129,7 +129,7 @@ where
     ///
     /// [`Font`]: text::Renderer::Font
     pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+        self.font = Some(font);
         self
     }
     /// Sets the width of the [`TextInput`].
@@ -179,6 +179,8 @@ where
         cursor_position: Point,
         value: Option<&Value>,
     ) {
+        let font = self.font.unwrap_or(renderer.default_font());
+
         draw(
             renderer,
             theme,
@@ -188,7 +190,7 @@ where
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
-            &self.font,
+            font,
             self.is_secure,
             &self.style,
         )
@@ -258,7 +260,7 @@ where
             shell,
             &mut self.value,
             self.size,
-            &self.font,
+            self.font.unwrap_or(renderer.default_font()),
             self.is_secure,
             self.on_change.as_ref(),
             self.on_paste.as_deref(),
@@ -277,6 +279,8 @@ where
         cursor_position: Point,
         _viewport: &Rectangle,
     ) {
+        let font = self.font.unwrap_or(renderer.default_font());
+
         draw(
             renderer,
             theme,
@@ -286,7 +290,7 @@ where
             &self.value,
             &self.placeholder,
             self.size,
-            &self.font,
+            font,
             self.is_secure,
             &self.style,
         )
@@ -410,7 +414,7 @@ pub fn update<'a, Message, Renderer>(
     shell: &mut Shell<'_, Message>,
     value: &mut Value,
     size: Option<f32>,
-    font: &Renderer::Font,
+    font: Renderer::Font,
     is_secure: bool,
     on_change: &dyn Fn(String) -> Message,
     on_paste: Option<&dyn Fn(String) -> Message>,
@@ -459,7 +463,7 @@ where
                             find_cursor_position(
                                 renderer,
                                 text_layout.bounds(),
-                                font.clone(),
+                                font,
                                 size,
                                 &value,
                                 state,
@@ -487,7 +491,7 @@ where
                             let position = find_cursor_position(
                                 renderer,
                                 text_layout.bounds(),
-                                font.clone(),
+                                font,
                                 size,
                                 value,
                                 state,
@@ -536,7 +540,7 @@ where
                 let position = find_cursor_position(
                     renderer,
                     text_layout.bounds(),
-                    font.clone(),
+                    font,
                     size,
                     &value,
                     state,
@@ -816,7 +820,7 @@ pub fn draw<Renderer>(
     value: &Value,
     placeholder: &str,
     size: Option<f32>,
-    font: &Renderer::Font,
+    font: Renderer::Font,
     is_secure: bool,
     style: &<Renderer::Theme as StyleSheet>::Style,
 ) where
@@ -862,7 +866,7 @@ pub fn draw<Renderer>(
                         value,
                         size,
                         position,
-                        font.clone(),
+                        font,
                     );
 
                 let is_cursor_visible = ((focus.now - focus.updated_at)
@@ -903,7 +907,7 @@ pub fn draw<Renderer>(
                         value,
                         size,
                         left,
-                        font.clone(),
+                        font,
                     );
 
                 let (right_position, right_offset) =
@@ -913,7 +917,7 @@ pub fn draw<Renderer>(
                         value,
                         size,
                         right,
-                        font.clone(),
+                        font,
                     );
 
                 let width = right_position - left_position;
@@ -948,7 +952,7 @@ pub fn draw<Renderer>(
     let text_width = renderer.measure_width(
         if text.is_empty() { placeholder } else { &text },
         size,
-        font.clone(),
+        font,
     );
 
     let render = |renderer: &mut Renderer| {
@@ -963,7 +967,7 @@ pub fn draw<Renderer>(
             } else {
                 theme.value_color(style)
             },
-            font: font.clone(),
+            font: font,
             bounds: Rectangle {
                 y: text_bounds.center_y(),
                 width: f32::INFINITY,
@@ -1195,8 +1199,7 @@ where
 {
     let size = size.unwrap_or_else(|| renderer.default_size());
 
-    let offset =
-        offset(renderer, text_bounds, font.clone(), size, value, state);
+    let offset = offset(renderer, text_bounds, font, size, value, state);
 
     renderer
         .hit_test(
diff --git a/native/src/widget/toggler.rs b/native/src/widget/toggler.rs
index a434af65ea..495406db69 100644
--- a/native/src/widget/toggler.rs
+++ b/native/src/widget/toggler.rs
@@ -42,7 +42,7 @@ where
     text_size: Option<f32>,
     text_alignment: alignment::Horizontal,
     spacing: f32,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -79,7 +79,7 @@ where
             text_size: None,
             text_alignment: alignment::Horizontal::Left,
             spacing: 0.0,
-            font: Renderer::Font::default(),
+            font: None,
             style: Default::default(),
         }
     }
@@ -117,8 +117,8 @@ where
     /// Sets the [`Font`] of the text of the [`Toggler`]
     ///
     /// [`Font`]: crate::text::Renderer::Font
-    pub fn font(mut self, font: Renderer::Font) -> Self {
-        self.font = font;
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
         self
     }
 
@@ -160,7 +160,7 @@ where
             row = row.push(
                 Text::new(label)
                     .horizontal_alignment(self.text_alignment)
-                    .font(self.font.clone())
+                    .font(self.font.unwrap_or_else(|| renderer.default_font()))
                     .width(self.width)
                     .size(
                         self.text_size
@@ -236,6 +236,7 @@ where
 
         if let Some(label) = &self.label {
             let label_layout = children.next().unwrap();
+            let font = self.font.unwrap_or_else(|| renderer.default_font());
 
             crate::widget::text::draw(
                 renderer,
@@ -243,7 +244,7 @@ where
                 label_layout,
                 label,
                 self.text_size,
-                self.font.clone(),
+                font,
                 Default::default(),
                 self.text_alignment,
                 alignment::Vertical::Center,
diff --git a/src/application.rs b/src/application.rs
index 1db5c93fda..9a1c185597 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -197,7 +197,6 @@ pub trait Application: Sized {
         let renderer_settings = crate::renderer::Settings {
             default_font: settings.default_font,
             default_text_size: settings.default_text_size,
-            text_multithreading: settings.text_multithreading,
             antialiasing: if settings.antialiasing {
                 Some(crate::renderer::settings::Antialiasing::MSAAx4)
             } else {
diff --git a/src/settings.rs b/src/settings.rs
index 266ad40453..ce07b0ddad 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,5 +1,6 @@
 //! Configure your application.
 use crate::window;
+use crate::Font;
 
 /// The settings of an application.
 #[derive(Debug, Clone)]
@@ -20,23 +21,16 @@ pub struct Settings<Flags> {
     /// [`Application`]: crate::Application
     pub flags: Flags,
 
-    /// The bytes of the font that will be used by default.
+    /// The default [`Font`] to be used.
     ///
-    /// If `None` is provided, a default system font will be chosen.
-    // TODO: Add `name` for web compatibility
-    pub default_font: Option<&'static [u8]>,
+    /// By default, it uses [`Font::SansSerif`].
+    pub default_font: Font,
 
     /// The text size that will be used by default.
     ///
     /// The default value is `16.0`.
     pub default_text_size: f32,
 
-    /// If enabled, spread text workload in multiple threads when multiple cores
-    /// are available.
-    ///
-    /// By default, it is disabled.
-    pub text_multithreading: bool,
-
     /// If set to true, the renderer will try to perform antialiasing for some
     /// primitives.
     ///
@@ -79,7 +73,6 @@ impl<Flags> Settings<Flags> {
             window: default_settings.window,
             default_font: default_settings.default_font,
             default_text_size: default_settings.default_text_size,
-            text_multithreading: default_settings.text_multithreading,
             antialiasing: default_settings.antialiasing,
             exit_on_close_request: default_settings.exit_on_close_request,
             try_opengles_first: default_settings.try_opengles_first,
@@ -96,9 +89,8 @@ where
             id: None,
             window: Default::default(),
             flags: Default::default(),
-            default_font: Default::default(),
+            default_font: Font::SansSerif,
             default_text_size: 16.0,
-            text_multithreading: false,
             antialiasing: false,
             exit_on_close_request: true,
             try_opengles_first: false,
diff --git a/graphics/fonts/Icons.ttf b/wgpu/fonts/Iced-Icons.ttf
similarity index 62%
rename from graphics/fonts/Icons.ttf
rename to wgpu/fonts/Iced-Icons.ttf
index 5e455b6988de00cc4a4e928aec96a27f555669a3..7112f08621071c423bf130f2906de1f878b6acbe 100644
GIT binary patch
delta 1197
zcmah|T}YEr7=F%owpp8~<p>F*FR&)aY%MLb9}3n&!+uOw5m{sVoTl41<}8C?cTrtc
z-&F-&1cFqA;EhBVL3CS01Xj=w5omPbg@Ik!bG{wz=cbMKywCe{p7Xx%Ip26_K2(AL
zP{YLo#N$0(x9=YM4%AN5TYn(7KaLRUXiw2L4<Fkc-D4hk2#71R6RB)6zYzX1Nqe5s
znL1xIeQy@YRNbcX`|_FWwHwz@0&*`9$Y+wndHQR}H$lB3Gjy@kcVPC#C2mO5@wDGc
zrq|t>K25Sp+S~f+@coo0Xvb(b^k<8sffFDWpJ)e%>{JqsILrOaL1i{Mn#Us?WW1lY
znM-D^`H`2mcxD5OIGVSIi?idgBP?K)@wR-S&B}k>*YpIaQWaf>ng(UZ?(w-Z)w_OR
zy_}&3@1A~3DE&#^ze*+Kn6uVX-%idkcZ-TG{k*Qni#0l8z(+jHa5L7qNkXo2dPGmD
z%uTv3z}QK$8Pyu3mU>MPqes<M&pT?Q_E8HMGnlJfTm;IxPF64Ie5MGW+XfM}!9~fR
zKgH(+jn9)46$=5U)>yTnj`z&J>|Q*lWI0)lS7kqNw#hCTgK#d(!4j|<AC}K+#gN7V
zeoSd>paQQome?pl8hhXuDUH1di1O4`Uw$#J{eCnV0gVHwHO{CRcvi9wRhjH{4S^u;
z>41SMJkwaB6Yn+lAjt8SH}g(JPGcYaH#PPnAtp5rV3V=kk-k9zr`OxcMmvy#g)~eT
z*~qE8>_}N@vm<5ah`SliV1zSBqCnHij0`0S;!w#&R~MLJks``R5TS0@bpH~UBP|Fs
zQ%NbpWh=StTrqAJGL{)_j+pH{dg*)`E#YW58i_LPzqKY<MS%?rxV4$s;?{$NRTv(y
zbLN)j$ZwJ`>4GUYQFk0JckI0K9p`wSdz-k1DjJ<RZ_w$gXgKBN-SA}!L&z0r`$8_9
n9w-?0Abo-_wc5Q;^<mfWrKuO`p(ri1lo39@eXO$n`s#iGu$IQh

delta 1098
zcmZ8fPe>F|82`PQb=`KXQ8!e&IE1F+-vmpll}gDDD~YbA5ZSP<yQ{l9!|s~eq4gwE
z9jt-qQimY$&>@H}(ZOp6JrzNRIt5Y}4+;^%_ItatA-?5%-|x@&zBli^-EY}!$wL6p
zu?iLT@c6`4<6-kXDt{T_8{^%*1IFk+AV$e2BPr9~SoyR=zR6gN+|3!@&jk-qxk2BU
zvty|Tk2j{t-vF8&GqX1JYVvhvUo5#YHyqsQ2h<+&t$5VT&o-<#v{Bfja4t@zGN?`f
zo>uavcq+H-*NET=ajHsM5fiPrLq0|BOPR|yUTZJNsliB_sp$6e`Udh<K-spfY%cWY
z>2-d<DE;$xCTjn<(*6Mm802dZlT3c}U;xU{wNMx*l4dTAQ{b73L*C9|ERu<s2_IGI
z2zt^LR0O<bRh@PoiSRAb3Wmz)V6af!E-nM6sLBQ%%>JV8Db{#dC7|qLuc}Z0%9)k2
zeQ5)Q#Os*KcgI$mx~u4ccTyVkc8O%j{(E#~fO>I1IP?05{2=GOzK|~+0bdS&y`0f6
z9Y9ly3%_ptl-GiCR(F+Wq`qPoX>gr7R+#6^`a*%T>~wgj(ors!DvE}DHCd&i&aGDR
zJWw676uUIrU0sWB|C{wuD>at)+gDzON(5c3QXg`$hdAWo3TOzs*h_uJ#eTFS=3))`
z0G`Nq@Eqet^LXWAfoh?<SiuR==wg+6r;9zrK^Iq`PK>zNOFiOZKPE-i#Tw3tkAs%I
zl1aqkIiq#3&FJlM?$<Q;&ROYPG?}!<qOrxKnJLq9o{VO)2`g=!?dmB@&hbFIV+Kw-
zYR!Cb4i?hLA&Mk_7RHETSR^))!BO`JckJ4F{iyb?_NH?o(BdowPB*GT5vt(L&RR?9
a&e=ppu@>Y*2?+i@b*Eo9-d<LJYySYqb+zLF

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9bf464b3af..874edb967b 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -27,6 +27,7 @@ pub struct Backend {
     #[cfg(any(feature = "image", feature = "svg"))]
     image_pipeline: image::Pipeline,
 
+    default_font: Font,
     default_text_size: f32,
 }
 
@@ -38,14 +39,7 @@ impl Backend {
         settings: Settings,
         format: wgpu::TextureFormat,
     ) -> Self {
-        let text_pipeline = text::Pipeline::new(
-            device,
-            queue,
-            format,
-            settings.default_font,
-            settings.text_multithreading,
-        );
-
+        let text_pipeline = text::Pipeline::new(device, queue, format);
         let quad_pipeline = quad::Pipeline::new(device, format);
         let triangle_pipeline =
             triangle::Pipeline::new(device, format, settings.antialiasing);
@@ -61,6 +55,7 @@ impl Backend {
             #[cfg(any(feature = "image", feature = "svg"))]
             image_pipeline,
 
+            default_font: settings.default_font,
             default_text_size: settings.default_text_size,
         }
     }
@@ -199,9 +194,13 @@ impl iced_graphics::Backend for Backend {
 }
 
 impl backend::Text for Backend {
-    const ICON_FONT: Font = Font::Default; // TODO
-    const CHECKMARK_ICON: char = '✓';
-    const ARROW_DOWN_ICON: char = '▼';
+    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const CHECKMARK_ICON: char = '\u{e800}';
+    const ARROW_DOWN_ICON: char = '\u{f00c}';
+
+    fn default_font(&self) -> Font {
+        self.default_font
+    }
 
     fn default_size(&self) -> f32 {
         self.default_text_size
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 1a2936814c..6d6d3fd637 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -47,7 +47,9 @@ mod quad;
 mod text;
 mod triangle;
 
-pub use iced_graphics::{Antialiasing, Color, Error, Primitive, Viewport};
+pub use iced_graphics::{
+    Antialiasing, Color, Error, Font, Primitive, Viewport,
+};
 pub use iced_native::Theme;
 pub use wgpu;
 
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index 5ef794997f..bd9cf473f5 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -1,12 +1,12 @@
 //! Configure a renderer.
-use std::fmt;
-
 pub use crate::Antialiasing;
 
+use crate::Font;
+
 /// The settings of a [`Backend`].
 ///
 /// [`Backend`]: crate::Backend
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Settings {
     /// The present mode of the [`Backend`].
     ///
@@ -16,42 +16,20 @@ pub struct Settings {
     /// The internal graphics backend to use.
     pub internal_backend: wgpu::Backends,
 
-    /// The bytes of the font that will be used by default.
-    ///
-    /// If `None` is provided, a default system font will be chosen.
-    pub default_font: Option<&'static [u8]>,
+    /// The default [`Font`] to use.
+    pub default_font: Font,
 
     /// The default size of text.
     ///
     /// By default, it will be set to `16.0`.
     pub default_text_size: f32,
 
-    /// If enabled, spread text workload in multiple threads when multiple cores
-    /// are available.
-    ///
-    /// By default, it is disabled.
-    pub text_multithreading: bool,
-
     /// The antialiasing strategy that will be used for triangle primitives.
     ///
     /// By default, it is `None`.
     pub antialiasing: Option<Antialiasing>,
 }
 
-impl fmt::Debug for Settings {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Settings")
-            .field("present_mode", &self.present_mode)
-            .field("internal_backend", &self.internal_backend)
-            // Instead of printing the font bytes, we simply show a `bool` indicating if using a default font or not.
-            .field("default_font", &self.default_font.is_some())
-            .field("default_text_size", &self.default_text_size)
-            .field("text_multithreading", &self.text_multithreading)
-            .field("antialiasing", &self.antialiasing)
-            .finish()
-    }
-}
-
 impl Settings {
     /// Creates new [`Settings`] using environment configuration.
     ///
@@ -81,9 +59,8 @@ impl Default for Settings {
         Settings {
             present_mode: wgpu::PresentMode::AutoVsync,
             internal_backend: wgpu::Backends::all(),
-            default_font: None,
-            default_text_size: 20.0,
-            text_multithreading: false,
+            default_font: Font::SansSerif,
+            default_text_size: 16.0,
             antialiasing: None,
         }
     }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index fa7fd5dfea..083d9d2b42 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -112,8 +112,6 @@ impl Pipeline {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         format: wgpu::TextureFormat,
-        _default_font: Option<&[u8]>,
-        _multithreading: bool,
     ) -> Self {
         Pipeline {
             renderers: Vec::new(),
@@ -316,7 +314,11 @@ impl Pipeline {
 
 fn to_family(font: Font) -> glyphon::Family<'static> {
     match font {
-        Font::Default => glyphon::Family::SansSerif,
-        Font::External { name, .. } => glyphon::Family::Name(name),
+        Font::Name(name) => glyphon::Family::Name(name),
+        Font::SansSerif => glyphon::Family::SansSerif,
+        Font::Serif => glyphon::Family::Serif,
+        Font::Cursive => glyphon::Family::Cursive,
+        Font::Fantasy => glyphon::Family::Fantasy,
+        Font::Monospace => glyphon::Family::Monospace,
     }
 }

From 238154af4ac8dda7f12dd90aa7be106e933bcb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 11:12:15 +0100
Subject: [PATCH 015/163] Implement `font::load` command in `iced_native`

---
 examples/todos/src/main.rs   |  15 +-
 graphics/src/backend.rs      |   5 +
 graphics/src/renderer.rs     |   5 +
 native/src/command/action.rs |  16 ++
 native/src/font.rs           |  19 ++
 native/src/lib.rs            |   6 +-
 native/src/program.rs        |   3 +-
 native/src/renderer/null.rs  |   4 +
 native/src/text.rs           |   7 +-
 src/lib.rs                   |   6 +-
 wgpu/Cargo.toml              |   1 +
 wgpu/src/backend.rs          |   6 +
 wgpu/src/text.rs             | 470 ++++++++++++++++++++---------------
 winit/src/application.rs     |  10 +
 14 files changed, 358 insertions(+), 215 deletions(-)
 create mode 100644 native/src/font.rs

diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 5509cf0e3a..5df4e968e7 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -1,5 +1,6 @@
 use iced::alignment::{self, Alignment};
 use iced::event::{self, Event};
+use iced::font::{self, Font};
 use iced::keyboard;
 use iced::subscription;
 use iced::theme::{self, Theme};
@@ -9,7 +10,7 @@ use iced::widget::{
 };
 use iced::window;
 use iced::{Application, Element};
-use iced::{Color, Command, Font, Length, Settings, Subscription};
+use iced::{Color, Command, Length, Settings, Subscription};
 
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
@@ -44,6 +45,7 @@ struct State {
 #[derive(Debug, Clone)]
 enum Message {
     Loaded(Result<SavedState, LoadError>),
+    FontLoaded(Result<(), font::Error>),
     Saved(Result<(), SaveError>),
     InputChanged(String),
     CreateTask,
@@ -61,7 +63,11 @@ impl Application for Todos {
     fn new(_flags: ()) -> (Todos, Command<Message>) {
         (
             Todos::Loading,
-            Command::perform(SavedState::load(), Message::Loaded),
+            Command::batch(vec![
+                font::load(include_bytes!("../fonts/icons.ttf").as_slice())
+                    .map(Message::FontLoaded),
+                Command::perform(SavedState::load(), Message::Loaded),
+            ]),
         )
     }
 
@@ -384,7 +390,7 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
     let tasks_left = tasks.iter().filter(|task| !task.completed).count();
 
     let filter_button = |label, filter, current_filter| {
-        let label = text(label).size(16);
+        let label = text(label);
 
         let button = button(label).style(if filter == current_filter {
             theme::Button::Primary
@@ -401,8 +407,7 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
             tasks_left,
             if tasks_left == 1 { "task" } else { "tasks" }
         ))
-        .width(Length::Fill)
-        .size(16),
+        .width(Length::Fill),
         row![
             filter_button("All", Filter::All, current_filter),
             filter_button("Active", Filter::Active, current_filter),
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 7bbdee95dd..8658cffe82 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -4,6 +4,8 @@ use iced_native::svg;
 use iced_native::text;
 use iced_native::{Font, Point, Size};
 
+use std::borrow::Cow;
+
 /// The graphics backend of a [`Renderer`].
 ///
 /// [`Renderer`]: crate::Renderer
@@ -64,6 +66,9 @@ pub trait Text {
         point: Point,
         nearest_only: bool,
     ) -> Option<text::Hit>;
+
+    /// Loads a [`Font`] from its bytes.
+    fn load_font(&mut self, font: Cow<'static, [u8]>);
 }
 
 /// A graphics backend that supports image rendering.
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 7ad53dec35..b052c09421 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -10,6 +10,7 @@ use iced_native::{Background, Color, Element, Font, Point, Rectangle, Size};
 
 pub use iced_native::renderer::Style;
 
+use std::borrow::Cow;
 use std::marker::PhantomData;
 
 /// A backend-agnostic renderer that supports all the built-in widgets.
@@ -167,6 +168,10 @@ where
         )
     }
 
+    fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
+        self.backend.load_font(bytes);
+    }
+
     fn fill_text(&mut self, text: Text<'_, Self::Font>) {
         self.primitives.push(Primitive::Text {
             content: text.content.to_string(),
diff --git a/native/src/command/action.rs b/native/src/command/action.rs
index a51b8c2186..d1589c05fb 100644
--- a/native/src/command/action.rs
+++ b/native/src/command/action.rs
@@ -1,10 +1,12 @@
 use crate::clipboard;
+use crate::font;
 use crate::system;
 use crate::widget;
 use crate::window;
 
 use iced_futures::MaybeSend;
 
+use std::borrow::Cow;
 use std::fmt;
 
 /// An action that a [`Command`] can perform.
@@ -27,6 +29,15 @@ pub enum Action<T> {
 
     /// Run a widget action.
     Widget(widget::Action<T>),
+
+    /// Load a font from its bytes.
+    LoadFont {
+        /// The bytes of the font to load.
+        bytes: Cow<'static, [u8]>,
+
+        /// The message to produce when the font has been loaded.
+        tagger: Box<dyn Fn(Result<(), font::Error>) -> T>,
+    },
 }
 
 impl<T> Action<T> {
@@ -49,6 +60,10 @@ impl<T> Action<T> {
             Self::Window(window) => Action::Window(window.map(f)),
             Self::System(system) => Action::System(system.map(f)),
             Self::Widget(widget) => Action::Widget(widget.map(f)),
+            Self::LoadFont { bytes, tagger } => Action::LoadFont {
+                bytes,
+                tagger: Box::new(move |result| f(tagger(result))),
+            },
         }
     }
 }
@@ -63,6 +78,7 @@ impl<T> fmt::Debug for Action<T> {
             Self::Window(action) => write!(f, "Action::Window({action:?})"),
             Self::System(action) => write!(f, "Action::System({action:?})"),
             Self::Widget(_action) => write!(f, "Action::Widget"),
+            Self::LoadFont { .. } => write!(f, "Action::LoadFont"),
         }
     }
 }
diff --git a/native/src/font.rs b/native/src/font.rs
new file mode 100644
index 0000000000..6840a25f7d
--- /dev/null
+++ b/native/src/font.rs
@@ -0,0 +1,19 @@
+//! Load and use fonts.
+pub use iced_core::Font;
+
+use crate::command::{self, Command};
+use std::borrow::Cow;
+
+/// An error while loading a font.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Error {}
+
+/// Load a font from its bytes.
+pub fn load(
+    bytes: impl Into<Cow<'static, [u8]>>,
+) -> Command<Result<(), Error>> {
+    Command::single(command::Action::LoadFont {
+        bytes: bytes.into(),
+        tagger: Box::new(std::convert::identity),
+    })
+}
diff --git a/native/src/lib.rs b/native/src/lib.rs
index ebdc849021..27b6fc0dc4 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -47,6 +47,7 @@
 pub mod clipboard;
 pub mod command;
 pub mod event;
+pub mod font;
 pub mod image;
 pub mod keyboard;
 pub mod layout;
@@ -80,8 +81,8 @@ mod debug;
 pub use iced_core::alignment;
 pub use iced_core::time;
 pub use iced_core::{
-    color, Alignment, Background, Color, ContentFit, Font, Length, Padding,
-    Pixels, Point, Rectangle, Size, Vector,
+    color, Alignment, Background, Color, ContentFit, Length, Padding, Pixels,
+    Point, Rectangle, Size, Vector,
 };
 pub use iced_futures::{executor, futures};
 pub use iced_style::application;
@@ -95,6 +96,7 @@ pub use command::Command;
 pub use debug::Debug;
 pub use element::Element;
 pub use event::Event;
+pub use font::Font;
 pub use hasher::Hasher;
 pub use layout::Layout;
 pub use overlay::Overlay;
diff --git a/native/src/program.rs b/native/src/program.rs
index c71c237fc1..25cab3329e 100644
--- a/native/src/program.rs
+++ b/native/src/program.rs
@@ -1,4 +1,5 @@
 //! Build interactive programs using The Elm Architecture.
+use crate::text;
 use crate::{Command, Element, Renderer};
 
 mod state;
@@ -8,7 +9,7 @@ pub use state::State;
 /// The core of a user interface application following The Elm Architecture.
 pub trait Program: Sized {
     /// The graphics backend to use to draw the [`Program`].
-    type Renderer: Renderer;
+    type Renderer: Renderer + text::Renderer;
 
     /// The type of __messages__ your [`Program`] will produce.
     type Message: std::fmt::Debug + Send;
diff --git a/native/src/renderer/null.rs b/native/src/renderer/null.rs
index 50d7d6d627..150ee7864c 100644
--- a/native/src/renderer/null.rs
+++ b/native/src/renderer/null.rs
@@ -2,6 +2,8 @@ use crate::renderer::{self, Renderer};
 use crate::text::{self, Text};
 use crate::{Background, Font, Point, Rectangle, Size, Theme, Vector};
 
+use std::borrow::Cow;
+
 /// A renderer that does nothing.
 ///
 /// It can be useful if you are writing tests!
@@ -52,6 +54,8 @@ impl text::Renderer for Null {
         16.0
     }
 
+    fn load_font(&mut self, _font: Cow<'static, [u8]>) {}
+
     fn measure(
         &self,
         _content: &str,
diff --git a/native/src/text.rs b/native/src/text.rs
index b7915a5563..1bbd36ccf1 100644
--- a/native/src/text.rs
+++ b/native/src/text.rs
@@ -2,6 +2,8 @@
 use crate::alignment;
 use crate::{Color, Point, Rectangle, Size, Vector};
 
+use std::borrow::Cow;
+
 /// A paragraph.
 #[derive(Debug, Clone, Copy)]
 pub struct Text<'a, Font> {
@@ -72,7 +74,7 @@ pub trait Renderer: crate::Renderer {
     /// [`ICON_FONT`]: Self::ICON_FONT
     const ARROW_DOWN_ICON: char;
 
-    /// Returns the default [`Font`].
+    /// Returns the default [`Self::Font`].
     fn default_font(&self) -> Self::Font;
 
     /// Returns the default size of [`Text`].
@@ -112,6 +114,9 @@ pub trait Renderer: crate::Renderer {
         nearest_only: bool,
     ) -> Option<Hit>;
 
+    /// Loads a [`Self::Font`] from its bytes.
+    fn load_font(&mut self, font: Cow<'static, [u8]>);
+
     /// Draws the given [`Text`].
     fn fill_text(&mut self, text: Text<'_, Self::Font>);
 }
diff --git a/src/lib.rs b/src/lib.rs
index 318852f903..17c5ab9760 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -196,6 +196,7 @@ use iced_glow as renderer;
 
 pub use iced_native::theme;
 pub use runtime::event;
+pub use runtime::font;
 pub use runtime::subscription;
 
 pub use application::Application;
@@ -203,6 +204,7 @@ pub use element::Element;
 pub use error::Error;
 pub use event::Event;
 pub use executor::Executor;
+pub use font::Font;
 pub use renderer::Renderer;
 pub use result::Result;
 pub use sandbox::Sandbox;
@@ -213,8 +215,8 @@ pub use theme::Theme;
 pub use runtime::alignment;
 pub use runtime::futures;
 pub use runtime::{
-    color, Alignment, Background, Color, Command, ContentFit, Font, Length,
-    Padding, Point, Rectangle, Size, Vector,
+    color, Alignment, Background, Color, Command, ContentFit, Length, Padding,
+    Point, Rectangle, Size, Vector,
 };
 
 #[cfg(feature = "system")]
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 1a94c6a35f..dffbbab072 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -36,6 +36,7 @@ bitflags = "1.2"
 once_cell = "1.0"
 rustc-hash = "1.1"
 twox-hash = "1.6"
+ouroboros = "0.15"
 
 [dependencies.bytemuck]
 version = "1.9"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 874edb967b..5a275c8af3 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -14,6 +14,8 @@ use tracing::info_span;
 #[cfg(any(feature = "image", feature = "svg"))]
 use crate::image;
 
+use std::borrow::Cow;
+
 /// A [`wgpu`] graphics backend for [`iced`].
 ///
 /// [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
@@ -234,6 +236,10 @@ impl backend::Text for Backend {
             nearest_only,
         )
     }
+
+    fn load_font(&mut self, font: Cow<'static, [u8]>) {
+        self.text_pipeline.load_font(font);
+    }
 }
 
 #[cfg(feature = "image")]
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 083d9d2b42..cdfcd576d0 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -5,108 +5,37 @@ use iced_native::alignment;
 use iced_native::{Color, Font, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
+use std::borrow::Cow;
 use std::cell::RefCell;
 use std::hash::{BuildHasher, Hash, Hasher};
+use std::sync::Arc;
 use twox_hash::RandomXxHashBuilder64;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
+    system: Option<System>,
     renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
-    cache: glyphon::SwashCache<'static>,
-    measurement_cache: RefCell<Cache>,
-    render_cache: Cache,
     layer: usize,
 }
 
-struct Cache {
-    entries: FxHashMap<KeyHash, glyphon::Buffer<'static>>,
-    recently_used: FxHashSet<KeyHash>,
-    hasher: RandomXxHashBuilder64,
-}
-
-impl Cache {
-    fn new() -> Self {
-        Self {
-            entries: FxHashMap::default(),
-            recently_used: FxHashSet::default(),
-            hasher: RandomXxHashBuilder64::default(),
-        }
-    }
-
-    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer<'static>> {
-        self.entries.get(key)
-    }
-
-    fn allocate(
-        &mut self,
-        key: Key<'_>,
-    ) -> (KeyHash, &mut glyphon::Buffer<'static>) {
-        let hash = {
-            let mut hasher = self.hasher.build_hasher();
-
-            key.content.hash(&mut hasher);
-            (key.size as i32).hash(&mut hasher);
-            key.font.hash(&mut hasher);
-            (key.bounds.width as i32).hash(&mut hasher);
-            (key.bounds.height as i32).hash(&mut hasher);
-            key.color.into_rgba8().hash(&mut hasher);
-
-            hasher.finish()
-        };
+#[ouroboros::self_referencing]
+struct System {
+    fonts: glyphon::FontSystem,
 
-        if !self.entries.contains_key(&hash) {
-            let metrics =
-                glyphon::Metrics::new(key.size as i32, (key.size * 1.2) as i32);
+    #[borrows(fonts)]
+    #[not_covariant]
+    cache: glyphon::SwashCache<'this>,
 
-            let mut buffer = glyphon::Buffer::new(&FONT_SYSTEM, metrics);
+    #[borrows(fonts)]
+    #[not_covariant]
+    measurement_cache: RefCell<Cache<'this>>,
 
-            buffer.set_size(key.bounds.width as i32, key.bounds.height as i32);
-            buffer.set_text(
-                key.content,
-                glyphon::Attrs::new().family(to_family(key.font)).color({
-                    let [r, g, b, a] = key.color.into_linear();
-
-                    glyphon::Color::rgba(
-                        (r * 255.0) as u8,
-                        (g * 255.0) as u8,
-                        (b * 255.0) as u8,
-                        (a * 255.0) as u8,
-                    )
-                }),
-            );
-
-            let _ = self.entries.insert(hash, buffer);
-        }
-
-        let _ = self.recently_used.insert(hash);
-
-        (hash, self.entries.get_mut(&hash).unwrap())
-    }
-
-    fn trim(&mut self) {
-        self.entries
-            .retain(|key, _| self.recently_used.contains(key));
-
-        self.recently_used.clear();
-    }
+    #[borrows(fonts)]
+    #[not_covariant]
+    render_cache: Cache<'this>,
 }
 
-#[derive(Debug, Clone, Copy)]
-struct Key<'a> {
-    content: &'a str,
-    size: f32,
-    font: Font,
-    bounds: Size,
-    color: Color,
-}
-
-type KeyHash = u64;
-
-// TODO: Share with `iced_graphics`
-static FONT_SYSTEM: once_cell::sync::Lazy<glyphon::FontSystem> =
-    once_cell::sync::Lazy::new(glyphon::FontSystem::new);
-
 impl Pipeline {
     pub fn new(
         device: &wgpu::Device,
@@ -114,15 +43,41 @@ impl Pipeline {
         format: wgpu::TextureFormat,
     ) -> Self {
         Pipeline {
+            system: Some(
+                SystemBuilder {
+                    fonts: glyphon::FontSystem::new(),
+                    cache_builder: |fonts| glyphon::SwashCache::new(fonts),
+                    measurement_cache_builder: |_| RefCell::new(Cache::new()),
+                    render_cache_builder: |_| Cache::new(),
+                }
+                .build(),
+            ),
             renderers: Vec::new(),
             atlas: glyphon::TextAtlas::new(device, queue, format),
-            cache: glyphon::SwashCache::new(&FONT_SYSTEM),
-            measurement_cache: RefCell::new(Cache::new()),
-            render_cache: Cache::new(),
             layer: 0,
         }
     }
 
+    pub fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
+        let heads = self.system.take().unwrap().into_heads();
+
+        let (locale, mut db) = heads.fonts.into_locale_and_db();
+
+        db.load_font_source(glyphon::fontdb::Source::Binary(Arc::new(
+            bytes.to_owned(),
+        )));
+
+        self.system = Some(
+            SystemBuilder {
+                fonts: glyphon::FontSystem::new_with_locale_and_db(locale, db),
+                cache_builder: |fonts| glyphon::SwashCache::new(fonts),
+                measurement_cache_builder: |_| RefCell::new(Cache::new()),
+                render_cache_builder: |_| Cache::new(),
+            }
+            .build(),
+        );
+    }
+
     pub fn prepare(
         &mut self,
         device: &wgpu::Device,
@@ -132,93 +87,100 @@ impl Pipeline {
         scale_factor: f32,
         target_size: Size<u32>,
     ) {
-        if self.renderers.len() <= self.layer {
-            self.renderers
-                .push(glyphon::TextRenderer::new(device, queue));
-        }
-
-        let renderer = &mut self.renderers[self.layer];
-
-        let keys: Vec<_> = sections
-            .iter()
-            .map(|section| {
-                let (key, _) = self.render_cache.allocate(Key {
-                    content: section.content,
-                    size: section.size * scale_factor,
-                    font: section.font,
-                    bounds: Size {
-                        width: section.bounds.width * scale_factor,
-                        height: section.bounds.height * scale_factor,
+        self.system.as_mut().unwrap().with_mut(|fields| {
+            if self.renderers.len() <= self.layer {
+                self.renderers
+                    .push(glyphon::TextRenderer::new(device, queue));
+            }
+
+            let renderer = &mut self.renderers[self.layer];
+
+            let keys: Vec<_> = sections
+                .iter()
+                .map(|section| {
+                    let (key, _) = fields.render_cache.allocate(
+                        fields.fonts,
+                        Key {
+                            content: section.content,
+                            size: section.size * scale_factor,
+                            font: section.font,
+                            bounds: Size {
+                                width: section.bounds.width * scale_factor,
+                                height: section.bounds.height * scale_factor,
+                            },
+                            color: section.color,
+                        },
+                    );
+
+                    key
+                })
+                .collect();
+
+            let bounds = glyphon::TextBounds {
+                left: (bounds.x * scale_factor) as i32,
+                top: (bounds.y * scale_factor) as i32,
+                right: ((bounds.x + bounds.width) * scale_factor) as i32,
+                bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
+            };
+
+            let text_areas: Vec<_> = sections
+                .iter()
+                .zip(keys.iter())
+                .map(|(section, key)| {
+                    let buffer = fields
+                        .render_cache
+                        .get(key)
+                        .expect("Get cached buffer");
+
+                    let x = section.bounds.x * scale_factor;
+                    let y = section.bounds.y * scale_factor;
+
+                    let (total_lines, max_width) = buffer
+                        .layout_runs()
+                        .enumerate()
+                        .fold((0, 0.0), |(_, max), (i, buffer)| {
+                            (i + 1, buffer.line_w.max(max))
+                        });
+
+                    let total_height =
+                        total_lines as f32 * section.size * 1.2 * scale_factor;
+
+                    let left = match section.horizontal_alignment {
+                        alignment::Horizontal::Left => x,
+                        alignment::Horizontal::Center => x - max_width / 2.0,
+                        alignment::Horizontal::Right => x - max_width,
+                    };
+
+                    let top = match section.vertical_alignment {
+                        alignment::Vertical::Top => y,
+                        alignment::Vertical::Center => y - total_height / 2.0,
+                        alignment::Vertical::Bottom => y - total_height,
+                    };
+
+                    glyphon::TextArea {
+                        buffer,
+                        left: left as i32,
+                        top: top as i32,
+                        bounds,
+                    }
+                })
+                .collect();
+
+            renderer
+                .prepare(
+                    device,
+                    queue,
+                    &mut self.atlas,
+                    glyphon::Resolution {
+                        width: target_size.width,
+                        height: target_size.height,
                     },
-                    color: section.color,
-                });
-
-                key
-            })
-            .collect();
-
-        let bounds = glyphon::TextBounds {
-            left: (bounds.x * scale_factor) as i32,
-            top: (bounds.y * scale_factor) as i32,
-            right: ((bounds.x + bounds.width) * scale_factor) as i32,
-            bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
-        };
-
-        let text_areas: Vec<_> = sections
-            .iter()
-            .zip(keys.iter())
-            .map(|(section, key)| {
-                let buffer =
-                    self.render_cache.get(key).expect("Get cached buffer");
-
-                let x = section.bounds.x * scale_factor;
-                let y = section.bounds.y * scale_factor;
-
-                let (total_lines, max_width) = buffer
-                    .layout_runs()
-                    .enumerate()
-                    .fold((0, 0.0), |(_, max), (i, buffer)| {
-                        (i + 1, buffer.line_w.max(max))
-                    });
-
-                let total_height =
-                    total_lines as f32 * section.size * 1.2 * scale_factor;
-
-                let left = match section.horizontal_alignment {
-                    alignment::Horizontal::Left => x,
-                    alignment::Horizontal::Center => x - max_width / 2.0,
-                    alignment::Horizontal::Right => x - max_width,
-                };
-
-                let top = match section.vertical_alignment {
-                    alignment::Vertical::Top => y,
-                    alignment::Vertical::Center => y - total_height / 2.0,
-                    alignment::Vertical::Bottom => y - total_height,
-                };
-
-                glyphon::TextArea {
-                    buffer,
-                    left: left as i32,
-                    top: top as i32,
-                    bounds,
-                }
-            })
-            .collect();
-
-        renderer
-            .prepare(
-                device,
-                queue,
-                &mut self.atlas,
-                glyphon::Resolution {
-                    width: target_size.width,
-                    height: target_size.height,
-                },
-                &text_areas,
-                glyphon::Color::rgb(0, 0, 0),
-                &mut self.cache,
-            )
-            .expect("Prepare text sections");
+                    &text_areas,
+                    glyphon::Color::rgb(0, 0, 0),
+                    fields.cache,
+                )
+                .expect("Prepare text sections");
+        });
     }
 
     pub fn render(
@@ -251,7 +213,10 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.renderers.truncate(self.layer);
-        self.render_cache.trim();
+        self.system
+            .as_mut()
+            .unwrap()
+            .with_render_cache_mut(|cache| cache.trim());
 
         self.layer = 0;
     }
@@ -263,24 +228,29 @@ impl Pipeline {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
-
-        let (_, paragraph) = measurement_cache.allocate(Key {
-            content,
-            size: size,
-            font,
-            bounds,
-            color: Color::BLACK,
-        });
+        self.system.as_ref().unwrap().with(|fields| {
+            let mut measurement_cache = fields.measurement_cache.borrow_mut();
+
+            let (_, paragraph) = measurement_cache.allocate(
+                fields.fonts,
+                Key {
+                    content,
+                    size: size,
+                    font,
+                    bounds,
+                    color: Color::BLACK,
+                },
+            );
 
-        let (total_lines, max_width) = paragraph
-            .layout_runs()
-            .enumerate()
-            .fold((0, 0.0), |(_, max), (i, buffer)| {
-                (i + 1, buffer.line_w.max(max))
-            });
+            let (total_lines, max_width) = paragraph
+                .layout_runs()
+                .enumerate()
+                .fold((0, 0.0), |(_, max), (i, buffer)| {
+                    (i + 1, buffer.line_w.max(max))
+                });
 
-        (max_width, size * 1.2 * total_lines as f32)
+            (max_width, size * 1.2 * total_lines as f32)
+        })
     }
 
     pub fn hit_test(
@@ -292,23 +262,31 @@ impl Pipeline {
         point: iced_native::Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
-
-        let (_, paragraph) = measurement_cache.allocate(Key {
-            content,
-            size: size,
-            font,
-            bounds,
-            color: Color::BLACK,
-        });
+        self.system.as_ref().unwrap().with(|fields| {
+            let mut measurement_cache = fields.measurement_cache.borrow_mut();
+
+            let (_, paragraph) = measurement_cache.allocate(
+                fields.fonts,
+                Key {
+                    content,
+                    size: size,
+                    font,
+                    bounds,
+                    color: Color::BLACK,
+                },
+            );
 
-        let cursor = paragraph.hit(point.x as i32, point.y as i32)?;
+            let cursor = paragraph.hit(point.x as i32, point.y as i32)?;
 
-        Some(Hit::CharOffset(cursor.index))
+            Some(Hit::CharOffset(cursor.index))
+        })
     }
 
     pub fn trim_measurement_cache(&mut self) {
-        self.measurement_cache.borrow_mut().trim();
+        self.system
+            .as_mut()
+            .unwrap()
+            .with_measurement_cache_mut(|cache| cache.borrow_mut().trim());
     }
 }
 
@@ -322,3 +300,87 @@ fn to_family(font: Font) -> glyphon::Family<'static> {
         Font::Monospace => glyphon::Family::Monospace,
     }
 }
+
+struct Cache<'a> {
+    entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
+    recently_used: FxHashSet<KeyHash>,
+    hasher: RandomXxHashBuilder64,
+}
+
+impl<'a> Cache<'a> {
+    fn new() -> Self {
+        Self {
+            entries: FxHashMap::default(),
+            recently_used: FxHashSet::default(),
+            hasher: RandomXxHashBuilder64::default(),
+        }
+    }
+
+    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer<'a>> {
+        self.entries.get(key)
+    }
+
+    fn allocate(
+        &mut self,
+        fonts: &'a glyphon::FontSystem,
+        key: Key<'_>,
+    ) -> (KeyHash, &mut glyphon::Buffer<'a>) {
+        let hash = {
+            let mut hasher = self.hasher.build_hasher();
+
+            key.content.hash(&mut hasher);
+            (key.size as i32).hash(&mut hasher);
+            key.font.hash(&mut hasher);
+            (key.bounds.width as i32).hash(&mut hasher);
+            (key.bounds.height as i32).hash(&mut hasher);
+            key.color.into_rgba8().hash(&mut hasher);
+
+            hasher.finish()
+        };
+
+        if !self.entries.contains_key(&hash) {
+            let metrics =
+                glyphon::Metrics::new(key.size as i32, (key.size * 1.2) as i32);
+            let mut buffer = glyphon::Buffer::new(&fonts, metrics);
+
+            buffer.set_size(key.bounds.width as i32, key.bounds.height as i32);
+            buffer.set_text(
+                key.content,
+                glyphon::Attrs::new().family(to_family(key.font)).color({
+                    let [r, g, b, a] = key.color.into_linear();
+
+                    glyphon::Color::rgba(
+                        (r * 255.0) as u8,
+                        (g * 255.0) as u8,
+                        (b * 255.0) as u8,
+                        (a * 255.0) as u8,
+                    )
+                }),
+            );
+
+            let _ = self.entries.insert(hash, buffer);
+        }
+
+        let _ = self.recently_used.insert(hash);
+
+        (hash, self.entries.get_mut(&hash).unwrap())
+    }
+
+    fn trim(&mut self) {
+        self.entries
+            .retain(|key, _| self.recently_used.contains(key));
+
+        self.recently_used.clear();
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct Key<'a> {
+    content: &'a str,
+    size: f32,
+    font: Font,
+    bounds: Size,
+    color: Color,
+}
+
+type KeyHash = u64;
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 9781a453eb..889becad7b 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -851,6 +851,16 @@ pub fn run_command<A, E>(
                 current_cache = user_interface.into_cache();
                 *cache = current_cache;
             }
+            command::Action::LoadFont { bytes, tagger } => {
+                use crate::text::Renderer;
+
+                // TODO: Error handling (?)
+                renderer.load_font(bytes);
+
+                proxy
+                    .send_event(tagger(Ok(())))
+                    .expect("Send message to event loop");
+            }
         }
     }
 }

From 5a82fc654e2933c4c93dac5393685861feb07b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 11:21:35 +0100
Subject: [PATCH 016/163] Use floating coordinates directly in `text::Pipeline`

---
 wgpu/Cargo.toml  |  3 ++-
 wgpu/src/text.rs | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index dffbbab072..280ce29ba7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -52,7 +52,8 @@ path = "../graphics"
 
 [dependencies.glyphon]
 version = "0.2"
-path = "../../glyphon"
+git = "https://github.com/hecrj/glyphon.git"
+rev = "bffca9b958af11d1bfd0c0d1a281fc8799cc5a5b"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index cdfcd576d0..2ca3f0d812 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -276,7 +276,7 @@ impl Pipeline {
                 },
             );
 
-            let cursor = paragraph.hit(point.x as i32, point.y as i32)?;
+            let cursor = paragraph.hit(point.x, point.y)?;
 
             Some(Hit::CharOffset(cursor.index))
         })
@@ -329,21 +329,20 @@ impl<'a> Cache<'a> {
             let mut hasher = self.hasher.build_hasher();
 
             key.content.hash(&mut hasher);
-            (key.size as i32).hash(&mut hasher);
+            key.size.to_bits().hash(&mut hasher);
             key.font.hash(&mut hasher);
-            (key.bounds.width as i32).hash(&mut hasher);
-            (key.bounds.height as i32).hash(&mut hasher);
+            key.bounds.width.to_bits().hash(&mut hasher);
+            key.bounds.height.to_bits().hash(&mut hasher);
             key.color.into_rgba8().hash(&mut hasher);
 
             hasher.finish()
         };
 
         if !self.entries.contains_key(&hash) {
-            let metrics =
-                glyphon::Metrics::new(key.size as i32, (key.size * 1.2) as i32);
+            let metrics = glyphon::Metrics::new(key.size, key.size * 1.2);
             let mut buffer = glyphon::Buffer::new(&fonts, metrics);
 
-            buffer.set_size(key.bounds.width as i32, key.bounds.height as i32);
+            buffer.set_size(key.bounds.width, key.bounds.height);
             buffer.set_text(
                 key.content,
                 glyphon::Attrs::new().family(to_family(key.font)).color({

From d2825360a75600bb6b4097737c987e2d9e05da6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 11:35:12 +0100
Subject: [PATCH 017/163] Load `Iced-Icons.ttf` font in `text::Pipeline::new`

---
 wgpu/Cargo.toml     | 2 +-
 wgpu/src/backend.rs | 4 ++--
 wgpu/src/text.rs    | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 280ce29ba7..1ab3d93ff4 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -53,7 +53,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "bffca9b958af11d1bfd0c0d1a281fc8799cc5a5b"
+rev = "4b5e5106f05332dc324bae2095468845a61f36b9"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 5a275c8af3..f19959bd96 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -197,8 +197,8 @@ impl iced_graphics::Backend for Backend {
 
 impl backend::Text for Backend {
     const ICON_FONT: Font = Font::Name("Iced-Icons");
-    const CHECKMARK_ICON: char = '\u{e800}';
-    const ARROW_DOWN_ICON: char = '\u{f00c}';
+    const CHECKMARK_ICON: char = '\u{f00c}';
+    const ARROW_DOWN_ICON: char = '\u{e800}';
 
     fn default_font(&self) -> Font {
         self.default_font
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 2ca3f0d812..4af57af3f4 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -45,7 +45,13 @@ impl Pipeline {
         Pipeline {
             system: Some(
                 SystemBuilder {
-                    fonts: glyphon::FontSystem::new(),
+                    fonts: glyphon::FontSystem::new_with_fonts(
+                        [glyphon::fontdb::Source::Binary(Arc::new(
+                            include_bytes!("../fonts/Iced-Icons.ttf")
+                                .as_slice(),
+                        ))]
+                        .into_iter(),
+                    ),
                     cache_builder: |fonts| glyphon::SwashCache::new(fonts),
                     measurement_cache_builder: |_| RefCell::new(Cache::new()),
                     render_cache_builder: |_| Cache::new(),

From 17470bf7d36ee164311020b9d8c79662ac49c166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 12:35:10 +0100
Subject: [PATCH 018/163] Fix `clippy` lints :tada:

---
 native/src/widget/text_input.rs |  2 +-
 wgpu/src/text.rs                | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index e6b70db24c..0656be62f4 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -967,7 +967,7 @@ pub fn draw<Renderer>(
             } else {
                 theme.value_color(style)
             },
-            font: font,
+            font,
             bounds: Rectangle {
                 y: text_bounds.center_y(),
                 width: f32::INFINITY,
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 4af57af3f4..967596f26b 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -7,6 +7,7 @@ use iced_native::{Color, Font, Rectangle, Size};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
 use std::cell::RefCell;
+use std::collections::hash_map;
 use std::hash::{BuildHasher, Hash, Hasher};
 use std::sync::Arc;
 use twox_hash::RandomXxHashBuilder64;
@@ -70,7 +71,7 @@ impl Pipeline {
         let (locale, mut db) = heads.fonts.into_locale_and_db();
 
         db.load_font_source(glyphon::fontdb::Source::Binary(Arc::new(
-            bytes.to_owned(),
+            bytes.into_owned(),
         )));
 
         self.system = Some(
@@ -241,7 +242,7 @@ impl Pipeline {
                 fields.fonts,
                 Key {
                     content,
-                    size: size,
+                    size,
                     font,
                     bounds,
                     color: Color::BLACK,
@@ -275,7 +276,7 @@ impl Pipeline {
                 fields.fonts,
                 Key {
                     content,
-                    size: size,
+                    size,
                     font,
                     bounds,
                     color: Color::BLACK,
@@ -344,9 +345,9 @@ impl<'a> Cache<'a> {
             hasher.finish()
         };
 
-        if !self.entries.contains_key(&hash) {
+        if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
             let metrics = glyphon::Metrics::new(key.size, key.size * 1.2);
-            let mut buffer = glyphon::Buffer::new(&fonts, metrics);
+            let mut buffer = glyphon::Buffer::new(fonts, metrics);
 
             buffer.set_size(key.bounds.width, key.bounds.height);
             buffer.set_text(
@@ -363,7 +364,7 @@ impl<'a> Cache<'a> {
                 }),
             );
 
-            let _ = self.entries.insert(hash, buffer);
+            let _ = entry.insert(buffer);
         }
 
         let _ = self.recently_used.insert(hash);

From da4182099db703d59006ca72de4cb4d54c9d7855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 12:42:02 +0100
Subject: [PATCH 019/163] Disable `std` feature for `twox-hash` to fix Wasm
 build

---
 wgpu/Cargo.toml  |  9 ++++++++-
 wgpu/src/text.rs | 11 ++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 1ab3d93ff4..0d9fb75b90 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -35,9 +35,16 @@ futures = "0.3"
 bitflags = "1.2"
 once_cell = "1.0"
 rustc-hash = "1.1"
-twox-hash = "1.6"
 ouroboros = "0.15"
 
+[dependencies.twox-hash]
+version = "1.6"
+default-features = false
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash]
+version = "1.6.1"
+features = ["std"]
+
 [dependencies.bytemuck]
 version = "1.9"
 features = ["derive"]
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 967596f26b..6c88acc338 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -10,7 +10,6 @@ use std::cell::RefCell;
 use std::collections::hash_map;
 use std::hash::{BuildHasher, Hash, Hasher};
 use std::sync::Arc;
-use twox_hash::RandomXxHashBuilder64;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
@@ -311,15 +310,21 @@ fn to_family(font: Font) -> glyphon::Family<'static> {
 struct Cache<'a> {
     entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
-    hasher: RandomXxHashBuilder64,
+    hasher: HashBuilder,
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+type HashBuilder = twox_hash::RandomXxHashBuilder64;
+
+#[cfg(target_arch = "wasm32")]
+type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
+
 impl<'a> Cache<'a> {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
-            hasher: RandomXxHashBuilder64::default(),
+            hasher: HashBuilder::default(),
         }
     }
 

From b4dd9b6d93479f28304ba23fec59816d6fcec564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 13:24:11 +0100
Subject: [PATCH 020/163] Update `glyphon` fork (sRGB support)

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 0d9fb75b90..da8cdf9faf 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -60,7 +60,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "4b5e5106f05332dc324bae2095468845a61f36b9"
+rev = "304dcaf8443bec7194891fdef3df468a6eaeb7d9"
 
 [dependencies.tracing]
 version = "0.1.6"

From de7fc637cf72eb14da17dac12510b41e8e3c4a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 14:44:42 +0100
Subject: [PATCH 021/163] Fix `test` workflow

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 38b8184234..390e7bf303 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,4 +38,4 @@ jobs:
     - name: Check compilation of `todos` example
       run: cargo build --package todos --target wasm32-unknown-unknown
     - name: Check compilation of `integration_wgpu` example
-      run: cargo build --package integration_wgpu --target wasm32-unknown-unknown
+      run: cargo build --package integration --target wasm32-unknown-unknown

From a2ab9e939502ff36fd51115d9828fcdcd7bc104d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 16:41:18 +0100
Subject: [PATCH 022/163] Use `Pixels` for `Text::size`

---
 native/src/overlay/menu.rs      |  3 ++-
 native/src/widget/checkbox.rs   |  3 +--
 native/src/widget/pick_list.rs  |  6 +++---
 native/src/widget/radio.rs      |  3 +--
 native/src/widget/text.rs       |  8 +++-----
 native/src/widget/text_input.rs | 18 ++++++++----------
 native/src/widget/toggler.rs    |  3 +--
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 9c3a8a442c..4ccccbf794 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -450,7 +450,8 @@ where
 
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
-        let option_height = (text_size + self.padding.vertical()) as usize;
+        let option_height =
+            (text_size + f32::from(self.padding.vertical())) as usize;
 
         let offset = viewport.y - bounds.y;
         let start = (offset / option_height as f32) as usize;
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 138c458cf8..0e21e9953a 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -288,7 +288,6 @@ where
 
         {
             let label_layout = children.next().unwrap();
-            let font = self.font.unwrap_or_else(|| renderer.default_font());
 
             widget::text::draw(
                 renderer,
@@ -296,7 +295,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
-                font,
+                self.font,
                 widget::text::Appearance {
                     color: custom_style.text_color,
                 },
diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs
index c1ff000449..b4cda7489e 100644
--- a/native/src/widget/pick_list.rs
+++ b/native/src/widget/pick_list.rs
@@ -163,7 +163,7 @@ where
             self.width,
             self.padding,
             self.text_size,
-            self.font.unwrap_or_else(|| renderer.default_font()),
+            self.font,
             self.placeholder.as_deref(),
             &self.options,
         )
@@ -344,7 +344,7 @@ pub fn layout<Renderer, T>(
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     placeholder: Option<&str>,
     options: &[T],
 ) -> layout::Node
@@ -363,7 +363,7 @@ where
                 let (width, _) = renderer.measure(
                     label,
                     text_size,
-                    font,
+                    font.unwrap_or_else(|| renderer.default_font()),
                     Size::new(f32::INFINITY, f32::INFINITY),
                 );
 
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index bd803910c9..5f60eaefad 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -268,7 +268,6 @@ where
 
         {
             let label_layout = children.next().unwrap();
-            let font = self.font.unwrap_or(renderer.default_font());
 
             widget::text::draw(
                 renderer,
@@ -276,7 +275,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
-                font,
+                self.font,
                 widget::text::Appearance {
                     color: custom_style.text_color,
                 },
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index 235a027e07..aede754a87 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -160,15 +160,13 @@ where
         _cursor_position: Point,
         _viewport: &Rectangle,
     ) {
-        let font = self.font.unwrap_or_else(|| renderer.default_font());
-
         draw(
             renderer,
             style,
             layout,
             &self.content,
             self.size,
-            font,
+            self.font,
             theme.appearance(self.style),
             self.horizontal_alignment,
             self.vertical_alignment,
@@ -192,7 +190,7 @@ pub fn draw<Renderer>(
     layout: Layout<'_>,
     content: &str,
     size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     appearance: Appearance,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
@@ -218,7 +216,7 @@ pub fn draw<Renderer>(
         size: size.unwrap_or_else(|| renderer.default_size()),
         bounds: Rectangle { x, y, ..bounds },
         color: appearance.color.unwrap_or(style.text_color),
-        font,
+        font: font.unwrap_or_else(|| renderer.default_font()),
         horizontal_alignment,
         vertical_alignment,
     });
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 0656be62f4..f71b45037e 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -179,8 +179,6 @@ where
         cursor_position: Point,
         value: Option<&Value>,
     ) {
-        let font = self.font.unwrap_or(renderer.default_font());
-
         draw(
             renderer,
             theme,
@@ -190,7 +188,7 @@ where
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
-            font,
+            self.font,
             self.is_secure,
             &self.style,
         )
@@ -260,7 +258,7 @@ where
             shell,
             &mut self.value,
             self.size,
-            self.font.unwrap_or(renderer.default_font()),
+            self.font,
             self.is_secure,
             self.on_change.as_ref(),
             self.on_paste.as_deref(),
@@ -279,8 +277,6 @@ where
         cursor_position: Point,
         _viewport: &Rectangle,
     ) {
-        let font = self.font.unwrap_or(renderer.default_font());
-
         draw(
             renderer,
             theme,
@@ -290,7 +286,7 @@ where
             &self.value,
             &self.placeholder,
             self.size,
-            font,
+            self.font,
             self.is_secure,
             &self.style,
         )
@@ -414,7 +410,7 @@ pub fn update<'a, Message, Renderer>(
     shell: &mut Shell<'_, Message>,
     value: &mut Value,
     size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     is_secure: bool,
     on_change: &dyn Fn(String) -> Message,
     on_paste: Option<&dyn Fn(String) -> Message>,
@@ -820,7 +816,7 @@ pub fn draw<Renderer>(
     value: &Value,
     placeholder: &str,
     size: Option<f32>,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     is_secure: bool,
     style: &<Renderer::Theme as StyleSheet>::Style,
 ) where
@@ -854,6 +850,7 @@ pub fn draw<Renderer>(
     );
 
     let text = value.to_string();
+    let font = font.unwrap_or_else(|| renderer.default_font());
     let size = size.unwrap_or_else(|| renderer.default_size());
 
     let (cursor, offset) = if let Some(focus) = &state.is_focused {
@@ -1188,7 +1185,7 @@ where
 fn find_cursor_position<Renderer>(
     renderer: &Renderer,
     text_bounds: Rectangle,
-    font: Renderer::Font,
+    font: Option<Renderer::Font>,
     size: Option<f32>,
     value: &Value,
     state: &State,
@@ -1197,6 +1194,7 @@ fn find_cursor_position<Renderer>(
 where
     Renderer: text::Renderer,
 {
+    let font = font.unwrap_or_else(|| renderer.default_font());
     let size = size.unwrap_or_else(|| renderer.default_size());
 
     let offset = offset(renderer, text_bounds, font, size, value, state);
diff --git a/native/src/widget/toggler.rs b/native/src/widget/toggler.rs
index 495406db69..d9c80ebe31 100644
--- a/native/src/widget/toggler.rs
+++ b/native/src/widget/toggler.rs
@@ -236,7 +236,6 @@ where
 
         if let Some(label) = &self.label {
             let label_layout = children.next().unwrap();
-            let font = self.font.unwrap_or_else(|| renderer.default_font());
 
             crate::widget::text::draw(
                 renderer,
@@ -244,7 +243,7 @@ where
                 label_layout,
                 label,
                 self.text_size,
-                font,
+                self.font,
                 Default::default(),
                 self.text_alignment,
                 alignment::Vertical::Center,

From eb3cd3a321db48a4a4555575f022e9a0ed85063b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:24:58 +0100
Subject: [PATCH 023/163] Fix `overlay::Menu` line height

---
 native/src/overlay/menu.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 4ccccbf794..0509f7bc7e 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -344,7 +344,7 @@ where
         let size = {
             let intrinsic = Size::new(
                 0.0,
-                (text_size + self.padding.vertical())
+                (text_size * 1.2 + self.padding.vertical())
                     * self.options.len() as f32,
             );
 
@@ -386,7 +386,7 @@ where
 
                     *self.hovered_option = Some(
                         ((cursor_position.y - bounds.y)
-                            / (text_size + self.padding.vertical()))
+                            / (text_size * 1.2 + self.padding.vertical()))
                             as usize,
                     );
                 }
@@ -401,7 +401,7 @@ where
 
                     *self.hovered_option = Some(
                         ((cursor_position.y - bounds.y)
-                            / (text_size + self.padding.vertical()))
+                            / (text_size * 1.2 + self.padding.vertical()))
                             as usize,
                     );
 
@@ -451,7 +451,7 @@ where
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
         let option_height =
-            (text_size + f32::from(self.padding.vertical())) as usize;
+            (text_size * 1.2 + f32::from(self.padding.vertical())) as usize;
 
         let offset = viewport.y - bounds.y;
         let start = (offset / option_height as f32) as usize;
@@ -468,7 +468,7 @@ where
                 x: bounds.x,
                 y: bounds.y + (option_height * i) as f32,
                 width: bounds.width,
-                height: text_size + self.padding.vertical(),
+                height: text_size * 1.2 + self.padding.vertical(),
             };
 
             if is_selected {

From 32309f0140efb4ea92e3e35e3adc5c740909f196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:26:09 +0100
Subject: [PATCH 024/163] Introduce `Weight` enum to `font`

---
 core/src/font.rs   | 16 ++++++++++++++++
 core/src/lib.rs    |  2 +-
 native/src/font.rs |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/src/font.rs b/core/src/font.rs
index 1f774a70ea..b67c08af15 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,3 +1,4 @@
+//! Load and use fonts.
 use std::hash::Hash;
 
 /// A font.
@@ -27,3 +28,18 @@ pub enum Font {
     /// fixed width.
     Monospace,
 }
+
+/// The weight of some text.
+#[allow(missing_docs)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Weight {
+    Thin,
+    ExtraLight,
+    Light,
+    Normal,
+    Medium,
+    Semibold,
+    Bold,
+    ExtraBold,
+    Black,
+}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d3596b4d04..d73148514c 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -25,6 +25,7 @@
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 pub mod alignment;
+pub mod font;
 pub mod keyboard;
 pub mod mouse;
 pub mod time;
@@ -32,7 +33,6 @@ pub mod time;
 mod background;
 mod color;
 mod content_fit;
-mod font;
 mod length;
 mod padding;
 mod pixels;
diff --git a/native/src/font.rs b/native/src/font.rs
index 6840a25f7d..1535969473 100644
--- a/native/src/font.rs
+++ b/native/src/font.rs
@@ -1,5 +1,5 @@
 //! Load and use fonts.
-pub use iced_core::Font;
+pub use iced_core::font::*;
 
 use crate::command::{self, Command};
 use std::borrow::Cow;

From 6cf4a10906e777645b6bf47faf0e7b8f3c36549e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:28:46 +0100
Subject: [PATCH 025/163] Stop reusing `SwashCache` in `text::Pipeline`

`SwashCache` can't be easily trimmed and it's not really getting us
anything since `glyphon` already caches using a glyph atlas anyways.
---
 wgpu/src/text.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 6c88acc338..59a840ca6b 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -23,10 +23,6 @@ pub struct Pipeline {
 struct System {
     fonts: glyphon::FontSystem,
 
-    #[borrows(fonts)]
-    #[not_covariant]
-    cache: glyphon::SwashCache<'this>,
-
     #[borrows(fonts)]
     #[not_covariant]
     measurement_cache: RefCell<Cache<'this>>,
@@ -52,7 +48,6 @@ impl Pipeline {
                         ))]
                         .into_iter(),
                     ),
-                    cache_builder: |fonts| glyphon::SwashCache::new(fonts),
                     measurement_cache_builder: |_| RefCell::new(Cache::new()),
                     render_cache_builder: |_| Cache::new(),
                 }
@@ -76,7 +71,6 @@ impl Pipeline {
         self.system = Some(
             SystemBuilder {
                 fonts: glyphon::FontSystem::new_with_locale_and_db(locale, db),
-                cache_builder: |fonts| glyphon::SwashCache::new(fonts),
                 measurement_cache_builder: |_| RefCell::new(Cache::new()),
                 render_cache_builder: |_| Cache::new(),
             }
@@ -183,7 +177,7 @@ impl Pipeline {
                     },
                     &text_areas,
                     glyphon::Color::rgb(0, 0, 0),
-                    fields.cache,
+                    &mut glyphon::SwashCache::new(fields.fonts),
                 )
                 .expect("Prepare text sections");
         });

From f37b87fbabf09296ad7fea695baded25020d5fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:30:11 +0100
Subject: [PATCH 026/163] Avoid allocating `text_areas` in `text::Pipeline`

---
 wgpu/Cargo.toml  |  2 +-
 wgpu/src/text.rs | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index da8cdf9faf..b3fbfc00e7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -60,7 +60,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "304dcaf8443bec7194891fdef3df468a6eaeb7d9"
+rev = "3c2acb9dea5b9fcb0fa650b3c73b3a3242c62f4a"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 59a840ca6b..e8c3e38547 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -123,10 +123,8 @@ impl Pipeline {
                 bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
             };
 
-            let text_areas: Vec<_> = sections
-                .iter()
-                .zip(keys.iter())
-                .map(|(section, key)| {
+            let text_areas =
+                sections.iter().zip(keys.iter()).map(|(section, key)| {
                     let buffer = fields
                         .render_cache
                         .get(key)
@@ -163,8 +161,7 @@ impl Pipeline {
                         top: top as i32,
                         bounds,
                     }
-                })
-                .collect();
+                });
 
             renderer
                 .prepare(
@@ -175,7 +172,7 @@ impl Pipeline {
                         width: target_size.width,
                         height: target_size.height,
                     },
-                    &text_areas,
+                    text_areas,
                     glyphon::Color::rgb(0, 0, 0),
                     &mut glyphon::SwashCache::new(fields.fonts),
                 )

From 15d257a52a994f0110d775eb49ca7e6100b0e1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:30:32 +0100
Subject: [PATCH 027/163] Stop truncating the `renderers` in `text::Pipeline`

We avoid recreating buffers this way, and the amount of layers should
stay relatively low anyways.
---
 wgpu/src/text.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index e8c3e38547..16eea234df 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -209,7 +209,6 @@ impl Pipeline {
     }
 
     pub fn end_frame(&mut self) {
-        self.renderers.truncate(self.layer);
         self.system
             .as_mut()
             .unwrap()

From dd80772da9ce89230d5a96c96923837f9887befa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:31:53 +0100
Subject: [PATCH 028/163] Set a minimum `height` for `Buffer` of `size * 1.2`

This avoids text from misteriously disappearing, even if the user uses a
`height` that isn't enough to fit the text.
---
 wgpu/src/text.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 16eea234df..f1171b5f54 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -344,7 +344,10 @@ impl<'a> Cache<'a> {
             let metrics = glyphon::Metrics::new(key.size, key.size * 1.2);
             let mut buffer = glyphon::Buffer::new(fonts, metrics);
 
-            buffer.set_size(key.bounds.width, key.bounds.height);
+            buffer.set_size(
+                key.bounds.width,
+                key.bounds.height.max(key.size * 1.2),
+            );
             buffer.set_text(
                 key.content,
                 glyphon::Attrs::new().family(to_family(key.font)).color({

From 7d4c63d4119c505801daf138be44e65599e748d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:33:09 +0100
Subject: [PATCH 029/163] Set `Attrs::monospaced` if `Font::Monospace` is
 selected

---
 wgpu/src/text.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f1171b5f54..6e7e60d83c 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -350,16 +350,19 @@ impl<'a> Cache<'a> {
             );
             buffer.set_text(
                 key.content,
-                glyphon::Attrs::new().family(to_family(key.font)).color({
-                    let [r, g, b, a] = key.color.into_linear();
-
-                    glyphon::Color::rgba(
-                        (r * 255.0) as u8,
-                        (g * 255.0) as u8,
-                        (b * 255.0) as u8,
-                        (a * 255.0) as u8,
-                    )
-                }),
+                glyphon::Attrs::new()
+                    .family(to_family(key.font))
+                    .color({
+                        let [r, g, b, a] = key.color.into_linear();
+
+                        glyphon::Color::rgba(
+                            (r * 255.0) as u8,
+                            (g * 255.0) as u8,
+                            (b * 255.0) as u8,
+                            (a * 255.0) as u8,
+                        )
+                    })
+                    .monospaced(matches!(key.font, Font::Monospace)),
             );
 
             let _ = entry.insert(buffer);

From c8befa8d95890eb22972f487e08974e962028eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:35:23 +0100
Subject: [PATCH 030/163] Fix useless `f32` conversions and please `clippy`

---
 native/src/widget/text_input.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index f71b45037e..f51416e14a 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -385,13 +385,8 @@ where
     Renderer: text::Renderer,
 {
     let text_size = size.unwrap_or_else(|| renderer.default_size());
-
     let padding = padding.fit(Size::ZERO, limits.max());
-
-    let limits = limits
-        .width(width)
-        .pad(padding)
-        .height(text_size as f32 * 1.2);
+    let limits = limits.width(width).pad(padding).height(text_size * 1.2);
 
     let mut text = layout::Node::new(limits.resolve(Size::ZERO));
     text.move_to(Point::new(padding.left, padding.top));

From 680ea5dcca37ecf71ab2e5194e907d9414715d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 6 Feb 2023 22:21:27 +0100
Subject: [PATCH 031/163] Refactor `quad::Pipeline` to `prepare` and `render`
 architecture

---
 wgpu/src/backend.rs |  31 ++++--
 wgpu/src/buffer.rs  |  86 +++++++++++++++++
 wgpu/src/quad.rs    | 225 +++++++++++++++++++++++---------------------
 3 files changed, 230 insertions(+), 112 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index f19959bd96..2c35936c8f 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -88,13 +88,14 @@ impl Backend {
         let mut layers = Layer::generate(primitives, viewport);
         layers.push(Layer::overlay(overlay_text, viewport));
 
-        for layer in layers {
+        for (i, layer) in layers.iter().enumerate() {
             self.flush(
                 device,
                 queue,
                 scale_factor,
                 transformation,
                 &layer,
+                i,
                 staging_belt,
                 encoder,
                 frame,
@@ -102,6 +103,7 @@ impl Backend {
             );
         }
 
+        self.quad_pipeline.end_frame();
         self.text_pipeline.end_frame();
 
         #[cfg(any(feature = "image", feature = "svg"))]
@@ -115,6 +117,7 @@ impl Backend {
         scale_factor: f32,
         transformation: Transformation,
         layer: &Layer<'_>,
+        layer_index: usize,
         staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
@@ -127,16 +130,32 @@ impl Backend {
         }
 
         if !layer.quads.is_empty() {
-            self.quad_pipeline.draw(
+            self.quad_pipeline.prepare(
                 device,
-                staging_belt,
-                encoder,
+                queue,
                 &layer.quads,
                 transformation,
                 scale_factor,
-                bounds,
-                target,
             );
+
+            let mut render_pass =
+                encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                    label: Some("iced_wgpu::quad render pass"),
+                    color_attachments: &[Some(
+                        wgpu::RenderPassColorAttachment {
+                            view: target,
+                            resolve_target: None,
+                            ops: wgpu::Operations {
+                                load: wgpu::LoadOp::Load,
+                                store: true,
+                            },
+                        },
+                    )],
+                    depth_stencil_attachment: None,
+                });
+
+            self.quad_pipeline
+                .render(layer_index, bounds, &mut render_pass);
         }
 
         if !layer.meshes.is_empty() {
diff --git a/wgpu/src/buffer.rs b/wgpu/src/buffer.rs
index 7c092d0b7a..c210dd4ebb 100644
--- a/wgpu/src/buffer.rs
+++ b/wgpu/src/buffer.rs
@@ -1,3 +1,89 @@
 //! Utilities for buffer operations.
 pub mod dynamic;
 pub mod r#static;
+
+use std::marker::PhantomData;
+use std::ops::RangeBounds;
+
+#[derive(Debug)]
+pub struct Buffer<T> {
+    label: &'static str,
+    size: u64,
+    usage: wgpu::BufferUsages,
+    raw: wgpu::Buffer,
+    type_: PhantomData<T>,
+}
+
+impl<T: bytemuck::Pod> Buffer<T> {
+    pub fn new(
+        device: &wgpu::Device,
+        label: &'static str,
+        amount: usize,
+        usage: wgpu::BufferUsages,
+    ) -> Self {
+        let size = next_copy_size::<T>(amount);
+
+        let raw = device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some(label),
+            size,
+            usage,
+            mapped_at_creation: false,
+        });
+
+        Self {
+            label,
+            size,
+            usage,
+            raw,
+            type_: PhantomData,
+        }
+    }
+
+    pub fn resize(&mut self, device: &wgpu::Device, new_count: usize) -> bool {
+        let new_size = (std::mem::size_of::<T>() * new_count) as u64;
+
+        if self.size < new_size {
+            self.raw = device.create_buffer(&wgpu::BufferDescriptor {
+                label: Some(self.label),
+                size: new_size,
+                usage: self.usage,
+                mapped_at_creation: false,
+            });
+
+            self.size = new_size;
+
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn write(
+        &self,
+        queue: &wgpu::Queue,
+        offset_count: usize,
+        contents: &[T],
+    ) {
+        queue.write_buffer(
+            &self.raw,
+            (std::mem::size_of::<T>() * offset_count) as u64,
+            bytemuck::cast_slice(contents),
+        );
+    }
+
+    pub fn slice(
+        &self,
+        bounds: impl RangeBounds<wgpu::BufferAddress>,
+    ) -> wgpu::BufferSlice<'_> {
+        self.raw.slice(bounds)
+    }
+}
+
+fn next_copy_size<T>(amount: usize) -> u64 {
+    let align_mask = wgpu::COPY_BUFFER_ALIGNMENT - 1;
+
+    (((std::mem::size_of::<T>() * amount).next_power_of_two() as u64
+        + align_mask)
+        & !align_mask)
+        .max(wgpu::COPY_BUFFER_ALIGNMENT)
+}
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 2f5fcc6be9..ebbe7a9d6f 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,3 +1,4 @@
+use crate::buffer::Buffer;
 use crate::Transformation;
 use iced_graphics::layer;
 use iced_native::Rectangle;
@@ -12,11 +13,11 @@ use tracing::info_span;
 #[derive(Debug)]
 pub struct Pipeline {
     pipeline: wgpu::RenderPipeline,
-    constants: wgpu::BindGroup,
-    constants_buffer: wgpu::Buffer,
+    constant_layout: wgpu::BindGroupLayout,
     vertices: wgpu::Buffer,
     indices: wgpu::Buffer,
-    instances: wgpu::Buffer,
+    layers: Vec<Layer>,
+    current_layer: usize,
 }
 
 impl Pipeline {
@@ -38,22 +39,6 @@ impl Pipeline {
                 }],
             });
 
-        let constants_buffer = device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some("iced_wgpu::quad uniforms buffer"),
-            size: mem::size_of::<Uniforms>() as wgpu::BufferAddress,
-            usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-            mapped_at_creation: false,
-        });
-
-        let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
-            label: Some("iced_wgpu::quad uniforms bind group"),
-            layout: &constant_layout,
-            entries: &[wgpu::BindGroupEntry {
-                binding: 0,
-                resource: constants_buffer.as_entire_binding(),
-            }],
-        });
-
         let layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("iced_wgpu::quad pipeline layout"),
@@ -148,118 +133,146 @@ impl Pipeline {
                 usage: wgpu::BufferUsages::INDEX,
             });
 
-        let instances = device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some("iced_wgpu::quad instance buffer"),
-            size: mem::size_of::<layer::Quad>() as u64 * MAX_INSTANCES as u64,
-            usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            mapped_at_creation: false,
-        });
-
         Pipeline {
             pipeline,
-            constants,
-            constants_buffer,
+            constant_layout,
             vertices,
             indices,
-            instances,
+            layers: Vec::new(),
+            current_layer: 0,
         }
     }
 
-    pub fn draw(
+    pub fn prepare(
         &mut self,
         device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
-        encoder: &mut wgpu::CommandEncoder,
+        queue: &wgpu::Queue,
         instances: &[layer::Quad],
         transformation: Transformation,
         scale: f32,
-        bounds: Rectangle<u32>,
-        target: &wgpu::TextureView,
     ) {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("Wgpu::Quad", "DRAW").entered();
+        if self.layers.len() <= self.current_layer {
+            self.layers.push(Layer::new(device, &self.constant_layout));
+        }
 
-        let uniforms = Uniforms::new(transformation, scale);
+        let layer = &mut self.layers[self.current_layer];
+        layer.prepare(device, queue, instances, transformation, scale);
 
-        {
-            let mut constants_buffer = staging_belt.write_buffer(
-                encoder,
-                &self.constants_buffer,
-                0,
-                wgpu::BufferSize::new(mem::size_of::<Uniforms>() as u64)
-                    .unwrap(),
-                device,
+        self.current_layer += 1;
+    }
+
+    pub fn render<'a>(
+        &'a self,
+        layer: usize,
+        bounds: Rectangle<u32>,
+        render_pass: &mut wgpu::RenderPass<'a>,
+    ) {
+        if let Some(layer) = self.layers.get(layer) {
+            render_pass.set_pipeline(&self.pipeline);
+
+            render_pass.set_scissor_rect(
+                bounds.x,
+                bounds.y,
+                bounds.width,
+                bounds.height,
+            );
+
+            render_pass.set_index_buffer(
+                self.indices.slice(..),
+                wgpu::IndexFormat::Uint16,
             );
+            render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
-            constants_buffer.copy_from_slice(bytemuck::bytes_of(&uniforms));
+            layer.draw(render_pass);
         }
+    }
 
-        let mut i = 0;
-        let total = instances.len();
+    pub fn end_frame(&mut self) {
+        self.current_layer = 0;
+    }
+}
 
-        while i < total {
-            let end = (i + MAX_INSTANCES).min(total);
-            let amount = end - i;
+#[derive(Debug)]
+struct Layer {
+    constants: wgpu::BindGroup,
+    constants_buffer: wgpu::Buffer,
+    instances: Buffer<layer::Quad>,
+    instance_count: usize,
+}
 
-            let instance_bytes = bytemuck::cast_slice(&instances[i..end]);
+impl Layer {
+    pub fn new(
+        device: &wgpu::Device,
+        constant_layout: &wgpu::BindGroupLayout,
+    ) -> Self {
+        let constants_buffer = device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("iced_wgpu::quad uniforms buffer"),
+            size: mem::size_of::<Uniforms>() as wgpu::BufferAddress,
+            usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
+            mapped_at_creation: false,
+        });
 
-            let mut instance_buffer = staging_belt.write_buffer(
-                encoder,
-                &self.instances,
-                0,
-                wgpu::BufferSize::new(instance_bytes.len() as u64).unwrap(),
-                device,
-            );
+        let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
+            label: Some("iced_wgpu::quad uniforms bind group"),
+            layout: &constant_layout,
+            entries: &[wgpu::BindGroupEntry {
+                binding: 0,
+                resource: constants_buffer.as_entire_binding(),
+            }],
+        });
 
-            instance_buffer.copy_from_slice(instance_bytes);
-
-            #[cfg(feature = "tracing")]
-            let _ = info_span!("Wgpu::Quad", "BEGIN_RENDER_PASS").enter();
-
-            {
-                let mut render_pass =
-                    encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                        label: Some("iced_wgpu::quad render pass"),
-                        color_attachments: &[Some(
-                            wgpu::RenderPassColorAttachment {
-                                view: target,
-                                resolve_target: None,
-                                ops: wgpu::Operations {
-                                    load: wgpu::LoadOp::Load,
-                                    store: true,
-                                },
-                            },
-                        )],
-                        depth_stencil_attachment: None,
-                    });
-
-                render_pass.set_pipeline(&self.pipeline);
-                render_pass.set_bind_group(0, &self.constants, &[]);
-                render_pass.set_index_buffer(
-                    self.indices.slice(..),
-                    wgpu::IndexFormat::Uint16,
-                );
-                render_pass.set_vertex_buffer(0, self.vertices.slice(..));
-                render_pass.set_vertex_buffer(1, self.instances.slice(..));
-
-                render_pass.set_scissor_rect(
-                    bounds.x,
-                    bounds.y,
-                    bounds.width,
-                    // TODO: Address anti-aliasing adjustments properly
-                    bounds.height,
-                );
-
-                render_pass.draw_indexed(
-                    0..QUAD_INDICES.len() as u32,
-                    0,
-                    0..amount as u32,
-                );
-            }
-
-            i += MAX_INSTANCES;
+        let instances = Buffer::new(
+            device,
+            "iced_wgpu::quad instance buffer",
+            MAX_INSTANCES,
+            wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+        );
+
+        Self {
+            constants,
+            constants_buffer,
+            instances,
+            instance_count: 0,
         }
     }
+
+    pub fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        instances: &[layer::Quad],
+        transformation: Transformation,
+        scale: f32,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Quad", "PREPARE").entered();
+
+        let uniforms = Uniforms::new(transformation, scale);
+
+        queue.write_buffer(
+            &self.constants_buffer,
+            0,
+            bytemuck::bytes_of(&uniforms),
+        );
+
+        let _ = self.instances.resize(device, instances.len());
+        self.instances.write(queue, 0, instances);
+        self.instance_count = instances.len();
+    }
+
+    pub fn draw<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Quad", "DRAW").entered();
+
+        render_pass.set_bind_group(0, &self.constants, &[]);
+        render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..QUAD_INDICES.len() as u32,
+            0,
+            0..self.instance_count as u32,
+        );
+    }
 }
 
 #[repr(C)]

From a970f34cb4968bfe913c1f77b5087f44f29aba8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 18:35:05 +0100
Subject: [PATCH 032/163] Apply `ceil` to text bounds when drawing

---
 wgpu/src/text.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 6e7e60d83c..95994a4e70 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -105,8 +105,10 @@ impl Pipeline {
                             size: section.size * scale_factor,
                             font: section.font,
                             bounds: Size {
-                                width: section.bounds.width * scale_factor,
-                                height: section.bounds.height * scale_factor,
+                                width: (section.bounds.width * scale_factor)
+                                    .ceil(),
+                                height: (section.bounds.height * scale_factor)
+                                    .ceil(),
                             },
                             color: section.color,
                         },

From 77b59496b0a138510938aca8367572e08019ddb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 19:26:41 +0100
Subject: [PATCH 033/163] Fix rendering order for `quad::Pipeline`

---
 wgpu/src/backend.rs |  7 ++-----
 wgpu/src/quad.rs    | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 2c35936c8f..395d28d55c 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -88,14 +88,13 @@ impl Backend {
         let mut layers = Layer::generate(primitives, viewport);
         layers.push(Layer::overlay(overlay_text, viewport));
 
-        for (i, layer) in layers.iter().enumerate() {
+        for layer in layers {
             self.flush(
                 device,
                 queue,
                 scale_factor,
                 transformation,
                 &layer,
-                i,
                 staging_belt,
                 encoder,
                 frame,
@@ -117,7 +116,6 @@ impl Backend {
         scale_factor: f32,
         transformation: Transformation,
         layer: &Layer<'_>,
-        layer_index: usize,
         staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
@@ -154,8 +152,7 @@ impl Backend {
                     depth_stencil_attachment: None,
                 });
 
-            self.quad_pipeline
-                .render(layer_index, bounds, &mut render_pass);
+            self.quad_pipeline.render(bounds, &mut render_pass);
         }
 
         if !layer.meshes.is_empty() {
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index ebbe7a9d6f..e4173b12d3 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -17,7 +17,8 @@ pub struct Pipeline {
     vertices: wgpu::Buffer,
     indices: wgpu::Buffer,
     layers: Vec<Layer>,
-    current_layer: usize,
+    prepare_layer: usize,
+    render_layer: usize,
 }
 
 impl Pipeline {
@@ -139,7 +140,8 @@ impl Pipeline {
             vertices,
             indices,
             layers: Vec::new(),
-            current_layer: 0,
+            prepare_layer: 0,
+            render_layer: 0,
         }
     }
 
@@ -151,23 +153,22 @@ impl Pipeline {
         transformation: Transformation,
         scale: f32,
     ) {
-        if self.layers.len() <= self.current_layer {
+        if self.layers.len() <= self.prepare_layer {
             self.layers.push(Layer::new(device, &self.constant_layout));
         }
 
-        let layer = &mut self.layers[self.current_layer];
+        let layer = &mut self.layers[self.prepare_layer];
         layer.prepare(device, queue, instances, transformation, scale);
 
-        self.current_layer += 1;
+        self.prepare_layer += 1;
     }
 
     pub fn render<'a>(
-        &'a self,
-        layer: usize,
+        &'a mut self,
         bounds: Rectangle<u32>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
-        if let Some(layer) = self.layers.get(layer) {
+        if let Some(layer) = self.layers.get(self.render_layer) {
             render_pass.set_pipeline(&self.pipeline);
 
             render_pass.set_scissor_rect(
@@ -184,11 +185,14 @@ impl Pipeline {
             render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
             layer.draw(render_pass);
+
+            self.render_layer += 1;
         }
     }
 
     pub fn end_frame(&mut self) {
-        self.current_layer = 0;
+        self.prepare_layer = 0;
+        self.render_layer = 0;
     }
 }
 

From 34c963f7b39e3f16b55665a978948ead5b869f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 20:08:26 +0100
Subject: [PATCH 034/163] Remove unnecessary borrow in `quad::Pipeline`

---
 wgpu/src/quad.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index e4173b12d3..94bcec9292 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -218,7 +218,7 @@ impl Layer {
 
         let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
             label: Some("iced_wgpu::quad uniforms bind group"),
-            layout: &constant_layout,
+            layout: constant_layout,
             entries: &[wgpu::BindGroupEntry {
                 binding: 0,
                 resource: constants_buffer.as_entire_binding(),

From 363966ee9e7aa81a3679eaea776d2c867aa6c3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 22:53:08 +0100
Subject: [PATCH 035/163] Refactor `image::Pipeline` into `prepare` and
 `render` architecture

---
 wgpu/src/backend.rs     |  26 +++-
 wgpu/src/image.rs       | 259 ++++++++++++++++++++++------------------
 wgpu/src/image/atlas.rs |  49 ++++----
 wgpu/src/lib.rs         |   3 +-
 4 files changed, 190 insertions(+), 147 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 395d28d55c..90a511ef66 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -106,7 +106,7 @@ impl Backend {
         self.text_pipeline.end_frame();
 
         #[cfg(any(feature = "image", feature = "svg"))]
-        self.image_pipeline.trim_cache(device, encoder);
+        self.image_pipeline.end_frame(device, queue, encoder);
     }
 
     fn flush(
@@ -177,16 +177,32 @@ impl Backend {
                 let scaled = transformation
                     * Transformation::scale(scale_factor, scale_factor);
 
-                self.image_pipeline.draw(
+                self.image_pipeline.prepare(
                     device,
-                    staging_belt,
+                    queue,
                     encoder,
                     &layer.images,
                     scaled,
-                    bounds,
-                    target,
                     scale_factor,
                 );
+
+                let mut render_pass =
+                    encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                        label: Some("iced_wgpu::image render pass"),
+                        color_attachments: &[Some(
+                            wgpu::RenderPassColorAttachment {
+                                view: target,
+                                resolve_target: None,
+                                ops: wgpu::Operations {
+                                    load: wgpu::LoadOp::Load,
+                                    store: true,
+                                },
+                            },
+                        )],
+                        depth_stencil_attachment: None,
+                    });
+
+                self.image_pipeline.render(bounds, &mut render_pass);
             }
         }
 
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index a5e63b171c..f6c39f1a17 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -6,7 +6,7 @@ use iced_graphics::image::raster;
 #[cfg(feature = "svg")]
 use iced_graphics::image::vector;
 
-use crate::Transformation;
+use crate::{Buffer, Transformation};
 use atlas::Atlas;
 
 use iced_graphics::layer;
@@ -34,15 +34,108 @@ pub struct Pipeline {
     vector_cache: RefCell<vector::Cache<Atlas>>,
 
     pipeline: wgpu::RenderPipeline,
-    uniforms: wgpu::Buffer,
     vertices: wgpu::Buffer,
     indices: wgpu::Buffer,
-    instances: wgpu::Buffer,
-    constants: wgpu::BindGroup,
+    sampler: wgpu::Sampler,
     texture: wgpu::BindGroup,
     texture_version: usize,
-    texture_layout: wgpu::BindGroupLayout,
     texture_atlas: Atlas,
+    texture_layout: wgpu::BindGroupLayout,
+    constant_layout: wgpu::BindGroupLayout,
+
+    layers: Vec<Layer>,
+    prepare_layer: usize,
+    render_layer: usize,
+}
+
+#[derive(Debug)]
+struct Layer {
+    uniforms: wgpu::Buffer,
+    constants: wgpu::BindGroup,
+    instances: Buffer<Instance>,
+    instance_count: usize,
+}
+
+impl Layer {
+    fn new(
+        device: &wgpu::Device,
+        constant_layout: &wgpu::BindGroupLayout,
+        sampler: &wgpu::Sampler,
+    ) -> Self {
+        let uniforms = device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("iced_wgpu::image uniforms buffer"),
+            size: mem::size_of::<Uniforms>() as u64,
+            usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
+            mapped_at_creation: false,
+        });
+
+        let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
+            label: Some("iced_wgpu::image constants bind group"),
+            layout: &constant_layout,
+            entries: &[
+                wgpu::BindGroupEntry {
+                    binding: 0,
+                    resource: wgpu::BindingResource::Buffer(
+                        wgpu::BufferBinding {
+                            buffer: &uniforms,
+                            offset: 0,
+                            size: None,
+                        },
+                    ),
+                },
+                wgpu::BindGroupEntry {
+                    binding: 1,
+                    resource: wgpu::BindingResource::Sampler(&sampler),
+                },
+            ],
+        });
+
+        let instances = Buffer::new(
+            device,
+            "iced_wgpu::image instance buffer",
+            Instance::INITIAL,
+            wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+        );
+
+        Self {
+            uniforms,
+            constants,
+            instances,
+            instance_count: 0,
+        }
+    }
+
+    fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        instances: &[Instance],
+        transformation: Transformation,
+    ) {
+        queue.write_buffer(
+            &self.uniforms,
+            0,
+            bytemuck::bytes_of(&Uniforms {
+                transform: transformation.into(),
+            }),
+        );
+
+        let _ = self.instances.resize(device, instances.len());
+        self.instances.write(queue, 0, instances);
+
+        self.instance_count = instances.len();
+    }
+
+    fn render<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>) {
+        render_pass.set_bind_group(0, &self.constants, &[]);
+        render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..QUAD_INDICES.len() as u32,
+            0,
+            0..self.instance_count as u32,
+        );
+    }
 }
 
 impl Pipeline {
@@ -86,35 +179,6 @@ impl Pipeline {
                 ],
             });
 
-        let uniforms_buffer = device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some("iced_wgpu::image uniforms buffer"),
-            size: mem::size_of::<Uniforms>() as u64,
-            usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-            mapped_at_creation: false,
-        });
-
-        let constant_bind_group =
-            device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu::image constants bind group"),
-                layout: &constant_layout,
-                entries: &[
-                    wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: wgpu::BindingResource::Buffer(
-                            wgpu::BufferBinding {
-                                buffer: &uniforms_buffer,
-                                offset: 0,
-                                size: None,
-                            },
-                        ),
-                    },
-                    wgpu::BindGroupEntry {
-                        binding: 1,
-                        resource: wgpu::BindingResource::Sampler(&sampler),
-                    },
-                ],
-            });
-
         let texture_layout =
             device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
                 label: Some("iced_wgpu::image texture atlas layout"),
@@ -225,13 +289,6 @@ impl Pipeline {
                 usage: wgpu::BufferUsages::INDEX,
             });
 
-        let instances = device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some("iced_wgpu::image instance buffer"),
-            size: mem::size_of::<Instance>() as u64 * Instance::MAX as u64,
-            usage: wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            mapped_at_creation: false,
-        });
-
         let texture_atlas = Atlas::new(device);
 
         let texture = device.create_bind_group(&wgpu::BindGroupDescriptor {
@@ -253,15 +310,18 @@ impl Pipeline {
             vector_cache: RefCell::new(vector::Cache::default()),
 
             pipeline,
-            uniforms: uniforms_buffer,
             vertices,
             indices,
-            instances,
-            constants: constant_bind_group,
+            sampler,
             texture,
             texture_version: texture_atlas.layer_count(),
-            texture_layout,
             texture_atlas,
+            texture_layout,
+            constant_layout,
+
+            layers: Vec::new(),
+            prepare_layer: 0,
+            render_layer: 0,
         }
     }
 
@@ -281,17 +341,18 @@ impl Pipeline {
         svg.viewport_dimensions()
     }
 
-    pub fn draw(
+    pub fn prepare(
         &mut self,
         device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
+        queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
         images: &[layer::Image],
         transformation: Transformation,
-        bounds: Rectangle<u32>,
-        target: &wgpu::TextureView,
         _scale: f32,
     ) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Image", "PREPARE").entered();
+
         #[cfg(feature = "tracing")]
         let _ = info_span!("Wgpu::Image", "DRAW").entered();
 
@@ -309,7 +370,7 @@ impl Pipeline {
                 layer::Image::Raster { handle, bounds } => {
                     if let Some(atlas_entry) = raster_cache.upload(
                         handle,
-                        &mut (device, encoder),
+                        &mut (device, queue, encoder),
                         &mut self.texture_atlas,
                     ) {
                         add_instances(
@@ -336,7 +397,7 @@ impl Pipeline {
                         *color,
                         size,
                         _scale,
-                        &mut (device, encoder),
+                        &mut (device, queue, encoder),
                         &mut self.texture_atlas,
                     ) {
                         add_instances(
@@ -376,68 +437,27 @@ impl Pipeline {
             self.texture_version = texture_version;
         }
 
-        {
-            let mut uniforms_buffer = staging_belt.write_buffer(
-                encoder,
-                &self.uniforms,
-                0,
-                wgpu::BufferSize::new(mem::size_of::<Uniforms>() as u64)
-                    .unwrap(),
+        if self.layers.len() <= self.prepare_layer {
+            self.layers.push(Layer::new(
                 device,
-            );
-
-            uniforms_buffer.copy_from_slice(bytemuck::bytes_of(&Uniforms {
-                transform: transformation.into(),
-            }));
+                &self.constant_layout,
+                &self.sampler,
+            ));
         }
 
-        let mut i = 0;
-        let total = instances.len();
-
-        while i < total {
-            let end = (i + Instance::MAX).min(total);
-            let amount = end - i;
-
-            let mut instances_buffer = staging_belt.write_buffer(
-                encoder,
-                &self.instances,
-                0,
-                wgpu::BufferSize::new(
-                    (amount * std::mem::size_of::<Instance>()) as u64,
-                )
-                .unwrap(),
-                device,
-            );
-
-            instances_buffer.copy_from_slice(bytemuck::cast_slice(
-                &instances[i..i + amount],
-            ));
+        let layer = &mut self.layers[self.prepare_layer];
+        layer.prepare(device, queue, instances, transformation);
 
-            let mut render_pass =
-                encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                    label: Some("iced_wgpu::image render pass"),
-                    color_attachments: &[Some(
-                        wgpu::RenderPassColorAttachment {
-                            view: target,
-                            resolve_target: None,
-                            ops: wgpu::Operations {
-                                load: wgpu::LoadOp::Load,
-                                store: true,
-                            },
-                        },
-                    )],
-                    depth_stencil_attachment: None,
-                });
+        self.prepare_layer += 1;
+    }
 
+    pub fn render<'a>(
+        &'a mut self,
+        bounds: Rectangle<u32>,
+        render_pass: &mut wgpu::RenderPass<'a>,
+    ) {
+        if let Some(layer) = self.layers.get(self.render_layer) {
             render_pass.set_pipeline(&self.pipeline);
-            render_pass.set_bind_group(0, &self.constants, &[]);
-            render_pass.set_bind_group(1, &self.texture, &[]);
-            render_pass.set_index_buffer(
-                self.indices.slice(..),
-                wgpu::IndexFormat::Uint16,
-            );
-            render_pass.set_vertex_buffer(0, self.vertices.slice(..));
-            render_pass.set_vertex_buffer(1, self.instances.slice(..));
 
             render_pass.set_scissor_rect(
                 bounds.x,
@@ -446,30 +466,37 @@ impl Pipeline {
                 bounds.height,
             );
 
-            render_pass.draw_indexed(
-                0..QUAD_INDICES.len() as u32,
-                0,
-                0..amount as u32,
+            render_pass.set_bind_group(1, &self.texture, &[]);
+            render_pass.set_index_buffer(
+                self.indices.slice(..),
+                wgpu::IndexFormat::Uint16,
             );
+            render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
-            i += Instance::MAX;
+            layer.render(render_pass);
+
+            self.render_layer += 1;
         }
     }
 
-    pub fn trim_cache(
+    pub fn end_frame(
         &mut self,
         device: &wgpu::Device,
+        queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
     ) {
         #[cfg(feature = "image")]
         self.raster_cache
             .borrow_mut()
-            .trim(&mut self.texture_atlas, &mut (device, encoder));
+            .trim(&mut self.texture_atlas, &mut (device, queue, encoder));
 
         #[cfg(feature = "svg")]
         self.vector_cache
             .borrow_mut()
-            .trim(&mut self.texture_atlas, &mut (device, encoder));
+            .trim(&mut self.texture_atlas, &mut (device, queue, encoder));
+
+        self.prepare_layer = 0;
+        self.render_layer = 0;
     }
 }
 
@@ -507,7 +534,7 @@ struct Instance {
 }
 
 impl Instance {
-    pub const MAX: usize = 1_000;
+    pub const INITIAL: usize = 1_000;
 }
 
 #[repr(C)]
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index eafe2f9656..7df67abdc0 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -185,13 +185,13 @@ impl Atlas {
 
     fn upload_allocation(
         &mut self,
-        buffer: &wgpu::Buffer,
+        data: &[u8],
         image_width: u32,
         image_height: u32,
         padding: u32,
         offset: usize,
         allocation: &Allocation,
-        encoder: &mut wgpu::CommandEncoder,
+        queue: &wgpu::Queue,
     ) {
         let (x, y) = allocation.position();
         let Size { width, height } = allocation.size();
@@ -203,15 +203,7 @@ impl Atlas {
             depth_or_array_layers: 1,
         };
 
-        encoder.copy_buffer_to_texture(
-            wgpu::ImageCopyBuffer {
-                buffer,
-                layout: wgpu::ImageDataLayout {
-                    offset: offset as u64,
-                    bytes_per_row: NonZeroU32::new(4 * image_width + padding),
-                    rows_per_image: NonZeroU32::new(image_height),
-                },
-            },
+        queue.write_texture(
             wgpu::ImageCopyTexture {
                 texture: &self.texture,
                 mip_level: 0,
@@ -222,6 +214,12 @@ impl Atlas {
                 },
                 aspect: wgpu::TextureAspect::default(),
             },
+            data,
+            wgpu::ImageDataLayout {
+                offset: offset as u64,
+                bytes_per_row: NonZeroU32::new(4 * image_width + padding),
+                rows_per_image: NonZeroU32::new(image_height),
+            },
             extent,
         );
     }
@@ -301,17 +299,19 @@ impl Atlas {
 
 impl image::Storage for Atlas {
     type Entry = Entry;
-    type State<'a> = (&'a wgpu::Device, &'a mut wgpu::CommandEncoder);
+    type State<'a> = (
+        &'a wgpu::Device,
+        &'a wgpu::Queue,
+        &'a mut wgpu::CommandEncoder,
+    );
 
     fn upload(
         &mut self,
         width: u32,
         height: u32,
         data: &[u8],
-        (device, encoder): &mut Self::State<'_>,
+        (device, queue, encoder): &mut Self::State<'_>,
     ) -> Option<Self::Entry> {
-        use wgpu::util::DeviceExt;
-
         let entry = {
             let current_size = self.layers.len();
             let entry = self.allocate(width, height)?;
@@ -344,17 +344,16 @@ impl image::Storage for Atlas {
             )
         }
 
-        let buffer =
-            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-                label: Some("iced_wgpu::image staging buffer"),
-                contents: &padded_data,
-                usage: wgpu::BufferUsages::COPY_SRC,
-            });
-
         match &entry {
             Entry::Contiguous(allocation) => {
                 self.upload_allocation(
-                    &buffer, width, height, padding, 0, allocation, encoder,
+                    &padded_data,
+                    width,
+                    height,
+                    padding,
+                    0,
+                    allocation,
+                    queue,
                 );
             }
             Entry::Fragmented { fragments, .. } => {
@@ -363,13 +362,13 @@ impl image::Storage for Atlas {
                     let offset = (y * padded_width as u32 + 4 * x) as usize;
 
                     self.upload_allocation(
-                        &buffer,
+                        &padded_data,
                         width,
                         height,
                         padding,
                         offset,
                         &fragment.allocation,
-                        encoder,
+                        queue,
                     );
                 }
             }
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 6d6d3fd637..9da4057261 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -56,7 +56,8 @@ pub use wgpu;
 pub use backend::Backend;
 pub use settings::Settings;
 
-pub(crate) use iced_graphics::Transformation;
+use crate::buffer::Buffer;
+use iced_graphics::Transformation;
 
 #[cfg(any(feature = "image", feature = "svg"))]
 mod image;

From 23ed352e83dcb8a13acdac1cd4c7e2a9df492ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 22:53:41 +0100
Subject: [PATCH 036/163] Fix needless borrows in `image::Pipeline`

---
 wgpu/src/image.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index f6c39f1a17..5d1ae8d7e1 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -71,7 +71,7 @@ impl Layer {
 
         let constants = device.create_bind_group(&wgpu::BindGroupDescriptor {
             label: Some("iced_wgpu::image constants bind group"),
-            layout: &constant_layout,
+            layout: constant_layout,
             entries: &[
                 wgpu::BindGroupEntry {
                     binding: 0,
@@ -85,7 +85,7 @@ impl Layer {
                 },
                 wgpu::BindGroupEntry {
                     binding: 1,
-                    resource: wgpu::BindingResource::Sampler(&sampler),
+                    resource: wgpu::BindingResource::Sampler(sampler),
                 },
             ],
         });

From b8c1809ea101cece6943432fd3597f785c39af09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Feb 2023 23:55:16 +0100
Subject: [PATCH 037/163] Refactor `triangle::Pipeline` into `prepare` and
 `render` architecture

And get rid of the staging belt! :tada:
---
 examples/integration/src/main.rs |   9 -
 wgpu/src/backend.rs              |  17 +-
 wgpu/src/buffer/dynamic.rs       |  23 +-
 wgpu/src/buffer/static.rs        |  21 +-
 wgpu/src/quad.rs                 |   7 +-
 wgpu/src/triangle.rs             | 561 +++++++++++++++++++------------
 wgpu/src/window/compositor.rs    |  11 -
 7 files changed, 358 insertions(+), 291 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 69f6961e00..5af30ab1ec 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -125,9 +125,6 @@ pub fn main() {
 
     let mut resized = false;
 
-    // Initialize staging belt
-    let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
-
     // Initialize scene and GUI controls
     let scene = Scene::new(&device, format);
     let controls = Controls::new();
@@ -252,7 +249,6 @@ pub fn main() {
                             backend.present(
                                 &device,
                                 &queue,
-                                &mut staging_belt,
                                 &mut encoder,
                                 &view,
                                 primitive,
@@ -262,7 +258,6 @@ pub fn main() {
                         });
 
                         // Then we submit the work
-                        staging_belt.finish();
                         queue.submit(Some(encoder.finish()));
                         frame.present();
 
@@ -272,10 +267,6 @@ pub fn main() {
                                  state.mouse_interaction(),
                              ),
                          );
-
-                        // And recall staging buffers
-                        staging_belt.recall();
-
                     }
                     Err(error) => match error {
                         wgpu::SurfaceError::OutOfMemory => {
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 90a511ef66..8c4c0daa86 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -70,7 +70,6 @@ impl Backend {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         frame: &wgpu::TextureView,
         primitives: &[Primitive],
@@ -95,7 +94,6 @@ impl Backend {
                 scale_factor,
                 transformation,
                 &layer,
-                staging_belt,
                 encoder,
                 frame,
                 target_size,
@@ -104,6 +102,7 @@ impl Backend {
 
         self.quad_pipeline.end_frame();
         self.text_pipeline.end_frame();
+        self.triangle_pipeline.end_frame();
 
         #[cfg(any(feature = "image", feature = "svg"))]
         self.image_pipeline.end_frame(device, queue, encoder);
@@ -116,7 +115,6 @@ impl Backend {
         scale_factor: f32,
         transformation: Transformation,
         layer: &Layer<'_>,
-        staging_belt: &mut wgpu::util::StagingBelt,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
         target_size: Size<u32>,
@@ -159,15 +157,20 @@ impl Backend {
             let scaled = transformation
                 * Transformation::scale(scale_factor, scale_factor);
 
-            self.triangle_pipeline.draw(
+            self.triangle_pipeline.prepare(
+                device,
+                queue,
+                &layer.meshes,
+                scaled,
+            );
+
+            self.triangle_pipeline.render(
                 device,
-                staging_belt,
                 encoder,
                 target,
                 target_size,
-                scaled,
-                scale_factor,
                 &layer.meshes,
+                scale_factor,
             );
         }
 
diff --git a/wgpu/src/buffer/dynamic.rs b/wgpu/src/buffer/dynamic.rs
index 88289b9802..43fc47ac71 100644
--- a/wgpu/src/buffer/dynamic.rs
+++ b/wgpu/src/buffer/dynamic.rs
@@ -112,25 +112,8 @@ impl<T: ShaderType + WriteInto> Buffer<T> {
     }
 
     /// Write the contents of this dynamic buffer to the GPU via staging belt command.
-    pub fn write(
-        &mut self,
-        device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
-        encoder: &mut wgpu::CommandEncoder,
-    ) {
-        let size = self.cpu.get_ref().len();
-
-        if let Some(buffer_size) = wgpu::BufferSize::new(size as u64) {
-            let mut buffer = staging_belt.write_buffer(
-                encoder,
-                &self.gpu,
-                0,
-                buffer_size,
-                device,
-            );
-
-            buffer.copy_from_slice(self.cpu.get_ref());
-        }
+    pub fn write(&mut self, queue: &wgpu::Queue) {
+        queue.write_buffer(&self.gpu, 0, self.cpu.get_ref());
     }
 
     // Gets the aligned offset at the given index from the CPU buffer.
@@ -184,7 +167,7 @@ impl Internal {
     }
 
     /// Returns bytearray of aligned CPU buffer.
-    pub(super) fn get_ref(&self) -> &Vec<u8> {
+    pub(super) fn get_ref(&self) -> &[u8] {
         match self {
             Internal::Uniform(buf) => buf.as_ref(),
             #[cfg(not(target_arch = "wasm32"))]
diff --git a/wgpu/src/buffer/static.rs b/wgpu/src/buffer/static.rs
index ef87422f41..7ae7edd256 100644
--- a/wgpu/src/buffer/static.rs
+++ b/wgpu/src/buffer/static.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use std::mem;
 
 //128 triangles/indices
-const DEFAULT_STATIC_BUFFER_COUNT: wgpu::BufferAddress = 128;
+const DEFAULT_STATIC_BUFFER_COUNT: wgpu::BufferAddress = 1_000;
 
 /// A generic buffer struct useful for items which have no alignment requirements
 /// (e.g. Vertex, Index buffers) & no dynamic offsets.
@@ -71,28 +71,15 @@ impl<T: Pod + Zeroable> Buffer<T> {
     /// Returns the size of the written bytes.
     pub fn write(
         &mut self,
-        device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
-        encoder: &mut wgpu::CommandEncoder,
+        queue: &wgpu::Queue,
         offset: u64,
         content: &[T],
     ) -> u64 {
         let bytes = bytemuck::cast_slice(content);
         let bytes_size = bytes.len() as u64;
 
-        if let Some(buffer_size) = wgpu::BufferSize::new(bytes_size) {
-            let mut buffer = staging_belt.write_buffer(
-                encoder,
-                &self.gpu,
-                offset,
-                buffer_size,
-                device,
-            );
-
-            buffer.copy_from_slice(bytes);
-
-            self.offsets.push(offset);
-        }
+        queue.write_buffer(&self.gpu, offset, bytes);
+        self.offsets.push(offset);
 
         bytes_size
     }
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 94bcec9292..c1aa49c48b 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,5 +1,4 @@
-use crate::buffer::Buffer;
-use crate::Transformation;
+use crate::{Buffer, Transformation};
 use iced_graphics::layer;
 use iced_native::Rectangle;
 
@@ -228,7 +227,7 @@ impl Layer {
         let instances = Buffer::new(
             device,
             "iced_wgpu::quad instance buffer",
-            MAX_INSTANCES,
+            INITIAL_INSTANCES,
             wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
         );
 
@@ -302,7 +301,7 @@ const QUAD_VERTS: [Vertex; 4] = [
     },
 ];
 
-const MAX_INSTANCES: usize = 100_000;
+const INITIAL_INSTANCES: usize = 10_000;
 
 #[repr(C)]
 #[derive(Debug, Clone, Copy, Zeroable, Pod)]
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index efdd214b0f..572af1e89d 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -14,50 +14,56 @@ use tracing::info_span;
 #[derive(Debug)]
 pub struct Pipeline {
     blit: Option<msaa::Blit>,
-    index_buffer: Buffer<u32>,
-    index_strides: Vec<u32>,
     solid: solid::Pipeline,
 
     /// Gradients are currently not supported on WASM targets due to their need of storage buffers.
     #[cfg(not(target_arch = "wasm32"))]
     gradient: gradient::Pipeline,
+
+    layers: Vec<Layer>,
+    prepare_layer: usize,
+    render_layer: usize,
 }
 
-impl Pipeline {
-    pub fn new(
+#[derive(Debug)]
+struct Layer {
+    index_buffer: Buffer<u32>,
+    index_strides: Vec<u32>,
+    solid: solid::Layer,
+
+    #[cfg(not(target_arch = "wasm32"))]
+    gradient: gradient::Layer,
+}
+
+impl Layer {
+    fn new(
         device: &wgpu::Device,
-        format: wgpu::TextureFormat,
-        antialiasing: Option<settings::Antialiasing>,
-    ) -> Pipeline {
-        Pipeline {
-            blit: antialiasing.map(|a| msaa::Blit::new(device, format, a)),
+        solid: &solid::Pipeline,
+        #[cfg(not(target_arch = "wasm32"))] gradient: &gradient::Pipeline,
+    ) -> Self {
+        Self {
             index_buffer: Buffer::new(
                 device,
                 "iced_wgpu::triangle vertex buffer",
                 wgpu::BufferUsages::INDEX | wgpu::BufferUsages::COPY_DST,
             ),
             index_strides: Vec::new(),
-            solid: solid::Pipeline::new(device, format, antialiasing),
+            solid: solid::Layer::new(device, &solid.constants_layout),
 
             #[cfg(not(target_arch = "wasm32"))]
-            gradient: gradient::Pipeline::new(device, format, antialiasing),
+            gradient: gradient::Layer::new(device, &gradient.constants_layout),
         }
     }
 
-    pub fn draw(
+    fn prepare(
         &mut self,
         device: &wgpu::Device,
-        staging_belt: &mut wgpu::util::StagingBelt,
-        encoder: &mut wgpu::CommandEncoder,
-        target: &wgpu::TextureView,
-        target_size: Size<u32>,
-        transformation: Transformation,
-        scale_factor: f32,
+        queue: &wgpu::Queue,
+        solid: &solid::Pipeline,
+        #[cfg(not(target_arch = "wasm32"))] gradient: &gradient::Pipeline,
         meshes: &[Mesh<'_>],
+        transformation: Transformation,
     ) {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("Wgpu::Triangle", "DRAW").entered();
-
         // Count the total amount of vertices & indices we need to handle
         let count = mesh::attribute_count_of(meshes);
 
@@ -75,6 +81,7 @@ impl Pipeline {
             .resize(device, count.gradient_vertices);
 
         // Prepare dynamic buffers & data store for writing
+        self.index_buffer.clear();
         self.index_strides.clear();
         self.solid.vertices.clear();
         self.solid.uniforms.clear();
@@ -99,13 +106,8 @@ impl Pipeline {
             let transform =
                 transformation * Transformation::translate(origin.x, origin.y);
 
-            let new_index_offset = self.index_buffer.write(
-                device,
-                staging_belt,
-                encoder,
-                index_offset,
-                indices,
-            );
+            let new_index_offset =
+                self.index_buffer.write(queue, index_offset, indices);
 
             index_offset += new_index_offset;
             self.index_strides.push(indices.len() as u32);
@@ -116,9 +118,7 @@ impl Pipeline {
                     self.solid.uniforms.push(&solid::Uniforms::new(transform));
 
                     let written_bytes = self.solid.vertices.write(
-                        device,
-                        staging_belt,
-                        encoder,
+                        queue,
                         solid_vertex_offset,
                         &buffers.vertices,
                     );
@@ -130,9 +130,7 @@ impl Pipeline {
                     buffers, gradient, ..
                 } => {
                     let written_bytes = self.gradient.vertices.write(
-                        device,
-                        staging_belt,
-                        encoder,
+                        queue,
                         gradient_vertex_offset,
                         &buffers.vertices,
                     );
@@ -196,14 +194,14 @@ impl Pipeline {
             let uniforms_resized = self.solid.uniforms.resize(device);
 
             if uniforms_resized {
-                self.solid.bind_group = solid::Pipeline::bind_group(
+                self.solid.constants = solid::Layer::bind_group(
                     device,
                     self.solid.uniforms.raw(),
-                    &self.solid.bind_group_layout,
+                    &solid.constants_layout,
                 )
             }
 
-            self.solid.uniforms.write(device, staging_belt, encoder);
+            self.solid.uniforms.write(queue);
         }
 
         #[cfg(not(target_arch = "wasm32"))]
@@ -218,22 +216,169 @@ impl Pipeline {
             let storage_resized = self.gradient.storage.resize(device);
 
             if uniforms_resized || storage_resized {
-                self.gradient.bind_group = gradient::Pipeline::bind_group(
+                self.gradient.constants = gradient::Layer::bind_group(
                     device,
                     self.gradient.uniforms.raw(),
                     self.gradient.storage.raw(),
-                    &self.gradient.bind_group_layout,
+                    &gradient.constants_layout,
                 );
             }
 
             // Write to GPU
-            self.gradient.uniforms.write(device, staging_belt, encoder);
-            self.gradient.storage.write(device, staging_belt, encoder);
+            self.gradient.uniforms.write(queue);
+            self.gradient.storage.write(queue);
 
             // Cleanup
             self.gradient.color_stop_offset = 0;
             self.gradient.color_stops_pending_write.color_stops.clear();
         }
+    }
+
+    fn render<'a>(
+        &'a mut self,
+        solid: &'a solid::Pipeline,
+        #[cfg(not(target_arch = "wasm32"))] gradient: &'a gradient::Pipeline,
+        meshes: &[Mesh<'_>],
+        scale_factor: f32,
+        render_pass: &mut wgpu::RenderPass<'a>,
+    ) {
+        let mut num_solids = 0;
+        #[cfg(not(target_arch = "wasm32"))]
+        let mut num_gradients = 0;
+        let mut last_is_solid = None;
+
+        for (index, mesh) in meshes.iter().enumerate() {
+            let clip_bounds = (mesh.clip_bounds() * scale_factor).snap();
+
+            render_pass.set_scissor_rect(
+                clip_bounds.x,
+                clip_bounds.y,
+                clip_bounds.width,
+                clip_bounds.height,
+            );
+
+            match mesh {
+                Mesh::Solid { .. } => {
+                    if !last_is_solid.unwrap_or(false) {
+                        render_pass.set_pipeline(&solid.pipeline);
+
+                        last_is_solid = Some(true);
+                    }
+
+                    render_pass.set_bind_group(
+                        0,
+                        &self.solid.constants,
+                        &[self.solid.uniforms.offset_at_index(num_solids)],
+                    );
+
+                    render_pass.set_vertex_buffer(
+                        0,
+                        self.solid.vertices.slice_from_index(num_solids),
+                    );
+
+                    num_solids += 1;
+                }
+                #[cfg(not(target_arch = "wasm32"))]
+                Mesh::Gradient { .. } => {
+                    if last_is_solid.unwrap_or(true) {
+                        render_pass.set_pipeline(&gradient.pipeline);
+
+                        last_is_solid = Some(false);
+                    }
+
+                    render_pass.set_bind_group(
+                        0,
+                        &self.gradient.constants,
+                        &[self
+                            .gradient
+                            .uniforms
+                            .offset_at_index(num_gradients)],
+                    );
+
+                    render_pass.set_vertex_buffer(
+                        0,
+                        self.gradient.vertices.slice_from_index(num_gradients),
+                    );
+
+                    num_gradients += 1;
+                }
+                #[cfg(target_arch = "wasm32")]
+                Mesh::Gradient { .. } => {}
+            };
+
+            render_pass.set_index_buffer(
+                self.index_buffer.slice_from_index(index),
+                wgpu::IndexFormat::Uint32,
+            );
+
+            render_pass.draw_indexed(0..self.index_strides[index], 0, 0..1);
+        }
+    }
+}
+
+impl Pipeline {
+    pub fn new(
+        device: &wgpu::Device,
+        format: wgpu::TextureFormat,
+        antialiasing: Option<settings::Antialiasing>,
+    ) -> Pipeline {
+        Pipeline {
+            blit: antialiasing.map(|a| msaa::Blit::new(device, format, a)),
+            solid: solid::Pipeline::new(device, format, antialiasing),
+
+            #[cfg(not(target_arch = "wasm32"))]
+            gradient: gradient::Pipeline::new(device, format, antialiasing),
+
+            layers: Vec::new(),
+            prepare_layer: 0,
+            render_layer: 0,
+        }
+    }
+
+    pub fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        meshes: &[Mesh<'_>],
+        transformation: Transformation,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Triangle", "PREPARE").entered();
+
+        if self.layers.len() <= self.prepare_layer {
+            self.layers.push(Layer::new(
+                device,
+                &self.solid,
+                #[cfg(not(target_arch = "wasm32"))]
+                &self.gradient,
+            ));
+        }
+
+        let layer = &mut self.layers[self.prepare_layer];
+        layer.prepare(
+            device,
+            queue,
+            &self.solid,
+            #[cfg(not(target_arch = "wasm32"))]
+            &self.gradient,
+            meshes,
+            transformation,
+        );
+
+        self.prepare_layer += 1;
+    }
+
+    pub fn render(
+        &mut self,
+        device: &wgpu::Device,
+        encoder: &mut wgpu::CommandEncoder,
+        target: &wgpu::TextureView,
+        target_size: Size<u32>,
+        meshes: &[Mesh<'_>],
+        scale_factor: f32,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Triangle", "DRAW").entered();
 
         // Configure render pass
         {
@@ -268,87 +413,29 @@ impl Pipeline {
                     depth_stencil_attachment: None,
                 });
 
-            let mut num_solids = 0;
-            #[cfg(not(target_arch = "wasm32"))]
-            let mut num_gradients = 0;
-            let mut last_is_solid = None;
-
-            for (index, mesh) in meshes.iter().enumerate() {
-                let clip_bounds = (mesh.clip_bounds() * scale_factor).snap();
-
-                render_pass.set_scissor_rect(
-                    clip_bounds.x,
-                    clip_bounds.y,
-                    clip_bounds.width,
-                    clip_bounds.height,
-                );
-
-                match mesh {
-                    Mesh::Solid { .. } => {
-                        if !last_is_solid.unwrap_or(false) {
-                            render_pass.set_pipeline(&self.solid.pipeline);
-
-                            last_is_solid = Some(true);
-                        }
-
-                        render_pass.set_bind_group(
-                            0,
-                            &self.solid.bind_group,
-                            &[self.solid.uniforms.offset_at_index(num_solids)],
-                        );
-
-                        render_pass.set_vertex_buffer(
-                            0,
-                            self.solid.vertices.slice_from_index(num_solids),
-                        );
-
-                        num_solids += 1;
-                    }
-                    #[cfg(not(target_arch = "wasm32"))]
-                    Mesh::Gradient { .. } => {
-                        if last_is_solid.unwrap_or(true) {
-                            render_pass.set_pipeline(&self.gradient.pipeline);
-
-                            last_is_solid = Some(false);
-                        }
-
-                        render_pass.set_bind_group(
-                            0,
-                            &self.gradient.bind_group,
-                            &[self
-                                .gradient
-                                .uniforms
-                                .offset_at_index(num_gradients)],
-                        );
-
-                        render_pass.set_vertex_buffer(
-                            0,
-                            self.gradient
-                                .vertices
-                                .slice_from_index(num_gradients),
-                        );
-
-                        num_gradients += 1;
-                    }
-                    #[cfg(target_arch = "wasm32")]
-                    Mesh::Gradient { .. } => {}
-                };
-
-                render_pass.set_index_buffer(
-                    self.index_buffer.slice_from_index(index),
-                    wgpu::IndexFormat::Uint32,
-                );
+            let layer = &mut self.layers[self.render_layer];
 
-                render_pass.draw_indexed(0..self.index_strides[index], 0, 0..1);
-            }
+            layer.render(
+                &self.solid,
+                #[cfg(not(target_arch = "wasm32"))]
+                &self.gradient,
+                meshes,
+                scale_factor,
+                &mut render_pass,
+            );
         }
 
-        self.index_buffer.clear();
+        self.render_layer += 1;
 
         if let Some(blit) = &mut self.blit {
             blit.draw(encoder, target);
         }
     }
+
+    pub fn end_frame(&mut self) {
+        self.prepare_layer = 0;
+        self.render_layer = 0;
+    }
 }
 
 fn fragment_target(
@@ -390,10 +477,62 @@ mod solid {
     #[derive(Debug)]
     pub struct Pipeline {
         pub pipeline: wgpu::RenderPipeline,
+        pub constants_layout: wgpu::BindGroupLayout,
+    }
+
+    #[derive(Debug)]
+    pub struct Layer {
         pub vertices: Buffer<triangle::ColoredVertex2D>,
         pub uniforms: dynamic::Buffer<Uniforms>,
-        pub bind_group_layout: wgpu::BindGroupLayout,
-        pub bind_group: wgpu::BindGroup,
+        pub constants: wgpu::BindGroup,
+    }
+
+    impl Layer {
+        pub fn new(
+            device: &wgpu::Device,
+            constants_layout: &wgpu::BindGroupLayout,
+        ) -> Self {
+            let vertices = Buffer::new(
+                device,
+                "iced_wgpu::triangle::solid vertex buffer",
+                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+            );
+
+            let uniforms = dynamic::Buffer::uniform(
+                device,
+                "iced_wgpu::triangle::solid uniforms",
+            );
+
+            let constants =
+                Self::bind_group(device, uniforms.raw(), constants_layout);
+
+            Self {
+                vertices,
+                uniforms,
+                constants,
+            }
+        }
+
+        pub fn bind_group(
+            device: &wgpu::Device,
+            buffer: &wgpu::Buffer,
+            layout: &wgpu::BindGroupLayout,
+        ) -> wgpu::BindGroup {
+            device.create_bind_group(&wgpu::BindGroupDescriptor {
+                label: Some("iced_wgpu::triangle::solid bind group"),
+                layout,
+                entries: &[wgpu::BindGroupEntry {
+                    binding: 0,
+                    resource: wgpu::BindingResource::Buffer(
+                        wgpu::BufferBinding {
+                            buffer,
+                            offset: 0,
+                            size: Some(Uniforms::min_size()),
+                        },
+                    ),
+                }],
+            })
+        }
     }
 
     #[derive(Debug, Clone, Copy, ShaderType)]
@@ -416,18 +555,7 @@ mod solid {
             format: wgpu::TextureFormat,
             antialiasing: Option<settings::Antialiasing>,
         ) -> Self {
-            let vertices = Buffer::new(
-                device,
-                "iced_wgpu::triangle::solid vertex buffer",
-                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            );
-
-            let uniforms = dynamic::Buffer::uniform(
-                device,
-                "iced_wgpu::triangle::solid uniforms",
-            );
-
-            let bind_group_layout = device.create_bind_group_layout(
+            let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
                     label: Some("iced_wgpu::triangle::solid bind group layout"),
                     entries: &[wgpu::BindGroupLayoutEntry {
@@ -443,13 +571,10 @@ mod solid {
                 },
             );
 
-            let bind_group =
-                Self::bind_group(device, uniforms.raw(), &bind_group_layout);
-
             let layout = device.create_pipeline_layout(
                 &wgpu::PipelineLayoutDescriptor {
                     label: Some("iced_wgpu::triangle::solid pipeline layout"),
-                    bind_group_layouts: &[&bind_group_layout],
+                    bind_group_layouts: &[&constants_layout],
                     push_constant_ranges: &[],
                 },
             );
@@ -501,33 +626,9 @@ mod solid {
 
             Self {
                 pipeline,
-                vertices,
-                uniforms,
-                bind_group_layout,
-                bind_group,
+                constants_layout,
             }
         }
-
-        pub fn bind_group(
-            device: &wgpu::Device,
-            buffer: &wgpu::Buffer,
-            layout: &wgpu::BindGroupLayout,
-        ) -> wgpu::BindGroup {
-            device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu::triangle::solid bind group"),
-                layout,
-                entries: &[wgpu::BindGroupEntry {
-                    binding: 0,
-                    resource: wgpu::BindingResource::Buffer(
-                        wgpu::BufferBinding {
-                            buffer,
-                            offset: 0,
-                            size: Some(Uniforms::min_size()),
-                        },
-                    ),
-                }],
-            })
-        }
     }
 }
 
@@ -545,15 +646,90 @@ mod gradient {
     #[derive(Debug)]
     pub struct Pipeline {
         pub pipeline: wgpu::RenderPipeline,
+        pub constants_layout: wgpu::BindGroupLayout,
+    }
+
+    #[derive(Debug)]
+    pub struct Layer {
         pub vertices: Buffer<Vertex2D>,
         pub uniforms: dynamic::Buffer<Uniforms>,
         pub storage: dynamic::Buffer<Storage>,
+        pub constants: wgpu::BindGroup,
         pub color_stop_offset: i32,
         //Need to store these and then write them all at once
         //or else they will be padded to 256 and cause gaps in the storage buffer
         pub color_stops_pending_write: Storage,
-        pub bind_group_layout: wgpu::BindGroupLayout,
-        pub bind_group: wgpu::BindGroup,
+    }
+
+    impl Layer {
+        pub fn new(
+            device: &wgpu::Device,
+            constants_layout: &wgpu::BindGroupLayout,
+        ) -> Self {
+            let vertices = Buffer::new(
+                device,
+                "iced_wgpu::triangle::gradient vertex buffer",
+                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+            );
+
+            let uniforms = dynamic::Buffer::uniform(
+                device,
+                "iced_wgpu::triangle::gradient uniforms",
+            );
+
+            // Note: with a WASM target storage buffers are not supported. Will need to use UBOs & static
+            // sized array (eg like the 32-sized array on OpenGL side right now) to make gradients work
+            let storage = dynamic::Buffer::storage(
+                device,
+                "iced_wgpu::triangle::gradient storage",
+            );
+
+            let constants = Self::bind_group(
+                device,
+                uniforms.raw(),
+                storage.raw(),
+                constants_layout,
+            );
+
+            Self {
+                vertices,
+                uniforms,
+                storage,
+                constants,
+                color_stop_offset: 0,
+                color_stops_pending_write: Storage {
+                    color_stops: vec![],
+                },
+            }
+        }
+
+        pub fn bind_group(
+            device: &wgpu::Device,
+            uniform_buffer: &wgpu::Buffer,
+            storage_buffer: &wgpu::Buffer,
+            layout: &wgpu::BindGroupLayout,
+        ) -> wgpu::BindGroup {
+            device.create_bind_group(&wgpu::BindGroupDescriptor {
+                label: Some("iced_wgpu::triangle::gradient bind group"),
+                layout,
+                entries: &[
+                    wgpu::BindGroupEntry {
+                        binding: 0,
+                        resource: wgpu::BindingResource::Buffer(
+                            wgpu::BufferBinding {
+                                buffer: uniform_buffer,
+                                offset: 0,
+                                size: Some(Uniforms::min_size()),
+                            },
+                        ),
+                    },
+                    wgpu::BindGroupEntry {
+                        binding: 1,
+                        resource: storage_buffer.as_entire_binding(),
+                    },
+                ],
+            })
+        }
     }
 
     #[derive(Debug, ShaderType)]
@@ -584,25 +760,7 @@ mod gradient {
             format: wgpu::TextureFormat,
             antialiasing: Option<settings::Antialiasing>,
         ) -> Self {
-            let vertices = Buffer::new(
-                device,
-                "iced_wgpu::triangle::gradient vertex buffer",
-                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            );
-
-            let uniforms = dynamic::Buffer::uniform(
-                device,
-                "iced_wgpu::triangle::gradient uniforms",
-            );
-
-            //Note: with a WASM target storage buffers are not supported. Will need to use UBOs & static
-            // sized array (eg like the 32-sized array on OpenGL side right now) to make gradients work
-            let storage = dynamic::Buffer::storage(
-                device,
-                "iced_wgpu::triangle::gradient storage",
-            );
-
-            let bind_group_layout = device.create_bind_group_layout(
+            let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
                     label: Some(
                         "iced_wgpu::triangle::gradient bind group layout",
@@ -634,19 +792,12 @@ mod gradient {
                 },
             );
 
-            let bind_group = Pipeline::bind_group(
-                device,
-                uniforms.raw(),
-                storage.raw(),
-                &bind_group_layout,
-            );
-
             let layout = device.create_pipeline_layout(
                 &wgpu::PipelineLayoutDescriptor {
                     label: Some(
                         "iced_wgpu::triangle::gradient pipeline layout",
                     ),
-                    bind_group_layouts: &[&bind_group_layout],
+                    bind_group_layouts: &[&constants_layout],
                     push_constant_ranges: &[],
                 },
             );
@@ -694,44 +845,8 @@ mod gradient {
 
             Self {
                 pipeline,
-                vertices,
-                uniforms,
-                storage,
-                color_stop_offset: 0,
-                color_stops_pending_write: Storage {
-                    color_stops: vec![],
-                },
-                bind_group_layout,
-                bind_group,
+                constants_layout,
             }
         }
-
-        pub fn bind_group(
-            device: &wgpu::Device,
-            uniform_buffer: &wgpu::Buffer,
-            storage_buffer: &wgpu::Buffer,
-            layout: &wgpu::BindGroupLayout,
-        ) -> wgpu::BindGroup {
-            device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu::triangle::gradient bind group"),
-                layout,
-                entries: &[
-                    wgpu::BindGroupEntry {
-                        binding: 0,
-                        resource: wgpu::BindingResource::Buffer(
-                            wgpu::BufferBinding {
-                                buffer: uniform_buffer,
-                                offset: 0,
-                                size: Some(Uniforms::min_size()),
-                            },
-                        ),
-                    },
-                    wgpu::BindGroupEntry {
-                        binding: 1,
-                        resource: storage_buffer.as_entire_binding(),
-                    },
-                ],
-            })
-        }
     }
 }
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 50231f7c08..6e1acc0609 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -16,14 +16,11 @@ pub struct Compositor<Theme> {
     adapter: wgpu::Adapter,
     device: wgpu::Device,
     queue: wgpu::Queue,
-    staging_belt: wgpu::util::StagingBelt,
     format: wgpu::TextureFormat,
     theme: PhantomData<Theme>,
 }
 
 impl<Theme> Compositor<Theme> {
-    const CHUNK_SIZE: u64 = 10 * 1024;
-
     /// Requests a new [`Compositor`] with the given [`Settings`].
     ///
     /// Returns `None` if no compatible graphics adapter could be found.
@@ -98,15 +95,12 @@ impl<Theme> Compositor<Theme> {
             .next()
             .await?;
 
-        let staging_belt = wgpu::util::StagingBelt::new(Self::CHUNK_SIZE);
-
         Some(Compositor {
             instance,
             settings,
             adapter,
             device,
             queue,
-            staging_belt,
             format,
             theme: PhantomData,
         })
@@ -228,7 +222,6 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                     backend.present(
                         &self.device,
                         &self.queue,
-                        &mut self.staging_belt,
                         &mut encoder,
                         view,
                         primitives,
@@ -238,13 +231,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 });
 
                 // Submit work
-                self.staging_belt.finish();
                 let _submission = self.queue.submit(Some(encoder.finish()));
                 frame.present();
 
-                // Recall staging buffers
-                self.staging_belt.recall();
-
                 Ok(())
             }
             Err(error) => match error {

From 730d6a07564d014c470e02f233394ec98325d463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 8 Feb 2023 00:47:16 +0100
Subject: [PATCH 038/163] Reuse a `RenderPass` as much as possible in
 `iced_wgpu`

---
 examples/integration/src/main.rs |   1 +
 wgpu/Cargo.toml                  |   5 +-
 wgpu/src/backend.rs              | 261 ++++++++++++++++++++-----------
 wgpu/src/image.rs                |  10 +-
 wgpu/src/quad.rs                 |  10 +-
 wgpu/src/text.rs                 |  40 ++---
 wgpu/src/triangle.rs             |  10 +-
 wgpu/src/window/compositor.rs    |  29 +---
 8 files changed, 196 insertions(+), 170 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 5af30ab1ec..a7a90ced11 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -250,6 +250,7 @@ pub fn main() {
                                 &device,
                                 &queue,
                                 &mut encoder,
+                                None,
                                 &view,
                                 primitive,
                                 &viewport,
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b3fbfc00e7..7a6b75f09b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -59,8 +59,9 @@ path = "../graphics"
 
 [dependencies.glyphon]
 version = "0.2"
-git = "https://github.com/hecrj/glyphon.git"
-rev = "3c2acb9dea5b9fcb0fa650b3c73b3a3242c62f4a"
+# git = "https://github.com/hecrj/glyphon.git"
+# rev = "3c2acb9dea5b9fcb0fa650b3c73b3a3242c62f4a"
+path = "../../glyphon"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 8c4c0daa86..9d1e3d1c56 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -5,8 +5,7 @@ use crate::{Settings, Transformation};
 
 use iced_graphics::backend;
 use iced_graphics::layer::Layer;
-use iced_graphics::{Primitive, Viewport};
-use iced_native::{Font, Size};
+use iced_graphics::{Color, Font, Primitive, Size, Viewport};
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
@@ -71,6 +70,7 @@ impl Backend {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
+        clear_color: Option<Color>,
         frame: &wgpu::TextureView,
         primitives: &[Primitive],
         viewport: &Viewport,
@@ -87,18 +87,25 @@ impl Backend {
         let mut layers = Layer::generate(primitives, viewport);
         layers.push(Layer::overlay(overlay_text, viewport));
 
-        for layer in layers {
-            self.flush(
-                device,
-                queue,
-                scale_factor,
-                transformation,
-                &layer,
-                encoder,
-                frame,
-                target_size,
-            );
-        }
+        self.prepare(
+            device,
+            queue,
+            encoder,
+            scale_factor,
+            transformation,
+            target_size,
+            &layers,
+        );
+
+        self.render(
+            device,
+            encoder,
+            frame,
+            clear_color,
+            scale_factor,
+            target_size,
+            &layers,
+        );
 
         self.quad_pipeline.end_frame();
         self.text_pipeline.end_frame();
@@ -108,90 +115,153 @@ impl Backend {
         self.image_pipeline.end_frame(device, queue, encoder);
     }
 
-    fn flush(
+    fn prepare(
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
+        _encoder: &mut wgpu::CommandEncoder,
         scale_factor: f32,
         transformation: Transformation,
-        layer: &Layer<'_>,
-        encoder: &mut wgpu::CommandEncoder,
-        target: &wgpu::TextureView,
         target_size: Size<u32>,
+        layers: &[Layer<'_>],
     ) {
-        let bounds = (layer.bounds * scale_factor).snap();
+        for layer in layers {
+            let bounds = (layer.bounds * scale_factor).snap();
 
-        if bounds.width < 1 || bounds.height < 1 {
-            return;
-        }
+            if bounds.width < 1 || bounds.height < 1 {
+                return;
+            }
 
-        if !layer.quads.is_empty() {
-            self.quad_pipeline.prepare(
-                device,
-                queue,
-                &layer.quads,
-                transformation,
-                scale_factor,
-            );
-
-            let mut render_pass =
-                encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                    label: Some("iced_wgpu::quad render pass"),
-                    color_attachments: &[Some(
-                        wgpu::RenderPassColorAttachment {
-                            view: target,
-                            resolve_target: None,
-                            ops: wgpu::Operations {
-                                load: wgpu::LoadOp::Load,
-                                store: true,
-                            },
-                        },
-                    )],
-                    depth_stencil_attachment: None,
-                });
+            if !layer.quads.is_empty() {
+                self.quad_pipeline.prepare(
+                    device,
+                    queue,
+                    &layer.quads,
+                    transformation,
+                    scale_factor,
+                );
+            }
 
-            self.quad_pipeline.render(bounds, &mut render_pass);
-        }
+            if !layer.meshes.is_empty() {
+                let scaled = transformation
+                    * Transformation::scale(scale_factor, scale_factor);
+
+                self.triangle_pipeline.prepare(
+                    device,
+                    queue,
+                    &layer.meshes,
+                    scaled,
+                );
+            }
 
-        if !layer.meshes.is_empty() {
-            let scaled = transformation
-                * Transformation::scale(scale_factor, scale_factor);
-
-            self.triangle_pipeline.prepare(
-                device,
-                queue,
-                &layer.meshes,
-                scaled,
-            );
-
-            self.triangle_pipeline.render(
-                device,
-                encoder,
-                target,
-                target_size,
-                &layer.meshes,
-                scale_factor,
-            );
+            #[cfg(any(feature = "image", feature = "svg"))]
+            {
+                if !layer.images.is_empty() {
+                    let scaled = transformation
+                        * Transformation::scale(scale_factor, scale_factor);
+
+                    self.image_pipeline.prepare(
+                        device,
+                        queue,
+                        _encoder,
+                        &layer.images,
+                        scaled,
+                        scale_factor,
+                    );
+                }
+            }
+
+            if !layer.text.is_empty() {
+                self.text_pipeline.prepare(
+                    device,
+                    queue,
+                    &layer.text,
+                    layer.bounds,
+                    scale_factor,
+                    target_size,
+                );
+            }
         }
+    }
 
+    fn render(
+        &mut self,
+        device: &wgpu::Device,
+        encoder: &mut wgpu::CommandEncoder,
+        target: &wgpu::TextureView,
+        clear_color: Option<Color>,
+        scale_factor: f32,
+        target_size: Size<u32>,
+        layers: &[Layer<'_>],
+    ) {
+        use std::mem::ManuallyDrop;
+
+        let mut quad_layer = 0;
+        let mut triangle_layer = 0;
         #[cfg(any(feature = "image", feature = "svg"))]
-        {
-            if !layer.images.is_empty() {
-                let scaled = transformation
-                    * Transformation::scale(scale_factor, scale_factor);
+        let mut image_layer = 0;
+        let mut text_layer = 0;
+
+        let mut render_pass = ManuallyDrop::new(encoder.begin_render_pass(
+            &wgpu::RenderPassDescriptor {
+                label: Some("iced_wgpu::quad render pass"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: target,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: match clear_color {
+                            Some(background_color) => wgpu::LoadOp::Clear({
+                                let [r, g, b, a] =
+                                    background_color.into_linear();
+
+                                wgpu::Color {
+                                    r: f64::from(r),
+                                    g: f64::from(g),
+                                    b: f64::from(b),
+                                    a: f64::from(a),
+                                }
+                            }),
+                            None => wgpu::LoadOp::Load,
+                        },
+                        store: true,
+                    },
+                })],
+                depth_stencil_attachment: None,
+            },
+        ));
+
+        for layer in layers {
+            let bounds = (layer.bounds * scale_factor).snap();
 
-                self.image_pipeline.prepare(
+            if bounds.width < 1 || bounds.height < 1 {
+                return;
+            }
+
+            if !layer.quads.is_empty() {
+                self.quad_pipeline
+                    .render(quad_layer, bounds, &mut render_pass);
+
+                quad_layer += 1;
+            }
+
+            if !layer.meshes.is_empty() {
+                let _ = ManuallyDrop::into_inner(render_pass);
+
+                self.triangle_pipeline.render(
                     device,
-                    queue,
                     encoder,
-                    &layer.images,
-                    scaled,
+                    target,
+                    triangle_layer,
+                    target_size,
+                    &layer.meshes,
                     scale_factor,
                 );
 
-                let mut render_pass =
-                    encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                        label: Some("iced_wgpu::image render pass"),
+                triangle_layer += 1;
+
+                render_pass = ManuallyDrop::new(encoder.begin_render_pass(
+                    &wgpu::RenderPassDescriptor {
+                        label: Some("iced_wgpu::quad render pass"),
                         color_attachments: &[Some(
                             wgpu::RenderPassColorAttachment {
                                 view: target,
@@ -203,24 +273,31 @@ impl Backend {
                             },
                         )],
                         depth_stencil_attachment: None,
-                    });
+                    },
+                ));
+            }
 
-                self.image_pipeline.render(bounds, &mut render_pass);
+            #[cfg(any(feature = "image", feature = "svg"))]
+            {
+                if !layer.images.is_empty() {
+                    self.image_pipeline.render(
+                        image_layer,
+                        bounds,
+                        &mut render_pass,
+                    );
+
+                    image_layer += 1;
+                }
             }
-        }
 
-        if !layer.text.is_empty() {
-            self.text_pipeline.prepare(
-                device,
-                queue,
-                &layer.text,
-                layer.bounds,
-                scale_factor,
-                target_size,
-            );
-
-            self.text_pipeline.render(encoder, target);
+            if !layer.text.is_empty() {
+                self.text_pipeline.render(text_layer, &mut render_pass);
+
+                text_layer += 1;
+            }
         }
+
+        let _ = ManuallyDrop::into_inner(render_pass);
     }
 }
 
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 5d1ae8d7e1..db05d2ffc4 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -45,7 +45,6 @@ pub struct Pipeline {
 
     layers: Vec<Layer>,
     prepare_layer: usize,
-    render_layer: usize,
 }
 
 #[derive(Debug)]
@@ -321,7 +320,6 @@ impl Pipeline {
 
             layers: Vec::new(),
             prepare_layer: 0,
-            render_layer: 0,
         }
     }
 
@@ -452,11 +450,12 @@ impl Pipeline {
     }
 
     pub fn render<'a>(
-        &'a mut self,
+        &'a self,
+        layer: usize,
         bounds: Rectangle<u32>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
-        if let Some(layer) = self.layers.get(self.render_layer) {
+        if let Some(layer) = self.layers.get(layer) {
             render_pass.set_pipeline(&self.pipeline);
 
             render_pass.set_scissor_rect(
@@ -474,8 +473,6 @@ impl Pipeline {
             render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
             layer.render(render_pass);
-
-            self.render_layer += 1;
         }
     }
 
@@ -496,7 +493,6 @@ impl Pipeline {
             .trim(&mut self.texture_atlas, &mut (device, queue, encoder));
 
         self.prepare_layer = 0;
-        self.render_layer = 0;
     }
 }
 
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index c1aa49c48b..246cc5e1dd 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -17,7 +17,6 @@ pub struct Pipeline {
     indices: wgpu::Buffer,
     layers: Vec<Layer>,
     prepare_layer: usize,
-    render_layer: usize,
 }
 
 impl Pipeline {
@@ -140,7 +139,6 @@ impl Pipeline {
             indices,
             layers: Vec::new(),
             prepare_layer: 0,
-            render_layer: 0,
         }
     }
 
@@ -163,11 +161,12 @@ impl Pipeline {
     }
 
     pub fn render<'a>(
-        &'a mut self,
+        &'a self,
+        layer: usize,
         bounds: Rectangle<u32>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
-        if let Some(layer) = self.layers.get(self.render_layer) {
+        if let Some(layer) = self.layers.get(layer) {
             render_pass.set_pipeline(&self.pipeline);
 
             render_pass.set_scissor_rect(
@@ -184,14 +183,11 @@ impl Pipeline {
             render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
             layer.draw(render_pass);
-
-            self.render_layer += 1;
         }
     }
 
     pub fn end_frame(&mut self) {
         self.prepare_layer = 0;
-        self.render_layer = 0;
     }
 }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 95994a4e70..73708fd8c5 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -16,7 +16,7 @@ pub struct Pipeline {
     system: Option<System>,
     renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
-    layer: usize,
+    prepare_layer: usize,
 }
 
 #[ouroboros::self_referencing]
@@ -55,7 +55,7 @@ impl Pipeline {
             ),
             renderers: Vec::new(),
             atlas: glyphon::TextAtlas::new(device, queue, format),
-            layer: 0,
+            prepare_layer: 0,
         }
     }
 
@@ -88,12 +88,12 @@ impl Pipeline {
         target_size: Size<u32>,
     ) {
         self.system.as_mut().unwrap().with_mut(|fields| {
-            if self.renderers.len() <= self.layer {
+            if self.renderers.len() <= self.prepare_layer {
                 self.renderers
                     .push(glyphon::TextRenderer::new(device, queue));
             }
 
-            let renderer = &mut self.renderers[self.layer];
+            let renderer = &mut self.renderers[self.prepare_layer];
 
             let keys: Vec<_> = sections
                 .iter()
@@ -179,35 +179,21 @@ impl Pipeline {
                     &mut glyphon::SwashCache::new(fields.fonts),
                 )
                 .expect("Prepare text sections");
+
+            self.prepare_layer += 1;
         });
     }
 
-    pub fn render(
-        &mut self,
-        encoder: &mut wgpu::CommandEncoder,
-        target: &wgpu::TextureView,
+    pub fn render<'a>(
+        &'a self,
+        layer: usize,
+        render_pass: &mut wgpu::RenderPass<'a>,
     ) {
-        let mut render_pass =
-            encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                label: None,
-                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                    view: target,
-                    resolve_target: None,
-                    ops: wgpu::Operations {
-                        load: wgpu::LoadOp::Load,
-                        store: true,
-                    },
-                })],
-                depth_stencil_attachment: None,
-            });
-
-        let renderer = &mut self.renderers[self.layer];
+        let renderer = &self.renderers[layer];
 
         renderer
-            .render(&self.atlas, &mut render_pass)
+            .render(&self.atlas, render_pass)
             .expect("Render text");
-
-        self.layer += 1;
     }
 
     pub fn end_frame(&mut self) {
@@ -216,7 +202,7 @@ impl Pipeline {
             .unwrap()
             .with_render_cache_mut(|cache| cache.trim());
 
-        self.layer = 0;
+        self.prepare_layer = 0;
     }
 
     pub fn measure(
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 572af1e89d..1b537bf4c8 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -22,7 +22,6 @@ pub struct Pipeline {
 
     layers: Vec<Layer>,
     prepare_layer: usize,
-    render_layer: usize,
 }
 
 #[derive(Debug)]
@@ -235,7 +234,7 @@ impl Layer {
     }
 
     fn render<'a>(
-        &'a mut self,
+        &'a self,
         solid: &'a solid::Pipeline,
         #[cfg(not(target_arch = "wasm32"))] gradient: &'a gradient::Pipeline,
         meshes: &[Mesh<'_>],
@@ -331,7 +330,6 @@ impl Pipeline {
 
             layers: Vec::new(),
             prepare_layer: 0,
-            render_layer: 0,
         }
     }
 
@@ -373,6 +371,7 @@ impl Pipeline {
         device: &wgpu::Device,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
+        layer: usize,
         target_size: Size<u32>,
         meshes: &[Mesh<'_>],
         scale_factor: f32,
@@ -413,7 +412,7 @@ impl Pipeline {
                     depth_stencil_attachment: None,
                 });
 
-            let layer = &mut self.layers[self.render_layer];
+            let layer = &mut self.layers[layer];
 
             layer.render(
                 &self.solid,
@@ -425,8 +424,6 @@ impl Pipeline {
             );
         }
 
-        self.render_layer += 1;
-
         if let Some(blit) = &mut self.blit {
             blit.draw(encoder, target);
         }
@@ -434,7 +431,6 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.prepare_layer = 0;
-        self.render_layer = 0;
     }
 }
 
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6e1acc0609..365cb60377 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -190,39 +190,12 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                     .texture
                     .create_view(&wgpu::TextureViewDescriptor::default());
 
-                let _ =
-                    encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                        label: Some(
-                            "iced_wgpu::window::Compositor render pass",
-                        ),
-                        color_attachments: &[Some(
-                            wgpu::RenderPassColorAttachment {
-                                view,
-                                resolve_target: None,
-                                ops: wgpu::Operations {
-                                    load: wgpu::LoadOp::Clear({
-                                        let [r, g, b, a] =
-                                            background_color.into_linear();
-
-                                        wgpu::Color {
-                                            r: f64::from(r),
-                                            g: f64::from(g),
-                                            b: f64::from(b),
-                                            a: f64::from(a),
-                                        }
-                                    }),
-                                    store: true,
-                                },
-                            },
-                        )],
-                        depth_stencil_attachment: None,
-                    });
-
                 renderer.with_primitives(|backend, primitives| {
                     backend.present(
                         &self.device,
                         &self.queue,
                         &mut encoder,
+                        Some(background_color),
                         view,
                         primitives,
                         viewport,

From 21886d7e9cde17904719f1642f0b3af9791102ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 8 Feb 2023 00:48:38 +0100
Subject: [PATCH 039/163] Use my GitHub fork of `glyphon`

---
 wgpu/Cargo.toml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 7a6b75f09b..46115a3c7b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -59,9 +59,8 @@ path = "../graphics"
 
 [dependencies.glyphon]
 version = "0.2"
-# git = "https://github.com/hecrj/glyphon.git"
-# rev = "3c2acb9dea5b9fcb0fa650b3c73b3a3242c62f4a"
-path = "../../glyphon"
+git = "https://github.com/hecrj/glyphon.git"
+rev = "ccf19c67e8a4564263626bc6b86b6154540768c4"
 
 [dependencies.tracing]
 version = "0.1.6"

From ddbf93a82ff2ee0ca3265baf2f5b4442717b9101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 8 Feb 2023 01:23:40 +0100
Subject: [PATCH 040/163] Set scissoring properly in `text::Pipeline`

---
 wgpu/src/backend.rs | 3 ++-
 wgpu/src/text.rs    | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9d1e3d1c56..d07898f792 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -291,7 +291,8 @@ impl Backend {
             }
 
             if !layer.text.is_empty() {
-                self.text_pipeline.render(text_layer, &mut render_pass);
+                self.text_pipeline
+                    .render(text_layer, bounds, &mut render_pass);
 
                 text_layer += 1;
             }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 73708fd8c5..655ad98719 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -187,10 +187,18 @@ impl Pipeline {
     pub fn render<'a>(
         &'a self,
         layer: usize,
+        bounds: Rectangle<u32>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
         let renderer = &self.renderers[layer];
 
+        render_pass.set_scissor_rect(
+            bounds.x,
+            bounds.y,
+            bounds.width,
+            bounds.height,
+        );
+
         renderer
             .render(&self.atlas, render_pass)
             .expect("Render text");

From 05c787c2efbd8c8bc11925e1605b8b09ba744268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 8 Feb 2023 23:21:04 +0100
Subject: [PATCH 041/163] Grow atlas in `text::Pipeline` when necessary

---
 wgpu/Cargo.toml     |  2 +-
 wgpu/src/backend.rs | 55 +++++++++++++++++++++++++++++++++------------
 wgpu/src/text.rs    | 54 +++++++++++++++++++++++++++++---------------
 3 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 46115a3c7b..6132768dca 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -60,7 +60,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "ccf19c67e8a4564263626bc6b86b6154540768c4"
+rev = "541efc5df644b1a25e96113f602a3f6803ce8a07"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index d07898f792..7f44fafa0e 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -93,10 +93,17 @@ impl Backend {
             encoder,
             scale_factor,
             transformation,
-            target_size,
             &layers,
         );
 
+        while !self.prepare_text(
+            device,
+            queue,
+            scale_factor,
+            target_size,
+            &layers,
+        ) {}
+
         self.render(
             device,
             encoder,
@@ -115,6 +122,38 @@ impl Backend {
         self.image_pipeline.end_frame(device, queue, encoder);
     }
 
+    fn prepare_text(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        scale_factor: f32,
+        target_size: Size<u32>,
+        layers: &[Layer<'_>],
+    ) -> bool {
+        for layer in layers {
+            let bounds = (layer.bounds * scale_factor).snap();
+
+            if bounds.width < 1 || bounds.height < 1 {
+                continue;
+            }
+
+            if !layer.text.is_empty() {
+                if !self.text_pipeline.prepare(
+                    device,
+                    queue,
+                    &layer.text,
+                    layer.bounds,
+                    scale_factor,
+                    target_size,
+                ) {
+                    return false;
+                }
+            }
+        }
+
+        true
+    }
+
     fn prepare(
         &mut self,
         device: &wgpu::Device,
@@ -122,14 +161,13 @@ impl Backend {
         _encoder: &mut wgpu::CommandEncoder,
         scale_factor: f32,
         transformation: Transformation,
-        target_size: Size<u32>,
         layers: &[Layer<'_>],
     ) {
         for layer in layers {
             let bounds = (layer.bounds * scale_factor).snap();
 
             if bounds.width < 1 || bounds.height < 1 {
-                return;
+                continue;
             }
 
             if !layer.quads.is_empty() {
@@ -170,17 +208,6 @@ impl Backend {
                     );
                 }
             }
-
-            if !layer.text.is_empty() {
-                self.text_pipeline.prepare(
-                    device,
-                    queue,
-                    &layer.text,
-                    layer.bounds,
-                    scale_factor,
-                    target_size,
-                );
-            }
         }
     }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 655ad98719..4406177a08 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -86,7 +86,7 @@ impl Pipeline {
         bounds: Rectangle,
         scale_factor: f32,
         target_size: Size<u32>,
-    ) {
+    ) -> bool {
         self.system.as_mut().unwrap().with_mut(|fields| {
             if self.renderers.len() <= self.prepare_layer {
                 self.renderers
@@ -165,23 +165,39 @@ impl Pipeline {
                     }
                 });
 
-            renderer
-                .prepare(
-                    device,
-                    queue,
-                    &mut self.atlas,
-                    glyphon::Resolution {
-                        width: target_size.width,
-                        height: target_size.height,
-                    },
-                    text_areas,
-                    glyphon::Color::rgb(0, 0, 0),
-                    &mut glyphon::SwashCache::new(fields.fonts),
-                )
-                .expect("Prepare text sections");
-
-            self.prepare_layer += 1;
-        });
+            let result = renderer.prepare(
+                device,
+                queue,
+                &mut self.atlas,
+                glyphon::Resolution {
+                    width: target_size.width,
+                    height: target_size.height,
+                },
+                text_areas,
+                glyphon::Color::rgb(0, 0, 0),
+                &mut glyphon::SwashCache::new(fields.fonts),
+            );
+
+            match result {
+                Ok(()) => {
+                    self.prepare_layer += 1;
+
+                    true
+                }
+                Err(glyphon::PrepareError::AtlasFull(content_type)) => {
+                    self.prepare_layer = 0;
+
+                    if self.atlas.grow(device, content_type) {
+                        false
+                    } else {
+                        // If the atlas cannot grow, then all bets are off.
+                        // Instead of panicking, we will just pray that the result
+                        // will be somewhat readable...
+                        true
+                    }
+                }
+            }
+        })
     }
 
     pub fn render<'a>(
@@ -205,6 +221,8 @@ impl Pipeline {
     }
 
     pub fn end_frame(&mut self) {
+        self.atlas.trim();
+
         self.system
             .as_mut()
             .unwrap()

From 0715d7d0c781a4c7ead4dfdbf0f4656022df67e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 9 Feb 2023 00:20:07 +0100
Subject: [PATCH 042/163] Update `glyphon` in `iced_wgpu`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 6132768dca..632873a370 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -60,7 +60,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "541efc5df644b1a25e96113f602a3f6803ce8a07"
+rev = "65b481d758f50fd13fc21af2cc5ef62ddee64955"
 
 [dependencies.tracing]
 version = "0.1.6"

From 2097a56b58d8fe1784a625f69c1cdd38fcfb9a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 9 Feb 2023 06:54:51 +0100
Subject: [PATCH 043/163] Provide some margin to static buffers when growing

---
 wgpu/src/buffer/static.rs | 13 ++++++++-----
 wgpu/src/triangle.rs      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/wgpu/src/buffer/static.rs b/wgpu/src/buffer/static.rs
index 7ae7edd256..d8ae116e4c 100644
--- a/wgpu/src/buffer/static.rs
+++ b/wgpu/src/buffer/static.rs
@@ -2,8 +2,7 @@ use bytemuck::{Pod, Zeroable};
 use std::marker::PhantomData;
 use std::mem;
 
-//128 triangles/indices
-const DEFAULT_STATIC_BUFFER_COUNT: wgpu::BufferAddress = 1_000;
+const DEFAULT_COUNT: wgpu::BufferAddress = 128;
 
 /// A generic buffer struct useful for items which have no alignment requirements
 /// (e.g. Vertex, Index buffers) & no dynamic offsets.
@@ -25,7 +24,7 @@ impl<T: Pod + Zeroable> Buffer<T> {
         label: &'static str,
         usages: wgpu::BufferUsages,
     ) -> Self {
-        let size = (mem::size_of::<T>() as u64) * DEFAULT_STATIC_BUFFER_COUNT;
+        let size = (mem::size_of::<T>() as u64) * DEFAULT_COUNT;
 
         Self {
             offsets: Vec::new(),
@@ -57,9 +56,13 @@ impl<T: Pod + Zeroable> Buffer<T> {
         let size = (mem::size_of::<T>() * new_count) as u64;
 
         if self.size < size {
+            self.size =
+                (mem::size_of::<T>() * (new_count + new_count / 2)) as u64;
+
+            self.gpu =
+                Self::gpu_buffer(device, self.label, self.size, self.usages);
+
             self.offsets.clear();
-            self.size = size;
-            self.gpu = Self::gpu_buffer(device, self.label, size, self.usages);
             true
         } else {
             false
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 1b537bf4c8..4b4fa16da4 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -43,7 +43,7 @@ impl Layer {
         Self {
             index_buffer: Buffer::new(
                 device,
-                "iced_wgpu::triangle vertex buffer",
+                "iced_wgpu::triangle index buffer",
                 wgpu::BufferUsages::INDEX | wgpu::BufferUsages::COPY_DST,
             ),
             index_strides: Vec::new(),

From 17a4d817c45da732e9fdc6559b6bbc7d5be94052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 9 Feb 2023 07:00:21 +0100
Subject: [PATCH 044/163] Collapse conditional and please `clippy`

---
 wgpu/src/backend.rs | 10 +++++-----
 wgpu/src/text.rs    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 7f44fafa0e..e650d9a5eb 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -137,17 +137,17 @@ impl Backend {
                 continue;
             }
 
-            if !layer.text.is_empty() {
-                if !self.text_pipeline.prepare(
+            if !layer.text.is_empty()
+                && !self.text_pipeline.prepare(
                     device,
                     queue,
                     &layer.text,
                     layer.bounds,
                     scale_factor,
                     target_size,
-                ) {
-                    return false;
-                }
+                )
+            {
+                return false;
             }
         }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 4406177a08..c0f4941719 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -187,6 +187,7 @@ impl Pipeline {
                 Err(glyphon::PrepareError::AtlasFull(content_type)) => {
                     self.prepare_layer = 0;
 
+                    #[allow(clippy::needless_bool)]
                     if self.atlas.grow(device, content_type) {
                         false
                     } else {

From 51844c5d0c7f7c9b65c56330862b69f0baa0e3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 10 Feb 2023 18:52:35 +0100
Subject: [PATCH 045/163] Trim `Cache` every 300 frames in `text::Pipeline`

---
 wgpu/src/text.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index c0f4941719..dea6ab18c6 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -316,6 +316,7 @@ struct Cache<'a> {
     entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
+    trim_count: usize,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -325,11 +326,14 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
 impl<'a> Cache<'a> {
+    const TRIM_INTERVAL: usize = 300;
+
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
+            trim_count: 0,
         }
     }
 
@@ -389,10 +393,16 @@ impl<'a> Cache<'a> {
     }
 
     fn trim(&mut self) {
-        self.entries
-            .retain(|key, _| self.recently_used.contains(key));
+        if self.trim_count >= Self::TRIM_INTERVAL {
+            self.entries
+                .retain(|key, _| self.recently_used.contains(key));
+
+            self.recently_used.clear();
 
-        self.recently_used.clear();
+            self.trim_count = 0;
+        } else {
+            self.trim_count += 1;
+        }
     }
 }
 

From 26e902f7d84290f8163a25c37488d29db4fc0708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 10 Feb 2023 20:03:33 +0100
Subject: [PATCH 046/163] Compute grapheme index in `find_cursor_position` for
 `TextInput`

---
 native/src/text.rs              | 13 +------------
 native/src/widget/text_input.rs | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/native/src/text.rs b/native/src/text.rs
index 1bbd36ccf1..4c72abc302 100644
--- a/native/src/text.rs
+++ b/native/src/text.rs
@@ -1,6 +1,6 @@
 //! Draw and interact with text.
 use crate::alignment;
-use crate::{Color, Point, Rectangle, Size, Vector};
+use crate::{Color, Point, Rectangle, Size};
 
 use std::borrow::Cow;
 
@@ -34,10 +34,6 @@ pub struct Text<'a, Font> {
 pub enum Hit {
     /// The point was within the bounds of the returned character index.
     CharOffset(usize),
-    /// The provided point was not within the bounds of a glyph. The index
-    /// of the character with the closest centeroid position is returned,
-    /// as well as its delta.
-    NearestCharOffset(usize, Vector),
 }
 
 impl Hit {
@@ -45,13 +41,6 @@ impl Hit {
     pub fn cursor(self) -> usize {
         match self {
             Self::CharOffset(i) => i,
-            Self::NearestCharOffset(i, delta) => {
-                if delta.x > f32::EPSILON {
-                    i + 1
-                } else {
-                    i
-                }
-            }
         }
     }
 }
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index f51416e14a..65a9bd3b21 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -1193,17 +1193,26 @@ where
     let size = size.unwrap_or_else(|| renderer.default_size());
 
     let offset = offset(renderer, text_bounds, font, size, value, state);
+    let value = value.to_string();
 
-    renderer
+    let char_offset = renderer
         .hit_test(
-            &value.to_string(),
+            &value,
             size,
             font,
             Size::INFINITY,
             Point::new(x + offset, text_bounds.height / 2.0),
             true,
         )
-        .map(text::Hit::cursor)
+        .map(text::Hit::cursor)?;
+
+    Some(
+        unicode_segmentation::UnicodeSegmentation::graphemes(
+            &value[..char_offset],
+            true,
+        )
+        .count(),
+    )
 }
 
 const CURSOR_BLINK_INTERVAL_MILLIS: u128 = 500;

From a0597471b81b122b43e1bb90e43e1bcde1e8a892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 10 Feb 2023 20:24:18 +0100
Subject: [PATCH 047/163] Remove `iced_glutin` and `iced_glow` leftovers

---
 Cargo.toml                |   3 -
 glutin/Cargo.toml         |  42 ----
 glutin/README.md          |  29 ---
 glutin/src/application.rs | 508 --------------------------------------
 glutin/src/lib.rs         |  33 ---
 src/lib.rs                |  11 +-
 src/settings.rs           |  12 -
 winit/src/settings.rs     |   8 -
 8 files changed, 1 insertion(+), 645 deletions(-)
 delete mode 100644 glutin/Cargo.toml
 delete mode 100644 glutin/README.md
 delete mode 100644 glutin/src/application.rs
 delete mode 100644 glutin/src/lib.rs

diff --git a/Cargo.toml b/Cargo.toml
index 42c9488cb6..5fc0cc103f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,6 @@ system = ["iced_winit/system"]
 # Enables chrome traces
 chrome-trace = [
     "iced_winit/chrome-trace",
-    "iced_glutin?/trace",
     "iced_wgpu?/tracing",
 ]
 
@@ -50,7 +49,6 @@ members = [
     "core",
     "futures",
     "graphics",
-    "glutin",
     "lazy",
     "native",
     "style",
@@ -65,7 +63,6 @@ iced_futures = { version = "0.6", path = "futures" }
 iced_native = { version = "0.9", path = "native" }
 iced_graphics = { version = "0.7", path = "graphics" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
-iced_glutin = { version = "0.7", path = "glutin", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
deleted file mode 100644
index 10d3778be9..0000000000
--- a/glutin/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "iced_glutin"
-version = "0.7.0"
-authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2021"
-description = "A glutin runtime for Iced"
-license = "MIT"
-repository = "https://github.com/iced-rs/iced"
-documentation = "https://docs.rs/iced_glutin"
-keywords = ["gui", "ui", "graphics", "interface", "widgets"]
-categories = ["gui"]
-
-[features]
-trace = ["iced_winit/trace"]
-debug = ["iced_winit/debug"]
-system = ["iced_winit/system"]
-
-[dependencies]
-log = "0.4"
-
-[dependencies.glutin]
-version = "0.29"
-git = "https://github.com/iced-rs/glutin"
-rev = "da8d291486b4c9bec12487a46c119c4b1d386abf"
-
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
-[dependencies.iced_winit]
-version = "0.8"
-path = "../winit"
-features = ["application"]
-
-[dependencies.iced_graphics]
-version = "0.7"
-path = "../graphics"
-features = ["opengl"]
-
-[dependencies.tracing]
-version = "0.1.6"
-optional = true
diff --git a/glutin/README.md b/glutin/README.md
deleted file mode 100644
index 45e8ee6b4f..0000000000
--- a/glutin/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# `iced_glutin`
-[![Documentation](https://docs.rs/iced_glutin/badge.svg)][documentation]
-[![Crates.io](https://img.shields.io/crates/v/iced_glutin.svg)](https://crates.io/crates/iced_glutin)
-[![License](https://img.shields.io/crates/l/iced_glutin.svg)](https://github.com/iced-rs/iced/blob/master/LICENSE)
-[![Discord Server](https://img.shields.io/discord/628993209984614400?label=&labelColor=6A7EC2&logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/3xZJ65GAhd)
-
-`iced_glutin` offers some convenient abstractions on top of [`iced_native`] to quickstart development when using [`glutin`].
-
-It exposes a renderer-agnostic `Application` trait that can be implemented and then run with a simple call. The use of this trait is optional. A `conversion` module is provided for users that decide to implement a custom event loop.
-
-<p align="center">
-  <img alt="The native target" src="../docs/graphs/native.png" width="80%">
-</p>
-
-[documentation]: https://docs.rs/iced_glutin
-[`iced_native`]: ../native
-[`glutin`]: https://github.com/rust-windowing/glutin
-
-## Installation
-Add `iced_glutin` as a dependency in your `Cargo.toml`:
-
-```toml
-iced_glutin = "0.7"
-```
-
-__Iced moves fast and the `master` branch can contain breaking changes!__ If
-you want to learn about a specific release, check out [the release list].
-
-[the release list]: https://github.com/iced-rs/iced/releases
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
deleted file mode 100644
index 5921bdd01a..0000000000
--- a/glutin/src/application.rs
+++ /dev/null
@@ -1,508 +0,0 @@
-//! Create interactive, native cross-platform applications.
-use crate::mouse;
-use crate::{Error, Executor, Runtime};
-
-pub use iced_winit::application::StyleSheet;
-pub use iced_winit::Application;
-
-use iced_graphics::window;
-use iced_winit::application;
-use iced_winit::conversion;
-use iced_winit::futures;
-use iced_winit::futures::channel::mpsc;
-use iced_winit::renderer;
-use iced_winit::time::Instant;
-use iced_winit::user_interface;
-use iced_winit::{Clipboard, Command, Debug, Event, Proxy, Settings};
-
-use glutin::window::Window;
-use std::mem::ManuallyDrop;
-
-#[cfg(feature = "tracing")]
-use tracing::{info_span, instrument::Instrument};
-
-/// Runs an [`Application`] with an executor, compositor, and the provided
-/// settings.
-pub fn run<A, E, C>(
-    settings: Settings<A::Flags>,
-    compositor_settings: C::Settings,
-) -> Result<(), Error>
-where
-    A: Application + 'static,
-    E: Executor + 'static,
-    C: window::GLCompositor<Renderer = A::Renderer> + 'static,
-    <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
-{
-    use futures::task;
-    use futures::Future;
-    use glutin::event_loop::EventLoopBuilder;
-    use glutin::platform::run_return::EventLoopExtRunReturn;
-    use glutin::ContextBuilder;
-
-    #[cfg(feature = "trace")]
-    let _guard = iced_winit::Profiler::init();
-
-    let mut debug = Debug::new();
-    debug.startup_started();
-
-    #[cfg(feature = "tracing")]
-    let _ = info_span!("Application::Glutin", "RUN").entered();
-
-    let mut event_loop = EventLoopBuilder::with_user_event().build();
-    let proxy = event_loop.create_proxy();
-
-    let runtime = {
-        let executor = E::new().map_err(Error::ExecutorCreationFailed)?;
-        let proxy = Proxy::new(event_loop.create_proxy());
-
-        Runtime::new(executor, proxy)
-    };
-
-    let (application, init_command) = {
-        let flags = settings.flags;
-
-        runtime.enter(|| A::new(flags))
-    };
-
-    let context = {
-        let builder = settings.window.into_builder(
-            &application.title(),
-            event_loop.primary_monitor(),
-            settings.id,
-        );
-
-        log::debug!("Window builder: {:#?}", builder);
-
-        let opengl_builder = ContextBuilder::new()
-            .with_vsync(true)
-            .with_multisampling(C::sample_count(&compositor_settings) as u16);
-
-        let opengles_builder = opengl_builder.clone().with_gl(
-            glutin::GlRequest::Specific(glutin::Api::OpenGlEs, (2, 0)),
-        );
-
-        let (first_builder, second_builder) = if settings.try_opengles_first {
-            (opengles_builder, opengl_builder)
-        } else {
-            (opengl_builder, opengles_builder)
-        };
-
-        log::info!("Trying first builder: {:#?}", first_builder);
-
-        let context = first_builder
-            .build_windowed(builder.clone(), &event_loop)
-            .or_else(|_| {
-                log::info!("Trying second builder: {:#?}", second_builder);
-                second_builder.build_windowed(builder, &event_loop)
-            })
-            .map_err(|error| {
-                use glutin::CreationError;
-                use iced_graphics::Error as ContextError;
-
-                match error {
-                    CreationError::Window(error) => {
-                        Error::WindowCreationFailed(error)
-                    }
-                    CreationError::OpenGlVersionNotSupported => {
-                        Error::GraphicsCreationFailed(
-                            ContextError::VersionNotSupported,
-                        )
-                    }
-                    CreationError::NoAvailablePixelFormat => {
-                        Error::GraphicsCreationFailed(
-                            ContextError::NoAvailablePixelFormat,
-                        )
-                    }
-                    error => Error::GraphicsCreationFailed(
-                        ContextError::BackendError(error.to_string()),
-                    ),
-                }
-            })?;
-
-        #[allow(unsafe_code)]
-        unsafe {
-            context.make_current().expect("Make OpenGL context current")
-        }
-    };
-
-    #[allow(unsafe_code)]
-    let (compositor, renderer) = unsafe {
-        C::new(compositor_settings, |address| {
-            context.get_proc_address(address)
-        })?
-    };
-
-    let (mut event_sender, event_receiver) = mpsc::unbounded();
-    let (control_sender, mut control_receiver) = mpsc::unbounded();
-
-    let mut instance = Box::pin({
-        let run_instance = run_instance::<A, E, C>(
-            application,
-            compositor,
-            renderer,
-            runtime,
-            proxy,
-            debug,
-            event_receiver,
-            control_sender,
-            context,
-            init_command,
-            settings.exit_on_close_request,
-        );
-
-        #[cfg(feature = "tracing")]
-        let run_instance =
-            run_instance.instrument(info_span!("Application", "LOOP"));
-
-        run_instance
-    });
-
-    let mut context = task::Context::from_waker(task::noop_waker_ref());
-
-    let _ = event_loop.run_return(move |event, _, control_flow| {
-        use glutin::event_loop::ControlFlow;
-
-        if let ControlFlow::ExitWithCode(_) = control_flow {
-            return;
-        }
-
-        let event = match event {
-            glutin::event::Event::WindowEvent {
-                event:
-                    glutin::event::WindowEvent::ScaleFactorChanged {
-                        new_inner_size,
-                        ..
-                    },
-                window_id,
-            } => Some(glutin::event::Event::WindowEvent {
-                event: glutin::event::WindowEvent::Resized(*new_inner_size),
-                window_id,
-            }),
-            _ => event.to_static(),
-        };
-
-        if let Some(event) = event {
-            event_sender.start_send(event).expect("Send event");
-
-            let poll = instance.as_mut().poll(&mut context);
-
-            match poll {
-                task::Poll::Pending => {
-                    if let Ok(Some(flow)) = control_receiver.try_next() {
-                        *control_flow = flow;
-                    }
-                }
-                task::Poll::Ready(_) => {
-                    *control_flow = ControlFlow::Exit;
-                }
-            }
-        }
-    });
-
-    Ok(())
-}
-
-async fn run_instance<A, E, C>(
-    mut application: A,
-    mut compositor: C,
-    mut renderer: A::Renderer,
-    mut runtime: Runtime<E, Proxy<A::Message>, A::Message>,
-    mut proxy: glutin::event_loop::EventLoopProxy<A::Message>,
-    mut debug: Debug,
-    mut event_receiver: mpsc::UnboundedReceiver<
-        glutin::event::Event<'_, A::Message>,
-    >,
-    mut control_sender: mpsc::UnboundedSender<glutin::event_loop::ControlFlow>,
-    mut context: glutin::ContextWrapper<glutin::PossiblyCurrent, Window>,
-    init_command: Command<A::Message>,
-    exit_on_close_request: bool,
-) where
-    A: Application + 'static,
-    E: Executor + 'static,
-    C: window::GLCompositor<Renderer = A::Renderer> + 'static,
-    <A::Renderer as iced_native::Renderer>::Theme: StyleSheet,
-{
-    use glutin::event;
-    use glutin::event_loop::ControlFlow;
-    use iced_winit::futures::stream::StreamExt;
-
-    let mut clipboard = Clipboard::connect(context.window());
-    let mut cache = user_interface::Cache::default();
-    let mut state = application::State::new(&application, context.window());
-    let mut viewport_version = state.viewport_version();
-    let mut should_exit = false;
-
-    application::run_command(
-        &application,
-        &mut cache,
-        &state,
-        &mut renderer,
-        init_command,
-        &mut runtime,
-        &mut clipboard,
-        &mut should_exit,
-        &mut proxy,
-        &mut debug,
-        context.window(),
-        || compositor.fetch_information(),
-    );
-    runtime.track(application.subscription());
-
-    let mut user_interface =
-        ManuallyDrop::new(application::build_user_interface(
-            &application,
-            user_interface::Cache::default(),
-            &mut renderer,
-            state.logical_size(),
-            &mut debug,
-        ));
-
-    let mut mouse_interaction = mouse::Interaction::default();
-    let mut events = Vec::new();
-    let mut messages = Vec::new();
-    let mut redraw_pending = false;
-
-    debug.startup_finished();
-
-    while let Some(event) = event_receiver.next().await {
-        match event {
-            event::Event::NewEvents(start_cause) => {
-                redraw_pending = matches!(
-                    start_cause,
-                    event::StartCause::Init
-                        | event::StartCause::Poll
-                        | event::StartCause::ResumeTimeReached { .. }
-                );
-            }
-            event::Event::MainEventsCleared => {
-                if !redraw_pending && events.is_empty() && messages.is_empty() {
-                    continue;
-                }
-
-                debug.event_processing_started();
-
-                let (interface_state, statuses) = user_interface.update(
-                    &events,
-                    state.cursor_position(),
-                    &mut renderer,
-                    &mut clipboard,
-                    &mut messages,
-                );
-
-                debug.event_processing_finished();
-
-                for event in events.drain(..).zip(statuses.into_iter()) {
-                    runtime.broadcast(event);
-                }
-
-                if !messages.is_empty()
-                    || matches!(
-                        interface_state,
-                        user_interface::State::Outdated
-                    )
-                {
-                    let mut cache =
-                        ManuallyDrop::into_inner(user_interface).into_cache();
-
-                    // Update application
-                    application::update(
-                        &mut application,
-                        &mut cache,
-                        &state,
-                        &mut renderer,
-                        &mut runtime,
-                        &mut clipboard,
-                        &mut should_exit,
-                        &mut proxy,
-                        &mut debug,
-                        &mut messages,
-                        context.window(),
-                        || compositor.fetch_information(),
-                    );
-
-                    // Update window
-                    state.synchronize(&application, context.window());
-
-                    user_interface =
-                        ManuallyDrop::new(application::build_user_interface(
-                            &application,
-                            cache,
-                            &mut renderer,
-                            state.logical_size(),
-                            &mut debug,
-                        ));
-
-                    if should_exit {
-                        break;
-                    }
-                }
-
-                // TODO: Avoid redrawing all the time by forcing widgets to
-                // request redraws on state changes
-                //
-                // Then, we can use the `interface_state` here to decide if a redraw
-                // is needed right away, or simply wait until a specific time.
-                let redraw_event = Event::Window(
-                    crate::window::Event::RedrawRequested(Instant::now()),
-                );
-
-                let (interface_state, _) = user_interface.update(
-                    &[redraw_event.clone()],
-                    state.cursor_position(),
-                    &mut renderer,
-                    &mut clipboard,
-                    &mut messages,
-                );
-
-                debug.draw_started();
-                let new_mouse_interaction = user_interface.draw(
-                    &mut renderer,
-                    state.theme(),
-                    &renderer::Style {
-                        text_color: state.text_color(),
-                    },
-                    state.cursor_position(),
-                );
-                debug.draw_finished();
-
-                if new_mouse_interaction != mouse_interaction {
-                    context.window().set_cursor_icon(
-                        conversion::mouse_interaction(new_mouse_interaction),
-                    );
-
-                    mouse_interaction = new_mouse_interaction;
-                }
-
-                context.window().request_redraw();
-                runtime
-                    .broadcast((redraw_event, crate::event::Status::Ignored));
-
-                let _ = control_sender.start_send(match interface_state {
-                    user_interface::State::Updated {
-                        redraw_request: Some(redraw_request),
-                    } => match redraw_request {
-                        crate::window::RedrawRequest::NextFrame => {
-                            ControlFlow::Poll
-                        }
-                        crate::window::RedrawRequest::At(at) => {
-                            ControlFlow::WaitUntil(at)
-                        }
-                    },
-                    _ => ControlFlow::Wait,
-                });
-
-                redraw_pending = false;
-            }
-            event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
-                event::MacOS::ReceivedUrl(url),
-            )) => {
-                use iced_native::event;
-                events.push(iced_native::Event::PlatformSpecific(
-                    event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
-                        url,
-                    )),
-                ));
-            }
-            event::Event::UserEvent(message) => {
-                messages.push(message);
-            }
-            event::Event::RedrawRequested(_) => {
-                #[cfg(feature = "tracing")]
-                let _ = info_span!("Application", "FRAME").entered();
-
-                debug.render_started();
-
-                #[allow(unsafe_code)]
-                unsafe {
-                    if !context.is_current() {
-                        context = context
-                            .make_current()
-                            .expect("Make OpenGL context current");
-                    }
-                }
-
-                let current_viewport_version = state.viewport_version();
-
-                if viewport_version != current_viewport_version {
-                    let physical_size = state.physical_size();
-                    let logical_size = state.logical_size();
-
-                    debug.layout_started();
-                    user_interface = ManuallyDrop::new(
-                        ManuallyDrop::into_inner(user_interface)
-                            .relayout(logical_size, &mut renderer),
-                    );
-                    debug.layout_finished();
-
-                    debug.draw_started();
-                    let new_mouse_interaction = user_interface.draw(
-                        &mut renderer,
-                        state.theme(),
-                        &renderer::Style {
-                            text_color: state.text_color(),
-                        },
-                        state.cursor_position(),
-                    );
-                    debug.draw_finished();
-
-                    if new_mouse_interaction != mouse_interaction {
-                        context.window().set_cursor_icon(
-                            conversion::mouse_interaction(
-                                new_mouse_interaction,
-                            ),
-                        );
-
-                        mouse_interaction = new_mouse_interaction;
-                    }
-
-                    context.resize(glutin::dpi::PhysicalSize::new(
-                        physical_size.width,
-                        physical_size.height,
-                    ));
-
-                    compositor.resize_viewport(physical_size);
-
-                    viewport_version = current_viewport_version;
-                }
-
-                compositor.present(
-                    &mut renderer,
-                    state.viewport(),
-                    state.background_color(),
-                    &debug.overlay(),
-                );
-
-                context.swap_buffers().expect("Swap buffers");
-
-                debug.render_finished();
-
-                // TODO: Handle animations!
-                // Maybe we can use `ControlFlow::WaitUntil` for this.
-            }
-            event::Event::WindowEvent {
-                event: window_event,
-                ..
-            } => {
-                if application::requests_exit(&window_event, state.modifiers())
-                    && exit_on_close_request
-                {
-                    break;
-                }
-
-                state.update(context.window(), &window_event, &mut debug);
-
-                if let Some(event) = conversion::window_event(
-                    &window_event,
-                    state.scale_factor(),
-                    state.modifiers(),
-                ) {
-                    events.push(event);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    // Manually drop the user interface
-    drop(ManuallyDrop::into_inner(user_interface));
-}
diff --git a/glutin/src/lib.rs b/glutin/src/lib.rs
deleted file mode 100644
index 33afd66435..0000000000
--- a/glutin/src/lib.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-//! A windowing shell for [`iced`], on top of [`glutin`].
-//!
-//! ![The native path of the Iced ecosystem](https://github.com/iced-rs/iced/blob/0525d76ff94e828b7b21634fa94a747022001c83/docs/graphs/native.png?raw=true)
-//!
-//! [`iced`]: https://github.com/iced-rs/iced
-//! [`glutin`]: https://github.com/rust-windowing/glutin
-#![doc(
-    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
-)]
-#![deny(
-    missing_docs,
-    missing_debug_implementations,
-    unsafe_code,
-    unused_results,
-    clippy::extra_unused_lifetimes,
-    clippy::from_over_into,
-    clippy::needless_borrow,
-    clippy::new_without_default,
-    clippy::useless_conversion
-)]
-#![forbid(rust_2018_idioms)]
-#![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
-
-pub use glutin;
-
-#[doc(no_inline)]
-pub use iced_winit::*;
-
-pub mod application;
-
-#[doc(no_inline)]
-pub use application::Application;
diff --git a/src/lib.rs b/src/lib.rs
index 17c5ab9760..31ec4f4892 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -182,17 +182,8 @@ pub mod touch;
 pub mod widget;
 pub mod window;
 
-#[cfg(all(not(feature = "glow"), feature = "wgpu"))]
-use iced_winit as runtime;
-
-#[cfg(feature = "glow")]
-use iced_glutin as runtime;
-
-#[cfg(all(not(feature = "glow"), feature = "wgpu"))]
 use iced_wgpu as renderer;
-
-#[cfg(feature = "glow")]
-use iced_glow as renderer;
+use iced_winit as runtime;
 
 pub use iced_native::theme;
 pub use runtime::event;
diff --git a/src/settings.rs b/src/settings.rs
index ce07b0ddad..13b3af7ca6 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -49,15 +49,6 @@ pub struct Settings<Flags> {
     ///
     /// [`Application`]: crate::Application
     pub exit_on_close_request: bool,
-
-    /// Whether the [`Application`] should try to build the context
-    /// using OpenGL ES first then OpenGL.
-    ///
-    /// By default, it is disabled.
-    /// **Note:** Only works for the `glow` backend.
-    ///
-    /// [`Application`]: crate::Application
-    pub try_opengles_first: bool,
 }
 
 impl<Flags> Settings<Flags> {
@@ -75,7 +66,6 @@ impl<Flags> Settings<Flags> {
             default_text_size: default_settings.default_text_size,
             antialiasing: default_settings.antialiasing,
             exit_on_close_request: default_settings.exit_on_close_request,
-            try_opengles_first: default_settings.try_opengles_first,
         }
     }
 }
@@ -93,7 +83,6 @@ where
             default_text_size: 16.0,
             antialiasing: false,
             exit_on_close_request: true,
-            try_opengles_first: false,
         }
     }
 }
@@ -105,7 +94,6 @@ impl<Flags> From<Settings<Flags>> for iced_winit::Settings<Flags> {
             window: settings.window.into(),
             flags: settings.flags,
             exit_on_close_request: settings.exit_on_close_request,
-            try_opengles_first: settings.try_opengles_first,
         }
     }
 }
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 78d580001a..5c64727bf8 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -51,14 +51,6 @@ pub struct Settings<Flags> {
     ///
     /// [`Application`]: crate::Application
     pub exit_on_close_request: bool,
-
-    /// Whether the [`Application`] should try to build the context
-    /// using OpenGL ES first then OpenGL.
-    ///
-    /// NOTE: Only works for the `glow` backend.
-    ///
-    /// [`Application`]: crate::Application
-    pub try_opengles_first: bool,
 }
 
 /// The window settings of an application.

From b2c87cdd238baa1562dc0422c00d1bf62132700f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 10 Feb 2023 22:36:02 +0100
Subject: [PATCH 048/163] Make `iced_wgpu` a mandatory dependency

---
 Cargo.toml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5fc0cc103f..551e12ac9c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,17 +12,14 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-default = ["wgpu"]
 # Enables the `Image` widget
-image = ["iced_wgpu?/image", "image_rs"]
+image = ["iced_wgpu/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_wgpu?/svg"]
+svg = ["iced_wgpu/svg"]
 # Enables the `Canvas` widget
 canvas = ["iced_graphics/canvas"]
 # Enables the `QRCode` widget
 qr_code = ["iced_graphics/qr_code"]
-# Enables the `iced_wgpu` renderer
-wgpu = ["iced_wgpu"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -38,7 +35,7 @@ system = ["iced_winit/system"]
 # Enables chrome traces
 chrome-trace = [
     "iced_winit/chrome-trace",
-    "iced_wgpu?/tracing",
+    "iced_wgpu/tracing",
 ]
 
 [badges]
@@ -71,10 +68,10 @@ package = "image"
 optional = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-iced_wgpu = { version = "0.9", path = "wgpu", optional = true }
+iced_wgpu = { version = "0.9", path = "wgpu" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-iced_wgpu = { version = "0.9", path = "wgpu", features = ["webgl"], optional = true }
+iced_wgpu = { version = "0.9", path = "wgpu", features = ["webgl"] }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]

From 700262e05c76e003158acfeb8edd9f6b026d78cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 24 Feb 2023 13:56:37 +0100
Subject: [PATCH 049/163] Fix `checkbox` example

---
 examples/checkbox/fonts/icons.ttf | Bin 1272 -> 1784 bytes
 examples/checkbox/src/main.rs     |  28 +++++++++++++++++++---------
 native/src/widget/checkbox.rs     |   2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/examples/checkbox/fonts/icons.ttf b/examples/checkbox/fonts/icons.ttf
index a20468447859c36c31b597f00325c92d501ba46f..82f284819e03ac896cb04aac5a05b04100a3d669 100644
GIT binary patch
literal 1784
zcmds1L2nyH6#m9zuj3fHcAKWCisB&zn?p8rwo!sBBqBr&tr|4~T5$*^TYGT~@os86
zQX@F@AAkg^RB@meE|dcY4yXbtClFFkh*m-%(F2#NJyn83Dr~-)T@y#ZAK*!|@B7}o
zdGF2JnSlWCIIciqrCNP$`Fi%@V}SJwtrIW3c(RHTo*@64T%CROm}?(QeGZ7%$=7Nv
zZ!>-AhX>?8a?~4MXOs3E{lBChX>4r2RZ*P_fP9(r&#e1ieQNi;2IqAAg>@RzE%_bi
z#>l7FTiwgq&#*@R75UMPu;yVMj3u8X&$YbEo5-*t2+dXCwfv8-{gDBZ%qt#lhMjKq
z=DWmJo%1Wud!rm)9-VyCe(rZ<lZM|tbmyuDcPG83*7AmYhiU`~%_v+acltYwYpA?2
zh-9e#SjLjZ)A7t;<=+mF@{0HXDIjqzaf{~nBQ5UZxM0QmM6hN1WeK<^ObttN2W0yy
zP!LgNG@pwW>H=t6L&PPi9ux7p3uL+*6LflkderPTL7TcK`hWKOw1F5A?*C@Epr7{T
ziJ+(CZY*sV{0bdiW1U!!VPU30eZ%Je9Ufs9bG#ob_{elO+9118(VZR0fAKXe$?I|n
z1$MDmDo&*>Ta+S@w$j$vk?|uLv9P!>Un<Jg$x`ubsW`c~s6nw<n95V8#Hv^|NQy#^
zQm9mvoy*zkDaU!knVIfg6>mq7^_;^&bJC}QLppp$SYrh-?k;Bdd0sFN)6E|ftR$m9
zU!1XRk?K9N?b8RGys(62&*V?rcJGl$MYi5<Z`Yo&<?0#R$!kJCI>d|UEtq3?k!eW|
z-|p*9)G5K!Wykge_HLHMleiSyll1u{#wld+O^hwtZ^w8PM@3$r_T=D}MOdF@8QT*$
zfWtACybn%{ll1v8#wm>B(->Q{e;?yf%;RUhk0xpe5uig@3j?ZG;G=;pY`{aC)NgEU
zcm!4B*EPCL4<8CHW>Ka-!Lb)9;x1D-^w6WsahxH-pj!>w4PUvlWpzTCjMVPD<2r8H
zrORHFK|SZ0sm=PDCcna*$%*rRyVDE<H8)%Sw^f5`m8mo^F+6ms>#X%6w)s6}_P)%x
zx&yOOeX8LHe%tH%b#-xDovMY)VHj}kpYMaV4NKa*BMH7KQY1wxy%jXelvvMceX<g9
k>N);t!51q!E&6TJcTm4U`q9x^#3MrZ^{1QK3&ZdJUvwhaB>(^b

literal 1272
zcmah|yH8V59R5yEdrKkdY2{@Mq1TG-LU~E3Bp8`UKnMnvsVbNDS|IdZC?$c!fkk7C
z2~HRcqoXnY0S?5)#mT5~B+-R9Ik-S<{qBQU4T-;-bI$ku-uFBp05o9>5`EJ*dI!{*
z&=xgsIOg&tW2Jre!y`a+kl!pCYb#u1<j&eqT;9Al60;=v2FKunX%vzNKOO*qm$VNp
zP!YZ(-;sYK?^-BTHln~MKsJz{UAFTE-eQSdCy$nljTJN?P2NYYTSm#;oroNhUuXV@
zEB0E2eNuv796O}EC7vS0{JVko)NFgJ_>M~=;`r5xVB3GoC~zp`er+G4l7mKPFHS^v
zfm6*H9kh9?biFzd#AWIm*>8ZKfPN@yziKr%N<V~)MeS>Qka6{S1q8iRoh|@mhh3LH
ze*e?0vgd8?Qi4sV(y3%vQzGqwuol)@+S}SAVkkQ_m`=%DXF4^VPIYFp4oIaE$v7n`
zaw6v<DH1VCVt80rv6#{?WHPri-CflkvE)JaTEKa^Cv)fmnw|6!p|vDL+dwwL>8fBI
zmK*F9>?Gn$uP2ofq3W?x6VXguXhKun@d>4>$0FqEsz=o$)vaW1Qf1-}p&uRmAbJbd
zs1M@K`up?o*^}10YUC%Hg6?)7G=JW4z{%=%%KOQ4@q}^iIrGpQk$WeZJTqs_vv}MI
zBVXkxxSB?^pcAurPUiHW;i8}6q=M__Pf@(`tpZ^`f>)Gy&eu!gAs+{c*L@t~OKkPA
zM*TG(H{u)~JNGCUp(aX;hXce#A4}pZJ`NJ!_i+eq;7f61HR@-4+=xNESj^ic+qSTX
zJZzLWY*@2qd2P|Q^!}bc{<DcP*62V3^Yo(!eWym9s+=*4>&r%&MNKxkj%64qpXxbg
zTNS-%T4vd(m<4@)Qy<UUQ|zq=V{YvVs~4HZayv3m;aZ?>9-ExU-5;3pet<oCueSbF
H{=vTi!DY8L

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 09950bb86f..7711149091 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -1,10 +1,9 @@
+use iced::executor;
+use iced::font::{self, Font};
 use iced::widget::{checkbox, column, container};
-use iced::{Element, Font, Length, Sandbox, Settings};
+use iced::{Application, Command, Element, Length, Settings, Theme};
 
-const ICON_FONT: Font = Font::External {
-    name: "Icons",
-    bytes: include_bytes!("../fonts/icons.ttf"),
-};
+const ICON_FONT: Font = Font::Name("icons");
 
 pub fn main() -> iced::Result {
     Example::run(Settings::default())
@@ -20,24 +19,35 @@ struct Example {
 enum Message {
     DefaultChecked(bool),
     CustomChecked(bool),
+    FontLoaded(Result<(), font::Error>),
 }
 
-impl Sandbox for Example {
+impl Application for Example {
     type Message = Message;
+    type Flags = ();
+    type Executor = executor::Default;
+    type Theme = Theme;
 
-    fn new() -> Self {
-        Default::default()
+    fn new(_flags: Self::Flags) -> (Self, Command<Message>) {
+        (
+            Self::default(),
+            font::load(include_bytes!("../fonts/icons.ttf").as_ref())
+                .map(Message::FontLoaded),
+        )
     }
 
     fn title(&self) -> String {
         String::from("Checkbox - Iced")
     }
 
-    fn update(&mut self, message: Message) {
+    fn update(&mut self, message: Message) -> Command<Message> {
         match message {
             Message::DefaultChecked(value) => self.default_checkbox = value,
             Message::CustomChecked(value) => self.custom_checkbox = value,
+            Message::FontLoaded(_) => (),
         }
+
+        Command::none()
     }
 
     fn view(&self) -> Element<Message> {
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 0e21e9953a..6ba06d3b82 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -267,7 +267,7 @@ where
                 code_point,
                 size,
             } = &self.icon;
-            let size = size.map(f32::from).unwrap_or(bounds.height * 0.7);
+            let size = size.unwrap_or(bounds.height * 0.7);
 
             if self.is_checked {
                 renderer.fill_text(text::Text {

From 8059c40142d601588e01c152ce1bb72a1295dde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 24 Feb 2023 13:58:17 +0100
Subject: [PATCH 050/163] Fix `clippy` lints

---
 native/src/overlay/menu.rs     | 2 +-
 native/src/widget/checkbox.rs  | 2 +-
 native/src/widget/pick_list.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 0509f7bc7e..bd58a12263 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -451,7 +451,7 @@ where
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
         let option_height =
-            (text_size * 1.2 + f32::from(self.padding.vertical())) as usize;
+            (text_size * 1.2 + self.padding.vertical()) as usize;
 
         let offset = viewport.y - bounds.y;
         let start = (offset / option_height as f32) as usize;
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 6ba06d3b82..cd8b9c6b16 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -272,7 +272,7 @@ where
             if self.is_checked {
                 renderer.fill_text(text::Text {
                     content: &code_point.to_string(),
-                    font: font.clone(),
+                    font: *font,
                     size,
                     bounds: Rectangle {
                         x: bounds.center_x(),
diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs
index b4cda7489e..8ff82f3b07 100644
--- a/native/src/widget/pick_list.rs
+++ b/native/src/widget/pick_list.rs
@@ -600,12 +600,12 @@ pub fn draw<'a, T, Renderer>(
             font,
             code_point,
             size,
-        }) => Some((font.clone(), *code_point, *size)),
+        }) => Some((*font, *code_point, *size)),
         Handle::Dynamic { open, closed } => {
             if state().is_open {
-                Some((open.font.clone(), open.code_point, open.size))
+                Some((open.font, open.code_point, open.size))
             } else {
-                Some((closed.font.clone(), closed.code_point, closed.size))
+                Some((closed.font, closed.code_point, closed.size))
             }
         }
         Handle::None => None,

From 5100b5d0a1f654ec1254b7765ceadfb9091d6939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 24 Feb 2023 23:24:48 +0100
Subject: [PATCH 051/163] Introduce `iced_renderer` subcrate featuring runtime
 renderer fallback

---
 Cargo.toml                           |  14 +--
 graphics/src/lib.rs                  |   2 +-
 graphics/src/renderer.rs             |   7 +-
 graphics/src/window/gl_compositor.rs |   2 +-
 renderer/Cargo.toml                  |  26 +++++
 renderer/src/backend.rs              |  94 ++++++++++++++++++
 renderer/src/lib.rs                  |  17 ++++
 renderer/src/settings.rs             |  30 ++++++
 renderer/src/window.rs               |   3 +
 renderer/src/window/compositor.rs    |  96 ++++++++++++++++++
 src/application.rs                   |   4 +-
 src/lib.rs                           |   2 +-
 wgpu/src/window.rs                   |   3 +-
 wgpu/src/window/compositor.rs        | 139 +++++++++++++++++----------
 winit/src/application.rs             |   2 +-
 winit/src/system.rs                  |   2 +-
 16 files changed, 371 insertions(+), 72 deletions(-)
 create mode 100644 renderer/Cargo.toml
 create mode 100644 renderer/src/backend.rs
 create mode 100644 renderer/src/lib.rs
 create mode 100644 renderer/src/settings.rs
 create mode 100644 renderer/src/window.rs
 create mode 100644 renderer/src/window/compositor.rs

diff --git a/Cargo.toml b/Cargo.toml
index 551e12ac9c..d999febe9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,9 @@ categories = ["gui"]
 
 [features]
 # Enables the `Image` widget
-image = ["iced_wgpu/image", "image_rs"]
+image = ["iced_renderer/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_wgpu/svg"]
+svg = ["iced_renderer/svg"]
 # Enables the `Canvas` widget
 canvas = ["iced_graphics/canvas"]
 # Enables the `QRCode` widget
@@ -35,7 +35,7 @@ system = ["iced_winit/system"]
 # Enables chrome traces
 chrome-trace = [
     "iced_winit/chrome-trace",
-    "iced_wgpu/tracing",
+    "iced_renderer/tracing",
 ]
 
 [badges]
@@ -48,6 +48,7 @@ members = [
     "graphics",
     "lazy",
     "native",
+    "renderer",
     "style",
     "wgpu",
     "winit",
@@ -59,6 +60,7 @@ iced_core = { version = "0.8", path = "core" }
 iced_futures = { version = "0.6", path = "futures" }
 iced_native = { version = "0.9", path = "native" }
 iced_graphics = { version = "0.7", path = "graphics" }
+iced_renderer = { version = "0.1", path = "renderer" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
 thiserror = "1.0"
 
@@ -67,12 +69,6 @@ version = "0.24"
 package = "image"
 optional = true
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-iced_wgpu = { version = "0.9", path = "wgpu" }
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-iced_wgpu = { version = "0.9", path = "wgpu", features = ["webgl"] }
-
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 features = ["image", "svg", "canvas", "qr_code"]
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 41bef2c368..bbbdfa0e14 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -46,9 +46,9 @@ pub use primitive::Primitive;
 pub use renderer::Renderer;
 pub use transformation::Transformation;
 pub use viewport::Viewport;
-pub use window::compositor;
 
 pub use iced_native::alignment;
+pub use iced_native::text;
 pub use iced_native::{
     Alignment, Background, Color, Font, Point, Rectangle, Size, Vector,
 };
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index b052c09421..859ebc0418 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -43,8 +43,11 @@ impl<B: Backend, T> Renderer<B, T> {
 
     /// Runs the given closure with the [`Backend`] and the recorded primitives
     /// of the [`Renderer`].
-    pub fn with_primitives(&mut self, f: impl FnOnce(&mut B, &[Primitive])) {
-        f(&mut self.backend, &self.primitives);
+    pub fn with_primitives<O>(
+        &mut self,
+        f: impl FnOnce(&mut B, &[Primitive]) -> O,
+    ) -> O {
+        f(&mut self.backend, &self.primitives)
     }
 }
 
diff --git a/graphics/src/window/gl_compositor.rs b/graphics/src/window/gl_compositor.rs
index a45a7ca114..3e6dfd9edc 100644
--- a/graphics/src/window/gl_compositor.rs
+++ b/graphics/src/window/gl_compositor.rs
@@ -1,6 +1,6 @@
 //! A compositor is responsible for initializing a renderer and managing window
 //! surfaces.
-use crate::compositor::Information;
+use crate::window::compositor::Information;
 use crate::{Color, Error, Size, Viewport};
 
 use core::ffi::c_void;
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
new file mode 100644
index 0000000000..2a179f3a47
--- /dev/null
+++ b/renderer/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "iced_renderer"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+image = ["iced_wgpu/image"]
+svg = ["iced_wgpu/svg"]
+tracing = ["iced_wgpu/tracing"]
+
+[dependencies]
+raw-window-handle = "0.5"
+
+[dependencies.iced_native]
+version = "0.9"
+path = "../native"
+
+[dependencies.iced_graphics]
+version = "0.7"
+path = "../graphics"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+iced_wgpu = { version = "0.9", path = "../wgpu" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+iced_wgpu = { version = "0.9", path = "../wgpu", features = ["webgl"] }
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
new file mode 100644
index 0000000000..a9a09593f5
--- /dev/null
+++ b/renderer/src/backend.rs
@@ -0,0 +1,94 @@
+use crate::{Font, Point, Size};
+
+use iced_graphics::backend;
+use iced_graphics::text;
+
+use std::borrow::Cow;
+
+pub enum Backend {
+    Wgpu(iced_wgpu::Backend),
+}
+
+impl iced_graphics::Backend for Backend {}
+
+impl backend::Text for Backend {
+    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const CHECKMARK_ICON: char = '\u{f00c}';
+    const ARROW_DOWN_ICON: char = '\u{e800}';
+
+    fn default_font(&self) -> Font {
+        match self {
+            Self::Wgpu(backend) => backend.default_font(),
+        }
+    }
+
+    fn default_size(&self) -> f32 {
+        match self {
+            Self::Wgpu(backend) => backend.default_size(),
+        }
+    }
+
+    fn measure(
+        &self,
+        contents: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
+    ) -> (f32, f32) {
+        match self {
+            Self::Wgpu(backend) => {
+                backend.measure(contents, size, font, bounds)
+            }
+        }
+    }
+
+    fn hit_test(
+        &self,
+        contents: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
+        position: Point,
+        nearest_only: bool,
+    ) -> Option<text::Hit> {
+        match self {
+            Self::Wgpu(backend) => backend.hit_test(
+                contents,
+                size,
+                font,
+                bounds,
+                position,
+                nearest_only,
+            ),
+        }
+    }
+
+    fn load_font(&mut self, font: Cow<'static, [u8]>) {
+        match self {
+            Self::Wgpu(backend) => {
+                backend.load_font(font);
+            }
+        }
+    }
+}
+
+#[cfg(feature = "image")]
+impl backend::Image for Backend {
+    fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
+        match self {
+            Self::Wgpu(backend) => backend.dimensions(handle),
+        }
+    }
+}
+
+#[cfg(feature = "svg")]
+impl backend::Svg for Backend {
+    fn viewport_dimensions(
+        &self,
+        handle: &iced_native::svg::Handle,
+    ) -> Size<u32> {
+        match self {
+            Self::Wgpu(backend) => backend.viewport_dimensions(handle),
+        }
+    }
+}
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
new file mode 100644
index 0000000000..d0ba67930b
--- /dev/null
+++ b/renderer/src/lib.rs
@@ -0,0 +1,17 @@
+pub mod window;
+
+mod backend;
+mod settings;
+
+pub use backend::Backend;
+pub use settings::Settings;
+
+pub use iced_graphics::{
+    Antialiasing, Color, Error, Font, Point, Size, Viewport,
+};
+
+/// The default graphics renderer for [`iced`].
+///
+/// [`iced`]: https://github.com/iced-rs/iced
+pub type Renderer<Theme = iced_native::Theme> =
+    iced_graphics::Renderer<Backend, Theme>;
diff --git a/renderer/src/settings.rs b/renderer/src/settings.rs
new file mode 100644
index 0000000000..c4dc248b10
--- /dev/null
+++ b/renderer/src/settings.rs
@@ -0,0 +1,30 @@
+use crate::{Antialiasing, Font};
+
+/// The settings of a [`Backend`].
+///
+/// [`Backend`]: crate::Backend
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Settings {
+    /// The default [`Font`] to use.
+    pub default_font: Font,
+
+    /// The default size of text.
+    ///
+    /// By default, it will be set to `16.0`.
+    pub default_text_size: f32,
+
+    /// The antialiasing strategy that will be used for triangle primitives.
+    ///
+    /// By default, it is `None`.
+    pub antialiasing: Option<Antialiasing>,
+}
+
+impl Default for Settings {
+    fn default() -> Settings {
+        Settings {
+            default_font: Font::SansSerif,
+            default_text_size: 16.0,
+            antialiasing: None,
+        }
+    }
+}
diff --git a/renderer/src/window.rs b/renderer/src/window.rs
new file mode 100644
index 0000000000..a7c8911b15
--- /dev/null
+++ b/renderer/src/window.rs
@@ -0,0 +1,3 @@
+mod compositor;
+
+pub use compositor::Compositor;
diff --git a/renderer/src/window/compositor.rs b/renderer/src/window/compositor.rs
new file mode 100644
index 0000000000..ad78d8bf25
--- /dev/null
+++ b/renderer/src/window/compositor.rs
@@ -0,0 +1,96 @@
+use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
+
+use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
+
+pub use iced_graphics::window::compositor::{Information, SurfaceError};
+
+pub enum Compositor<Theme> {
+    Wgpu(iced_wgpu::window::Compositor<Theme>),
+}
+
+pub enum Surface {
+    Wgpu(iced_wgpu::window::Surface),
+}
+
+impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
+    type Settings = Settings;
+    type Renderer = Renderer<Theme>;
+    type Surface = Surface;
+
+    fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
+        settings: Self::Settings,
+        compatible_window: Option<&W>,
+    ) -> Result<(Self, Self::Renderer), Error> {
+        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)),
+        ))
+    }
+
+    fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
+        &mut self,
+        window: &W,
+    ) -> Surface {
+        match self {
+            Self::Wgpu(compositor) => {
+                Surface::Wgpu(compositor.create_surface(window))
+            }
+        }
+    }
+
+    fn configure_surface(
+        &mut self,
+        surface: &mut Surface,
+        width: u32,
+        height: u32,
+    ) {
+        match (self, surface) {
+            (Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
+                compositor.configure_surface(surface, width, height);
+            }
+        }
+    }
+
+    fn fetch_information(&self) -> Information {
+        match self {
+            Self::Wgpu(compositor) => compositor.fetch_information(),
+        }
+    }
+
+    fn present<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Result<(), SurfaceError> {
+        renderer.with_primitives(|backend, primitives| {
+            match (self, backend, surface) {
+                (
+                    Self::Wgpu(compositor),
+                    Backend::Wgpu(backend),
+                    Surface::Wgpu(surface),
+                ) => iced_wgpu::window::compositor::present(
+                    compositor,
+                    backend,
+                    surface,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                ),
+            }
+        })
+    }
+}
diff --git a/src/application.rs b/src/application.rs
index 9a1c185597..b9871556e6 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -198,11 +198,11 @@ pub trait Application: Sized {
             default_font: settings.default_font,
             default_text_size: settings.default_text_size,
             antialiasing: if settings.antialiasing {
-                Some(crate::renderer::settings::Antialiasing::MSAAx4)
+                Some(crate::renderer::Antialiasing::MSAAx4)
             } else {
                 None
             },
-            ..crate::renderer::Settings::from_env()
+            ..crate::renderer::Settings::default()
         };
 
         Ok(crate::runtime::application::run::<
diff --git a/src/lib.rs b/src/lib.rs
index 31ec4f4892..bb162f2d6f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -182,7 +182,7 @@ pub mod touch;
 pub mod widget;
 pub mod window;
 
-use iced_wgpu as renderer;
+use iced_renderer as renderer;
 use iced_winit as runtime;
 
 pub use iced_native::theme;
diff --git a/wgpu/src/window.rs b/wgpu/src/window.rs
index aac5fb9ed8..9545a14e5b 100644
--- a/wgpu/src/window.rs
+++ b/wgpu/src/window.rs
@@ -1,4 +1,5 @@
 //! Display rendering results on windows.
-mod compositor;
+pub mod compositor;
 
 pub use compositor::Compositor;
+pub use wgpu::Surface;
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 365cb60377..7406bfb8cc 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -1,8 +1,9 @@
-use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
+//! Connect a window with a renderer.
+use crate::{Backend, Color, Error, Primitive, Renderer, Settings, Viewport};
 
 use futures::stream::{self, StreamExt};
 
-use iced_graphics::compositor;
+use iced_graphics::window::compositor;
 use iced_native::futures;
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 
@@ -112,6 +113,77 @@ impl<Theme> Compositor<Theme> {
     }
 }
 
+/// Creates a [`Compositor`] and its [`Backend`] for the given [`Settings`] and
+/// window.
+pub fn new<Theme, W: HasRawWindowHandle + HasRawDisplayHandle>(
+    settings: Settings,
+    compatible_window: Option<&W>,
+) -> Result<(Compositor<Theme>, Backend), Error> {
+    let compositor = futures::executor::block_on(Compositor::request(
+        settings,
+        compatible_window,
+    ))
+    .ok_or(Error::GraphicsAdapterNotFound)?;
+
+    let backend = compositor.create_backend();
+
+    Ok((compositor, backend))
+}
+
+/// Presents the given primitives with the given [`Compositor`] and [`Backend`].
+pub fn present<Theme, T: AsRef<str>>(
+    compositor: &mut Compositor<Theme>,
+    backend: &mut Backend,
+    surface: &mut wgpu::Surface,
+    primitives: &[Primitive],
+    viewport: &Viewport,
+    background_color: Color,
+    overlay: &[T],
+) -> Result<(), compositor::SurfaceError> {
+    match surface.get_current_texture() {
+        Ok(frame) => {
+            let mut encoder = compositor.device.create_command_encoder(
+                &wgpu::CommandEncoderDescriptor {
+                    label: Some("iced_wgpu encoder"),
+                },
+            );
+
+            let view = &frame
+                .texture
+                .create_view(&wgpu::TextureViewDescriptor::default());
+
+            backend.present(
+                &compositor.device,
+                &compositor.queue,
+                &mut encoder,
+                Some(background_color),
+                view,
+                primitives,
+                viewport,
+                overlay,
+            );
+
+            // Submit work
+            let _submission = compositor.queue.submit(Some(encoder.finish()));
+            frame.present();
+
+            Ok(())
+        }
+        Err(error) => match error {
+            wgpu::SurfaceError::Timeout => {
+                Err(compositor::SurfaceError::Timeout)
+            }
+            wgpu::SurfaceError::Outdated => {
+                Err(compositor::SurfaceError::Outdated)
+            }
+            wgpu::SurfaceError::Lost => Err(compositor::SurfaceError::Lost),
+            wgpu::SurfaceError::OutOfMemory => {
+                Err(compositor::SurfaceError::OutOfMemory)
+            }
+        },
+    }
+}
+
 impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
@@ -121,13 +193,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
         settings: Self::Settings,
         compatible_window: Option<&W>,
     ) -> Result<(Self, Self::Renderer), Error> {
-        let compositor = futures::executor::block_on(Self::request(
-            settings,
-            compatible_window,
-        ))
-        .ok_or(Error::GraphicsAdapterNotFound)?;
-
-        let backend = compositor.create_backend();
+        let (compositor, backend) = new(settings, compatible_window)?;
 
         Ok((compositor, Renderer::new(backend)))
     }
@@ -178,49 +244,16 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
         background_color: Color,
         overlay: &[T],
     ) -> Result<(), compositor::SurfaceError> {
-        match surface.get_current_texture() {
-            Ok(frame) => {
-                let mut encoder = self.device.create_command_encoder(
-                    &wgpu::CommandEncoderDescriptor {
-                        label: Some("iced_wgpu encoder"),
-                    },
-                );
-
-                let view = &frame
-                    .texture
-                    .create_view(&wgpu::TextureViewDescriptor::default());
-
-                renderer.with_primitives(|backend, primitives| {
-                    backend.present(
-                        &self.device,
-                        &self.queue,
-                        &mut encoder,
-                        Some(background_color),
-                        view,
-                        primitives,
-                        viewport,
-                        overlay,
-                    );
-                });
-
-                // Submit work
-                let _submission = self.queue.submit(Some(encoder.finish()));
-                frame.present();
-
-                Ok(())
-            }
-            Err(error) => match error {
-                wgpu::SurfaceError::Timeout => {
-                    Err(compositor::SurfaceError::Timeout)
-                }
-                wgpu::SurfaceError::Outdated => {
-                    Err(compositor::SurfaceError::Outdated)
-                }
-                wgpu::SurfaceError::Lost => Err(compositor::SurfaceError::Lost),
-                wgpu::SurfaceError::OutOfMemory => {
-                    Err(compositor::SurfaceError::OutOfMemory)
-                }
-            },
-        }
+        renderer.with_primitives(|backend, primitives| {
+            present(
+                self,
+                backend,
+                surface,
+                primitives,
+                viewport,
+                background_color,
+                overlay,
+            )
+        })
     }
 }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 889becad7b..1bfce3a10c 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -17,8 +17,8 @@ use crate::{
 
 use iced_futures::futures;
 use iced_futures::futures::channel::mpsc;
-use iced_graphics::compositor;
 use iced_graphics::window;
+use iced_graphics::window::compositor;
 use iced_native::program::Program;
 use iced_native::time::Instant;
 use iced_native::user_interface::{self, UserInterface};
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 619086b80a..8a7b2a116d 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -2,7 +2,7 @@
 use crate::command::{self, Command};
 pub use iced_native::system::*;
 
-use iced_graphics::compositor;
+use iced_graphics::window::compositor;
 
 /// Query for available system information.
 pub fn fetch_information<Message>(

From a01bc865a0561ff1daf255c4746746acf67524f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 25 Feb 2023 15:11:35 +0100
Subject: [PATCH 052/163] Trim measurements in `renderer::Backend`

---
 renderer/src/backend.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index a9a09593f5..7b09eea8dd 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -9,7 +9,13 @@ pub enum Backend {
     Wgpu(iced_wgpu::Backend),
 }
 
-impl iced_graphics::Backend for Backend {}
+impl iced_graphics::Backend for Backend {
+    fn trim_measurements(&mut self) {
+        match self {
+            Self::Wgpu(backend) => backend.trim_measurements(),
+        }
+    }
+}
 
 impl backend::Text for Backend {
     const ICON_FONT: Font = Font::Name("Iced-Icons");

From 8c373cd497e370d356b480380482779397bdb510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 25 Feb 2023 15:38:25 +0100
Subject: [PATCH 053/163] Scaffold `iced_tiny_skia` and connect it to
 `iced_renderer`

---
 Cargo.toml                         |  1 +
 renderer/Cargo.toml                |  8 ++-
 renderer/src/backend.rs            | 20 +++++++
 renderer/src/window/compositor.rs  | 54 +++++++++++++----
 tiny_skia/Cargo.toml               | 21 +++++++
 tiny_skia/src/backend.rs           | 87 +++++++++++++++++++++++++++
 tiny_skia/src/lib.rs               | 16 +++++
 tiny_skia/src/settings.rs          | 24 ++++++++
 tiny_skia/src/window.rs            |  3 +
 tiny_skia/src/window/compositor.rs | 96 ++++++++++++++++++++++++++++++
 10 files changed, 318 insertions(+), 12 deletions(-)
 create mode 100644 tiny_skia/Cargo.toml
 create mode 100644 tiny_skia/src/backend.rs
 create mode 100644 tiny_skia/src/lib.rs
 create mode 100644 tiny_skia/src/settings.rs
 create mode 100644 tiny_skia/src/window.rs
 create mode 100644 tiny_skia/src/window/compositor.rs

diff --git a/Cargo.toml b/Cargo.toml
index d999febe9d..b1f5cf66bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,6 +50,7 @@ members = [
     "native",
     "renderer",
     "style",
+    "tiny_skia",
     "wgpu",
     "winit",
     "examples/*",
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 2a179f3a47..5ba5d426fe 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 7b09eea8dd..a46d6f9b8f 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 ad78d8bf25..42afddc4e9 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!(),
             }
         })
     }
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
new file mode 100644
index 0000000000..7f4b0f8c48
--- /dev/null
+++ b/tiny_skia/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "iced_tiny_skia"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+image = []
+svg = []
+
+[dependencies]
+raw-window-handle = "0.5"
+softbuffer = "0.2"
+tiny-skia = "0.8"
+
+[dependencies.iced_native]
+version = "0.9"
+path = "../native"
+
+[dependencies.iced_graphics]
+version = "0.7"
+path = "../graphics"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
new file mode 100644
index 0000000000..4282a745c3
--- /dev/null
+++ b/tiny_skia/src/backend.rs
@@ -0,0 +1,87 @@
+use crate::{Font, Settings, Size};
+
+use iced_graphics::backend;
+use iced_graphics::text;
+
+use std::borrow::Cow;
+
+pub struct Backend {
+    default_font: Font,
+    default_text_size: f32,
+}
+
+impl Backend {
+    pub fn new(settings: Settings) -> Self {
+        Self {
+            default_font: settings.default_font,
+            default_text_size: settings.default_text_size,
+        }
+    }
+}
+
+impl iced_graphics::Backend for Backend {
+    fn trim_measurements(&mut self) {
+        // TODO
+    }
+}
+
+impl backend::Text for Backend {
+    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const CHECKMARK_ICON: char = '\u{f00c}';
+    const ARROW_DOWN_ICON: char = '\u{e800}';
+
+    fn default_font(&self) -> Font {
+        self.default_font
+    }
+
+    fn default_size(&self) -> f32 {
+        self.default_text_size
+    }
+
+    fn measure(
+        &self,
+        _contents: &str,
+        _size: f32,
+        _font: Font,
+        _bounds: Size,
+    ) -> (f32, f32) {
+        // TODO
+        (0.0, 0.0)
+    }
+
+    fn hit_test(
+        &self,
+        _contents: &str,
+        _size: f32,
+        _font: Font,
+        _bounds: Size,
+        _point: iced_native::Point,
+        _nearest_only: bool,
+    ) -> Option<text::Hit> {
+        // TODO
+        None
+    }
+
+    fn load_font(&mut self, _font: Cow<'static, [u8]>) {
+        // TODO
+    }
+}
+
+#[cfg(feature = "image")]
+impl backend::Image for Backend {
+    fn dimensions(&self, _handle: &iced_native::image::Handle) -> Size<u32> {
+        // TODO
+        Size::new(0, 0)
+    }
+}
+
+#[cfg(feature = "svg")]
+impl backend::Svg for Backend {
+    fn viewport_dimensions(
+        &self,
+        _handle: &iced_native::svg::Handle,
+    ) -> Size<u32> {
+        // TODO
+        Size::new(0, 0)
+    }
+}
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
new file mode 100644
index 0000000000..fce44e9e19
--- /dev/null
+++ b/tiny_skia/src/lib.rs
@@ -0,0 +1,16 @@
+pub mod window;
+
+mod backend;
+mod settings;
+
+pub use backend::Backend;
+pub use settings::Settings;
+
+pub use iced_graphics::{Color, Error, Font, Point, Size, Vector, Viewport};
+
+/// A [`tiny-skia`] graphics renderer for [`iced`].
+///
+/// [`tiny-skia`]: https://github.com/RazrFalcon/tiny-skia
+/// [`iced`]: https://github.com/iced-rs/iced
+pub type Renderer<Theme = iced_native::Theme> =
+    iced_graphics::Renderer<Backend, Theme>;
diff --git a/tiny_skia/src/settings.rs b/tiny_skia/src/settings.rs
new file mode 100644
index 0000000000..88098345f2
--- /dev/null
+++ b/tiny_skia/src/settings.rs
@@ -0,0 +1,24 @@
+use crate::Font;
+
+/// The settings of a [`Backend`].
+///
+/// [`Backend`]: crate::Backend
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Settings {
+    /// The default [`Font`] to use.
+    pub default_font: Font,
+
+    /// The default size of text.
+    ///
+    /// By default, it will be set to `16.0`.
+    pub default_text_size: f32,
+}
+
+impl Default for Settings {
+    fn default() -> Settings {
+        Settings {
+            default_font: Font::SansSerif,
+            default_text_size: 16.0,
+        }
+    }
+}
diff --git a/tiny_skia/src/window.rs b/tiny_skia/src/window.rs
new file mode 100644
index 0000000000..d8d9378e16
--- /dev/null
+++ b/tiny_skia/src/window.rs
@@ -0,0 +1,3 @@
+pub mod compositor;
+
+pub use compositor::{Compositor, Surface};
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
new file mode 100644
index 0000000000..053bb29b28
--- /dev/null
+++ b/tiny_skia/src/window/compositor.rs
@@ -0,0 +1,96 @@
+use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
+
+use iced_graphics::window::compositor::{self, Information, SurfaceError};
+use iced_graphics::Primitive;
+
+use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
+use std::marker::PhantomData;
+
+pub struct Compositor<Theme> {
+    _theme: PhantomData<Theme>,
+}
+
+pub struct Surface;
+
+impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
+    type Settings = Settings;
+    type Renderer = Renderer<Theme>;
+    type Surface = Surface;
+
+    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)))
+    }
+
+    fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
+        &mut self,
+        _window: &W,
+    ) -> Surface {
+        // TODO
+        Surface
+    }
+
+    fn configure_surface(
+        &mut self,
+        _surface: &mut Surface,
+        _width: u32,
+        _height: u32,
+    ) {
+        // TODO
+    }
+
+    fn fetch_information(&self) -> Information {
+        Information {
+            adapter: String::from("CPU"),
+            backend: String::from("tiny-skia"),
+        }
+    }
+
+    fn present<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Result<(), SurfaceError> {
+        renderer.with_primitives(|backend, primitives| {
+            present(
+                self,
+                backend,
+                surface,
+                primitives,
+                viewport,
+                background_color,
+                overlay,
+            )
+        })
+    }
+}
+
+pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
+    // TODO
+    (
+        Compositor {
+            _theme: PhantomData,
+        },
+        Backend::new(settings),
+    )
+}
+
+pub fn present<Theme, T: AsRef<str>>(
+    _compositor: &mut Compositor<Theme>,
+    _backend: &mut Backend,
+    _surface: &mut Surface,
+    _primitives: &[Primitive],
+    _viewport: &Viewport,
+    _background_color: Color,
+    _overlay: &[T],
+) -> Result<(), compositor::SurfaceError> {
+    // TODO
+    Ok(())
+}

From 535d7a4d57e131e661587b36e41820dd6ccccc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 25 Feb 2023 16:05:42 +0100
Subject: [PATCH 054/163] Implement basic presentation with `softbuffer` for
 `iced_tiny_skia`

---
 graphics/src/window/compositor.rs  |  2 +
 renderer/src/window/compositor.rs  | 10 +++--
 tiny_skia/src/backend.rs           | 19 ++++++++-
 tiny_skia/src/window/compositor.rs | 66 +++++++++++++++++++++++-------
 wgpu/src/window/compositor.rs      | 10 +++--
 winit/src/application.rs           | 13 +++---
 6 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs
index db4ba45dc3..15f8dab55f 100644
--- a/graphics/src/window/compositor.rs
+++ b/graphics/src/window/compositor.rs
@@ -28,6 +28,8 @@ pub trait Compositor: Sized {
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
         &mut self,
         window: &W,
+        width: u32,
+        height: u32,
     ) -> Self::Surface;
 
     /// Configures a new [`Surface`] with the given dimensions.
diff --git a/renderer/src/window/compositor.rs b/renderer/src/window/compositor.rs
index 42afddc4e9..a11374eda6 100644
--- a/renderer/src/window/compositor.rs
+++ b/renderer/src/window/compositor.rs
@@ -52,14 +52,16 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
         &mut self,
         window: &W,
+        width: u32,
+        height: u32,
     ) -> Surface {
         match self {
             Self::Wgpu(compositor) => {
-                Surface::Wgpu(compositor.create_surface(window))
-            }
-            Self::TinySkia(compositor) => {
-                Surface::TinySkia(compositor.create_surface(window))
+                Surface::Wgpu(compositor.create_surface(window, width, height))
             }
+            Self::TinySkia(compositor) => Surface::TinySkia(
+                compositor.create_surface(window, width, height),
+            ),
         }
     }
 
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 4282a745c3..62373ec706 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,7 +1,8 @@
-use crate::{Font, Settings, Size};
+use crate::{Color, Font, Settings, Size, Viewport};
 
 use iced_graphics::backend;
 use iced_graphics::text;
+use iced_graphics::Primitive;
 
 use std::borrow::Cow;
 
@@ -17,6 +18,22 @@ impl Backend {
             default_text_size: settings.default_text_size,
         }
     }
+
+    pub fn draw<T: AsRef<str>>(
+        &mut self,
+        pixels: &mut tiny_skia::Pixmap,
+        _primitives: &[Primitive],
+        _viewport: &Viewport,
+        background_color: Color,
+        _overlay: &[T],
+    ) {
+        pixels.fill(into_color(background_color));
+    }
+}
+
+fn into_color(color: Color) -> tiny_skia::Color {
+    tiny_skia::Color::from_rgba(color.r, color.g, color.b, color.a)
+        .expect("Convert color from iced to tiny_skia")
 }
 
 impl iced_graphics::Backend for Backend {
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 053bb29b28..164d99c6cf 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -10,7 +10,11 @@ pub struct Compositor<Theme> {
     _theme: PhantomData<Theme>,
 }
 
-pub struct Surface;
+pub struct Surface {
+    window: softbuffer::GraphicsContext,
+    pixels: tiny_skia::Pixmap,
+    buffer: Vec<u32>,
+}
 
 impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     type Settings = Settings;
@@ -28,19 +32,33 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
 
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
         &mut self,
-        _window: &W,
+        window: &W,
+        width: u32,
+        height: u32,
     ) -> Surface {
-        // TODO
-        Surface
+        let window =
+            unsafe { softbuffer::GraphicsContext::new(window, window) }
+                .expect("Create softbuffer for window");
+
+        let pixels = tiny_skia::Pixmap::new(width, height)
+            .expect("Create pixmap for window");
+
+        Surface {
+            window,
+            pixels,
+            buffer: vec![0; (width * height) as usize],
+        }
     }
 
     fn configure_surface(
         &mut self,
-        _surface: &mut Surface,
-        _width: u32,
-        _height: u32,
+        surface: &mut Surface,
+        width: u32,
+        height: u32,
     ) {
-        // TODO
+        surface.pixels = tiny_skia::Pixmap::new(width, height)
+            .expect("Create pixmap for window");
+        surface.buffer = vec![0; (width * height) as usize];
     }
 
     fn fetch_information(&self) -> Information {
@@ -84,13 +102,33 @@ pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
 
 pub fn present<Theme, T: AsRef<str>>(
     _compositor: &mut Compositor<Theme>,
-    _backend: &mut Backend,
-    _surface: &mut Surface,
-    _primitives: &[Primitive],
-    _viewport: &Viewport,
-    _background_color: Color,
-    _overlay: &[T],
+    backend: &mut Backend,
+    surface: &mut Surface,
+    primitives: &[Primitive],
+    viewport: &Viewport,
+    background_color: Color,
+    overlay: &[T],
 ) -> Result<(), compositor::SurfaceError> {
+    backend.draw(
+        &mut surface.pixels,
+        primitives,
+        viewport,
+        background_color,
+        overlay,
+    );
+
+    for (i, pixel) in surface.pixels.pixels_mut().iter().enumerate() {
+        surface.buffer[i] = u32::from(pixel.red()) << 16
+            | u32::from(pixel.green()) << 8
+            | u32::from(pixel.blue());
+    }
+
+    surface.window.set_buffer(
+        &surface.buffer,
+        surface.pixels.width() as u16,
+        surface.pixels.height() as u16,
+    );
+
     // TODO
     Ok(())
 }
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 7406bfb8cc..3a4a71233a 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -201,11 +201,15 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
         &mut self,
         window: &W,
+        width: u32,
+        height: u32,
     ) -> wgpu::Surface {
         #[allow(unsafe_code)]
-        unsafe {
-            self.instance.create_surface(window)
-        }
+        let mut surface = unsafe { self.instance.create_surface(window) };
+
+        self.configure_surface(&mut surface, width, height);
+
+        surface
     }
 
     fn configure_surface(
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 1bfce3a10c..b52f01974a 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -285,21 +285,18 @@ async fn run_instance<A, E, C>(
     use winit::event;
     use winit::event_loop::ControlFlow;
 
-    let mut clipboard = Clipboard::connect(&window);
-    let mut cache = user_interface::Cache::default();
-    let mut surface = compositor.create_surface(&window);
-    let mut should_exit = false;
-
     let mut state = State::new(&application, &window);
     let mut viewport_version = state.viewport_version();
-
     let physical_size = state.physical_size();
 
-    compositor.configure_surface(
-        &mut surface,
+    let mut clipboard = Clipboard::connect(&window);
+    let mut cache = user_interface::Cache::default();
+    let mut surface = compositor.create_surface(
+        &window,
         physical_size.width,
         physical_size.height,
     );
+    let mut should_exit = false;
 
     if should_be_visible {
         window.set_visible(true);

From 445b31c6c5f16ecc9f07bd072f246e827aa5b854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 25 Feb 2023 21:06:58 +0100
Subject: [PATCH 055/163] Resize `Surface::buffer` instead of reallocating in
 `iced_tiny_skia`

---
 tiny_skia/src/window/compositor.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 164d99c6cf..8bb52a0338 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -58,7 +58,8 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     ) {
         surface.pixels = tiny_skia::Pixmap::new(width, height)
             .expect("Create pixmap for window");
-        surface.buffer = vec![0; (width * height) as usize];
+
+        surface.buffer.resize((width * height) as usize, 0);
     }
 
     fn fetch_information(&self) -> Information {

From df5d66423de141a009bbed993d99d491ed6373c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 00:38:46 +0100
Subject: [PATCH 056/163] Draft support for `Quad` and `Clip` primitives in
 `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 153 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 150 insertions(+), 3 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 62373ec706..54752a215b 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -2,7 +2,7 @@ use crate::{Color, Font, Settings, Size, Viewport};
 
 use iced_graphics::backend;
 use iced_graphics::text;
-use iced_graphics::Primitive;
+use iced_graphics::{Background, Primitive, Rectangle, Vector};
 
 use std::borrow::Cow;
 
@@ -22,12 +22,133 @@ impl Backend {
     pub fn draw<T: AsRef<str>>(
         &mut self,
         pixels: &mut tiny_skia::Pixmap,
-        _primitives: &[Primitive],
-        _viewport: &Viewport,
+        primitives: &[Primitive],
+        viewport: &Viewport,
         background_color: Color,
         _overlay: &[T],
     ) {
         pixels.fill(into_color(background_color));
+
+        let scale_factor = viewport.scale_factor() as f32;
+
+        for primitive in primitives {
+            draw_primitive(primitive, pixels, None, scale_factor, Vector::ZERO);
+        }
+    }
+}
+
+fn draw_primitive(
+    primitive: &Primitive,
+    pixels: &mut tiny_skia::Pixmap,
+    clip_mask: Option<&tiny_skia::ClipMask>,
+    scale_factor: f32,
+    translation: Vector,
+) {
+    match primitive {
+        Primitive::None => {}
+        Primitive::Quad {
+            bounds,
+            background,
+            border_radius: _, // TODO
+            border_width,
+            border_color,
+        } => {
+            let transform = tiny_skia::Transform::from_translate(
+                translation.x,
+                translation.y,
+            )
+            .post_scale(scale_factor, scale_factor);
+
+            let path = tiny_skia::PathBuilder::from_rect(
+                tiny_skia::Rect::from_xywh(
+                    bounds.x,
+                    bounds.y,
+                    bounds.width,
+                    bounds.height,
+                )
+                .expect("Create quad rectangle"),
+            );
+
+            pixels.fill_path(
+                &path,
+                &tiny_skia::Paint {
+                    shader: match background {
+                        Background::Color(color) => {
+                            tiny_skia::Shader::SolidColor(into_color(*color))
+                        }
+                    },
+                    anti_alias: true,
+                    ..tiny_skia::Paint::default()
+                },
+                tiny_skia::FillRule::EvenOdd,
+                transform,
+                clip_mask,
+            );
+
+            if *border_width > 0.0 {
+                pixels.stroke_path(
+                    &path,
+                    &tiny_skia::Paint {
+                        shader: tiny_skia::Shader::SolidColor(into_color(
+                            *border_color,
+                        )),
+                        anti_alias: true,
+                        ..tiny_skia::Paint::default()
+                    },
+                    &tiny_skia::Stroke {
+                        width: *border_width,
+                        ..tiny_skia::Stroke::default()
+                    },
+                    transform,
+                    clip_mask,
+                );
+            }
+        }
+        Primitive::Text { .. } => {
+            // TODO
+        }
+        Primitive::Image { .. } => {
+            // TODO
+        }
+        Primitive::Svg { .. } => {
+            // TODO
+        }
+        Primitive::Group { primitives } => {
+            for primitive in primitives {
+                draw_primitive(
+                    primitive,
+                    pixels,
+                    clip_mask,
+                    scale_factor,
+                    translation,
+                );
+            }
+        }
+        Primitive::Translate {
+            translation: offset,
+            content,
+        } => {
+            draw_primitive(
+                content,
+                pixels,
+                clip_mask,
+                scale_factor,
+                translation + *offset,
+            );
+        }
+        Primitive::Clip { bounds, content } => {
+            draw_primitive(
+                content,
+                pixels,
+                Some(&rectangular_clip_mask(pixels, *bounds * scale_factor)),
+                scale_factor,
+                translation,
+            );
+        }
+        Primitive::Cached { cache } => {
+            draw_primitive(cache, pixels, clip_mask, scale_factor, translation);
+        }
+        Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {}
     }
 }
 
@@ -36,6 +157,32 @@ fn into_color(color: Color) -> tiny_skia::Color {
         .expect("Convert color from iced to tiny_skia")
 }
 
+fn rectangular_clip_mask(
+    pixels: &tiny_skia::Pixmap,
+    bounds: Rectangle,
+) -> tiny_skia::ClipMask {
+    let mut clip_mask = tiny_skia::ClipMask::new();
+
+    let path = {
+        let mut builder = tiny_skia::PathBuilder::new();
+        builder.push_rect(bounds.x, bounds.y, bounds.width, bounds.height);
+
+        builder.finish().unwrap()
+    };
+
+    clip_mask
+        .set_path(
+            pixels.width(),
+            pixels.height(),
+            &path,
+            tiny_skia::FillRule::EvenOdd,
+            true,
+        )
+        .expect("Set path of clipping area");
+
+    clip_mask
+}
+
 impl iced_graphics::Backend for Backend {
     fn trim_measurements(&mut self) {
         // TODO

From 744f3028f484c44899fed56d9190387569828a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 00:49:27 +0100
Subject: [PATCH 057/163] Use `Surface::buffer` directly for drawing in
 `iced_tiny_skia`

... with a nice little color trick :^)
---
 tiny_skia/Cargo.toml               |  1 +
 tiny_skia/src/backend.rs           |  8 ++++----
 tiny_skia/src/window/compositor.rs | 30 +++++++++++-------------------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 7f4b0f8c48..70b1f5e7fc 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -11,6 +11,7 @@ svg = []
 raw-window-handle = "0.5"
 softbuffer = "0.2"
 tiny-skia = "0.8"
+bytemuck = "1"
 
 [dependencies.iced_native]
 version = "0.9"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 54752a215b..9eea1a3290 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -21,7 +21,7 @@ impl Backend {
 
     pub fn draw<T: AsRef<str>>(
         &mut self,
-        pixels: &mut tiny_skia::Pixmap,
+        pixels: &mut tiny_skia::PixmapMut<'_>,
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
@@ -39,7 +39,7 @@ impl Backend {
 
 fn draw_primitive(
     primitive: &Primitive,
-    pixels: &mut tiny_skia::Pixmap,
+    pixels: &mut tiny_skia::PixmapMut<'_>,
     clip_mask: Option<&tiny_skia::ClipMask>,
     scale_factor: f32,
     translation: Vector,
@@ -153,12 +153,12 @@ fn draw_primitive(
 }
 
 fn into_color(color: Color) -> tiny_skia::Color {
-    tiny_skia::Color::from_rgba(color.r, color.g, color.b, color.a)
+    tiny_skia::Color::from_rgba(color.b, color.g, color.r, color.a)
         .expect("Convert color from iced to tiny_skia")
 }
 
 fn rectangular_clip_mask(
-    pixels: &tiny_skia::Pixmap,
+    pixels: &tiny_skia::PixmapMut<'_>,
     bounds: Rectangle,
 ) -> tiny_skia::ClipMask {
     let mut clip_mask = tiny_skia::ClipMask::new();
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 8bb52a0338..2bd5831e38 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -12,7 +12,6 @@ pub struct Compositor<Theme> {
 
 pub struct Surface {
     window: softbuffer::GraphicsContext,
-    pixels: tiny_skia::Pixmap,
     buffer: Vec<u32>,
 }
 
@@ -40,13 +39,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
             unsafe { softbuffer::GraphicsContext::new(window, window) }
                 .expect("Create softbuffer for window");
 
-        let pixels = tiny_skia::Pixmap::new(width, height)
-            .expect("Create pixmap for window");
-
         Surface {
             window,
-            pixels,
-            buffer: vec![0; (width * height) as usize],
+            buffer: vec![0; width as usize * height as usize],
         }
     }
 
@@ -56,9 +51,6 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) {
-        surface.pixels = tiny_skia::Pixmap::new(width, height)
-            .expect("Create pixmap for window");
-
         surface.buffer.resize((width * height) as usize, 0);
     }
 
@@ -110,26 +102,26 @@ pub fn present<Theme, T: AsRef<str>>(
     background_color: Color,
     overlay: &[T],
 ) -> Result<(), compositor::SurfaceError> {
+    let physical_size = viewport.physical_size();
+
     backend.draw(
-        &mut surface.pixels,
+        &mut tiny_skia::PixmapMut::from_bytes(
+            bytemuck::cast_slice_mut(&mut surface.buffer),
+            physical_size.width,
+            physical_size.height,
+        )
+        .expect("Create pixel map"),
         primitives,
         viewport,
         background_color,
         overlay,
     );
 
-    for (i, pixel) in surface.pixels.pixels_mut().iter().enumerate() {
-        surface.buffer[i] = u32::from(pixel.red()) << 16
-            | u32::from(pixel.green()) << 8
-            | u32::from(pixel.blue());
-    }
-
     surface.window.set_buffer(
         &surface.buffer,
-        surface.pixels.width() as u16,
-        surface.pixels.height() as u16,
+        physical_size.width as u16,
+        physical_size.height as u16,
     );
 
-    // TODO
     Ok(())
 }

From 64fb722dfe8769d4a92edb0133f1863383ecfd86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 23:40:17 +0100
Subject: [PATCH 058/163] Draft text support in `iced_tiny_skia`

---
 tiny_skia/Cargo.toml     |  15 ++
 tiny_skia/src/backend.rs | 269 +++++++++++++++++-------------
 tiny_skia/src/lib.rs     |   1 +
 tiny_skia/src/text.rs    | 350 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 523 insertions(+), 112 deletions(-)
 create mode 100644 tiny_skia/src/text.rs

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 70b1f5e7fc..55f7f5b7d6 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -12,6 +12,8 @@ raw-window-handle = "0.5"
 softbuffer = "0.2"
 tiny-skia = "0.8"
 bytemuck = "1"
+rustc-hash = "1.1"
+ouroboros = "0.15"
 
 [dependencies.iced_native]
 version = "0.9"
@@ -20,3 +22,16 @@ path = "../native"
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
+
+[dependencies.cosmic-text]
+features = ["std", "swash"]
+git = "https://github.com/hecrj/cosmic-text"
+rev = "dc83efbf00a2efb4118403538e8a47bfd69c3e5e"
+
+[dependencies.twox-hash]
+version = "1.6"
+default-features = false
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash]
+version = "1.6.1"
+features = ["std"]
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 9eea1a3290..5e743479ee 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -9,6 +9,7 @@ use std::borrow::Cow;
 pub struct Backend {
     default_font: Font,
     default_text_size: f32,
+    text_pipeline: crate::text::Pipeline,
 }
 
 impl Backend {
@@ -16,6 +17,7 @@ impl Backend {
         Self {
             default_font: settings.default_font,
             default_text_size: settings.default_text_size,
+            text_pipeline: crate::text::Pipeline::new(),
         }
     }
 
@@ -32,123 +34,161 @@ impl Backend {
         let scale_factor = viewport.scale_factor() as f32;
 
         for primitive in primitives {
-            draw_primitive(primitive, pixels, None, scale_factor, Vector::ZERO);
+            self.draw_primitive(
+                primitive,
+                pixels,
+                None,
+                scale_factor,
+                Vector::ZERO,
+            );
         }
+
+        self.text_pipeline.end_frame();
     }
-}
 
-fn draw_primitive(
-    primitive: &Primitive,
-    pixels: &mut tiny_skia::PixmapMut<'_>,
-    clip_mask: Option<&tiny_skia::ClipMask>,
-    scale_factor: f32,
-    translation: Vector,
-) {
-    match primitive {
-        Primitive::None => {}
-        Primitive::Quad {
-            bounds,
-            background,
-            border_radius: _, // TODO
-            border_width,
-            border_color,
-        } => {
-            let transform = tiny_skia::Transform::from_translate(
-                translation.x,
-                translation.y,
-            )
-            .post_scale(scale_factor, scale_factor);
-
-            let path = tiny_skia::PathBuilder::from_rect(
-                tiny_skia::Rect::from_xywh(
-                    bounds.x,
-                    bounds.y,
-                    bounds.width,
-                    bounds.height,
+    fn draw_primitive(
+        &mut self,
+        primitive: &Primitive,
+        pixels: &mut tiny_skia::PixmapMut<'_>,
+        clip_mask: Option<&tiny_skia::ClipMask>,
+        scale_factor: f32,
+        translation: Vector,
+    ) {
+        match primitive {
+            Primitive::None => {}
+            Primitive::Quad {
+                bounds,
+                background,
+                border_radius: _, // TODO
+                border_width,
+                border_color,
+            } => {
+                let transform = tiny_skia::Transform::from_translate(
+                    translation.x,
+                    translation.y,
                 )
-                .expect("Create quad rectangle"),
-            );
+                .post_scale(scale_factor, scale_factor);
 
-            pixels.fill_path(
-                &path,
-                &tiny_skia::Paint {
-                    shader: match background {
-                        Background::Color(color) => {
-                            tiny_skia::Shader::SolidColor(into_color(*color))
-                        }
-                    },
-                    anti_alias: true,
-                    ..tiny_skia::Paint::default()
-                },
-                tiny_skia::FillRule::EvenOdd,
-                transform,
-                clip_mask,
-            );
+                let path = tiny_skia::PathBuilder::from_rect(
+                    tiny_skia::Rect::from_xywh(
+                        bounds.x,
+                        bounds.y,
+                        bounds.width,
+                        bounds.height,
+                    )
+                    .expect("Create quad rectangle"),
+                );
 
-            if *border_width > 0.0 {
-                pixels.stroke_path(
+                pixels.fill_path(
                     &path,
                     &tiny_skia::Paint {
-                        shader: tiny_skia::Shader::SolidColor(into_color(
-                            *border_color,
-                        )),
+                        shader: match background {
+                            Background::Color(color) => {
+                                tiny_skia::Shader::SolidColor(into_color(
+                                    *color,
+                                ))
+                            }
+                        },
                         anti_alias: true,
                         ..tiny_skia::Paint::default()
                     },
-                    &tiny_skia::Stroke {
-                        width: *border_width,
-                        ..tiny_skia::Stroke::default()
-                    },
+                    tiny_skia::FillRule::EvenOdd,
                     transform,
                     clip_mask,
                 );
+
+                if *border_width > 0.0 {
+                    pixels.stroke_path(
+                        &path,
+                        &tiny_skia::Paint {
+                            shader: tiny_skia::Shader::SolidColor(into_color(
+                                *border_color,
+                            )),
+                            anti_alias: true,
+                            ..tiny_skia::Paint::default()
+                        },
+                        &tiny_skia::Stroke {
+                            width: *border_width,
+                            ..tiny_skia::Stroke::default()
+                        },
+                        transform,
+                        clip_mask,
+                    );
+                }
             }
-        }
-        Primitive::Text { .. } => {
-            // TODO
-        }
-        Primitive::Image { .. } => {
-            // TODO
-        }
-        Primitive::Svg { .. } => {
-            // TODO
-        }
-        Primitive::Group { primitives } => {
-            for primitive in primitives {
-                draw_primitive(
-                    primitive,
+            Primitive::Text {
+                content,
+                bounds,
+                color,
+                size,
+                font,
+                horizontal_alignment,
+                vertical_alignment,
+            } => {
+                self.text_pipeline.draw(
+                    content,
+                    (*bounds + translation) * scale_factor,
+                    *color,
+                    *size * scale_factor,
+                    *font,
+                    *horizontal_alignment,
+                    *vertical_alignment,
+                    pixels,
+                    clip_mask,
+                );
+            }
+            Primitive::Image { .. } => {
+                // TODO
+            }
+            Primitive::Svg { .. } => {
+                // TODO
+            }
+            Primitive::Group { primitives } => {
+                for primitive in primitives {
+                    self.draw_primitive(
+                        primitive,
+                        pixels,
+                        clip_mask,
+                        scale_factor,
+                        translation,
+                    );
+                }
+            }
+            Primitive::Translate {
+                translation: offset,
+                content,
+            } => {
+                self.draw_primitive(
+                    content,
                     pixels,
                     clip_mask,
                     scale_factor,
+                    translation + *offset,
+                );
+            }
+            Primitive::Clip { bounds, content } => {
+                self.draw_primitive(
+                    content,
+                    pixels,
+                    Some(&rectangular_clip_mask(
+                        pixels,
+                        *bounds * scale_factor,
+                    )),
+                    scale_factor,
                     translation,
                 );
             }
+            Primitive::Cached { cache } => {
+                self.draw_primitive(
+                    cache,
+                    pixels,
+                    clip_mask,
+                    scale_factor,
+                    translation,
+                );
+            }
+            Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {}
         }
-        Primitive::Translate {
-            translation: offset,
-            content,
-        } => {
-            draw_primitive(
-                content,
-                pixels,
-                clip_mask,
-                scale_factor,
-                translation + *offset,
-            );
-        }
-        Primitive::Clip { bounds, content } => {
-            draw_primitive(
-                content,
-                pixels,
-                Some(&rectangular_clip_mask(pixels, *bounds * scale_factor)),
-                scale_factor,
-                translation,
-            );
-        }
-        Primitive::Cached { cache } => {
-            draw_primitive(cache, pixels, clip_mask, scale_factor, translation);
-        }
-        Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {}
     }
 }
 
@@ -185,7 +225,7 @@ fn rectangular_clip_mask(
 
 impl iced_graphics::Backend for Backend {
     fn trim_measurements(&mut self) {
-        // TODO
+        self.text_pipeline.trim_measurement_cache();
     }
 }
 
@@ -204,30 +244,35 @@ impl backend::Text for Backend {
 
     fn measure(
         &self,
-        _contents: &str,
-        _size: f32,
-        _font: Font,
-        _bounds: Size,
+        contents: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
     ) -> (f32, f32) {
-        // TODO
-        (0.0, 0.0)
+        self.text_pipeline.measure(contents, size, font, bounds)
     }
 
     fn hit_test(
         &self,
-        _contents: &str,
-        _size: f32,
-        _font: Font,
-        _bounds: Size,
-        _point: iced_native::Point,
-        _nearest_only: bool,
+        contents: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
+        point: iced_native::Point,
+        nearest_only: bool,
     ) -> Option<text::Hit> {
-        // TODO
-        None
+        self.text_pipeline.hit_test(
+            contents,
+            size,
+            font,
+            bounds,
+            point,
+            nearest_only,
+        )
     }
 
-    fn load_font(&mut self, _font: Cow<'static, [u8]>) {
-        // TODO
+    fn load_font(&mut self, font: Cow<'static, [u8]>) {
+        self.text_pipeline.load_font(font);
     }
 }
 
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index fce44e9e19..420a1ffbeb 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -2,6 +2,7 @@ pub mod window;
 
 mod backend;
 mod settings;
+mod text;
 
 pub use backend::Backend;
 pub use settings::Settings;
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
new file mode 100644
index 0000000000..5bd6eff1ad
--- /dev/null
+++ b/tiny_skia/src/text.rs
@@ -0,0 +1,350 @@
+pub use iced_native::text::Hit;
+
+use iced_native::alignment;
+use iced_native::{Color, Font, Rectangle, Size};
+
+use rustc_hash::{FxHashMap, FxHashSet};
+use std::borrow::Cow;
+use std::cell::RefCell;
+use std::collections::hash_map;
+use std::hash::{BuildHasher, Hash, Hasher};
+use std::sync::Arc;
+
+#[allow(missing_debug_implementations)]
+pub struct Pipeline {
+    system: Option<System>,
+}
+
+#[ouroboros::self_referencing]
+struct System {
+    fonts: cosmic_text::FontSystem,
+
+    #[borrows(fonts)]
+    #[not_covariant]
+    measurement_cache: RefCell<Cache<'this>>,
+
+    #[borrows(fonts)]
+    #[not_covariant]
+    render_cache: Cache<'this>,
+}
+
+impl Pipeline {
+    pub fn new() -> Self {
+        Pipeline {
+            system: Some(
+                SystemBuilder {
+                    fonts: cosmic_text::FontSystem::new_with_fonts(
+                        [cosmic_text::fontdb::Source::Binary(Arc::new(
+                            include_bytes!("../../wgpu/fonts/Iced-Icons.ttf")
+                                .as_slice(),
+                        ))]
+                        .into_iter(),
+                    ),
+                    measurement_cache_builder: |_| RefCell::new(Cache::new()),
+                    render_cache_builder: |_| Cache::new(),
+                }
+                .build(),
+            ),
+        }
+    }
+
+    pub fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
+        let heads = self.system.take().unwrap().into_heads();
+
+        let (locale, mut db) = heads.fonts.into_locale_and_db();
+
+        db.load_font_source(cosmic_text::fontdb::Source::Binary(Arc::new(
+            bytes.into_owned(),
+        )));
+
+        self.system = Some(
+            SystemBuilder {
+                fonts: cosmic_text::FontSystem::new_with_locale_and_db(
+                    locale, db,
+                ),
+                measurement_cache_builder: |_| RefCell::new(Cache::new()),
+                render_cache_builder: |_| Cache::new(),
+            }
+            .build(),
+        );
+    }
+
+    pub fn draw(
+        &mut self,
+        content: &str,
+        bounds: Rectangle,
+        color: Color,
+        size: f32,
+        font: Font,
+        _horizontal_alignment: alignment::Horizontal, // TODO
+        _vertical_alignment: alignment::Vertical,     // TODO
+        pixels: &mut tiny_skia::PixmapMut<'_>,
+        clip_mask: Option<&tiny_skia::ClipMask>,
+    ) {
+        self.system.as_mut().unwrap().with_mut(|fields| {
+            let key = Key {
+                bounds: bounds.size(),
+                content,
+                font,
+                size,
+            };
+
+            let (_, buffer) = fields.render_cache.allocate(&fields.fonts, key);
+
+            let mut swash = cosmic_text::SwashCache::new(&fields.fonts);
+
+            for run in buffer.layout_runs() {
+                for glyph in run.glyphs {
+                    // TODO: Outline support
+                    if let Some(image) = swash.get_image(glyph.cache_key) {
+                        let glyph_size = image.placement.width as usize
+                            * image.placement.height as usize;
+
+                        if glyph_size == 0 {
+                            continue;
+                        }
+
+                        // TODO: Cache glyph rasterization
+                        let mut buffer = vec![0u32; glyph_size];
+
+                        match image.content {
+                            cosmic_text::SwashContent::Mask => {
+                                let mut i = 0;
+
+                                // TODO: Blend alpha
+                                let [r, g, b, _a] = color.into_rgba8();
+
+                                for _y in 0..image.placement.height {
+                                    for _x in 0..image.placement.width {
+                                        buffer[i] =
+                                            tiny_skia::ColorU8::from_rgba(
+                                                b,
+                                                g,
+                                                r,
+                                                image.data[i],
+                                            )
+                                            .premultiply()
+                                            .get();
+
+                                        i += 1;
+                                    }
+                                }
+                            }
+                            cosmic_text::SwashContent::Color => {
+                                let mut i = 0;
+
+                                for _y in 0..image.placement.height {
+                                    for _x in 0..image.placement.width {
+                                        // TODO: Blend alpha
+                                        buffer[i] = (image.data[i + 3] as u32)
+                                            << 24
+                                            | (image.data[i + 2] as u32) << 16
+                                            | (image.data[i + 1] as u32) << 8
+                                            | image.data[i] as u32;
+
+                                        i += 1;
+                                    }
+                                }
+                            }
+                            cosmic_text::SwashContent::SubpixelMask => {
+                                // TODO
+                            }
+                        }
+
+                        let pixmap = tiny_skia::PixmapRef::from_bytes(
+                            bytemuck::cast_slice(&buffer),
+                            image.placement.width,
+                            image.placement.height,
+                        )
+                        .expect("Create glyph pixel map");
+
+                        pixels.draw_pixmap(
+                            bounds.x as i32
+                                + glyph.x_int
+                                + image.placement.left,
+                            bounds.y as i32 - glyph.y_int - image.placement.top
+                                + run.line_y as i32,
+                            pixmap,
+                            &tiny_skia::PixmapPaint::default(),
+                            tiny_skia::Transform::identity(),
+                            clip_mask,
+                        );
+                    }
+                }
+            }
+        });
+    }
+
+    pub fn end_frame(&mut self) {
+        self.system
+            .as_mut()
+            .unwrap()
+            .with_render_cache_mut(|cache| cache.trim());
+    }
+
+    pub fn measure(
+        &self,
+        content: &str,
+        size: f32,
+        font: Font,
+        bounds: Size,
+    ) -> (f32, f32) {
+        self.system.as_ref().unwrap().with(|fields| {
+            let mut measurement_cache = fields.measurement_cache.borrow_mut();
+
+            let (_, paragraph) = measurement_cache.allocate(
+                fields.fonts,
+                Key {
+                    content,
+                    size,
+                    font,
+                    bounds,
+                },
+            );
+
+            let (total_lines, max_width) = paragraph
+                .layout_runs()
+                .enumerate()
+                .fold((0, 0.0), |(_, max), (i, buffer)| {
+                    (i + 1, buffer.line_w.max(max))
+                });
+
+            (max_width, size * 1.2 * total_lines as f32)
+        })
+    }
+
+    pub fn hit_test(
+        &self,
+        content: &str,
+        size: f32,
+        font: iced_native::Font,
+        bounds: iced_native::Size,
+        point: iced_native::Point,
+        _nearest_only: bool,
+    ) -> Option<Hit> {
+        self.system.as_ref().unwrap().with(|fields| {
+            let mut measurement_cache = fields.measurement_cache.borrow_mut();
+
+            let (_, paragraph) = measurement_cache.allocate(
+                fields.fonts,
+                Key {
+                    content,
+                    size,
+                    font,
+                    bounds,
+                },
+            );
+
+            let cursor = paragraph.hit(point.x, point.y)?;
+
+            Some(Hit::CharOffset(cursor.index))
+        })
+    }
+
+    pub fn trim_measurement_cache(&mut self) {
+        self.system
+            .as_mut()
+            .unwrap()
+            .with_measurement_cache_mut(|cache| cache.borrow_mut().trim());
+    }
+}
+
+fn to_family(font: Font) -> cosmic_text::Family<'static> {
+    match font {
+        Font::Name(name) => cosmic_text::Family::Name(name),
+        Font::SansSerif => cosmic_text::Family::SansSerif,
+        Font::Serif => cosmic_text::Family::Serif,
+        Font::Cursive => cosmic_text::Family::Cursive,
+        Font::Fantasy => cosmic_text::Family::Fantasy,
+        Font::Monospace => cosmic_text::Family::Monospace,
+    }
+}
+
+struct Cache<'a> {
+    entries: FxHashMap<KeyHash, cosmic_text::Buffer<'a>>,
+    recently_used: FxHashSet<KeyHash>,
+    hasher: HashBuilder,
+    trim_count: usize,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+type HashBuilder = twox_hash::RandomXxHashBuilder64;
+
+#[cfg(target_arch = "wasm32")]
+type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
+
+impl<'a> Cache<'a> {
+    const TRIM_INTERVAL: usize = 300;
+
+    fn new() -> Self {
+        Self {
+            entries: FxHashMap::default(),
+            recently_used: FxHashSet::default(),
+            hasher: HashBuilder::default(),
+            trim_count: 0,
+        }
+    }
+
+    fn allocate(
+        &mut self,
+        fonts: &'a cosmic_text::FontSystem,
+        key: Key<'_>,
+    ) -> (KeyHash, &mut cosmic_text::Buffer<'a>) {
+        let hash = {
+            let mut hasher = self.hasher.build_hasher();
+
+            key.content.hash(&mut hasher);
+            key.size.to_bits().hash(&mut hasher);
+            key.font.hash(&mut hasher);
+            key.bounds.width.to_bits().hash(&mut hasher);
+            key.bounds.height.to_bits().hash(&mut hasher);
+
+            hasher.finish()
+        };
+
+        if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
+            let metrics = cosmic_text::Metrics::new(key.size, key.size * 1.2);
+            let mut buffer = cosmic_text::Buffer::new(fonts, metrics);
+
+            buffer.set_size(
+                key.bounds.width,
+                key.bounds.height.max(key.size * 1.2),
+            );
+            buffer.set_text(
+                key.content,
+                cosmic_text::Attrs::new()
+                    .family(to_family(key.font))
+                    .monospaced(matches!(key.font, Font::Monospace)),
+            );
+
+            let _ = entry.insert(buffer);
+        }
+
+        let _ = self.recently_used.insert(hash);
+
+        (hash, self.entries.get_mut(&hash).unwrap())
+    }
+
+    fn trim(&mut self) {
+        if self.trim_count >= Self::TRIM_INTERVAL {
+            self.entries
+                .retain(|key, _| self.recently_used.contains(key));
+
+            self.recently_used.clear();
+
+            self.trim_count = 0;
+        } else {
+            self.trim_count += 1;
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct Key<'a> {
+    content: &'a str,
+    size: f32,
+    font: Font,
+    bounds: Size,
+}
+
+type KeyHash = u64;

From 3386402f5a3e75cdacd230f5e76cd54f4868d87d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 23:44:50 +0100
Subject: [PATCH 059/163] Implement text alignment support in `iced_tiny_skia`

---
 tiny_skia/src/text.rs | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 5bd6eff1ad..64f31aae0a 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -76,8 +76,8 @@ impl Pipeline {
         color: Color,
         size: f32,
         font: Font,
-        _horizontal_alignment: alignment::Horizontal, // TODO
-        _vertical_alignment: alignment::Vertical,     // TODO
+        horizontal_alignment: alignment::Horizontal,
+        vertical_alignment: alignment::Vertical,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::ClipMask>,
     ) {
@@ -91,6 +91,27 @@ impl Pipeline {
 
             let (_, buffer) = fields.render_cache.allocate(&fields.fonts, key);
 
+            let (total_lines, max_width) = buffer
+                .layout_runs()
+                .enumerate()
+                .fold((0, 0.0), |(_, max), (i, buffer)| {
+                    (i + 1, buffer.line_w.max(max))
+                });
+
+            let total_height = total_lines as f32 * size * 1.2;
+
+            let x = match horizontal_alignment {
+                alignment::Horizontal::Left => bounds.x,
+                alignment::Horizontal::Center => bounds.x - max_width / 2.0,
+                alignment::Horizontal::Right => bounds.x - max_width,
+            };
+
+            let y = match vertical_alignment {
+                alignment::Vertical::Top => bounds.y,
+                alignment::Vertical::Center => bounds.y - total_height / 2.0,
+                alignment::Vertical::Bottom => bounds.y - total_height,
+            };
+
             let mut swash = cosmic_text::SwashCache::new(&fields.fonts);
 
             for run in buffer.layout_runs() {
@@ -159,10 +180,8 @@ impl Pipeline {
                         .expect("Create glyph pixel map");
 
                         pixels.draw_pixmap(
-                            bounds.x as i32
-                                + glyph.x_int
-                                + image.placement.left,
-                            bounds.y as i32 - glyph.y_int - image.placement.top
+                            x as i32 + glyph.x_int + image.placement.left,
+                            y as i32 - glyph.y_int - image.placement.top
                                 + run.line_y as i32,
                             pixmap,
                             &tiny_skia::PixmapPaint::default(),

From 4067c427db19eb59c4ec6c8c6d6658a9643df580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 23:49:58 +0100
Subject: [PATCH 060/163] Fix glyphs with color mask in `iced_tiny_skia`

---
 tiny_skia/src/text.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 64f31aae0a..fc26703b97 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -157,13 +157,17 @@ impl Pipeline {
                                 for _y in 0..image.placement.height {
                                     for _x in 0..image.placement.width {
                                         // TODO: Blend alpha
-                                        buffer[i] = (image.data[i + 3] as u32)
-                                            << 24
-                                            | (image.data[i + 2] as u32) << 16
-                                            | (image.data[i + 1] as u32) << 8
-                                            | image.data[i] as u32;
+                                        buffer[i >> 2] =
+                                            tiny_skia::ColorU8::from_rgba(
+                                                image.data[i + 2],
+                                                image.data[i + 1],
+                                                image.data[i],
+                                                image.data[i + 3],
+                                            )
+                                            .premultiply()
+                                            .get();
 
-                                        i += 1;
+                                        i += 4;
                                     }
                                 }
                             }

From 53573cf7cfd48f9bfd97d9e8b82308a0290d2b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 26 Feb 2023 23:59:00 +0100
Subject: [PATCH 061/163] Draw debug overlay in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 5e743479ee..cefed71fc8 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,5 +1,6 @@
 use crate::{Color, Font, Settings, Size, Viewport};
 
+use iced_graphics::alignment;
 use iced_graphics::backend;
 use iced_graphics::text;
 use iced_graphics::{Background, Primitive, Rectangle, Vector};
@@ -27,7 +28,7 @@ impl Backend {
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
-        _overlay: &[T],
+        overlay: &[T],
     ) {
         pixels.fill(into_color(background_color));
 
@@ -43,6 +44,31 @@ impl Backend {
             );
         }
 
+        for (i, text) in overlay.iter().enumerate() {
+            const OVERLAY_TEXT_SIZE: f32 = 20.0;
+
+            self.draw_primitive(
+                &Primitive::Text {
+                    content: text.as_ref().to_owned(),
+                    size: OVERLAY_TEXT_SIZE,
+                    bounds: Rectangle {
+                        x: 10.0,
+                        y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
+                        width: f32::INFINITY,
+                        height: f32::INFINITY,
+                    },
+                    color: Color::BLACK,
+                    font: Font::Monospace,
+                    horizontal_alignment: alignment::Horizontal::Left,
+                    vertical_alignment: alignment::Vertical::Top,
+                },
+                pixels,
+                None,
+                scale_factor,
+                Vector::ZERO,
+            );
+        }
+
         self.text_pipeline.end_frame();
     }
 

From fbb14bf9b879d3d154618fa8d6a81bac018fee69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 00:47:53 +0100
Subject: [PATCH 062/163] Implement `border_radius` support for quads in
 `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 80 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 70 insertions(+), 10 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index cefed71fc8..b1dd6a4672 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -85,7 +85,7 @@ impl Backend {
             Primitive::Quad {
                 bounds,
                 background,
-                border_radius: _, // TODO
+                border_radius,
                 border_width,
                 border_color,
             } => {
@@ -95,15 +95,7 @@ impl Backend {
                 )
                 .post_scale(scale_factor, scale_factor);
 
-                let path = tiny_skia::PathBuilder::from_rect(
-                    tiny_skia::Rect::from_xywh(
-                        bounds.x,
-                        bounds.y,
-                        bounds.width,
-                        bounds.height,
-                    )
-                    .expect("Create quad rectangle"),
-                );
+                let path = rounded_rectangle(*bounds, *border_radius);
 
                 pixels.fill_path(
                     &path,
@@ -223,6 +215,74 @@ fn into_color(color: Color) -> tiny_skia::Color {
         .expect("Convert color from iced to tiny_skia")
 }
 
+fn rounded_rectangle(
+    bounds: Rectangle,
+    border_radius: [f32; 4],
+) -> tiny_skia::Path {
+    let [top_left, top_right, bottom_right, bottom_left] = border_radius;
+
+    if top_left == top_right
+        && top_left == bottom_right
+        && top_left == bottom_left
+        && top_left == bounds.width / 2.0
+        && top_left == bounds.height / 2.0
+    {
+        return tiny_skia::PathBuilder::from_circle(
+            bounds.x + bounds.width / 2.0,
+            bounds.y + bounds.height / 2.0,
+            top_left,
+        )
+        .expect("Build circle path");
+    }
+
+    let mut builder = tiny_skia::PathBuilder::new();
+
+    builder.move_to(bounds.x + top_left, bounds.y);
+    builder.line_to(bounds.x + bounds.width - top_right, bounds.y);
+
+    if top_right > 0.0 {
+        builder.quad_to(
+            bounds.x + bounds.width,
+            bounds.y,
+            bounds.x + bounds.width,
+            bounds.y + top_right,
+        );
+    }
+
+    builder.line_to(
+        bounds.x + bounds.width,
+        bounds.y + bounds.height - bottom_right,
+    );
+
+    if bottom_right > 0.0 {
+        builder.quad_to(
+            bounds.x + bounds.width,
+            bounds.y + bounds.height,
+            bounds.x + bounds.width - bottom_right,
+            bounds.y + bounds.height,
+        );
+    }
+
+    builder.line_to(bounds.x + bottom_left, bounds.y + bounds.height);
+
+    if bottom_right > 0.0 {
+        builder.quad_to(
+            bounds.x,
+            bounds.y + bounds.height,
+            bounds.x,
+            bounds.y + bounds.height - bottom_left,
+        );
+    }
+
+    builder.line_to(bounds.x, bounds.y + top_left);
+
+    if top_left > 0.0 {
+        builder.quad_to(bounds.x, bounds.y, bounds.x + top_left, bounds.y);
+    }
+
+    builder.finish().expect("Build rounded rectangle path")
+}
+
 fn rectangular_clip_mask(
     pixels: &tiny_skia::PixmapMut<'_>,
     bounds: Rectangle,

From 4e615a65cab9dfc5fa4a17a72580c573c1c040d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 01:12:06 +0100
Subject: [PATCH 063/163] Fix `clippy` lints

---
 renderer/src/backend.rs | 1 +
 tiny_skia/src/text.rs   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index a46d6f9b8f..b0a409dc76 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -5,6 +5,7 @@ use iced_graphics::text;
 
 use std::borrow::Cow;
 
+#[allow(clippy::large_enum_variant)]
 pub enum Backend {
     Wgpu(iced_wgpu::Backend),
     TinySkia(iced_tiny_skia::Backend),
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index fc26703b97..6d4cfe963a 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -89,7 +89,7 @@ impl Pipeline {
                 size,
             };
 
-            let (_, buffer) = fields.render_cache.allocate(&fields.fonts, key);
+            let (_, buffer) = fields.render_cache.allocate(fields.fonts, key);
 
             let (total_lines, max_width) = buffer
                 .layout_runs()
@@ -112,7 +112,7 @@ impl Pipeline {
                 alignment::Vertical::Bottom => bounds.y - total_height,
             };
 
-            let mut swash = cosmic_text::SwashCache::new(&fields.fonts);
+            let mut swash = cosmic_text::SwashCache::new(fields.fonts);
 
             for run in buffer.layout_runs() {
                 for glyph in run.glyphs {

From 37ce30f360ce7cba9ad05654e1faf26276a1dc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 02:58:02 +0100
Subject: [PATCH 064/163] Use `kurbo` to approximate arcs in `iced_tiny_skia`

---
 tiny_skia/Cargo.toml     |  1 +
 tiny_skia/src/backend.rs | 80 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 55f7f5b7d6..7fee49cbae 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -14,6 +14,7 @@ tiny-skia = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
 ouroboros = "0.15"
+kurbo = "0.9"
 
 [dependencies.iced_native]
 version = "0.9"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index b1dd6a4672..38a6c51dcf 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -241,48 +241,108 @@ fn rounded_rectangle(
     builder.line_to(bounds.x + bounds.width - top_right, bounds.y);
 
     if top_right > 0.0 {
-        builder.quad_to(
-            bounds.x + bounds.width,
+        arc_to(
+            &mut builder,
+            bounds.x + bounds.width - top_right,
             bounds.y,
             bounds.x + bounds.width,
             bounds.y + top_right,
+            top_right,
         );
     }
 
-    builder.line_to(
+    maybe_line_to(
+        &mut builder,
         bounds.x + bounds.width,
         bounds.y + bounds.height - bottom_right,
     );
 
     if bottom_right > 0.0 {
-        builder.quad_to(
+        arc_to(
+            &mut builder,
             bounds.x + bounds.width,
-            bounds.y + bounds.height,
+            bounds.y + bounds.height - bottom_right,
             bounds.x + bounds.width - bottom_right,
             bounds.y + bounds.height,
+            bottom_right,
         );
     }
 
-    builder.line_to(bounds.x + bottom_left, bounds.y + bounds.height);
+    maybe_line_to(
+        &mut builder,
+        bounds.x + bottom_left,
+        bounds.y + bounds.height,
+    );
 
     if bottom_right > 0.0 {
-        builder.quad_to(
-            bounds.x,
+        arc_to(
+            &mut builder,
+            bounds.x + bottom_left,
             bounds.y + bounds.height,
             bounds.x,
             bounds.y + bounds.height - bottom_left,
+            bottom_left,
         );
     }
 
-    builder.line_to(bounds.x, bounds.y + top_left);
+    maybe_line_to(&mut builder, bounds.x, bounds.y + top_left);
 
     if top_left > 0.0 {
-        builder.quad_to(bounds.x, bounds.y, bounds.x + top_left, bounds.y);
+        arc_to(
+            &mut builder,
+            bounds.x,
+            bounds.y + top_left,
+            bounds.x + top_left,
+            bounds.y,
+            top_left,
+        );
     }
 
     builder.finish().expect("Build rounded rectangle path")
 }
 
+fn maybe_line_to(path: &mut tiny_skia::PathBuilder, x: f32, y: f32) {
+    if path.last_point() != Some(tiny_skia::Point { x, y }) {
+        path.line_to(x, y);
+    }
+}
+
+fn arc_to(
+    path: &mut tiny_skia::PathBuilder,
+    x_from: f32,
+    y_from: f32,
+    x_to: f32,
+    y_to: f32,
+    radius: f32,
+) {
+    let svg_arc = kurbo::SvgArc {
+        from: kurbo::Point::new(f64::from(x_from), f64::from(y_from)),
+        to: kurbo::Point::new(f64::from(x_to), f64::from(y_to)),
+        radii: kurbo::Vec2::new(f64::from(radius), f64::from(radius)),
+        x_rotation: 0.0,
+        large_arc: false,
+        sweep: true,
+    };
+
+    match kurbo::Arc::from_svg_arc(&svg_arc) {
+        Some(arc) => {
+            arc.to_cubic_beziers(0.1, |p1, p2, p| {
+                path.cubic_to(
+                    p1.x as f32,
+                    p1.y as f32,
+                    p2.x as f32,
+                    p2.y as f32,
+                    p.x as f32,
+                    p.y as f32,
+                );
+            });
+        }
+        None => {
+            path.line_to(x_to as f32, y_to as f32);
+        }
+    }
+}
+
 fn rectangular_clip_mask(
     pixels: &tiny_skia::PixmapMut<'_>,
     bounds: Rectangle,

From 8750d83337041f1d0fac8c2c0f4c40fd3a051a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 03:02:13 +0100
Subject: [PATCH 065/163] Short-circuit rectangle path building in
 `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 38a6c51dcf..d0977462a6 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -221,6 +221,22 @@ fn rounded_rectangle(
 ) -> tiny_skia::Path {
     let [top_left, top_right, bottom_right, bottom_left] = border_radius;
 
+    if top_left == 0.0
+        && top_right == 0.0
+        && bottom_right == 0.0
+        && bottom_left == 0.0
+    {
+        return tiny_skia::PathBuilder::from_rect(
+            tiny_skia::Rect::from_xywh(
+                bounds.x,
+                bounds.y,
+                bounds.width,
+                bounds.height,
+            )
+            .expect("Build quad rectangle"),
+        );
+    }
+
     if top_left == top_right
         && top_left == bottom_right
         && top_left == bottom_left

From 3105ad2e0036e101e66b5e6ab437b570f2d923a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 03:04:05 +0100
Subject: [PATCH 066/163] Remove useless `f32` conversion in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d0977462a6..66d832210b 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -354,7 +354,7 @@ fn arc_to(
             });
         }
         None => {
-            path.line_to(x_to as f32, y_to as f32);
+            path.line_to(x_to, y_to);
         }
     }
 }

From 11b2c3bbe31a43e73a61b9bd9f022233f302ae27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 03:40:58 +0100
Subject: [PATCH 067/163] Reuse text buffers independently of color in
 `iced_wgpu`

---
 wgpu/Cargo.toml  |  2 +-
 wgpu/src/text.rs | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 632873a370..9e80a76d2a 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -60,7 +60,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "65b481d758f50fd13fc21af2cc5ef62ddee64955"
+rev = "810bc979f9005e2bd343b72b980e57e46174283f"
 
 [dependencies.tracing]
 version = "0.1.6"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index dea6ab18c6..3839b31f48 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -2,7 +2,7 @@ pub use iced_native::text::Hit;
 
 use iced_graphics::layer::Text;
 use iced_native::alignment;
-use iced_native::{Color, Font, Rectangle, Size};
+use iced_native::{Font, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
@@ -110,7 +110,6 @@ impl Pipeline {
                                 height: (section.bounds.height * scale_factor)
                                     .ceil(),
                             },
-                            color: section.color,
                         },
                     );
 
@@ -162,6 +161,16 @@ impl Pipeline {
                         left: left as i32,
                         top: top as i32,
                         bounds,
+                        default_color: {
+                            let [r, g, b, a] = section.color.into_linear();
+
+                            glyphon::Color::rgba(
+                                (r * 255.0) as u8,
+                                (g * 255.0) as u8,
+                                (b * 255.0) as u8,
+                                (a * 255.0) as u8,
+                            )
+                        },
                     }
                 });
 
@@ -174,7 +183,6 @@ impl Pipeline {
                     height: target_size.height,
                 },
                 text_areas,
-                glyphon::Color::rgb(0, 0, 0),
                 &mut glyphon::SwashCache::new(fields.fonts),
             );
 
@@ -249,7 +257,6 @@ impl Pipeline {
                     size,
                     font,
                     bounds,
-                    color: Color::BLACK,
                 },
             );
 
@@ -283,7 +290,6 @@ impl Pipeline {
                     size,
                     font,
                     bounds,
-                    color: Color::BLACK,
                 },
             );
 
@@ -354,7 +360,6 @@ impl<'a> Cache<'a> {
             key.font.hash(&mut hasher);
             key.bounds.width.to_bits().hash(&mut hasher);
             key.bounds.height.to_bits().hash(&mut hasher);
-            key.color.into_rgba8().hash(&mut hasher);
 
             hasher.finish()
         };
@@ -371,16 +376,6 @@ impl<'a> Cache<'a> {
                 key.content,
                 glyphon::Attrs::new()
                     .family(to_family(key.font))
-                    .color({
-                        let [r, g, b, a] = key.color.into_linear();
-
-                        glyphon::Color::rgba(
-                            (r * 255.0) as u8,
-                            (g * 255.0) as u8,
-                            (b * 255.0) as u8,
-                            (a * 255.0) as u8,
-                        )
-                    })
                     .monospaced(matches!(key.font, Font::Monospace)),
             );
 
@@ -412,7 +407,6 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
-    color: Color,
 }
 
 type KeyHash = u64;

From c1ff803b8f98beb2a73bb4252b34921110aa6cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 16:28:19 +0100
Subject: [PATCH 068/163] Implement basic glyph cache in `iced_tiny_skia`

---
 tiny_skia/Cargo.toml  |   2 +-
 tiny_skia/src/text.rs | 183 +++++++++++++++++++++++++++---------------
 2 files changed, 120 insertions(+), 65 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 7fee49cbae..781e7d3458 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -27,7 +27,7 @@ path = "../graphics"
 [dependencies.cosmic-text]
 features = ["std", "swash"]
 git = "https://github.com/hecrj/cosmic-text"
-rev = "dc83efbf00a2efb4118403538e8a47bfd69c3e5e"
+rev = "81080c1b9498933b43c1889601a7ea6a3d16e161"
 
 [dependencies.twox-hash]
 version = "1.6"
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 6d4cfe963a..cd7eb1ed13 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -13,6 +13,7 @@ use std::sync::Arc;
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
     system: Option<System>,
+    glyph_cache: GlyphCache,
 }
 
 #[ouroboros::self_referencing]
@@ -45,6 +46,7 @@ impl Pipeline {
                 }
                 .build(),
             ),
+            glyph_cache: GlyphCache::new(),
         }
     }
 
@@ -116,76 +118,20 @@ impl Pipeline {
 
             for run in buffer.layout_runs() {
                 for glyph in run.glyphs {
-                    // TODO: Outline support
-                    if let Some(image) = swash.get_image(glyph.cache_key) {
-                        let glyph_size = image.placement.width as usize
-                            * image.placement.height as usize;
-
-                        if glyph_size == 0 {
-                            continue;
-                        }
-
-                        // TODO: Cache glyph rasterization
-                        let mut buffer = vec![0u32; glyph_size];
-
-                        match image.content {
-                            cosmic_text::SwashContent::Mask => {
-                                let mut i = 0;
-
-                                // TODO: Blend alpha
-                                let [r, g, b, _a] = color.into_rgba8();
-
-                                for _y in 0..image.placement.height {
-                                    for _x in 0..image.placement.width {
-                                        buffer[i] =
-                                            tiny_skia::ColorU8::from_rgba(
-                                                b,
-                                                g,
-                                                r,
-                                                image.data[i],
-                                            )
-                                            .premultiply()
-                                            .get();
-
-                                        i += 1;
-                                    }
-                                }
-                            }
-                            cosmic_text::SwashContent::Color => {
-                                let mut i = 0;
-
-                                for _y in 0..image.placement.height {
-                                    for _x in 0..image.placement.width {
-                                        // TODO: Blend alpha
-                                        buffer[i >> 2] =
-                                            tiny_skia::ColorU8::from_rgba(
-                                                image.data[i + 2],
-                                                image.data[i + 1],
-                                                image.data[i],
-                                                image.data[i + 3],
-                                            )
-                                            .premultiply()
-                                            .get();
-
-                                        i += 4;
-                                    }
-                                }
-                            }
-                            cosmic_text::SwashContent::SubpixelMask => {
-                                // TODO
-                            }
-                        }
-
+                    if let Some((buffer, placement)) = self
+                        .glyph_cache
+                        .allocate(glyph.cache_key, color, &mut swash)
+                    {
                         let pixmap = tiny_skia::PixmapRef::from_bytes(
                             bytemuck::cast_slice(&buffer),
-                            image.placement.width,
-                            image.placement.height,
+                            placement.width,
+                            placement.height,
                         )
                         .expect("Create glyph pixel map");
 
                         pixels.draw_pixmap(
-                            x as i32 + glyph.x_int + image.placement.left,
-                            y as i32 - glyph.y_int - image.placement.top
+                            x as i32 + glyph.x_int + placement.left,
+                            y as i32 - glyph.y_int - placement.top
                                 + run.line_y as i32,
                             pixmap,
                             &tiny_skia::PixmapPaint::default(),
@@ -203,6 +149,8 @@ impl Pipeline {
             .as_mut()
             .unwrap()
             .with_render_cache_mut(|cache| cache.trim());
+
+        self.glyph_cache.trim();
     }
 
     pub fn measure(
@@ -283,6 +231,113 @@ fn to_family(font: Font) -> cosmic_text::Family<'static> {
     }
 }
 
+#[derive(Debug, Clone, Default)]
+struct GlyphCache {
+    entries: FxHashMap<
+        (cosmic_text::CacheKey, [u8; 3]),
+        (Vec<u32>, cosmic_text::Placement),
+    >,
+    recently_used: FxHashSet<(cosmic_text::CacheKey, [u8; 3])>,
+    trim_count: usize,
+}
+
+impl GlyphCache {
+    fn new() -> Self {
+        GlyphCache::default()
+    }
+
+    fn allocate(
+        &mut self,
+        cache_key: cosmic_text::CacheKey,
+        color: Color,
+        swash: &mut cosmic_text::SwashCache<'_>,
+    ) -> Option<(&[u8], cosmic_text::Placement)> {
+        let [r, g, b, _a] = color.into_rgba8();
+        let key = (cache_key, [r, g, b]);
+
+        if let hash_map::Entry::Vacant(entry) = self.entries.entry(key) {
+            // TODO: Outline support
+            let image = swash.get_image(cache_key).as_ref()?;
+
+            let glyph_size = image.placement.width as usize
+                * image.placement.height as usize;
+
+            if glyph_size == 0 {
+                return None;
+            }
+
+            // TODO: Cache glyph rasterization
+            let mut buffer = vec![0u32; glyph_size];
+
+            match image.content {
+                cosmic_text::SwashContent::Mask => {
+                    let mut i = 0;
+
+                    // TODO: Blend alpha
+
+                    for _y in 0..image.placement.height {
+                        for _x in 0..image.placement.width {
+                            buffer[i] = tiny_skia::ColorU8::from_rgba(
+                                b,
+                                g,
+                                r,
+                                image.data[i],
+                            )
+                            .premultiply()
+                            .get();
+
+                            i += 1;
+                        }
+                    }
+                }
+                cosmic_text::SwashContent::Color => {
+                    let mut i = 0;
+
+                    for _y in 0..image.placement.height {
+                        for _x in 0..image.placement.width {
+                            // TODO: Blend alpha
+                            buffer[i >> 2] = tiny_skia::ColorU8::from_rgba(
+                                image.data[i + 2],
+                                image.data[i + 1],
+                                image.data[i],
+                                image.data[i + 3],
+                            )
+                            .premultiply()
+                            .get();
+
+                            i += 4;
+                        }
+                    }
+                }
+                cosmic_text::SwashContent::SubpixelMask => {
+                    // TODO
+                }
+            }
+
+            entry.insert((buffer, image.placement));
+        }
+
+        self.recently_used.insert(key);
+
+        self.entries.get(&key).map(|(buffer, placement)| {
+            (bytemuck::cast_slice(buffer.as_slice()), *placement)
+        })
+    }
+
+    pub fn trim(&mut self) {
+        if self.trim_count > 300 {
+            self.entries
+                .retain(|key, _| self.recently_used.contains(key));
+
+            self.recently_used.clear();
+
+            self.trim_count = 0;
+        } else {
+            self.trim_count += 1;
+        }
+    }
+}
+
 struct Cache<'a> {
     entries: FxHashMap<KeyHash, cosmic_text::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,

From 151daf95b70d5a53007496e58f49fc618c1a22e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 27 Feb 2023 16:30:54 +0100
Subject: [PATCH 069/163] Remove unnecessary `cast_slice` in `iced_tiny_skia`

---
 tiny_skia/src/text.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index cd7eb1ed13..37b0fe475f 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -123,7 +123,7 @@ impl Pipeline {
                         .allocate(glyph.cache_key, color, &mut swash)
                     {
                         let pixmap = tiny_skia::PixmapRef::from_bytes(
-                            bytemuck::cast_slice(&buffer),
+                            buffer,
                             placement.width,
                             placement.height,
                         )
@@ -266,7 +266,6 @@ impl GlyphCache {
                 return None;
             }
 
-            // TODO: Cache glyph rasterization
             let mut buffer = vec![0u32; glyph_size];
 
             match image.content {

From fd06de5d9c5afa05c5b11cda730b0769aef92caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 28 Feb 2023 03:48:34 +0100
Subject: [PATCH 070/163] Use `get_image_uncached` in `iced_tiny_skia`

... since we are not reusing the `SwashCache`
---
 tiny_skia/src/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 37b0fe475f..da3a06bfb3 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -257,7 +257,7 @@ impl GlyphCache {
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(key) {
             // TODO: Outline support
-            let image = swash.get_image(cache_key).as_ref()?;
+            let image = swash.get_image_uncached(cache_key)?;
 
             let glyph_size = image.placement.width as usize
                 * image.placement.height as usize;

From 3f6e28fa9b1b8d911f765c9efb5249a9e0c942d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 28 Feb 2023 20:47:13 +0100
Subject: [PATCH 071/163] Use `iced_renderer` instead of `iced_graphics` in
 root crate

---
 Cargo.toml             | 5 ++---
 renderer/Cargo.toml    | 2 ++
 renderer/src/lib.rs    | 1 +
 renderer/src/widget.rs | 5 +++++
 src/error.rs           | 2 +-
 src/widget.rs          | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 renderer/src/widget.rs

diff --git a/Cargo.toml b/Cargo.toml
index b1f5cf66bb..942966e5c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,9 +17,9 @@ image = ["iced_renderer/image", "image_rs"]
 # Enables the `Svg` widget
 svg = ["iced_renderer/svg"]
 # Enables the `Canvas` widget
-canvas = ["iced_graphics/canvas"]
+canvas = ["iced_renderer/canvas"]
 # Enables the `QRCode` widget
-qr_code = ["iced_graphics/qr_code"]
+qr_code = ["iced_renderer/qr_code"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -60,7 +60,6 @@ members = [
 iced_core = { version = "0.8", path = "core" }
 iced_futures = { version = "0.6", path = "futures" }
 iced_native = { version = "0.9", path = "native" }
-iced_graphics = { version = "0.7", path = "graphics" }
 iced_renderer = { version = "0.1", path = "renderer" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
 thiserror = "1.0"
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 5ba5d426fe..1f21f06bb1 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -6,6 +6,8 @@ edition = "2021"
 [features]
 image = ["iced_wgpu/image", "iced_tiny_skia/image"]
 svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
+canvas = ["iced_graphics/canvas"]
+qr_code = ["iced_graphics/qr_code"]
 tracing = ["iced_wgpu/tracing"]
 
 [dependencies]
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index d0ba67930b..f9bfc37349 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod widget;
 pub mod window;
 
 mod backend;
diff --git a/renderer/src/widget.rs b/renderer/src/widget.rs
new file mode 100644
index 0000000000..417cc06fad
--- /dev/null
+++ b/renderer/src/widget.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "qr_code")]
+pub use iced_graphics::widget::qr_code;
+
+#[cfg(feature = "canvas")]
+pub use iced_graphics::widget::canvas;
diff --git a/src/error.rs b/src/error.rs
index 0bfa3ff1c4..5326718f1b 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -13,7 +13,7 @@ pub enum Error {
 
     /// The application graphics context could not be created.
     #[error("the application graphics context could not be created")]
-    GraphicsCreationFailed(iced_graphics::Error),
+    GraphicsCreationFailed(iced_renderer::Error),
 }
 
 impl From<iced_winit::Error> for Error {
diff --git a/src/widget.rs b/src/widget.rs
index e2b0537e53..04cb0e50cc 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -165,7 +165,7 @@ pub use vertical_slider::VerticalSlider;
 
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub use iced_graphics::widget::canvas;
+pub use iced_renderer::widget::canvas;
 
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
@@ -192,7 +192,7 @@ pub mod image {
 
 #[cfg(feature = "qr_code")]
 #[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub use iced_graphics::widget::qr_code;
+pub use iced_renderer::widget::qr_code;
 
 #[cfg(feature = "svg")]
 #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]

From 5fd5d1cdf8e5354788dc40729c4565ef377d3bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:34:26 +0100
Subject: [PATCH 072/163] Implement `Canvas` support for `iced_tiny_skia`

---
 core/Cargo.toml                               |   1 +
 {graphics => core}/src/gradient.rs            |   0
 {graphics => core}/src/gradient/linear.rs     |   0
 core/src/lib.rs                               |   2 +
 examples/arc/src/main.rs                      |   9 +-
 examples/bezier_tool/src/main.rs              |  25 +-
 examples/clock/src/main.rs                    |   9 +-
 examples/color_palette/src/main.rs            |   9 +-
 examples/game_of_life/src/main.rs             |  73 ++---
 examples/geometry/src/main.rs                 |   6 +-
 examples/modern_art/src/main.rs               |   5 +-
 examples/multitouch/src/main.rs               |   7 +-
 examples/sierpinski_triangle/src/main.rs      |   9 +-
 examples/solar_system/src/main.rs             |  28 +-
 graphics/Cargo.toml                           |  13 +-
 graphics/src/backend.rs                       |   2 +
 graphics/src/lib.rs                           |  13 +-
 graphics/src/primitive.rs                     | 128 +++++---
 graphics/src/renderer.rs                      |  43 +--
 graphics/src/triangle.rs                      |  32 --
 native/Cargo.toml                             |   6 +
 native/src/lib.rs                             |   4 +-
 native/src/widget.rs                          |  16 +
 {graphics => native}/src/widget/canvas.rs     | 101 +++----
 .../src/widget/canvas/cursor.rs               |   2 +-
 .../src/widget/canvas/event.rs                |   8 +-
 .../src/widget/canvas/fill.rs                 |  18 +-
 .../src/widget/canvas/path.rs                 |  52 +---
 .../src/widget/canvas/path/arc.rs             |   2 +-
 .../src/widget/canvas/path/builder.rs         |  24 +-
 .../src/widget/canvas/program.rs              |  24 +-
 .../src/widget/canvas/stroke.rs               |  22 +-
 .../src/widget/canvas/style.rs                |   3 +-
 .../src/widget/canvas/text.rs                 |   0
 renderer/Cargo.toml                           |  10 +-
 renderer/src/backend.rs                       |   4 +-
 renderer/src/lib.rs                           |  14 +-
 renderer/src/widget.rs                        |  12 +-
 renderer/src/widget/canvas.rs                 | 177 +++++++++++
 renderer/src/widget/canvas/cache.rs           |  85 ++++++
 {graphics => renderer}/src/widget/qr_code.rs  |  90 +++---
 src/widget.rs                                 |   5 +-
 tiny_skia/Cargo.toml                          |   1 +
 tiny_skia/src/backend.rs                      |  48 ++-
 tiny_skia/src/canvas.rs                       | 276 ++++++++++++++++++
 tiny_skia/src/lib.rs                          |  10 +-
 tiny_skia/src/primitive.rs                    |  82 ++++++
 tiny_skia/src/window/compositor.rs            |   3 +-
 wgpu/Cargo.toml                               |  15 +-
 wgpu/src/backend.rs                           |   7 +-
 wgpu/src/image.rs                             |   2 +-
 {graphics => wgpu}/src/layer.rs               |  80 ++---
 {graphics => wgpu}/src/layer/image.rs         |   0
 {graphics => wgpu}/src/layer/mesh.rs          |   6 +-
 {graphics => wgpu}/src/layer/quad.rs          |   0
 {graphics => wgpu}/src/layer/text.rs          |   0
 wgpu/src/lib.rs                               |  15 +-
 wgpu/src/quad.rs                              |   3 +-
 wgpu/src/text.rs                              |   3 +-
 wgpu/src/triangle.rs                          |  71 ++---
 {graphics => wgpu}/src/widget.rs              |   9 +-
 wgpu/src/widget/canvas.rs                     |  16 +
 {graphics => wgpu}/src/widget/canvas/cache.rs |  19 +-
 {graphics => wgpu}/src/widget/canvas/frame.rs | 157 +++++++---
 .../src/widget/canvas/geometry.rs             |   0
 65 files changed, 1350 insertions(+), 566 deletions(-)
 rename {graphics => core}/src/gradient.rs (100%)
 rename {graphics => core}/src/gradient/linear.rs (100%)
 rename {graphics => native}/src/widget/canvas.rs (73%)
 rename {graphics => native}/src/widget/canvas/cursor.rs (98%)
 rename {graphics => native}/src/widget/canvas/event.rs (73%)
 rename {graphics => native}/src/widget/canvas/fill.rs (77%)
 rename {graphics => native}/src/widget/canvas/path.rs (50%)
 rename {graphics => native}/src/widget/canvas/path/arc.rs (97%)
 rename {graphics => native}/src/widget/canvas/path/builder.rs (91%)
 rename {graphics => native}/src/widget/canvas/program.rs (83%)
 rename {graphics => native}/src/widget/canvas/stroke.rs (79%)
 rename {graphics => native}/src/widget/canvas/style.rs (88%)
 rename {graphics => native}/src/widget/canvas/text.rs (100%)
 create mode 100644 renderer/src/widget/canvas.rs
 create mode 100644 renderer/src/widget/canvas/cache.rs
 rename {graphics => renderer}/src/widget/qr_code.rs (81%)
 create mode 100644 tiny_skia/src/canvas.rs
 create mode 100644 tiny_skia/src/primitive.rs
 rename {graphics => wgpu}/src/layer.rs (95%)
 rename {graphics => wgpu}/src/layer/image.rs (100%)
 rename {graphics => wgpu}/src/layer/mesh.rs (94%)
 rename {graphics => wgpu}/src/layer/quad.rs (100%)
 rename {graphics => wgpu}/src/layer/text.rs (100%)
 rename {graphics => wgpu}/src/widget.rs (56%)
 create mode 100644 wgpu/src/widget/canvas.rs
 rename {graphics => wgpu}/src/widget/canvas/cache.rs (87%)
 rename {graphics => wgpu}/src/widget/canvas/frame.rs (77%)
 rename {graphics => wgpu}/src/widget/canvas/geometry.rs (100%)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 43865e4d83..7ccb7b7aca 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/iced-rs/iced"
 
 [dependencies]
 bitflags = "1.2"
+thiserror = "1"
 
 [dependencies.palette]
 version = "0.6"
diff --git a/graphics/src/gradient.rs b/core/src/gradient.rs
similarity index 100%
rename from graphics/src/gradient.rs
rename to core/src/gradient.rs
diff --git a/graphics/src/gradient/linear.rs b/core/src/gradient/linear.rs
similarity index 100%
rename from graphics/src/gradient/linear.rs
rename to core/src/gradient/linear.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d73148514c..1e4f0411d9 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -26,6 +26,7 @@
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 pub mod alignment;
 pub mod font;
+pub mod gradient;
 pub mod keyboard;
 pub mod mouse;
 pub mod time;
@@ -46,6 +47,7 @@ pub use background::Background;
 pub use color::Color;
 pub use content_fit::ContentFit;
 pub use font::Font;
+pub use gradient::Gradient;
 pub use length::Length;
 pub use padding::Padding;
 pub use pixels::Pixels;
diff --git a/examples/arc/src/main.rs b/examples/arc/src/main.rs
index 7b6ea0e186..d71ba6f6f2 100644
--- a/examples/arc/src/main.rs
+++ b/examples/arc/src/main.rs
@@ -5,8 +5,8 @@ use iced::widget::canvas::{
     self, stroke, Cache, Canvas, Cursor, Geometry, Path, Stroke,
 };
 use iced::{
-    Application, Command, Element, Length, Point, Rectangle, Settings,
-    Subscription, Theme,
+    Application, Command, Element, Length, Point, Rectangle, Renderer,
+    Settings, Subscription, Theme,
 };
 
 pub fn main() -> iced::Result {
@@ -69,17 +69,18 @@ impl Application for Arc {
     }
 }
 
-impl<Message> canvas::Program<Message> for Arc {
+impl<Message> canvas::Program<Message, Renderer> for Arc {
     type State = ();
 
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         theme: &Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<Geometry> {
-        let geometry = self.cache.draw(bounds.size(), |frame| {
+        let geometry = self.cache.draw(renderer, bounds.size(), |frame| {
             let palette = theme.palette();
 
             let center = frame.center();
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index 7c3916d4a2..5bb463c3ee 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -64,7 +64,7 @@ mod bezier {
     use iced::widget::canvas::{
         self, Canvas, Cursor, Frame, Geometry, Path, Stroke,
     };
-    use iced::{Element, Length, Point, Rectangle, Theme};
+    use iced::{Element, Length, Point, Rectangle, Renderer, Theme};
 
     #[derive(Default)]
     pub struct State {
@@ -92,7 +92,7 @@ mod bezier {
         curves: &'a [Curve],
     }
 
-    impl<'a> canvas::Program<Curve> for Bezier<'a> {
+    impl<'a> canvas::Program<Curve, Renderer> for Bezier<'a> {
         type State = Option<Pending>;
 
         fn update(
@@ -152,22 +152,26 @@ mod bezier {
         fn draw(
             &self,
             state: &Self::State,
+            renderer: &Renderer,
             _theme: &Theme,
             bounds: Rectangle,
             cursor: Cursor,
         ) -> Vec<Geometry> {
-            let content =
-                self.state.cache.draw(bounds.size(), |frame: &mut Frame| {
+            let content = self.state.cache.draw(
+                renderer,
+                bounds.size(),
+                |frame: &mut Frame| {
                     Curve::draw_all(self.curves, frame);
 
                     frame.stroke(
                         &Path::rectangle(Point::ORIGIN, frame.size()),
                         Stroke::default().with_width(2.0),
                     );
-                });
+                },
+            );
 
             if let Some(pending) = state {
-                let pending_curve = pending.draw(bounds, cursor);
+                let pending_curve = pending.draw(renderer, bounds, cursor);
 
                 vec![content, pending_curve]
             } else {
@@ -216,8 +220,13 @@ mod bezier {
     }
 
     impl Pending {
-        fn draw(&self, bounds: Rectangle, cursor: Cursor) -> Geometry {
-            let mut frame = Frame::new(bounds.size());
+        fn draw(
+            &self,
+            renderer: &Renderer,
+            bounds: Rectangle,
+            cursor: Cursor,
+        ) -> Geometry {
+            let mut frame = Frame::new(renderer, bounds.size());
 
             if let Some(cursor_position) = cursor.position_in(&bounds) {
                 match *self {
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index a389c54f6b..6425e2da77 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -4,8 +4,8 @@ use iced::widget::canvas::{
 };
 use iced::widget::{canvas, container};
 use iced::{
-    Application, Color, Command, Element, Length, Point, Rectangle, Settings,
-    Subscription, Theme, Vector,
+    Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
+    Settings, Subscription, Theme, Vector,
 };
 
 pub fn main() -> iced::Result {
@@ -83,17 +83,18 @@ impl Application for Clock {
     }
 }
 
-impl<Message> canvas::Program<Message> for Clock {
+impl<Message> canvas::Program<Message, Renderer> for Clock {
     type State = ();
 
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<Geometry> {
-        let clock = self.clock.draw(bounds.size(), |frame| {
+        let clock = self.clock.draw(renderer, bounds.size(), |frame| {
             let center = frame.center();
             let radius = frame.width().min(frame.height()) / 2.0;
 
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index a2df36c2ee..1109a88388 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -1,8 +1,8 @@
 use iced::widget::canvas::{self, Canvas, Cursor, Frame, Geometry, Path};
 use iced::widget::{column, row, text, Slider};
 use iced::{
-    alignment, Alignment, Color, Element, Length, Point, Rectangle, Sandbox,
-    Settings, Size, Vector,
+    alignment, Alignment, Color, Element, Length, Point, Rectangle, Renderer,
+    Sandbox, Settings, Size, Vector,
 };
 use palette::{self, convert::FromColor, Hsl, Srgb};
 use std::marker::PhantomData;
@@ -237,17 +237,18 @@ impl Theme {
     }
 }
 
-impl<Message> canvas::Program<Message> for Theme {
+impl<Message> canvas::Program<Message, Renderer> for Theme {
     type State = ();
 
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &iced::Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<Geometry> {
-        let theme = self.canvas_cache.draw(bounds.size(), |frame| {
+        let theme = self.canvas_cache.draw(renderer, bounds.size(), |frame| {
             self.draw(frame);
         });
 
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index ed911160e3..494f71a667 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -211,8 +211,8 @@ mod grid {
         Cache, Canvas, Cursor, Frame, Geometry, Path, Text,
     };
     use iced::{
-        alignment, mouse, Color, Element, Length, Point, Rectangle, Size,
-        Theme, Vector,
+        alignment, mouse, Color, Element, Length, Point, Rectangle, Renderer,
+        Size, Theme, Vector,
     };
     use rustc_hash::{FxHashMap, FxHashSet};
     use std::future::Future;
@@ -393,7 +393,7 @@ mod grid {
         }
     }
 
-    impl canvas::Program<Message> for Grid {
+    impl canvas::Program<Message, Renderer> for Grid {
         type State = Interaction;
 
         fn update(
@@ -536,13 +536,14 @@ mod grid {
         fn draw(
             &self,
             _interaction: &Interaction,
+            renderer: &Renderer,
             _theme: &Theme,
             bounds: Rectangle,
             cursor: Cursor,
         ) -> Vec<Geometry> {
             let center = Vector::new(bounds.width / 2.0, bounds.height / 2.0);
 
-            let life = self.life_cache.draw(bounds.size(), |frame| {
+            let life = self.life_cache.draw(renderer, bounds.size(), |frame| {
                 let background = Path::rectangle(Point::ORIGIN, frame.size());
                 frame.fill(&background, Color::from_rgb8(0x40, 0x44, 0x4B));
 
@@ -565,7 +566,7 @@ mod grid {
             });
 
             let overlay = {
-                let mut frame = Frame::new(bounds.size());
+                let mut frame = Frame::new(renderer, bounds.size());
 
                 let hovered_cell =
                     cursor.position_in(&bounds).map(|position| {
@@ -626,38 +627,40 @@ mod grid {
             if self.scaling < 0.2 || !self.show_lines {
                 vec![life, overlay]
             } else {
-                let grid = self.grid_cache.draw(bounds.size(), |frame| {
-                    frame.translate(center);
-                    frame.scale(self.scaling);
-                    frame.translate(self.translation);
-                    frame.scale(Cell::SIZE as f32);
-
-                    let region = self.visible_region(frame.size());
-                    let rows = region.rows();
-                    let columns = region.columns();
-                    let (total_rows, total_columns) =
-                        (rows.clone().count(), columns.clone().count());
-                    let width = 2.0 / Cell::SIZE as f32;
-                    let color = Color::from_rgb8(70, 74, 83);
-
-                    frame.translate(Vector::new(-width / 2.0, -width / 2.0));
+                let grid =
+                    self.grid_cache.draw(renderer, bounds.size(), |frame| {
+                        frame.translate(center);
+                        frame.scale(self.scaling);
+                        frame.translate(self.translation);
+                        frame.scale(Cell::SIZE as f32);
 
-                    for row in region.rows() {
-                        frame.fill_rectangle(
-                            Point::new(*columns.start() as f32, row as f32),
-                            Size::new(total_columns as f32, width),
-                            color,
-                        );
-                    }
+                        let region = self.visible_region(frame.size());
+                        let rows = region.rows();
+                        let columns = region.columns();
+                        let (total_rows, total_columns) =
+                            (rows.clone().count(), columns.clone().count());
+                        let width = 2.0 / Cell::SIZE as f32;
+                        let color = Color::from_rgb8(70, 74, 83);
+
+                        frame
+                            .translate(Vector::new(-width / 2.0, -width / 2.0));
+
+                        for row in region.rows() {
+                            frame.fill_rectangle(
+                                Point::new(*columns.start() as f32, row as f32),
+                                Size::new(total_columns as f32, width),
+                                color,
+                            );
+                        }
 
-                    for column in region.columns() {
-                        frame.fill_rectangle(
-                            Point::new(column as f32, *rows.start() as f32),
-                            Size::new(width, total_rows as f32),
-                            color,
-                        );
-                    }
-                });
+                        for column in region.columns() {
+                            frame.fill_rectangle(
+                                Point::new(column as f32, *rows.start() as f32),
+                                Size::new(width, total_rows as f32),
+                                color,
+                            );
+                        }
+                    });
 
                 vec![life, grid, overlay]
             }
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 9bacce7f6b..a77772d5b3 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -10,9 +10,9 @@ mod rainbow {
     // Of course, you can choose to make the implementation renderer-agnostic,
     // if you wish to, by creating your own `Renderer` trait, which could be
     // implemented by `iced_wgpu` and other renderers.
+    use iced_graphics::primitive::{ColoredVertex2D, Primitive};
     use iced_graphics::renderer::{self, Renderer};
-    use iced_graphics::triangle::ColoredVertex2D;
-    use iced_graphics::{Backend, Primitive};
+    use iced_graphics::Backend;
 
     use iced_native::layout;
     use iced_native::widget::{self, Widget};
@@ -59,7 +59,7 @@ mod rainbow {
             cursor_position: Point,
             _viewport: &Rectangle,
         ) {
-            use iced_graphics::triangle::Mesh2D;
+            use iced_graphics::primitive::Mesh2D;
             use iced_native::Renderer as _;
 
             let b = layout.bounds();
diff --git a/examples/modern_art/src/main.rs b/examples/modern_art/src/main.rs
index 28ed3e215c..a43a2b2b0e 100644
--- a/examples/modern_art/src/main.rs
+++ b/examples/modern_art/src/main.rs
@@ -55,17 +55,18 @@ impl Application for ModernArt {
     }
 }
 
-impl<Message> canvas::Program<Message> for ModernArt {
+impl<Message> canvas::Program<Message, Renderer> for ModernArt {
     type State = ();
 
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<Geometry> {
-        let geometry = self.cache.draw(bounds.size(), |frame| {
+        let geometry = self.cache.draw(renderer, bounds.size(), |frame| {
             let num_squares = thread_rng().gen_range(0..1200);
 
             let mut i = 0;
diff --git a/examples/multitouch/src/main.rs b/examples/multitouch/src/main.rs
index f5faae0f4a..7df6c929af 100644
--- a/examples/multitouch/src/main.rs
+++ b/examples/multitouch/src/main.rs
@@ -6,7 +6,7 @@ use iced::widget::canvas::stroke::{self, Stroke};
 use iced::widget::canvas::{self, Canvas, Cursor, Geometry};
 use iced::{
     executor, touch, window, Application, Color, Command, Element, Length,
-    Point, Rectangle, Settings, Subscription, Theme,
+    Point, Rectangle, Renderer, Settings, Subscription, Theme,
 };
 
 use std::collections::HashMap;
@@ -95,7 +95,7 @@ impl Application for Multitouch {
     }
 }
 
-impl canvas::Program<Message> for State {
+impl canvas::Program<Message, Renderer> for State {
     type State = ();
 
     fn update(
@@ -125,11 +125,12 @@ impl canvas::Program<Message> for State {
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<Geometry> {
-        let fingerweb = self.cache.draw(bounds.size(), |frame| {
+        let fingerweb = self.cache.draw(renderer, bounds.size(), |frame| {
             if self.fingers.len() < 2 {
                 return;
             }
diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
index 1d25d17166..e85f839195 100644
--- a/examples/sierpinski_triangle/src/main.rs
+++ b/examples/sierpinski_triangle/src/main.rs
@@ -5,8 +5,8 @@ use iced::widget::canvas::event::{self, Event};
 use iced::widget::canvas::{self, Canvas};
 use iced::widget::{column, row, slider, text};
 use iced::{
-    Application, Color, Command, Length, Point, Rectangle, Settings, Size,
-    Theme,
+    Application, Color, Command, Length, Point, Rectangle, Renderer, Settings,
+    Size, Theme,
 };
 
 use rand::Rng;
@@ -97,7 +97,7 @@ struct SierpinskiGraph {
     cache: canvas::Cache,
 }
 
-impl canvas::Program<Message> for SierpinskiGraph {
+impl canvas::Program<Message, Renderer> for SierpinskiGraph {
     type State = ();
 
     fn update(
@@ -134,11 +134,12 @@ impl canvas::Program<Message> for SierpinskiGraph {
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
         _cursor: canvas::Cursor,
     ) -> Vec<canvas::Geometry> {
-        let geom = self.cache.draw(bounds.size(), |frame| {
+        let geom = self.cache.draw(renderer, bounds.size(), |frame| {
             frame.stroke(
                 &canvas::Path::rectangle(Point::ORIGIN, frame.size()),
                 canvas::Stroke::default(),
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index 9a4ee7549a..0023a69b73 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -15,8 +15,8 @@ use iced::widget::canvas::stroke::{self, Stroke};
 use iced::widget::canvas::{Cursor, Path};
 use iced::window;
 use iced::{
-    Application, Color, Command, Element, Length, Point, Rectangle, Settings,
-    Size, Subscription, Vector,
+    Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
+    Settings, Size, Subscription, Vector,
 };
 
 use std::time::Instant;
@@ -150,30 +150,32 @@ impl State {
     }
 }
 
-impl<Message> canvas::Program<Message> for State {
+impl<Message> canvas::Program<Message, Renderer> for State {
     type State = ();
 
     fn draw(
         &self,
         _state: &Self::State,
+        renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
         _cursor: Cursor,
     ) -> Vec<canvas::Geometry> {
         use std::f32::consts::PI;
 
-        let background = self.space_cache.draw(bounds.size(), |frame| {
-            let stars = Path::new(|path| {
-                for (p, size) in &self.stars {
-                    path.rectangle(*p, Size::new(*size, *size));
-                }
-            });
+        let background =
+            self.space_cache.draw(renderer, bounds.size(), |frame| {
+                let stars = Path::new(|path| {
+                    for (p, size) in &self.stars {
+                        path.rectangle(*p, Size::new(*size, *size));
+                    }
+                });
 
-            frame.translate(frame.center() - Point::ORIGIN);
-            frame.fill(&stars, Color::WHITE);
-        });
+                frame.translate(frame.center() - Point::ORIGIN);
+                frame.fill(&stars, Color::WHITE);
+            });
 
-        let system = self.system_cache.draw(bounds.size(), |frame| {
+        let system = self.system_cache.draw(renderer, bounds.size(), |frame| {
             let center = frame.center();
 
             let sun = Path::circle(center, Self::SUN_RADIUS);
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 9795d31f8b..36d8a516c7 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -24,8 +24,7 @@ bmp = ["image_rs/bmp"]
 hdr = ["image_rs/hdr"]
 dds = ["image_rs/dds"]
 farbfeld = ["image_rs/farbfeld"]
-canvas = ["lyon"]
-qr_code = ["qrcode", "canvas"]
+canvas = ["iced_native/canvas"]
 opengl = []
 image_rs = ["kamadak-exif"]
 
@@ -35,6 +34,7 @@ log = "0.4"
 raw-window-handle = "0.5"
 thiserror = "1.0"
 bitflags = "1.2"
+tiny-skia = "0.8"
 
 [dependencies.bytemuck]
 version = "1.4"
@@ -48,15 +48,6 @@ path = "../native"
 version = "0.7"
 path = "../style"
 
-[dependencies.lyon]
-version = "1.0"
-optional = true
-
-[dependencies.qrcode]
-version = "0.12"
-optional = true
-default-features = false
-
 [dependencies.image_rs]
 version = "0.24"
 package = "image"
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 8658cffe82..c44372e8e7 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -10,6 +10,8 @@ use std::borrow::Cow;
 ///
 /// [`Renderer`]: crate::Renderer
 pub trait Backend {
+    type Geometry: Into<crate::Primitive>;
+
     /// Trims the measurements cache.
     ///
     /// This method is currently necessary to properly trim the text cache in
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index bbbdfa0e14..576b2d7812 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -9,7 +9,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    missing_docs,
+    //missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
@@ -23,25 +23,19 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 mod antialiasing;
 mod error;
-mod primitive;
 mod transformation;
 mod viewport;
 
 pub mod backend;
-pub mod gradient;
 pub mod image;
-pub mod layer;
 pub mod overlay;
+pub mod primitive;
 pub mod renderer;
-pub mod triangle;
-pub mod widget;
 pub mod window;
 
 pub use antialiasing::Antialiasing;
 pub use backend::Backend;
 pub use error::Error;
-pub use gradient::Gradient;
-pub use layer::Layer;
 pub use primitive::Primitive;
 pub use renderer::Renderer;
 pub use transformation::Transformation;
@@ -50,5 +44,6 @@ pub use viewport::Viewport;
 pub use iced_native::alignment;
 pub use iced_native::text;
 pub use iced_native::{
-    Alignment, Background, Color, Font, Point, Rectangle, Size, Vector,
+    Alignment, Background, Color, Font, Gradient, Point, Rectangle, Size,
+    Vector,
 };
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 5a163a2f5f..e48265911e 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,23 +1,15 @@
+use crate::alignment;
+
 use iced_native::image;
 use iced_native::svg;
-use iced_native::{Background, Color, Font, Rectangle, Size, Vector};
-
-use crate::alignment;
-use crate::gradient::Gradient;
-use crate::triangle;
+use iced_native::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
 
+use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
 
 /// A rendering primitive.
 #[derive(Debug, Clone)]
 pub enum Primitive {
-    /// An empty primitive
-    None,
-    /// A group of primitives
-    Group {
-        /// The primitives of the group
-        primitives: Vec<Primitive>,
-    },
     /// A text primitive
     Text {
         /// The contents of the text
@@ -66,27 +58,12 @@ pub enum Primitive {
         /// The bounds of the viewport
         bounds: Rectangle,
     },
-    /// A clip primitive
-    Clip {
-        /// The bounds of the clip
-        bounds: Rectangle,
-        /// The content of the clip
-        content: Box<Primitive>,
-    },
-    /// A primitive that applies a translation
-    Translate {
-        /// The translation vector
-        translation: Vector,
-
-        /// The primitive to translate
-        content: Box<Primitive>,
-    },
     /// A low-level primitive to render a mesh of triangles with a solid color.
     ///
     /// It can be used to render many kinds of geometry freely.
     SolidMesh {
         /// The vertices and indices of the mesh.
-        buffers: triangle::Mesh2D<triangle::ColoredVertex2D>,
+        buffers: Mesh2D<ColoredVertex2D>,
 
         /// The size of the drawable region of the mesh.
         ///
@@ -98,7 +75,7 @@ pub enum Primitive {
     /// It can be used to render many kinds of geometry freely.
     GradientMesh {
         /// The vertices and indices of the mesh.
-        buffers: triangle::Mesh2D<triangle::Vertex2D>,
+        buffers: Mesh2D<Vertex2D>,
 
         /// The size of the drawable region of the mesh.
         ///
@@ -108,18 +85,101 @@ pub enum Primitive {
         /// The [`Gradient`] to apply to the mesh.
         gradient: Gradient,
     },
+    Fill {
+        path: tiny_skia::Path,
+        paint: tiny_skia::Paint<'static>,
+        rule: tiny_skia::FillRule,
+        transform: tiny_skia::Transform,
+    },
+    Stroke {
+        path: tiny_skia::Path,
+        paint: tiny_skia::Paint<'static>,
+        stroke: tiny_skia::Stroke,
+        transform: tiny_skia::Transform,
+    },
+    /// A group of primitives
+    Group {
+        /// The primitives of the group
+        primitives: Vec<Primitive>,
+    },
+    /// A clip primitive
+    Clip {
+        /// The bounds of the clip
+        bounds: Rectangle,
+        /// The content of the clip
+        content: Box<Primitive>,
+    },
+    /// A primitive that applies a translation
+    Translate {
+        /// The translation vector
+        translation: Vector,
+
+        /// The primitive to translate
+        content: Box<Primitive>,
+    },
     /// A cached primitive.
     ///
     /// This can be useful if you are implementing a widget where primitive
     /// generation is expensive.
-    Cached {
+    Cache {
         /// The cached primitive
-        cache: Arc<Primitive>,
+        content: Arc<Primitive>,
     },
 }
 
-impl Default for Primitive {
-    fn default() -> Primitive {
-        Primitive::None
+impl Primitive {
+    pub fn group(primitives: Vec<Self>) -> Self {
+        Self::Group { primitives }
+    }
+
+    pub fn clip(self, bounds: Rectangle) -> Self {
+        Self::Clip {
+            bounds,
+            content: Box::new(self),
+        }
+    }
+
+    pub fn translate(self, translation: Vector) -> Self {
+        Self::Translate {
+            translation,
+            content: Box::new(self),
+        }
+    }
+}
+
+/// A set of [`Vertex2D`] and indices representing a list of triangles.
+#[derive(Clone, Debug)]
+pub struct Mesh2D<T> {
+    /// The vertices of the mesh
+    pub vertices: Vec<T>,
+
+    /// The list of vertex indices that defines the triangles of the mesh.
+    ///
+    /// Therefore, this list should always have a length that is a multiple of 3.
+    pub indices: Vec<u32>,
+}
+
+/// A two-dimensional vertex.
+#[derive(Copy, Clone, Debug, Zeroable, Pod)]
+#[repr(C)]
+pub struct Vertex2D {
+    /// The vertex position in 2D space.
+    pub position: [f32; 2],
+}
+
+/// A two-dimensional vertex with a color.
+#[derive(Copy, Clone, Debug, Zeroable, Pod)]
+#[repr(C)]
+pub struct ColoredVertex2D {
+    /// The vertex position in 2D space.
+    pub position: [f32; 2],
+
+    /// The color of the vertex in __linear__ RGBA.
+    pub color: [f32; 4],
+}
+
+impl From<()> for Primitive {
+    fn from(_: ()) -> Self {
+        Self::Group { primitives: vec![] }
     }
 }
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 859ebc0418..793ee7d7ec 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,6 +1,7 @@
 //! Create a renderer from a [`Backend`].
 use crate::backend::{self, Backend};
 use crate::{Primitive, Vector};
+
 use iced_native::image;
 use iced_native::layout;
 use iced_native::renderer;
@@ -70,19 +71,13 @@ where
     }
 
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
-        let current_primitives = std::mem::take(&mut self.primitives);
+        let current = std::mem::take(&mut self.primitives);
 
         f(self);
 
-        let layer_primitives =
-            std::mem::replace(&mut self.primitives, current_primitives);
+        let layer = std::mem::replace(&mut self.primitives, current);
 
-        self.primitives.push(Primitive::Clip {
-            bounds,
-            content: Box::new(Primitive::Group {
-                primitives: layer_primitives,
-            }),
-        });
+        self.primitives.push(Primitive::group(layer).clip(bounds));
     }
 
     fn with_translation(
@@ -90,19 +85,14 @@ where
         translation: Vector,
         f: impl FnOnce(&mut Self),
     ) {
-        let current_primitives = std::mem::take(&mut self.primitives);
+        let current = std::mem::take(&mut self.primitives);
 
         f(self);
 
-        let layer_primitives =
-            std::mem::replace(&mut self.primitives, current_primitives);
+        let layer = std::mem::replace(&mut self.primitives, current);
 
-        self.primitives.push(Primitive::Translate {
-            translation,
-            content: Box::new(Primitive::Group {
-                primitives: layer_primitives,
-            }),
-        });
+        self.primitives
+            .push(Primitive::group(layer).translate(translation));
     }
 
     fn fill_quad(
@@ -199,7 +189,7 @@ where
     }
 
     fn draw(&mut self, handle: image::Handle, bounds: Rectangle) {
-        self.draw_primitive(Primitive::Image { handle, bounds })
+        self.primitives.push(Primitive::Image { handle, bounds })
     }
 }
 
@@ -217,10 +207,23 @@ where
         color: Option<Color>,
         bounds: Rectangle,
     ) {
-        self.draw_primitive(Primitive::Svg {
+        self.primitives.push(Primitive::Svg {
             handle,
             color,
             bounds,
         })
     }
 }
+
+#[cfg(feature = "canvas")]
+impl<B, T> iced_native::widget::canvas::Renderer for Renderer<B, T>
+where
+    B: Backend,
+{
+    type Geometry = B::Geometry;
+
+    fn draw(&mut self, layers: Vec<Self::Geometry>) {
+        self.primitives
+            .extend(layers.into_iter().map(B::Geometry::into));
+    }
+}
diff --git a/graphics/src/triangle.rs b/graphics/src/triangle.rs
index f52b2339b1..09b6176753 100644
--- a/graphics/src/triangle.rs
+++ b/graphics/src/triangle.rs
@@ -1,33 +1 @@
 //! Draw geometry using meshes of triangles.
-use bytemuck::{Pod, Zeroable};
-
-/// A set of [`Vertex2D`] and indices representing a list of triangles.
-#[derive(Clone, Debug)]
-pub struct Mesh2D<T> {
-    /// The vertices of the mesh
-    pub vertices: Vec<T>,
-
-    /// The list of vertex indices that defines the triangles of the mesh.
-    ///
-    /// Therefore, this list should always have a length that is a multiple of 3.
-    pub indices: Vec<u32>,
-}
-
-/// A two-dimensional vertex.
-#[derive(Copy, Clone, Debug, Zeroable, Pod)]
-#[repr(C)]
-pub struct Vertex2D {
-    /// The vertex position in 2D space.
-    pub position: [f32; 2],
-}
-
-/// A two-dimensional vertex with a color.
-#[derive(Copy, Clone, Debug, Zeroable, Pod)]
-#[repr(C)]
-pub struct ColoredVertex2D {
-    /// The vertex position in 2D space.
-    pub position: [f32; 2],
-
-    /// The color of the vertex in __linear__ RGBA.
-    pub color: [f32; 4],
-}
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 3f92783eb9..23533e33c1 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -8,12 +8,14 @@ license = "MIT"
 repository = "https://github.com/iced-rs/iced"
 
 [features]
+canvas = ["lyon_path"]
 debug = []
 
 [dependencies]
 twox-hash = { version = "1.5", default-features = false }
 unicode-segmentation = "1.6"
 num-traits = "0.2"
+thiserror = "1"
 
 [dependencies.iced_core]
 version = "0.8"
@@ -27,3 +29,7 @@ features = ["thread-pool"]
 [dependencies.iced_style]
 version = "0.7"
 path = "../style"
+
+[dependencies.lyon_path]
+version = "1"
+optional = true
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 27b6fc0dc4..c98827e76f 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -33,7 +33,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    missing_docs,
+    //missing_docs,
     unused_results,
     clippy::extra_unused_lifetimes,
     clippy::from_over_into,
@@ -79,6 +79,7 @@ mod debug;
 mod debug;
 
 pub use iced_core::alignment;
+pub use iced_core::gradient;
 pub use iced_core::time;
 pub use iced_core::{
     color, Alignment, Background, Color, ContentFit, Length, Padding, Pixels,
@@ -97,6 +98,7 @@ pub use debug::Debug;
 pub use element::Element;
 pub use event::Event;
 pub use font::Font;
+pub use gradient::Gradient;
 pub use hasher::Hasher;
 pub use layout::Layout;
 pub use overlay::Overlay;
diff --git a/native/src/widget.rs b/native/src/widget.rs
index 2b3ca7be07..27330894a6 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -83,6 +83,22 @@ pub use tree::Tree;
 #[doc(no_inline)]
 pub use vertical_slider::VerticalSlider;
 
+#[cfg(feature = "canvas")]
+#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
+pub mod canvas;
+
+#[cfg(feature = "canvas")]
+#[doc(no_inline)]
+pub use canvas::Canvas;
+
+#[cfg(feature = "qr_code")]
+#[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
+pub mod qr_code;
+
+#[cfg(feature = "qr_code")]
+#[doc(no_inline)]
+pub use qr_code::QRCode;
+
 pub use action::Action;
 pub use id::Id;
 pub use operation::Operation;
diff --git a/graphics/src/widget/canvas.rs b/native/src/widget/canvas.rs
similarity index 73%
rename from graphics/src/widget/canvas.rs
rename to native/src/widget/canvas.rs
index a8d050f543..8a9addd285 100644
--- a/graphics/src/widget/canvas.rs
+++ b/native/src/widget/canvas.rs
@@ -8,34 +8,26 @@ pub mod fill;
 pub mod path;
 pub mod stroke;
 
-mod cache;
 mod cursor;
-mod frame;
-mod geometry;
 mod program;
 mod style;
 mod text;
 
 pub use crate::gradient::{self, Gradient};
-pub use cache::Cache;
 pub use cursor::Cursor;
 pub use event::Event;
-pub use fill::{Fill, FillRule};
-pub use frame::Frame;
-pub use geometry::Geometry;
+pub use fill::Fill;
 pub use path::Path;
 pub use program::Program;
 pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
 pub use style::Style;
 pub use text::Text;
 
-use crate::{Backend, Primitive, Renderer};
-
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::renderer;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::{
+use crate::layout::{self, Layout};
+use crate::mouse;
+use crate::renderer;
+use crate::widget::tree::{self, Tree};
+use crate::{
     Clipboard, Element, Length, Point, Rectangle, Shell, Size, Vector, Widget,
 };
 
@@ -85,20 +77,22 @@ use std::marker::PhantomData;
 /// let canvas = Canvas::new(Circle { radius: 50.0 });
 /// ```
 #[derive(Debug)]
-pub struct Canvas<Message, Theme, P>
+pub struct Canvas<Message, Renderer, P>
 where
-    P: Program<Message, Theme>,
+    Renderer: self::Renderer,
+    P: Program<Message, Renderer>,
 {
     width: Length,
     height: Length,
     program: P,
     message_: PhantomData<Message>,
-    theme_: PhantomData<Theme>,
+    theme_: PhantomData<Renderer>,
 }
 
-impl<Message, Theme, P> Canvas<Message, Theme, P>
+impl<Message, Renderer, P> Canvas<Message, Renderer, P>
 where
-    P: Program<Message, Theme>,
+    Renderer: self::Renderer,
+    P: Program<Message, Renderer>,
 {
     const DEFAULT_SIZE: f32 = 100.0;
 
@@ -126,10 +120,11 @@ where
     }
 }
 
-impl<Message, P, B, T> Widget<Message, Renderer<B, T>> for Canvas<Message, T, P>
+impl<Message, Renderer, P> Widget<Message, Renderer>
+    for Canvas<Message, Renderer, P>
 where
-    P: Program<Message, T>,
-    B: Backend,
+    Renderer: self::Renderer,
+    P: Program<Message, Renderer>,
 {
     fn tag(&self) -> tree::Tag {
         struct Tag<T>(T);
@@ -150,7 +145,7 @@ where
 
     fn layout(
         &self,
-        _renderer: &Renderer<B, T>,
+        _renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
         let limits = limits.width(self.width).height(self.height);
@@ -162,23 +157,19 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: crate::Event,
         layout: Layout<'_>,
         cursor_position: Point,
-        _renderer: &Renderer<B, T>,
+        _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         let bounds = layout.bounds();
 
         let canvas_event = match event {
-            iced_native::Event::Mouse(mouse_event) => {
-                Some(Event::Mouse(mouse_event))
-            }
-            iced_native::Event::Touch(touch_event) => {
-                Some(Event::Touch(touch_event))
-            }
-            iced_native::Event::Keyboard(keyboard_event) => {
+            crate::Event::Mouse(mouse_event) => Some(Event::Mouse(mouse_event)),
+            crate::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
+            crate::Event::Keyboard(keyboard_event) => {
                 Some(Event::Keyboard(keyboard_event))
             }
             _ => None,
@@ -208,7 +199,7 @@ where
         layout: Layout<'_>,
         cursor_position: Point,
         _viewport: &Rectangle,
-        _renderer: &Renderer<B, T>,
+        _renderer: &Renderer,
     ) -> mouse::Interaction {
         let bounds = layout.bounds();
         let cursor = Cursor::from_window_position(cursor_position);
@@ -220,49 +211,49 @@ where
     fn draw(
         &self,
         tree: &Tree,
-        renderer: &mut Renderer<B, T>,
-        theme: &T,
+        renderer: &mut Renderer,
+        theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
         _viewport: &Rectangle,
     ) {
-        use iced_native::Renderer as _;
-
         let bounds = layout.bounds();
 
         if bounds.width < 1.0 || bounds.height < 1.0 {
             return;
         }
 
-        let translation = Vector::new(bounds.x, bounds.y);
         let cursor = Cursor::from_window_position(cursor_position);
         let state = tree.state.downcast_ref::<P::State>();
 
-        renderer.with_translation(translation, |renderer| {
-            renderer.draw_primitive(Primitive::Group {
-                primitives: self
-                    .program
-                    .draw(state, theme, bounds, cursor)
-                    .into_iter()
-                    .map(Geometry::into_primitive)
-                    .collect(),
-            });
-        });
+        renderer.with_translation(
+            Vector::new(bounds.x, bounds.y),
+            |renderer| {
+                renderer.draw(
+                    self.program.draw(state, renderer, theme, bounds, cursor),
+                );
+            },
+        );
     }
 }
 
-impl<'a, Message, P, B, T> From<Canvas<Message, T, P>>
-    for Element<'a, Message, Renderer<B, T>>
+impl<'a, Message, Renderer, P> From<Canvas<Message, Renderer, P>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    P: Program<Message, T> + 'a,
-    B: Backend,
-    T: 'a,
+    Renderer: 'a + self::Renderer,
+    P: Program<Message, Renderer> + 'a,
 {
     fn from(
-        canvas: Canvas<Message, T, P>,
-    ) -> Element<'a, Message, Renderer<B, T>> {
+        canvas: Canvas<Message, Renderer, P>,
+    ) -> Element<'a, Message, Renderer> {
         Element::new(canvas)
     }
 }
+
+pub trait Renderer: crate::Renderer {
+    type Geometry;
+
+    fn draw(&mut self, geometry: Vec<Self::Geometry>);
+}
diff --git a/graphics/src/widget/canvas/cursor.rs b/native/src/widget/canvas/cursor.rs
similarity index 98%
rename from graphics/src/widget/canvas/cursor.rs
rename to native/src/widget/canvas/cursor.rs
index 9588d12990..ef6a7771f0 100644
--- a/graphics/src/widget/canvas/cursor.rs
+++ b/native/src/widget/canvas/cursor.rs
@@ -1,4 +1,4 @@
-use iced_native::{Point, Rectangle};
+use crate::{Point, Rectangle};
 
 /// The mouse cursor state.
 #[derive(Debug, Clone, Copy, PartialEq)]
diff --git a/graphics/src/widget/canvas/event.rs b/native/src/widget/canvas/event.rs
similarity index 73%
rename from graphics/src/widget/canvas/event.rs
rename to native/src/widget/canvas/event.rs
index 7c733a4d8a..1d726577aa 100644
--- a/graphics/src/widget/canvas/event.rs
+++ b/native/src/widget/canvas/event.rs
@@ -1,9 +1,9 @@
 //! Handle events of a canvas.
-use iced_native::keyboard;
-use iced_native::mouse;
-use iced_native::touch;
+use crate::keyboard;
+use crate::mouse;
+use crate::touch;
 
-pub use iced_native::event::Status;
+pub use crate::event::Status;
 
 /// A [`Canvas`] event.
 ///
diff --git a/graphics/src/widget/canvas/fill.rs b/native/src/widget/canvas/fill.rs
similarity index 77%
rename from graphics/src/widget/canvas/fill.rs
rename to native/src/widget/canvas/fill.rs
index e954ebb52b..92b1e47ef2 100644
--- a/graphics/src/widget/canvas/fill.rs
+++ b/native/src/widget/canvas/fill.rs
@@ -1,5 +1,6 @@
 //! Fill [crate::widget::canvas::Geometry] with a certain style.
-use crate::{Color, Gradient};
+use crate::widget::canvas::Gradient;
+use crate::Color;
 
 pub use crate::widget::canvas::Style;
 
@@ -19,14 +20,14 @@ pub struct Fill {
     /// By default, it is set to `NonZero`.
     ///
     /// [1]: https://www.w3.org/TR/SVG/painting.html#FillRuleProperty
-    pub rule: FillRule,
+    pub rule: Rule,
 }
 
 impl Default for Fill {
     fn default() -> Self {
         Self {
             style: Style::Solid(Color::BLACK),
-            rule: FillRule::NonZero,
+            rule: Rule::NonZero,
         }
     }
 }
@@ -57,16 +58,7 @@ impl From<Gradient> for Fill {
 /// [1]: https://www.w3.org/TR/SVG/painting.html#FillRuleProperty
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[allow(missing_docs)]
-pub enum FillRule {
+pub enum Rule {
     NonZero,
     EvenOdd,
 }
-
-impl From<FillRule> for lyon::tessellation::FillRule {
-    fn from(rule: FillRule) -> lyon::tessellation::FillRule {
-        match rule {
-            FillRule::NonZero => lyon::tessellation::FillRule::NonZero,
-            FillRule::EvenOdd => lyon::tessellation::FillRule::EvenOdd,
-        }
-    }
-}
diff --git a/graphics/src/widget/canvas/path.rs b/native/src/widget/canvas/path.rs
similarity index 50%
rename from graphics/src/widget/canvas/path.rs
rename to native/src/widget/canvas/path.rs
index aeb2589e02..30c387c50d 100644
--- a/graphics/src/widget/canvas/path.rs
+++ b/native/src/widget/canvas/path.rs
@@ -7,18 +7,16 @@ mod builder;
 pub use arc::Arc;
 pub use builder::Builder;
 
-use crate::widget::canvas::LineDash;
+pub use lyon_path;
 
-use iced_native::{Point, Size};
-use lyon::algorithms::walk::{walk_along_path, RepeatedPattern, WalkerEvent};
-use lyon::path::iterator::PathIterator;
+use crate::{Point, Size};
 
 /// An immutable set of points that may or may not be connected.
 ///
 /// A single [`Path`] can represent different kinds of 2D shapes!
 #[derive(Debug, Clone)]
 pub struct Path {
-    raw: lyon::path::Path,
+    raw: lyon_path::Path,
 }
 
 impl Path {
@@ -56,54 +54,14 @@ impl Path {
     }
 
     #[inline]
-    pub(crate) fn raw(&self) -> &lyon::path::Path {
+    pub fn raw(&self) -> &lyon_path::Path {
         &self.raw
     }
 
     #[inline]
-    pub(crate) fn transformed(
-        &self,
-        transform: &lyon::math::Transform,
-    ) -> Path {
+    pub fn transform(&self, transform: &lyon_path::math::Transform) -> Path {
         Path {
             raw: self.raw.clone().transformed(transform),
         }
     }
 }
-
-pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
-    Path::new(|builder| {
-        let segments_odd = (line_dash.segments.len() % 2 == 1)
-            .then(|| [line_dash.segments, line_dash.segments].concat());
-
-        let mut draw_line = false;
-
-        walk_along_path(
-            path.raw().iter().flattened(0.01),
-            0.0,
-            lyon::tessellation::StrokeOptions::DEFAULT_TOLERANCE,
-            &mut RepeatedPattern {
-                callback: |event: WalkerEvent<'_>| {
-                    let point = Point {
-                        x: event.position.x,
-                        y: event.position.y,
-                    };
-
-                    if draw_line {
-                        builder.line_to(point);
-                    } else {
-                        builder.move_to(point);
-                    }
-
-                    draw_line = !draw_line;
-
-                    true
-                },
-                index: line_dash.offset,
-                intervals: segments_odd
-                    .as_deref()
-                    .unwrap_or(line_dash.segments),
-            },
-        );
-    })
-}
diff --git a/graphics/src/widget/canvas/path/arc.rs b/native/src/widget/canvas/path/arc.rs
similarity index 97%
rename from graphics/src/widget/canvas/path/arc.rs
rename to native/src/widget/canvas/path/arc.rs
index b8e72dafa1..e0747d3e07 100644
--- a/graphics/src/widget/canvas/path/arc.rs
+++ b/native/src/widget/canvas/path/arc.rs
@@ -1,5 +1,5 @@
 //! Build and draw curves.
-use iced_native::{Point, Vector};
+use crate::{Point, Vector};
 
 /// A segment of a differentiable curve.
 #[derive(Debug, Clone, Copy)]
diff --git a/graphics/src/widget/canvas/path/builder.rs b/native/src/widget/canvas/path/builder.rs
similarity index 91%
rename from graphics/src/widget/canvas/path/builder.rs
rename to native/src/widget/canvas/path/builder.rs
index 5121aa6861..84fda05227 100644
--- a/graphics/src/widget/canvas/path/builder.rs
+++ b/native/src/widget/canvas/path/builder.rs
@@ -1,35 +1,37 @@
 use crate::widget::canvas::path::{arc, Arc, Path};
+use crate::{Point, Size};
 
-use iced_native::{Point, Size};
-use lyon::path::builder::SvgPathBuilder;
+use lyon_path::builder::{self, SvgPathBuilder};
+use lyon_path::geom;
+use lyon_path::math;
 
 /// A [`Path`] builder.
 ///
 /// Once a [`Path`] is built, it can no longer be mutated.
 #[allow(missing_debug_implementations)]
 pub struct Builder {
-    raw: lyon::path::builder::WithSvg<lyon::path::path::BuilderImpl>,
+    raw: builder::WithSvg<lyon_path::path::BuilderImpl>,
 }
 
 impl Builder {
     /// Creates a new [`Builder`].
     pub fn new() -> Builder {
         Builder {
-            raw: lyon::path::Path::builder().with_svg(),
+            raw: lyon_path::Path::builder().with_svg(),
         }
     }
 
     /// Moves the starting point of a new sub-path to the given `Point`.
     #[inline]
     pub fn move_to(&mut self, point: Point) {
-        let _ = self.raw.move_to(lyon::math::Point::new(point.x, point.y));
+        let _ = self.raw.move_to(math::Point::new(point.x, point.y));
     }
 
     /// Connects the last point in the [`Path`] to the given `Point` with a
     /// straight line.
     #[inline]
     pub fn line_to(&mut self, point: Point) {
-        let _ = self.raw.line_to(lyon::math::Point::new(point.x, point.y));
+        let _ = self.raw.line_to(math::Point::new(point.x, point.y));
     }
 
     /// Adds an [`Arc`] to the [`Path`] from `start_angle` to `end_angle` in
@@ -53,8 +55,6 @@ impl Builder {
     /// See [the HTML5 specification of `arcTo`](https://html.spec.whatwg.org/multipage/canvas.html#building-paths:dom-context-2d-arcto)
     /// for more details and examples.
     pub fn arc_to(&mut self, a: Point, b: Point, radius: f32) {
-        use lyon::{math, path};
-
         let start = self.raw.current_position();
         let mid = math::Point::new(a.x, a.y);
         let end = math::Point::new(b.x, b.y);
@@ -92,7 +92,7 @@ impl Builder {
         self.raw.arc_to(
             math::Vector::new(radius, radius),
             math::Angle::radians(0.0),
-            path::ArcFlags {
+            lyon_path::ArcFlags {
                 large_arc: false,
                 sweep,
             },
@@ -102,8 +102,6 @@ impl Builder {
 
     /// Adds an ellipse to the [`Path`] using a clockwise direction.
     pub fn ellipse(&mut self, arc: arc::Elliptical) {
-        use lyon::{geom, math};
-
         let arc = geom::Arc {
             center: math::Point::new(arc.center.x, arc.center.y),
             radii: math::Vector::new(arc.radii.x, arc.radii.y),
@@ -128,8 +126,6 @@ impl Builder {
         control_b: Point,
         to: Point,
     ) {
-        use lyon::math;
-
         let _ = self.raw.cubic_bezier_to(
             math::Point::new(control_a.x, control_a.y),
             math::Point::new(control_b.x, control_b.y),
@@ -141,8 +137,6 @@ impl Builder {
     /// and its end point.
     #[inline]
     pub fn quadratic_curve_to(&mut self, control: Point, to: Point) {
-        use lyon::math;
-
         let _ = self.raw.quadratic_bezier_to(
             math::Point::new(control.x, control.y),
             math::Point::new(to.x, to.y),
diff --git a/graphics/src/widget/canvas/program.rs b/native/src/widget/canvas/program.rs
similarity index 83%
rename from graphics/src/widget/canvas/program.rs
rename to native/src/widget/canvas/program.rs
index 656dbfa627..17a5a13731 100644
--- a/graphics/src/widget/canvas/program.rs
+++ b/native/src/widget/canvas/program.rs
@@ -1,6 +1,6 @@
 use crate::widget::canvas::event::{self, Event};
 use crate::widget::canvas::mouse;
-use crate::widget::canvas::{Cursor, Geometry};
+use crate::widget::canvas::{Cursor, Renderer};
 use crate::Rectangle;
 
 /// The state and logic of a [`Canvas`].
@@ -9,7 +9,10 @@ use crate::Rectangle;
 /// application.
 ///
 /// [`Canvas`]: crate::widget::Canvas
-pub trait Program<Message, Theme = iced_native::Theme> {
+pub trait Program<Message, Renderer>
+where
+    Renderer: self::Renderer,
+{
     /// The internal state mutated by the [`Program`].
     type State: Default + 'static;
 
@@ -44,10 +47,11 @@ pub trait Program<Message, Theme = iced_native::Theme> {
     fn draw(
         &self,
         state: &Self::State,
-        theme: &Theme,
+        renderer: &Renderer,
+        theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: Cursor,
-    ) -> Vec<Geometry>;
+    ) -> Vec<Renderer::Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
     ///
@@ -65,9 +69,10 @@ pub trait Program<Message, Theme = iced_native::Theme> {
     }
 }
 
-impl<Message, Theme, T> Program<Message, Theme> for &T
+impl<Message, Renderer, T> Program<Message, Renderer> for &T
 where
-    T: Program<Message, Theme>,
+    Renderer: self::Renderer,
+    T: Program<Message, Renderer>,
 {
     type State = T::State;
 
@@ -84,11 +89,12 @@ where
     fn draw(
         &self,
         state: &Self::State,
-        theme: &Theme,
+        renderer: &Renderer,
+        theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: Cursor,
-    ) -> Vec<Geometry> {
-        T::draw(self, state, theme, bounds, cursor)
+    ) -> Vec<Renderer::Geometry> {
+        T::draw(self, state, renderer, theme, bounds, cursor)
     }
 
     fn mouse_interaction(
diff --git a/graphics/src/widget/canvas/stroke.rs b/native/src/widget/canvas/stroke.rs
similarity index 79%
rename from graphics/src/widget/canvas/stroke.rs
rename to native/src/widget/canvas/stroke.rs
index 4c19251d79..ab4727b269 100644
--- a/graphics/src/widget/canvas/stroke.rs
+++ b/native/src/widget/canvas/stroke.rs
@@ -1,7 +1,7 @@
 //! Create lines from a [crate::widget::canvas::Path] and assigns them various attributes/styles.
 pub use crate::widget::canvas::Style;
 
-use iced_native::Color;
+use crate::Color;
 
 /// The style of a stroke.
 #[derive(Debug, Clone)]
@@ -77,16 +77,6 @@ impl Default for LineCap {
     }
 }
 
-impl From<LineCap> for lyon::tessellation::LineCap {
-    fn from(line_cap: LineCap) -> lyon::tessellation::LineCap {
-        match line_cap {
-            LineCap::Butt => lyon::tessellation::LineCap::Butt,
-            LineCap::Square => lyon::tessellation::LineCap::Square,
-            LineCap::Round => lyon::tessellation::LineCap::Round,
-        }
-    }
-}
-
 /// The shape used at the corners of paths or basic shapes when they are
 /// stroked.
 #[derive(Debug, Clone, Copy)]
@@ -105,16 +95,6 @@ impl Default for LineJoin {
     }
 }
 
-impl From<LineJoin> for lyon::tessellation::LineJoin {
-    fn from(line_join: LineJoin) -> lyon::tessellation::LineJoin {
-        match line_join {
-            LineJoin::Miter => lyon::tessellation::LineJoin::Miter,
-            LineJoin::Round => lyon::tessellation::LineJoin::Round,
-            LineJoin::Bevel => lyon::tessellation::LineJoin::Bevel,
-        }
-    }
-}
-
 /// The dash pattern used when stroking the line.
 #[derive(Debug, Clone, Copy, Default)]
 pub struct LineDash<'a> {
diff --git a/graphics/src/widget/canvas/style.rs b/native/src/widget/canvas/style.rs
similarity index 88%
rename from graphics/src/widget/canvas/style.rs
rename to native/src/widget/canvas/style.rs
index 6794f2e753..2642fdb858 100644
--- a/graphics/src/widget/canvas/style.rs
+++ b/native/src/widget/canvas/style.rs
@@ -1,4 +1,5 @@
-use crate::{Color, Gradient};
+use crate::widget::canvas::Gradient;
+use crate::Color;
 
 /// The coloring style of some drawing.
 #[derive(Debug, Clone, PartialEq)]
diff --git a/graphics/src/widget/canvas/text.rs b/native/src/widget/canvas/text.rs
similarity index 100%
rename from graphics/src/widget/canvas/text.rs
rename to native/src/widget/canvas/text.rs
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 1f21f06bb1..429b55c261 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -6,12 +6,13 @@ edition = "2021"
 [features]
 image = ["iced_wgpu/image", "iced_tiny_skia/image"]
 svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
-canvas = ["iced_graphics/canvas"]
-qr_code = ["iced_graphics/qr_code"]
+canvas = ["iced_wgpu/canvas", "iced_tiny_skia/canvas"]
+qr_code = ["canvas", "qrcode"]
 tracing = ["iced_wgpu/tracing"]
 
 [dependencies]
 raw-window-handle = "0.5"
+thiserror = "1"
 
 [dependencies.iced_native]
 version = "0.9"
@@ -30,3 +31,8 @@ iced_wgpu = { version = "0.9", path = "../wgpu" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 iced_wgpu = { version = "0.9", path = "../wgpu", features = ["webgl"] }
+
+[dependencies.qrcode]
+version = "0.12"
+optional = true
+default-features = false
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index b0a409dc76..6c0b4e5c62 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -1,4 +1,4 @@
-use crate::{Font, Point, Size};
+use crate::{Font, Geometry, Point, Size};
 
 use iced_graphics::backend;
 use iced_graphics::text;
@@ -12,6 +12,8 @@ pub enum Backend {
 }
 
 impl iced_graphics::Backend for Backend {
+    type Geometry = Geometry;
+
     fn trim_measurements(&mut self) {
         match self {
             Self::Wgpu(backend) => backend.trim_measurements(),
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index f9bfc37349..d9c85e82c4 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -4,11 +4,14 @@ pub mod window;
 mod backend;
 mod settings;
 
+pub use iced_graphics::primitive;
+
 pub use backend::Backend;
+pub use primitive::Primitive;
 pub use settings::Settings;
 
 pub use iced_graphics::{
-    Antialiasing, Color, Error, Font, Point, Size, Viewport,
+    Antialiasing, Color, Error, Font, Point, Rectangle, Size, Vector, Viewport,
 };
 
 /// The default graphics renderer for [`iced`].
@@ -16,3 +19,12 @@ pub use iced_graphics::{
 /// [`iced`]: https://github.com/iced-rs/iced
 pub type Renderer<Theme = iced_native::Theme> =
     iced_graphics::Renderer<Backend, Theme>;
+
+#[derive(Debug, Clone)]
+pub struct Geometry(pub(crate) Primitive);
+
+impl From<Geometry> for Primitive {
+    fn from(geometry: Geometry) -> Self {
+        geometry.0
+    }
+}
diff --git a/renderer/src/widget.rs b/renderer/src/widget.rs
index 417cc06fad..6c0c2a833f 100644
--- a/renderer/src/widget.rs
+++ b/renderer/src/widget.rs
@@ -1,5 +1,11 @@
-#[cfg(feature = "qr_code")]
-pub use iced_graphics::widget::qr_code;
+#[cfg(feature = "canvas")]
+pub mod canvas;
 
 #[cfg(feature = "canvas")]
-pub use iced_graphics::widget::canvas;
+pub use canvas::Canvas;
+
+#[cfg(feature = "qr_code")]
+pub mod qr_code;
+
+#[cfg(feature = "qr_code")]
+pub use qr_code::QRCode;
diff --git a/renderer/src/widget/canvas.rs b/renderer/src/widget/canvas.rs
new file mode 100644
index 0000000000..f40a109707
--- /dev/null
+++ b/renderer/src/widget/canvas.rs
@@ -0,0 +1,177 @@
+mod cache;
+
+pub use cache::Cache;
+
+pub use iced_native::widget::canvas::event::{self, Event};
+pub use iced_native::widget::canvas::fill::{self, Fill};
+pub use iced_native::widget::canvas::gradient::{self, Gradient};
+pub use iced_native::widget::canvas::path::{self, Path};
+pub use iced_native::widget::canvas::stroke::{self, Stroke};
+pub use iced_native::widget::canvas::{
+    Canvas, Cursor, LineCap, LineDash, LineJoin, Program, Renderer, Style, Text,
+};
+
+use crate::{Backend, Point, Rectangle, Size, Vector};
+
+pub use crate::Geometry;
+
+pub enum Frame {
+    Wgpu(iced_wgpu::widget::canvas::Frame),
+    TinySkia(iced_tiny_skia::canvas::Frame),
+}
+
+macro_rules! delegate {
+    ($frame:expr, $name:ident => $body:expr) => {
+        match $frame {
+            Self::Wgpu($name) => $body,
+            Self::TinySkia($name) => $body,
+        }
+    };
+}
+
+impl Frame {
+    pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
+        match renderer.backend() {
+            Backend::Wgpu(_) => {
+                Frame::Wgpu(iced_wgpu::widget::canvas::Frame::new(size))
+            }
+            Backend::TinySkia(_) => {
+                Frame::TinySkia(iced_tiny_skia::canvas::Frame::new(size))
+            }
+        }
+    }
+
+    /// Returns the width of the [`Frame`].
+    #[inline]
+    pub fn width(&self) -> f32 {
+        delegate!(self, frame => frame.width())
+    }
+
+    /// Returns the height of the [`Frame`].
+    #[inline]
+    pub fn height(&self) -> f32 {
+        delegate!(self, frame => frame.height())
+    }
+
+    /// Returns the dimensions of the [`Frame`].
+    #[inline]
+    pub fn size(&self) -> Size {
+        delegate!(self, frame => frame.size())
+    }
+
+    /// Returns the coordinate of the center of the [`Frame`].
+    #[inline]
+    pub fn center(&self) -> Point {
+        delegate!(self, frame => frame.center())
+    }
+
+    /// Draws the given [`Path`] on the [`Frame`] by filling it with the
+    /// provided style.
+    pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
+        delegate!(self, frame => frame.fill(path, fill));
+    }
+
+    /// Draws an axis-aligned rectangle given its top-left corner coordinate and
+    /// its `Size` on the [`Frame`] by filling it with the provided style.
+    pub fn fill_rectangle(
+        &mut self,
+        top_left: Point,
+        size: Size,
+        fill: impl Into<Fill>,
+    ) {
+        delegate!(self, frame => frame.fill_rectangle(top_left, size, fill));
+    }
+
+    /// Draws the stroke of the given [`Path`] on the [`Frame`] with the
+    /// provided style.
+    pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
+        delegate!(self, frame => frame.stroke(path, stroke));
+    }
+
+    /// Draws the characters of the given [`Text`] on the [`Frame`], filling
+    /// them with the given color.
+    ///
+    /// __Warning:__ Text currently does not work well with rotations and scale
+    /// transforms! The position will be correctly transformed, but the
+    /// resulting glyphs will not be rotated or scaled properly.
+    ///
+    /// Additionally, all text will be rendered on top of all the layers of
+    /// a [`Canvas`]. Therefore, it is currently only meant to be used for
+    /// overlays, which is the most common use case.
+    ///
+    /// Support for vectorial text is planned, and should address all these
+    /// limitations.
+    ///
+    /// [`Canvas`]: crate::widget::Canvas
+    pub fn fill_text(&mut self, text: impl Into<Text>) {
+        delegate!(self, frame => frame.fill_text(text));
+    }
+
+    /// Stores the current transform of the [`Frame`] and executes the given
+    /// drawing operations, restoring the transform afterwards.
+    ///
+    /// This method is useful to compose transforms and perform drawing
+    /// operations in different coordinate systems.
+    #[inline]
+    pub fn with_save(&mut self, f: impl FnOnce(&mut Frame)) {
+        delegate!(self, frame => frame.push_transform());
+
+        f(self);
+
+        delegate!(self, frame => frame.pop_transform());
+    }
+
+    /// Executes the given drawing operations within a [`Rectangle`] region,
+    /// clipping any geometry that overflows its bounds. Any transformations
+    /// performed are local to the provided closure.
+    ///
+    /// This method is useful to perform drawing operations that need to be
+    /// clipped.
+    #[inline]
+    pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
+        let mut frame = match self {
+            Self::Wgpu(_) => {
+                Self::Wgpu(iced_wgpu::widget::canvas::Frame::new(region.size()))
+            }
+            Self::TinySkia(_) => Self::TinySkia(
+                iced_tiny_skia::canvas::Frame::new(region.size()),
+            ),
+        };
+
+        f(&mut frame);
+
+        let translation = Vector::new(region.x, region.y);
+
+        match (self, frame) {
+            (Self::Wgpu(target), Self::Wgpu(frame)) => {
+                target.clip(frame, translation);
+            }
+            (Self::TinySkia(target), Self::TinySkia(frame)) => {
+                target.clip(frame, translation);
+            }
+            _ => unreachable!(),
+        };
+    }
+
+    /// Applies a translation to the current transform of the [`Frame`].
+    #[inline]
+    pub fn translate(&mut self, translation: Vector) {
+        delegate!(self, frame => frame.translate(translation));
+    }
+
+    /// Applies a rotation in radians to the current transform of the [`Frame`].
+    #[inline]
+    pub fn rotate(&mut self, angle: f32) {
+        delegate!(self, frame => frame.rotate(angle));
+    }
+
+    /// Applies a scaling to the current transform of the [`Frame`].
+    #[inline]
+    pub fn scale(&mut self, scale: f32) {
+        delegate!(self, frame => frame.scale(scale));
+    }
+
+    pub fn into_geometry(self) -> Geometry {
+        Geometry(delegate!(self, frame => frame.into_primitive()))
+    }
+}
diff --git a/renderer/src/widget/canvas/cache.rs b/renderer/src/widget/canvas/cache.rs
new file mode 100644
index 0000000000..7d6b4811e7
--- /dev/null
+++ b/renderer/src/widget/canvas/cache.rs
@@ -0,0 +1,85 @@
+use crate::widget::canvas::{Frame, Geometry};
+use crate::{Primitive, Renderer, Size};
+
+use std::cell::RefCell;
+use std::sync::Arc;
+
+/// A simple cache that stores generated [`Geometry`] to avoid recomputation.
+///
+/// A [`Cache`] will not redraw its geometry unless the dimensions of its layer
+/// change or it is explicitly cleared.
+#[derive(Debug, Default)]
+pub struct Cache {
+    state: RefCell<State>,
+}
+
+#[derive(Debug, Default)]
+enum State {
+    #[default]
+    Empty,
+    Filled {
+        bounds: Size,
+        primitive: Arc<Primitive>,
+    },
+}
+
+impl Cache {
+    /// Creates a new empty [`Cache`].
+    pub fn new() -> Self {
+        Cache {
+            state: Default::default(),
+        }
+    }
+
+    /// Clears the [`Cache`], forcing a redraw the next time it is used.
+    pub fn clear(&self) {
+        *self.state.borrow_mut() = State::Empty;
+    }
+
+    /// Draws [`Geometry`] using the provided closure and stores it in the
+    /// [`Cache`].
+    ///
+    /// The closure will only be called when
+    /// - the bounds have changed since the previous draw call.
+    /// - the [`Cache`] is empty or has been explicitly cleared.
+    ///
+    /// Otherwise, the previously stored [`Geometry`] will be returned. The
+    /// [`Cache`] is not cleared in this case. In other words, it will keep
+    /// returning the stored [`Geometry`] if needed.
+    pub fn draw<Theme>(
+        &self,
+        renderer: &Renderer<Theme>,
+        bounds: Size,
+        draw_fn: impl FnOnce(&mut Frame),
+    ) -> Geometry {
+        use std::ops::Deref;
+
+        if let State::Filled {
+            bounds: cached_bounds,
+            primitive,
+        } = self.state.borrow().deref()
+        {
+            if *cached_bounds == bounds {
+                return Geometry(Primitive::Cache {
+                    content: primitive.clone(),
+                });
+            }
+        }
+
+        let mut frame = Frame::new(renderer, bounds);
+        draw_fn(&mut frame);
+
+        let primitive = {
+            let geometry = frame.into_geometry();
+
+            Arc::new(geometry.0)
+        };
+
+        *self.state.borrow_mut() = State::Filled {
+            bounds,
+            primitive: primitive.clone(),
+        };
+
+        Geometry(Primitive::Cache { content: primitive })
+    }
+}
diff --git a/graphics/src/widget/qr_code.rs b/renderer/src/widget/qr_code.rs
similarity index 81%
rename from graphics/src/widget/qr_code.rs
rename to renderer/src/widget/qr_code.rs
index 12ce5b1f90..aae4ec8863 100644
--- a/graphics/src/widget/qr_code.rs
+++ b/renderer/src/widget/qr_code.rs
@@ -1,7 +1,8 @@
 //! Encode and display information in a QR code.
-use crate::renderer::{self, Renderer};
 use crate::widget::canvas;
-use crate::Backend;
+use crate::Renderer;
+
+use iced_graphics::renderer;
 
 use iced_native::layout;
 use iced_native::widget::Tree;
@@ -48,10 +49,7 @@ impl<'a> QRCode<'a> {
     }
 }
 
-impl<'a, Message, B, T> Widget<Message, Renderer<B, T>> for QRCode<'a>
-where
-    B: Backend,
-{
+impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
     fn width(&self) -> Length {
         Length::Shrink
     }
@@ -62,7 +60,7 @@ where
 
     fn layout(
         &self,
-        _renderer: &Renderer<B, T>,
+        _renderer: &Renderer<Theme>,
         _limits: &layout::Limits,
     ) -> layout::Node {
         let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
@@ -74,8 +72,8 @@ where
     fn draw(
         &self,
         _state: &Tree,
-        renderer: &mut Renderer<B, T>,
-        _theme: &T,
+        renderer: &mut Renderer<Theme>,
+        _theme: &Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
         _cursor_position: Point,
@@ -87,50 +85,52 @@ where
         let side_length = self.state.width + 2 * QUIET_ZONE;
 
         // Reuse cache if possible
-        let geometry = self.state.cache.draw(bounds.size(), |frame| {
-            // Scale units to cell size
-            frame.scale(f32::from(self.cell_size));
-
-            // Draw background
-            frame.fill_rectangle(
-                Point::ORIGIN,
-                Size::new(side_length as f32, side_length as f32),
-                self.light,
-            );
-
-            // Avoid drawing on the quiet zone
-            frame.translate(Vector::new(QUIET_ZONE as f32, QUIET_ZONE as f32));
-
-            // Draw contents
-            self.state
-                .contents
-                .iter()
-                .enumerate()
-                .filter(|(_, value)| **value == qrcode::Color::Dark)
-                .for_each(|(index, _)| {
-                    let row = index / self.state.width;
-                    let column = index % self.state.width;
-
-                    frame.fill_rectangle(
-                        Point::new(column as f32, row as f32),
-                        Size::UNIT,
-                        self.dark,
-                    );
-                });
-        });
+        let geometry =
+            self.state.cache.draw(renderer, bounds.size(), |frame| {
+                // Scale units to cell size
+                frame.scale(f32::from(self.cell_size));
+
+                // Draw background
+                frame.fill_rectangle(
+                    Point::ORIGIN,
+                    Size::new(side_length as f32, side_length as f32),
+                    self.light,
+                );
+
+                // Avoid drawing on the quiet zone
+                frame.translate(Vector::new(
+                    QUIET_ZONE as f32,
+                    QUIET_ZONE as f32,
+                ));
+
+                // Draw contents
+                self.state
+                    .contents
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, value)| **value == qrcode::Color::Dark)
+                    .for_each(|(index, _)| {
+                        let row = index / self.state.width;
+                        let column = index % self.state.width;
+
+                        frame.fill_rectangle(
+                            Point::new(column as f32, row as f32),
+                            Size::UNIT,
+                            self.dark,
+                        );
+                    });
+            });
 
         let translation = Vector::new(bounds.x, bounds.y);
 
         renderer.with_translation(translation, |renderer| {
-            renderer.draw_primitive(geometry.into_primitive());
+            renderer.draw_primitive(geometry.0);
         });
     }
 }
 
-impl<'a, Message, B, T> From<QRCode<'a>>
-    for Element<'a, Message, Renderer<B, T>>
-where
-    B: Backend,
+impl<'a, Message, Theme> From<QRCode<'a>>
+    for Element<'a, Message, Renderer<Theme>>
 {
     fn from(qr_code: QRCode<'a>) -> Self {
         Self::new(qr_code)
diff --git a/src/widget.rs b/src/widget.rs
index 04cb0e50cc..f3a66101f7 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -170,9 +170,10 @@ pub use iced_renderer::widget::canvas;
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
 /// Creates a new [`Canvas`].
-pub fn canvas<P, Message, Theme>(program: P) -> Canvas<Message, Theme, P>
+pub fn canvas<P, Message, Renderer>(program: P) -> Canvas<Message, Renderer, P>
 where
-    P: canvas::Program<Message, Theme>,
+    Renderer: canvas::Renderer,
+    P: canvas::Program<Message, Renderer>,
 {
     Canvas::new(program)
 }
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 781e7d3458..5f39fce28f 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 [features]
 image = []
 svg = []
+canvas = ["iced_native/canvas"]
 
 [dependencies]
 raw-window-handle = "0.5"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 66d832210b..e08cede703 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,9 +1,9 @@
-use crate::{Color, Font, Settings, Size, Viewport};
+use crate::{Color, Font, Primitive, Settings, Size, Viewport};
 
 use iced_graphics::alignment;
 use iced_graphics::backend;
 use iced_graphics::text;
-use iced_graphics::{Background, Primitive, Rectangle, Vector};
+use iced_graphics::{Background, Rectangle, Vector};
 
 use std::borrow::Cow;
 
@@ -81,7 +81,6 @@ impl Backend {
         translation: Vector,
     ) {
         match primitive {
-            Primitive::None => {}
             Primitive::Quad {
                 bounds,
                 background,
@@ -161,6 +160,38 @@ impl Backend {
             Primitive::Svg { .. } => {
                 // TODO
             }
+            Primitive::Fill {
+                path,
+                paint,
+                rule,
+                transform,
+            } => {
+                pixels.fill_path(
+                    path,
+                    paint,
+                    *rule,
+                    transform
+                        .post_translate(translation.x, translation.y)
+                        .post_scale(scale_factor, scale_factor),
+                    clip_mask,
+                );
+            }
+            Primitive::Stroke {
+                path,
+                paint,
+                stroke,
+                transform,
+            } => {
+                pixels.stroke_path(
+                    path,
+                    paint,
+                    stroke,
+                    transform
+                        .post_translate(translation.x, translation.y)
+                        .post_scale(scale_factor, scale_factor),
+                    clip_mask,
+                );
+            }
             Primitive::Group { primitives } => {
                 for primitive in primitives {
                     self.draw_primitive(
@@ -196,16 +227,19 @@ impl Backend {
                     translation,
                 );
             }
-            Primitive::Cached { cache } => {
+            Primitive::Cache { content } => {
                 self.draw_primitive(
-                    cache,
+                    content,
                     pixels,
                     clip_mask,
                     scale_factor,
                     translation,
                 );
             }
-            Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {}
+            Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {
+                // Not supported!
+                // TODO: Draw a placeholder (?) / Log it (?)
+            }
         }
     }
 }
@@ -386,6 +420,8 @@ fn rectangular_clip_mask(
 }
 
 impl iced_graphics::Backend for Backend {
+    type Geometry = ();
+
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache();
     }
diff --git a/tiny_skia/src/canvas.rs b/tiny_skia/src/canvas.rs
new file mode 100644
index 0000000000..c3b8b31626
--- /dev/null
+++ b/tiny_skia/src/canvas.rs
@@ -0,0 +1,276 @@
+use crate::{Point, Primitive, Rectangle, Size, Vector};
+
+use iced_native::widget::canvas::fill::{self, Fill};
+use iced_native::widget::canvas::stroke::{self, Stroke};
+use iced_native::widget::canvas::{Path, Style, Text};
+use iced_native::Gradient;
+
+pub struct Frame {
+    size: Size,
+    transform: tiny_skia::Transform,
+    stack: Vec<tiny_skia::Transform>,
+    primitives: Vec<Primitive>,
+}
+
+impl Frame {
+    pub fn new(size: Size) -> Self {
+        Self {
+            size,
+            transform: tiny_skia::Transform::identity(),
+            stack: Vec::new(),
+            primitives: Vec::new(),
+        }
+    }
+
+    pub fn width(&self) -> f32 {
+        self.size.width
+    }
+
+    pub fn height(&self) -> f32 {
+        self.size.height
+    }
+
+    pub fn size(&self) -> Size {
+        self.size
+    }
+
+    pub fn center(&self) -> Point {
+        Point::new(self.size.width / 2.0, self.size.height / 2.0)
+    }
+
+    pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
+        let path = convert_path(path);
+        let fill = fill.into();
+
+        self.primitives.push(Primitive::Fill {
+            path,
+            paint: into_paint(fill.style),
+            rule: into_fill_rule(fill.rule),
+            transform: self.transform,
+        });
+    }
+
+    pub fn fill_rectangle(
+        &mut self,
+        top_left: Point,
+        size: Size,
+        fill: impl Into<Fill>,
+    ) {
+        self.fill(&Path::rectangle(top_left, size), fill);
+    }
+
+    pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
+        let path = convert_path(path);
+        let stroke = stroke.into();
+        let skia_stroke = into_stroke(&stroke);
+
+        self.primitives.push(Primitive::Stroke {
+            path,
+            paint: into_paint(stroke.style),
+            stroke: skia_stroke,
+            transform: self.transform,
+        });
+    }
+
+    pub fn fill_text(&mut self, text: impl Into<Text>) {
+        let text = text.into();
+
+        let position = if self.transform.is_identity() {
+            text.position
+        } else {
+            let mut transformed = [tiny_skia::Point {
+                x: text.position.x,
+                y: text.position.y,
+            }];
+
+            self.transform.map_points(&mut transformed);
+
+            Point::new(transformed[0].x, transformed[0].y)
+        };
+
+        // TODO: Use vectorial text instead of primitive
+        self.primitives.push(Primitive::Text {
+            content: text.content,
+            bounds: Rectangle {
+                x: position.x,
+                y: position.y,
+                width: f32::INFINITY,
+                height: f32::INFINITY,
+            },
+            color: text.color,
+            size: text.size,
+            font: text.font,
+            horizontal_alignment: text.horizontal_alignment,
+            vertical_alignment: text.vertical_alignment,
+        });
+    }
+
+    pub fn push_transform(&mut self) {
+        self.stack.push(self.transform);
+    }
+
+    pub fn pop_transform(&mut self) {
+        self.transform = self.stack.pop().expect("Pop transform");
+    }
+
+    pub fn clip(&mut self, _frame: Self, _translation: Vector) {}
+
+    pub fn translate(&mut self, translation: Vector) {
+        self.transform =
+            self.transform.pre_translate(translation.x, translation.y);
+    }
+
+    pub fn rotate(&mut self, angle: f32) {
+        self.transform = self
+            .transform
+            .pre_concat(tiny_skia::Transform::from_rotate(angle.to_degrees()));
+    }
+
+    pub fn scale(&mut self, scale: f32) {
+        self.transform = self.transform.pre_scale(scale, scale);
+    }
+
+    pub fn into_primitive(self) -> Primitive {
+        Primitive::Clip {
+            bounds: Rectangle::new(Point::ORIGIN, self.size),
+            content: Box::new(Primitive::Group {
+                primitives: self.primitives,
+            }),
+        }
+    }
+}
+
+fn convert_path(path: &Path) -> tiny_skia::Path {
+    use iced_native::widget::canvas::path::lyon_path;
+
+    let mut builder = tiny_skia::PathBuilder::new();
+    let mut last_point = Default::default();
+
+    for event in path.raw().iter() {
+        match event {
+            lyon_path::Event::Begin { at } => {
+                builder.move_to(at.x, at.y);
+
+                last_point = at;
+            }
+            lyon_path::Event::Line { from, to } => {
+                if last_point != from {
+                    builder.move_to(from.x, from.y);
+                }
+
+                builder.line_to(to.x, to.y);
+
+                last_point = to;
+            }
+            lyon_path::Event::Quadratic { from, ctrl, to } => {
+                if last_point != from {
+                    builder.move_to(from.x, from.y);
+                }
+
+                builder.quad_to(ctrl.x, ctrl.y, to.x, to.y);
+
+                last_point = to;
+            }
+            lyon_path::Event::Cubic {
+                from,
+                ctrl1,
+                ctrl2,
+                to,
+            } => {
+                if last_point != from {
+                    builder.move_to(from.x, from.y);
+                }
+
+                builder
+                    .cubic_to(ctrl1.x, ctrl1.y, ctrl2.x, ctrl2.y, to.x, to.y);
+
+                last_point = to;
+            }
+            lyon_path::Event::End { close, .. } => {
+                if close {
+                    builder.close();
+                }
+            }
+        }
+    }
+
+    builder
+        .finish()
+        .expect("Convert lyon path to tiny_skia path")
+}
+
+pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
+    tiny_skia::Paint {
+        shader: match style {
+            Style::Solid(color) => tiny_skia::Shader::SolidColor(
+                tiny_skia::Color::from_rgba(color.b, color.g, color.r, color.a)
+                    .expect("Create color"),
+            ),
+            Style::Gradient(gradient) => match gradient {
+                Gradient::Linear(linear) => tiny_skia::LinearGradient::new(
+                    tiny_skia::Point {
+                        x: linear.start.x,
+                        y: linear.start.y,
+                    },
+                    tiny_skia::Point {
+                        x: linear.end.x,
+                        y: linear.end.y,
+                    },
+                    linear
+                        .color_stops
+                        .into_iter()
+                        .map(|stop| {
+                            tiny_skia::GradientStop::new(
+                                stop.offset,
+                                tiny_skia::Color::from_rgba(
+                                    stop.color.b,
+                                    stop.color.g,
+                                    stop.color.r,
+                                    stop.color.a,
+                                )
+                                .expect("Create color"),
+                            )
+                        })
+                        .collect(),
+                    tiny_skia::SpreadMode::Pad,
+                    tiny_skia::Transform::identity(),
+                )
+                .expect("Create linear gradient"),
+            },
+        },
+        anti_alias: true,
+        ..Default::default()
+    }
+}
+
+pub fn into_fill_rule(rule: fill::Rule) -> tiny_skia::FillRule {
+    match rule {
+        fill::Rule::EvenOdd => tiny_skia::FillRule::EvenOdd,
+        fill::Rule::NonZero => tiny_skia::FillRule::Winding,
+    }
+}
+
+pub fn into_stroke(stroke: &Stroke) -> tiny_skia::Stroke {
+    tiny_skia::Stroke {
+        width: stroke.width,
+        line_cap: match stroke.line_cap {
+            stroke::LineCap::Butt => tiny_skia::LineCap::Butt,
+            stroke::LineCap::Square => tiny_skia::LineCap::Square,
+            stroke::LineCap::Round => tiny_skia::LineCap::Round,
+        },
+        line_join: match stroke.line_join {
+            stroke::LineJoin::Miter => tiny_skia::LineJoin::Miter,
+            stroke::LineJoin::Round => tiny_skia::LineJoin::Round,
+            stroke::LineJoin::Bevel => tiny_skia::LineJoin::Bevel,
+        },
+        dash: if stroke.line_dash.segments.is_empty() {
+            None
+        } else {
+            tiny_skia::StrokeDash::new(
+                stroke.line_dash.segments.into(),
+                stroke.line_dash.offset as f32,
+            )
+        },
+        ..Default::default()
+    }
+}
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index 420a1ffbeb..e66e6412fa 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -4,10 +4,18 @@ mod backend;
 mod settings;
 mod text;
 
+#[cfg(feature = "canvas")]
+pub mod canvas;
+
+pub use iced_graphics::primitive;
+
 pub use backend::Backend;
+pub use primitive::Primitive;
 pub use settings::Settings;
 
-pub use iced_graphics::{Color, Error, Font, Point, Size, Vector, Viewport};
+pub use iced_graphics::{
+    Color, Error, Font, Point, Rectangle, Size, Vector, Viewport,
+};
 
 /// A [`tiny-skia`] graphics renderer for [`iced`].
 ///
diff --git a/tiny_skia/src/primitive.rs b/tiny_skia/src/primitive.rs
new file mode 100644
index 0000000000..22daaedc57
--- /dev/null
+++ b/tiny_skia/src/primitive.rs
@@ -0,0 +1,82 @@
+use crate::{Rectangle, Vector};
+
+use std::sync::Arc;
+
+#[derive(Debug, Clone)]
+pub enum Primitive {
+    /// A group of primitives
+    Group {
+        /// The primitives of the group
+        primitives: Vec<Primitive>,
+    },
+    /// A clip primitive
+    Clip {
+        /// The bounds of the clip
+        bounds: Rectangle,
+        /// The content of the clip
+        content: Box<Primitive>,
+    },
+    /// A primitive that applies a translation
+    Translate {
+        /// The translation vector
+        translation: Vector,
+
+        /// The primitive to translate
+        content: Box<Primitive>,
+    },
+    /// A cached primitive.
+    ///
+    /// This can be useful if you are implementing a widget where primitive
+    /// generation is expensive.
+    Cached {
+        /// The cached primitive
+        cache: Arc<Primitive>,
+    },
+    /// A basic primitive.
+    Basic(iced_graphics::Primitive),
+}
+
+impl iced_graphics::backend::Primitive for Primitive {
+    fn translate(self, translation: Vector) -> Self {
+        Self::Translate {
+            translation,
+            content: Box::new(self),
+        }
+    }
+
+    fn clip(self, bounds: Rectangle) -> Self {
+        Self::Clip {
+            bounds,
+            content: Box::new(self),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Recording(pub(crate) Vec<Primitive>);
+
+impl iced_graphics::backend::Recording for Recording {
+    type Primitive = Primitive;
+
+    fn push(&mut self, primitive: Primitive) {
+        self.0.push(primitive);
+    }
+
+    fn push_basic(&mut self, basic: iced_graphics::Primitive) {
+        self.0.push(Primitive::Basic(basic));
+    }
+
+    fn group(self) -> Self::Primitive {
+        Primitive::Group { primitives: self.0 }
+    }
+
+    fn clear(&mut self) {
+        self.0.clear();
+    }
+}
+
+impl Recording {
+    pub fn primitives(&self) -> &[Primitive] {
+        &self.0
+    }
+}
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 2bd5831e38..08159cd801 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -1,7 +1,6 @@
-use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
+use crate::{Backend, Color, Error, Primitive, Renderer, Settings, Viewport};
 
 use iced_graphics::window::compositor::{self, Information, SurfaceError};
-use iced_graphics::Primitive;
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 632873a370..0bcef71c29 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -21,8 +21,7 @@ bmp = ["iced_graphics/bmp"]
 hdr = ["iced_graphics/hdr"]
 dds = ["iced_graphics/dds"]
 farbfeld = ["iced_graphics/farbfeld"]
-canvas = ["iced_graphics/canvas"]
-qr_code = ["iced_graphics/qr_code"]
+canvas = ["iced_graphics/canvas", "lyon"]
 spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
@@ -62,10 +61,6 @@ version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
 rev = "65b481d758f50fd13fc21af2cc5ef62ddee64955"
 
-[dependencies.tracing]
-version = "0.1.6"
-optional = true
-
 [dependencies.encase]
 version = "0.3.0"
 features = ["glam"]
@@ -73,6 +68,14 @@ features = ["glam"]
 [dependencies.glam]
 version = "0.21.3"
 
+[dependencies.lyon]
+version = "1.0"
+optional = true
+
+[dependencies.tracing]
+version = "0.1.6"
+optional = true
+
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index e650d9a5eb..10dc5b4ff3 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,11 +1,10 @@
 use crate::quad;
 use crate::text;
 use crate::triangle;
-use crate::{Settings, Transformation};
+use crate::{Layer, Primitive, Settings, Transformation};
 
 use iced_graphics::backend;
-use iced_graphics::layer::Layer;
-use iced_graphics::{Color, Font, Primitive, Size, Viewport};
+use iced_graphics::{Color, Font, Size, Viewport};
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
@@ -330,6 +329,8 @@ impl Backend {
 }
 
 impl iced_graphics::Backend for Backend {
+    type Geometry = ();
+
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache()
     }
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index db05d2ffc4..2159a3ec65 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -6,10 +6,10 @@ use iced_graphics::image::raster;
 #[cfg(feature = "svg")]
 use iced_graphics::image::vector;
 
+use crate::layer;
 use crate::{Buffer, Transformation};
 use atlas::Atlas;
 
-use iced_graphics::layer;
 use iced_native::{Rectangle, Size};
 
 use std::cell::RefCell;
diff --git a/graphics/src/layer.rs b/wgpu/src/layer.rs
similarity index 95%
rename from graphics/src/layer.rs
rename to wgpu/src/layer.rs
index f6eb2fdd00..0840555a94 100644
--- a/graphics/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -10,10 +10,11 @@ pub use mesh::Mesh;
 pub use quad::Quad;
 pub use text::Text;
 
-use crate::alignment;
-use crate::{
-    Background, Color, Font, Point, Primitive, Rectangle, Size, Vector,
-    Viewport,
+use crate::Primitive;
+
+use iced_graphics::alignment;
+use iced_graphics::{
+    Background, Color, Font, Point, Rectangle, Size, Vector, Viewport,
 };
 
 /// A group of primitives that should be clipped together.
@@ -110,18 +111,6 @@ impl<'a> Layer<'a> {
         current_layer: usize,
     ) {
         match primitive {
-            Primitive::None => {}
-            Primitive::Group { primitives } => {
-                // TODO: Inspect a bit and regroup (?)
-                for primitive in primitives {
-                    Self::process_primitive(
-                        layers,
-                        translation,
-                        primitive,
-                        current_layer,
-                    )
-                }
-            }
             Primitive::Text {
                 content,
                 bounds,
@@ -167,6 +156,27 @@ impl<'a> Layer<'a> {
                     border_color: border_color.into_linear(),
                 });
             }
+            Primitive::Image { handle, bounds } => {
+                let layer = &mut layers[current_layer];
+
+                layer.images.push(Image::Raster {
+                    handle: handle.clone(),
+                    bounds: *bounds + translation,
+                });
+            }
+            Primitive::Svg {
+                handle,
+                color,
+                bounds,
+            } => {
+                let layer = &mut layers[current_layer];
+
+                layer.images.push(Image::Vector {
+                    handle: handle.clone(),
+                    color: *color,
+                    bounds: *bounds + translation,
+                });
+            }
             Primitive::SolidMesh { buffers, size } => {
                 let layer = &mut layers[current_layer];
 
@@ -206,6 +216,17 @@ impl<'a> Layer<'a> {
                     });
                 }
             }
+            Primitive::Group { primitives } => {
+                // TODO: Inspect a bit and regroup (?)
+                for primitive in primitives {
+                    Self::process_primitive(
+                        layers,
+                        translation,
+                        primitive,
+                        current_layer,
+                    )
+                }
+            }
             Primitive::Clip { bounds, content } => {
                 let layer = &mut layers[current_layer];
                 let translated_bounds = *bounds + translation;
@@ -236,34 +257,17 @@ impl<'a> Layer<'a> {
                     current_layer,
                 );
             }
-            Primitive::Cached { cache } => {
+            Primitive::Cache { content } => {
                 Self::process_primitive(
                     layers,
                     translation,
-                    cache,
+                    content,
                     current_layer,
                 );
             }
-            Primitive::Image { handle, bounds } => {
-                let layer = &mut layers[current_layer];
-
-                layer.images.push(Image::Raster {
-                    handle: handle.clone(),
-                    bounds: *bounds + translation,
-                });
-            }
-            Primitive::Svg {
-                handle,
-                color,
-                bounds,
-            } => {
-                let layer = &mut layers[current_layer];
-
-                layer.images.push(Image::Vector {
-                    handle: handle.clone(),
-                    color: *color,
-                    bounds: *bounds + translation,
-                });
+            Primitive::Fill { .. } | Primitive::Stroke { .. } => {
+                // Unsupported!
+                // TODO: Draw a placeholder (?)
             }
         }
     }
diff --git a/graphics/src/layer/image.rs b/wgpu/src/layer/image.rs
similarity index 100%
rename from graphics/src/layer/image.rs
rename to wgpu/src/layer/image.rs
diff --git a/graphics/src/layer/mesh.rs b/wgpu/src/layer/mesh.rs
similarity index 94%
rename from graphics/src/layer/mesh.rs
rename to wgpu/src/layer/mesh.rs
index 7661c5c9c3..5c1e41ad26 100644
--- a/graphics/src/layer/mesh.rs
+++ b/wgpu/src/layer/mesh.rs
@@ -1,5 +1,5 @@
 //! A collection of triangle primitives.
-use crate::triangle;
+use crate::primitive;
 use crate::{Gradient, Point, Rectangle};
 
 /// A mesh of triangles.
@@ -11,7 +11,7 @@ pub enum Mesh<'a> {
         origin: Point,
 
         /// The vertex and index buffers of the [`Mesh`].
-        buffers: &'a triangle::Mesh2D<triangle::ColoredVertex2D>,
+        buffers: &'a primitive::Mesh2D<primitive::ColoredVertex2D>,
 
         /// The clipping bounds of the [`Mesh`].
         clip_bounds: Rectangle<f32>,
@@ -22,7 +22,7 @@ pub enum Mesh<'a> {
         origin: Point,
 
         /// The vertex and index buffers of the [`Mesh`].
-        buffers: &'a triangle::Mesh2D<triangle::Vertex2D>,
+        buffers: &'a primitive::Mesh2D<primitive::Vertex2D>,
 
         /// The clipping bounds of the [`Mesh`].
         clip_bounds: Rectangle<f32>,
diff --git a/graphics/src/layer/quad.rs b/wgpu/src/layer/quad.rs
similarity index 100%
rename from graphics/src/layer/quad.rs
rename to wgpu/src/layer/quad.rs
diff --git a/graphics/src/layer/text.rs b/wgpu/src/layer/text.rs
similarity index 100%
rename from graphics/src/layer/text.rs
rename to wgpu/src/layer/text.rs
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 9da4057261..8be12602d0 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -25,7 +25,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    missing_docs,
+    //missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
@@ -38,7 +38,9 @@
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
+pub mod layer;
 pub mod settings;
+pub mod widget;
 pub mod window;
 
 mod backend;
@@ -47,16 +49,23 @@ mod quad;
 mod text;
 mod triangle;
 
+pub use iced_graphics::primitive;
 pub use iced_graphics::{
-    Antialiasing, Color, Error, Font, Primitive, Viewport,
+    Antialiasing, Color, Error, Font, Gradient, Point, Rectangle, Size, Vector,
+    Viewport,
 };
+pub use iced_native::alignment;
+
 pub use iced_native::Theme;
 pub use wgpu;
 
 pub use backend::Backend;
+pub use layer::Layer;
+pub use primitive::Primitive;
 pub use settings::Settings;
 
-use crate::buffer::Buffer;
+use buffer::Buffer;
+
 use iced_graphics::Transformation;
 
 #[cfg(any(feature = "image", feature = "svg"))]
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 246cc5e1dd..8a568968b1 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,5 +1,6 @@
+use crate::layer;
 use crate::{Buffer, Transformation};
-use iced_graphics::layer;
+
 use iced_native::Rectangle;
 
 use bytemuck::{Pod, Zeroable};
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index dea6ab18c6..0dc8a64cae 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,7 @@
+use crate::layer::Text;
+
 pub use iced_native::text::Hit;
 
-use iced_graphics::layer::Text;
 use iced_native::alignment;
 use iced_native::{Color, Font, Rectangle, Size};
 
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 4b4fa16da4..706e428258 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -2,12 +2,12 @@
 mod msaa;
 
 use crate::buffer::r#static::Buffer;
+use crate::layer::mesh::{self, Mesh};
 use crate::settings;
 use crate::Transformation;
 
-use iced_graphics::layer::mesh::{self, Mesh};
-use iced_graphics::triangle::ColoredVertex2D;
 use iced_graphics::Size;
+
 #[cfg(feature = "tracing")]
 use tracing::info_span;
 
@@ -468,6 +468,7 @@ mod solid {
     use crate::settings;
     use crate::triangle;
     use encase::ShaderType;
+    use iced_graphics::primitive;
     use iced_graphics::Transformation;
 
     #[derive(Debug)]
@@ -478,7 +479,7 @@ mod solid {
 
     #[derive(Debug)]
     pub struct Layer {
-        pub vertices: Buffer<triangle::ColoredVertex2D>,
+        pub vertices: Buffer<primitive::ColoredVertex2D>,
         pub uniforms: dynamic::Buffer<Uniforms>,
         pub constants: wgpu::BindGroup,
     }
@@ -596,7 +597,7 @@ mod solid {
                         entry_point: "vs_main",
                         buffers: &[wgpu::VertexBufferLayout {
                             array_stride: std::mem::size_of::<
-                                triangle::ColoredVertex2D,
+                                primitive::ColoredVertex2D,
                             >()
                                 as u64,
                             step_mode: wgpu::VertexStepMode::Vertex,
@@ -637,7 +638,7 @@ mod gradient {
 
     use encase::ShaderType;
     use glam::{IVec4, Vec4};
-    use iced_graphics::triangle::Vertex2D;
+    use iced_graphics::primitive;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -647,7 +648,7 @@ mod gradient {
 
     #[derive(Debug)]
     pub struct Layer {
-        pub vertices: Buffer<Vertex2D>,
+        pub vertices: Buffer<primitive::Vertex2D>,
         pub uniforms: dynamic::Buffer<Uniforms>,
         pub storage: dynamic::Buffer<Storage>,
         pub constants: wgpu::BindGroup,
@@ -810,34 +811,38 @@ mod gradient {
                     ),
                 });
 
-            let pipeline = device.create_render_pipeline(
-                &wgpu::RenderPipelineDescriptor {
-                    label: Some("iced_wgpu::triangle::gradient pipeline"),
-                    layout: Some(&layout),
-                    vertex: wgpu::VertexState {
-                        module: &shader,
-                        entry_point: "vs_main",
-                        buffers: &[wgpu::VertexBufferLayout {
-                            array_stride: std::mem::size_of::<Vertex2D>()
-                                as u64,
-                            step_mode: wgpu::VertexStepMode::Vertex,
-                            attributes: &wgpu::vertex_attr_array!(
-                                // Position
-                                0 => Float32x2,
-                            ),
-                        }],
+            let pipeline =
+                device.create_render_pipeline(
+                    &wgpu::RenderPipelineDescriptor {
+                        label: Some("iced_wgpu::triangle::gradient pipeline"),
+                        layout: Some(&layout),
+                        vertex: wgpu::VertexState {
+                            module: &shader,
+                            entry_point: "vs_main",
+                            buffers: &[wgpu::VertexBufferLayout {
+                                array_stride: std::mem::size_of::<
+                                    primitive::Vertex2D,
+                                >(
+                                )
+                                    as u64,
+                                step_mode: wgpu::VertexStepMode::Vertex,
+                                attributes: &wgpu::vertex_attr_array!(
+                                    // Position
+                                    0 => Float32x2,
+                                ),
+                            }],
+                        },
+                        fragment: Some(wgpu::FragmentState {
+                            module: &shader,
+                            entry_point: "fs_main",
+                            targets: &[triangle::fragment_target(format)],
+                        }),
+                        primitive: triangle::primitive_state(),
+                        depth_stencil: None,
+                        multisample: triangle::multisample_state(antialiasing),
+                        multiview: None,
                     },
-                    fragment: Some(wgpu::FragmentState {
-                        module: &shader,
-                        entry_point: "fs_main",
-                        targets: &[triangle::fragment_target(format)],
-                    }),
-                    primitive: triangle::primitive_state(),
-                    depth_stencil: None,
-                    multisample: triangle::multisample_state(antialiasing),
-                    multiview: None,
-                },
-            );
+                );
 
             Self {
                 pipeline,
diff --git a/graphics/src/widget.rs b/wgpu/src/widget.rs
similarity index 56%
rename from graphics/src/widget.rs
rename to wgpu/src/widget.rs
index e7fab97c17..8d05041e6d 100644
--- a/graphics/src/widget.rs
+++ b/wgpu/src/widget.rs
@@ -1,4 +1,5 @@
 //! Use the graphical widgets supported out-of-the-box.
+
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
 pub mod canvas;
@@ -6,11 +7,3 @@ pub mod canvas;
 #[cfg(feature = "canvas")]
 #[doc(no_inline)]
 pub use canvas::Canvas;
-
-#[cfg(feature = "qr_code")]
-#[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub mod qr_code;
-
-#[cfg(feature = "qr_code")]
-#[doc(no_inline)]
-pub use qr_code::QRCode;
diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
new file mode 100644
index 0000000000..41444fcf45
--- /dev/null
+++ b/wgpu/src/widget/canvas.rs
@@ -0,0 +1,16 @@
+mod cache;
+mod frame;
+mod geometry;
+
+pub use cache::Cache;
+pub use frame::Frame;
+pub use geometry::Geometry;
+
+pub use iced_native::widget::canvas::event::{self, Event};
+pub use iced_native::widget::canvas::fill::{self, Fill};
+pub use iced_native::widget::canvas::gradient::{self, Gradient};
+pub use iced_native::widget::canvas::path::{self, Path};
+pub use iced_native::widget::canvas::stroke::{self, Stroke};
+pub use iced_native::widget::canvas::{
+    Canvas, Cursor, LineCap, LineDash, LineJoin, Program, Renderer, Style, Text,
+};
diff --git a/graphics/src/widget/canvas/cache.rs b/wgpu/src/widget/canvas/cache.rs
similarity index 87%
rename from graphics/src/widget/canvas/cache.rs
rename to wgpu/src/widget/canvas/cache.rs
index 52217bbbe0..09b26b900e 100644
--- a/graphics/src/widget/canvas/cache.rs
+++ b/wgpu/src/widget/canvas/cache.rs
@@ -4,7 +4,9 @@ use crate::Primitive;
 use iced_native::Size;
 use std::{cell::RefCell, sync::Arc};
 
+#[derive(Default)]
 enum State {
+    #[default]
     Empty,
     Filled {
         bounds: Size,
@@ -12,11 +14,6 @@ enum State {
     },
 }
 
-impl Default for State {
-    fn default() -> Self {
-        State::Empty
-    }
-}
 /// A simple cache that stores generated [`Geometry`] to avoid recomputation.
 ///
 /// A [`Cache`] will not redraw its geometry unless the dimensions of its layer
@@ -62,8 +59,8 @@ impl Cache {
         } = self.state.borrow().deref()
         {
             if *cached_bounds == bounds {
-                return Geometry::from_primitive(Primitive::Cached {
-                    cache: primitive.clone(),
+                return Geometry::from_primitive(Primitive::Cache {
+                    content: primitive.clone(),
                 });
             }
         }
@@ -71,18 +68,14 @@ impl Cache {
         let mut frame = Frame::new(bounds);
         draw_fn(&mut frame);
 
-        let primitive = {
-            let geometry = frame.into_geometry();
-
-            Arc::new(geometry.into_primitive())
-        };
+        let primitive = Arc::new(frame.into_primitive());
 
         *self.state.borrow_mut() = State::Filled {
             bounds,
             primitive: primitive.clone(),
         };
 
-        Geometry::from_primitive(Primitive::Cached { cache: primitive })
+        Geometry::from_primitive(Primitive::Cache { content: primitive })
     }
 }
 
diff --git a/graphics/src/widget/canvas/frame.rs b/wgpu/src/widget/canvas/frame.rs
similarity index 77%
rename from graphics/src/widget/canvas/frame.rs
rename to wgpu/src/widget/canvas/frame.rs
index d68548ae8d..987570ec00 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/wgpu/src/widget/canvas/frame.rs
@@ -1,9 +1,10 @@
-use crate::gradient::Gradient;
-use crate::triangle;
-use crate::widget::canvas::{path, Fill, Geometry, Path, Stroke, Style, Text};
-use crate::Primitive;
+use crate::primitive::{self, Primitive};
+use crate::widget::canvas::fill::{self, Fill};
+use crate::widget::canvas::{
+    LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
+};
 
-use iced_native::{Point, Rectangle, Size, Vector};
+use iced_native::{Gradient, Point, Rectangle, Size, Vector};
 
 use lyon::geom::euclid;
 use lyon::tessellation;
@@ -23,9 +24,9 @@ pub struct Frame {
 }
 
 enum Buffer {
-    Solid(tessellation::VertexBuffers<triangle::ColoredVertex2D, u32>),
+    Solid(tessellation::VertexBuffers<primitive::ColoredVertex2D, u32>),
     Gradient(
-        tessellation::VertexBuffers<triangle::Vertex2D, u32>,
+        tessellation::VertexBuffers<primitive::Vertex2D, u32>,
         Gradient,
     ),
 }
@@ -196,8 +197,8 @@ impl Frame {
             .buffers
             .get_fill(&self.transforms.current.transform_style(style));
 
-        let options =
-            tessellation::FillOptions::default().with_fill_rule(rule.into());
+        let options = tessellation::FillOptions::default()
+            .with_fill_rule(into_fill_rule(rule));
 
         if self.transforms.current.is_identity {
             self.fill_tessellator.tessellate_path(
@@ -206,7 +207,7 @@ impl Frame {
                 buffer.as_mut(),
             )
         } else {
-            let path = path.transformed(&self.transforms.current.raw);
+            let path = path.transform(&self.transforms.current.raw);
 
             self.fill_tessellator.tessellate_path(
                 path.raw(),
@@ -241,8 +242,8 @@ impl Frame {
                 lyon::math::Vector::new(size.width, size.height),
             );
 
-        let options =
-            tessellation::FillOptions::default().with_fill_rule(rule.into());
+        let options = tessellation::FillOptions::default()
+            .with_fill_rule(into_fill_rule(rule));
 
         self.fill_tessellator
             .tessellate_rectangle(
@@ -264,14 +265,14 @@ impl Frame {
 
         let mut options = tessellation::StrokeOptions::default();
         options.line_width = stroke.width;
-        options.start_cap = stroke.line_cap.into();
-        options.end_cap = stroke.line_cap.into();
-        options.line_join = stroke.line_join.into();
+        options.start_cap = into_line_cap(stroke.line_cap);
+        options.end_cap = into_line_cap(stroke.line_cap);
+        options.line_join = into_line_join(stroke.line_join);
 
         let path = if stroke.line_dash.segments.is_empty() {
             Cow::Borrowed(path)
         } else {
-            Cow::Owned(path::dashed(path, stroke.line_dash))
+            Cow::Owned(dashed(path, stroke.line_dash))
         };
 
         if self.transforms.current.is_identity {
@@ -281,7 +282,7 @@ impl Frame {
                 buffer.as_mut(),
             )
         } else {
-            let path = path.transformed(&self.transforms.current.raw);
+            let path = path.transform(&self.transforms.current.raw);
 
             self.stroke_tessellator.tessellate_path(
                 path.raw(),
@@ -344,10 +345,18 @@ impl Frame {
     /// operations in different coordinate systems.
     #[inline]
     pub fn with_save(&mut self, f: impl FnOnce(&mut Frame)) {
-        self.transforms.previous.push(self.transforms.current);
+        self.push_transform();
 
         f(self);
 
+        self.pop_transform();
+    }
+
+    pub fn push_transform(&mut self) {
+        self.transforms.previous.push(self.transforms.current);
+    }
+
+    pub fn pop_transform(&mut self) {
         self.transforms.current = self.transforms.previous.pop().unwrap();
     }
 
@@ -363,14 +372,19 @@ impl Frame {
 
         f(&mut frame);
 
+        let translation = Vector::new(region.x, region.y);
+
+        self.clip(frame, translation);
+    }
+
+    pub fn clip(&mut self, frame: Frame, translation: Vector) {
+        let size = frame.size();
         let primitives = frame.into_primitives();
 
         let (text, meshes) = primitives
             .into_iter()
             .partition(|primitive| matches!(primitive, Primitive::Text { .. }));
 
-        let translation = Vector::new(region.x, region.y);
-
         self.primitives.push(Primitive::Group {
             primitives: vec![
                 Primitive::Translate {
@@ -380,7 +394,7 @@ impl Frame {
                 Primitive::Translate {
                     translation,
                     content: Box::new(Primitive::Clip {
-                        bounds: Rectangle::with_size(region.size()),
+                        bounds: Rectangle::with_size(size),
                         content: Box::new(Primitive::Group {
                             primitives: text,
                         }),
@@ -423,11 +437,11 @@ impl Frame {
         self.transforms.current.is_identity = false;
     }
 
-    /// Produces the [`Geometry`] representing everything drawn on the [`Frame`].
-    pub fn into_geometry(self) -> Geometry {
-        Geometry::from_primitive(Primitive::Group {
+    /// Produces the [`Primitive`] representing everything drawn on the [`Frame`].
+    pub fn into_primitive(self) -> Primitive {
+        Primitive::Group {
             primitives: self.into_primitives(),
-        })
+        }
     }
 
     fn into_primitives(mut self) -> Vec<Primitive> {
@@ -436,7 +450,7 @@ impl Frame {
                 Buffer::Solid(buffer) => {
                     if !buffer.indices.is_empty() {
                         self.primitives.push(Primitive::SolidMesh {
-                            buffers: triangle::Mesh2D {
+                            buffers: primitive::Mesh2D {
                                 vertices: buffer.vertices,
                                 indices: buffer.indices,
                             },
@@ -447,7 +461,7 @@ impl Frame {
                 Buffer::Gradient(buffer, gradient) => {
                     if !buffer.indices.is_empty() {
                         self.primitives.push(Primitive::GradientMesh {
-                            buffers: triangle::Mesh2D {
+                            buffers: primitive::Mesh2D {
                                 vertices: buffer.vertices,
                                 indices: buffer.indices,
                             },
@@ -465,31 +479,31 @@ impl Frame {
 
 struct Vertex2DBuilder;
 
-impl tessellation::FillVertexConstructor<triangle::Vertex2D>
+impl tessellation::FillVertexConstructor<primitive::Vertex2D>
     for Vertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::FillVertex<'_>,
-    ) -> triangle::Vertex2D {
+    ) -> primitive::Vertex2D {
         let position = vertex.position();
 
-        triangle::Vertex2D {
+        primitive::Vertex2D {
             position: [position.x, position.y],
         }
     }
 }
 
-impl tessellation::StrokeVertexConstructor<triangle::Vertex2D>
+impl tessellation::StrokeVertexConstructor<primitive::Vertex2D>
     for Vertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::StrokeVertex<'_, '_>,
-    ) -> triangle::Vertex2D {
+    ) -> primitive::Vertex2D {
         let position = vertex.position();
 
-        triangle::Vertex2D {
+        primitive::Vertex2D {
             position: [position.x, position.y],
         }
     }
@@ -497,34 +511,99 @@ impl tessellation::StrokeVertexConstructor<triangle::Vertex2D>
 
 struct TriangleVertex2DBuilder([f32; 4]);
 
-impl tessellation::FillVertexConstructor<triangle::ColoredVertex2D>
+impl tessellation::FillVertexConstructor<primitive::ColoredVertex2D>
     for TriangleVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::FillVertex<'_>,
-    ) -> triangle::ColoredVertex2D {
+    ) -> primitive::ColoredVertex2D {
         let position = vertex.position();
 
-        triangle::ColoredVertex2D {
+        primitive::ColoredVertex2D {
             position: [position.x, position.y],
             color: self.0,
         }
     }
 }
 
-impl tessellation::StrokeVertexConstructor<triangle::ColoredVertex2D>
+impl tessellation::StrokeVertexConstructor<primitive::ColoredVertex2D>
     for TriangleVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::StrokeVertex<'_, '_>,
-    ) -> triangle::ColoredVertex2D {
+    ) -> primitive::ColoredVertex2D {
         let position = vertex.position();
 
-        triangle::ColoredVertex2D {
+        primitive::ColoredVertex2D {
             position: [position.x, position.y],
             color: self.0,
         }
     }
 }
+
+fn into_line_join(line_join: LineJoin) -> lyon::tessellation::LineJoin {
+    match line_join {
+        LineJoin::Miter => lyon::tessellation::LineJoin::Miter,
+        LineJoin::Round => lyon::tessellation::LineJoin::Round,
+        LineJoin::Bevel => lyon::tessellation::LineJoin::Bevel,
+    }
+}
+
+fn into_line_cap(line_cap: LineCap) -> lyon::tessellation::LineCap {
+    match line_cap {
+        LineCap::Butt => lyon::tessellation::LineCap::Butt,
+        LineCap::Square => lyon::tessellation::LineCap::Square,
+        LineCap::Round => lyon::tessellation::LineCap::Round,
+    }
+}
+
+fn into_fill_rule(rule: fill::Rule) -> lyon::tessellation::FillRule {
+    match rule {
+        fill::Rule::NonZero => lyon::tessellation::FillRule::NonZero,
+        fill::Rule::EvenOdd => lyon::tessellation::FillRule::EvenOdd,
+    }
+}
+
+pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
+    use lyon::algorithms::walk::{
+        walk_along_path, RepeatedPattern, WalkerEvent,
+    };
+    use lyon::path::iterator::PathIterator;
+
+    Path::new(|builder| {
+        let segments_odd = (line_dash.segments.len() % 2 == 1)
+            .then(|| [line_dash.segments, line_dash.segments].concat());
+
+        let mut draw_line = false;
+
+        walk_along_path(
+            path.raw().iter().flattened(0.01),
+            0.0,
+            lyon::tessellation::StrokeOptions::DEFAULT_TOLERANCE,
+            &mut RepeatedPattern {
+                callback: |event: WalkerEvent<'_>| {
+                    let point = Point {
+                        x: event.position.x,
+                        y: event.position.y,
+                    };
+
+                    if draw_line {
+                        builder.line_to(point);
+                    } else {
+                        builder.move_to(point);
+                    }
+
+                    draw_line = !draw_line;
+
+                    true
+                },
+                index: line_dash.offset,
+                intervals: segments_odd
+                    .as_deref()
+                    .unwrap_or(line_dash.segments),
+            },
+        );
+    })
+}
diff --git a/graphics/src/widget/canvas/geometry.rs b/wgpu/src/widget/canvas/geometry.rs
similarity index 100%
rename from graphics/src/widget/canvas/geometry.rs
rename to wgpu/src/widget/canvas/geometry.rs

From 5c0427edbb4358896412c736af2f441c12601d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:41:32 +0100
Subject: [PATCH 073/163] Fix `Clip` primitive translation in `iced_tiny_skia`

---
 examples/game_of_life/src/main.rs | 2 +-
 tiny_skia/src/backend.rs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index 494f71a667..cdb33aca38 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -145,7 +145,7 @@ impl Application for GameOfLife {
             self.grid
                 .view()
                 .map(move |message| Message::Grid(message, version)),
-            controls
+            controls,
         ];
 
         container(content)
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index e08cede703..838426f552 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -221,7 +221,7 @@ impl Backend {
                     pixels,
                     Some(&rectangular_clip_mask(
                         pixels,
-                        *bounds * scale_factor,
+                        (*bounds + translation) * scale_factor,
                     )),
                     scale_factor,
                     translation,

From 838fd96212b14f20fe2224c4844904a8995f2db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:47:15 +0100
Subject: [PATCH 074/163] Disable `anti_alias` for `Frame::fill_rectangle` in
 `iced_tiny_skia`

---
 tiny_skia/src/canvas.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tiny_skia/src/canvas.rs b/tiny_skia/src/canvas.rs
index c3b8b31626..59765f5956 100644
--- a/tiny_skia/src/canvas.rs
+++ b/tiny_skia/src/canvas.rs
@@ -44,7 +44,7 @@ impl Frame {
 
         self.primitives.push(Primitive::Fill {
             path,
-            paint: into_paint(fill.style),
+            paint: into_paint(fill.style, true),
             rule: into_fill_rule(fill.rule),
             transform: self.transform,
         });
@@ -56,7 +56,15 @@ impl Frame {
         size: Size,
         fill: impl Into<Fill>,
     ) {
-        self.fill(&Path::rectangle(top_left, size), fill);
+        let path = convert_path(&Path::rectangle(top_left, size));
+        let fill = fill.into();
+
+        self.primitives.push(Primitive::Fill {
+            path,
+            paint: into_paint(fill.style, false),
+            rule: into_fill_rule(fill.rule),
+            transform: self.transform,
+        });
     }
 
     pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
@@ -66,7 +74,7 @@ impl Frame {
 
         self.primitives.push(Primitive::Stroke {
             path,
-            paint: into_paint(stroke.style),
+            paint: into_paint(stroke.style, true),
             stroke: skia_stroke,
             transform: self.transform,
         });
@@ -199,7 +207,7 @@ fn convert_path(path: &Path) -> tiny_skia::Path {
         .expect("Convert lyon path to tiny_skia path")
 }
 
-pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
+pub fn into_paint(style: Style, anti_alias: bool) -> tiny_skia::Paint<'static> {
     tiny_skia::Paint {
         shader: match style {
             Style::Solid(color) => tiny_skia::Shader::SolidColor(
@@ -238,7 +246,7 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
                 .expect("Create linear gradient"),
             },
         },
-        anti_alias: true,
+        anti_alias,
         ..Default::default()
     }
 }

From 119cf2ecd10f70471199439acb1c4f9d96a57ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:48:27 +0100
Subject: [PATCH 075/163] Remove magic boolean in `into_paint`

---
 tiny_skia/src/canvas.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tiny_skia/src/canvas.rs b/tiny_skia/src/canvas.rs
index 59765f5956..958063d253 100644
--- a/tiny_skia/src/canvas.rs
+++ b/tiny_skia/src/canvas.rs
@@ -44,7 +44,7 @@ impl Frame {
 
         self.primitives.push(Primitive::Fill {
             path,
-            paint: into_paint(fill.style, true),
+            paint: into_paint(fill.style),
             rule: into_fill_rule(fill.rule),
             transform: self.transform,
         });
@@ -61,7 +61,10 @@ impl Frame {
 
         self.primitives.push(Primitive::Fill {
             path,
-            paint: into_paint(fill.style, false),
+            paint: tiny_skia::Paint {
+                anti_alias: false,
+                ..into_paint(fill.style)
+            },
             rule: into_fill_rule(fill.rule),
             transform: self.transform,
         });
@@ -74,7 +77,7 @@ impl Frame {
 
         self.primitives.push(Primitive::Stroke {
             path,
-            paint: into_paint(stroke.style, true),
+            paint: into_paint(stroke.style),
             stroke: skia_stroke,
             transform: self.transform,
         });
@@ -207,7 +210,7 @@ fn convert_path(path: &Path) -> tiny_skia::Path {
         .expect("Convert lyon path to tiny_skia path")
 }
 
-pub fn into_paint(style: Style, anti_alias: bool) -> tiny_skia::Paint<'static> {
+pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
     tiny_skia::Paint {
         shader: match style {
             Style::Solid(color) => tiny_skia::Shader::SolidColor(
@@ -246,7 +249,7 @@ pub fn into_paint(style: Style, anti_alias: bool) -> tiny_skia::Paint<'static> {
                 .expect("Create linear gradient"),
             },
         },
-        anti_alias,
+        anti_alias: true,
         ..Default::default()
     }
 }

From 350427e82c3a49367da65086c20a307e9b864a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:52:12 +0100
Subject: [PATCH 076/163] Fix missing `qr_code` module in `iced_native`

---
 native/src/widget.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/native/src/widget.rs b/native/src/widget.rs
index 27330894a6..f107cd69d5 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -91,14 +91,6 @@ pub mod canvas;
 #[doc(no_inline)]
 pub use canvas::Canvas;
 
-#[cfg(feature = "qr_code")]
-#[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub mod qr_code;
-
-#[cfg(feature = "qr_code")]
-#[doc(no_inline)]
-pub use qr_code::QRCode;
-
 pub use action::Action;
 pub use id::Id;
 pub use operation::Operation;

From 868f79d22e2be82e98b06d66da3b4cbc6139d7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 2 Mar 2023 00:40:36 +0100
Subject: [PATCH 077/163] Reuse `ClipMask` in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs           | 41 ++++++++++++++++++++----------
 tiny_skia/src/window/compositor.rs |  7 +++--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 838426f552..2e4663ea69 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -25,6 +25,7 @@ impl Backend {
     pub fn draw<T: AsRef<str>>(
         &mut self,
         pixels: &mut tiny_skia::PixmapMut<'_>,
+        clip_mask: &mut tiny_skia::ClipMask,
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
@@ -38,6 +39,7 @@ impl Backend {
             self.draw_primitive(
                 primitive,
                 pixels,
+                clip_mask,
                 None,
                 scale_factor,
                 Vector::ZERO,
@@ -63,6 +65,7 @@ impl Backend {
                     vertical_alignment: alignment::Vertical::Top,
                 },
                 pixels,
+                clip_mask,
                 None,
                 scale_factor,
                 Vector::ZERO,
@@ -76,7 +79,8 @@ impl Backend {
         &mut self,
         primitive: &Primitive,
         pixels: &mut tiny_skia::PixmapMut<'_>,
-        clip_mask: Option<&tiny_skia::ClipMask>,
+        clip_mask: &mut tiny_skia::ClipMask,
+        clip_bounds: Option<Rectangle>,
         scale_factor: f32,
         translation: Vector,
     ) {
@@ -95,6 +99,7 @@ impl Backend {
                 .post_scale(scale_factor, scale_factor);
 
                 let path = rounded_rectangle(*bounds, *border_radius);
+                let clip_mask = clip_bounds.map(|_| clip_mask as &_);
 
                 pixels.fill_path(
                     &path,
@@ -151,7 +156,7 @@ impl Backend {
                     *horizontal_alignment,
                     *vertical_alignment,
                     pixels,
-                    clip_mask,
+                    clip_bounds.map(|_| clip_mask as &_),
                 );
             }
             Primitive::Image { .. } => {
@@ -173,7 +178,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    clip_mask,
+                    clip_bounds.map(|_| clip_mask as &_),
                 );
             }
             Primitive::Stroke {
@@ -189,7 +194,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    clip_mask,
+                    clip_bounds.map(|_| clip_mask as &_),
                 );
             }
             Primitive::Group { primitives } => {
@@ -198,6 +203,7 @@ impl Backend {
                         primitive,
                         pixels,
                         clip_mask,
+                        clip_bounds,
                         scale_factor,
                         translation,
                     );
@@ -211,27 +217,37 @@ impl Backend {
                     content,
                     pixels,
                     clip_mask,
+                    clip_bounds,
                     scale_factor,
                     translation + *offset,
                 );
             }
             Primitive::Clip { bounds, content } => {
+                let bounds = (*bounds + translation) * scale_factor;
+
+                adjust_clip_mask(clip_mask, pixels, bounds);
+
                 self.draw_primitive(
                     content,
                     pixels,
-                    Some(&rectangular_clip_mask(
-                        pixels,
-                        (*bounds + translation) * scale_factor,
-                    )),
+                    clip_mask,
+                    Some(bounds),
                     scale_factor,
                     translation,
                 );
+
+                if let Some(bounds) = clip_bounds {
+                    adjust_clip_mask(clip_mask, pixels, bounds);
+                } else {
+                    clip_mask.clear();
+                }
             }
             Primitive::Cache { content } => {
                 self.draw_primitive(
                     content,
                     pixels,
                     clip_mask,
+                    clip_bounds,
                     scale_factor,
                     translation,
                 );
@@ -393,12 +409,11 @@ fn arc_to(
     }
 }
 
-fn rectangular_clip_mask(
+fn adjust_clip_mask(
+    clip_mask: &mut tiny_skia::ClipMask,
     pixels: &tiny_skia::PixmapMut<'_>,
     bounds: Rectangle,
-) -> tiny_skia::ClipMask {
-    let mut clip_mask = tiny_skia::ClipMask::new();
-
+) {
     let path = {
         let mut builder = tiny_skia::PathBuilder::new();
         builder.push_rect(bounds.x, bounds.y, bounds.width, bounds.height);
@@ -415,8 +430,6 @@ fn rectangular_clip_mask(
             true,
         )
         .expect("Set path of clipping area");
-
-    clip_mask
 }
 
 impl iced_graphics::Backend for Backend {
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 08159cd801..76f371e17e 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -6,6 +6,7 @@ use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
 
 pub struct Compositor<Theme> {
+    clip_mask: tiny_skia::ClipMask,
     _theme: PhantomData<Theme>,
 }
 
@@ -83,9 +84,10 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
 }
 
 pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
-    // TODO
+    // TOD
     (
         Compositor {
+            clip_mask: tiny_skia::ClipMask::new(),
             _theme: PhantomData,
         },
         Backend::new(settings),
@@ -93,7 +95,7 @@ pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
 }
 
 pub fn present<Theme, T: AsRef<str>>(
-    _compositor: &mut Compositor<Theme>,
+    compositor: &mut Compositor<Theme>,
     backend: &mut Backend,
     surface: &mut Surface,
     primitives: &[Primitive],
@@ -110,6 +112,7 @@ pub fn present<Theme, T: AsRef<str>>(
             physical_size.height,
         )
         .expect("Create pixel map"),
+        &mut compositor.clip_mask,
         primitives,
         viewport,
         background_color,

From bbeaf10c04a922af5c1c3b898f0c4301d23feab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 3 Mar 2023 03:55:07 +0100
Subject: [PATCH 078/163] Mark `Primitive` as `non-exhaustive` in
 `iced_graphics`

---
 graphics/Cargo.toml       | 5 ++++-
 graphics/src/primitive.rs | 3 +++
 tiny_skia/Cargo.toml      | 1 +
 wgpu/src/layer.rs         | 3 +--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 36d8a516c7..62e67cf8da 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -34,7 +34,6 @@ log = "0.4"
 raw-window-handle = "0.5"
 thiserror = "1.0"
 bitflags = "1.2"
-tiny-skia = "0.8"
 
 [dependencies.bytemuck]
 version = "1.4"
@@ -48,6 +47,10 @@ path = "../native"
 version = "0.7"
 path = "../style"
 
+[dependencies.tiny-skia]
+version = "0.8"
+optional = true
+
 [dependencies.image_rs]
 version = "0.24"
 package = "image"
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index e48265911e..5a48639d00 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -9,6 +9,7 @@ use std::sync::Arc;
 
 /// A rendering primitive.
 #[derive(Debug, Clone)]
+#[non_exhaustive]
 pub enum Primitive {
     /// A text primitive
     Text {
@@ -85,12 +86,14 @@ pub enum Primitive {
         /// The [`Gradient`] to apply to the mesh.
         gradient: Gradient,
     },
+    #[cfg(feature = "tiny_skia")]
     Fill {
         path: tiny_skia::Path,
         paint: tiny_skia::Paint<'static>,
         rule: tiny_skia::FillRule,
         transform: tiny_skia::Transform,
     },
+    #[cfg(feature = "tiny_skia")]
     Stroke {
         path: tiny_skia::Path,
         paint: tiny_skia::Paint<'static>,
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 5f39fce28f..72181735f6 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -24,6 +24,7 @@ path = "../native"
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
+features = ["tiny-skia"]
 
 [dependencies.cosmic-text]
 features = ["std", "swash"]
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 0840555a94..69fcf8995e 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -265,9 +265,8 @@ impl<'a> Layer<'a> {
                     current_layer,
                 );
             }
-            Primitive::Fill { .. } | Primitive::Stroke { .. } => {
+            _ => {
                 // Unsupported!
-                // TODO: Draw a placeholder (?)
             }
         }
     }

From d13d19ba3569560edd67f20b48f37548d10ceee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 3 Mar 2023 04:00:44 +0100
Subject: [PATCH 079/163] Rename `canvas::frame` to `canvas` in `iced_wgpu`

---
 graphics/src/primitive.rs                     |  4 +-
 renderer/src/widget/canvas.rs                 |  6 +-
 tiny_skia/src/backend.rs                      |  3 +
 .../src/{widget/canvas/frame.rs => canvas.rs} |  7 +-
 wgpu/src/lib.rs                               |  5 +-
 wgpu/src/widget.rs                            |  9 --
 wgpu/src/widget/canvas.rs                     | 16 ----
 wgpu/src/widget/canvas/cache.rs               | 93 -------------------
 wgpu/src/widget/canvas/geometry.rs            | 24 -----
 9 files changed, 14 insertions(+), 153 deletions(-)
 rename wgpu/src/{widget/canvas/frame.rs => canvas.rs} (99%)
 delete mode 100644 wgpu/src/widget.rs
 delete mode 100644 wgpu/src/widget/canvas.rs
 delete mode 100644 wgpu/src/widget/canvas/cache.rs
 delete mode 100644 wgpu/src/widget/canvas/geometry.rs

diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 5a48639d00..f900b3fdae 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -86,14 +86,14 @@ pub enum Primitive {
         /// The [`Gradient`] to apply to the mesh.
         gradient: Gradient,
     },
-    #[cfg(feature = "tiny_skia")]
+    #[cfg(feature = "tiny-skia")]
     Fill {
         path: tiny_skia::Path,
         paint: tiny_skia::Paint<'static>,
         rule: tiny_skia::FillRule,
         transform: tiny_skia::Transform,
     },
-    #[cfg(feature = "tiny_skia")]
+    #[cfg(feature = "tiny-skia")]
     Stroke {
         path: tiny_skia::Path,
         paint: tiny_skia::Paint<'static>,
diff --git a/renderer/src/widget/canvas.rs b/renderer/src/widget/canvas.rs
index f40a109707..35c8fff960 100644
--- a/renderer/src/widget/canvas.rs
+++ b/renderer/src/widget/canvas.rs
@@ -16,7 +16,7 @@ use crate::{Backend, Point, Rectangle, Size, Vector};
 pub use crate::Geometry;
 
 pub enum Frame {
-    Wgpu(iced_wgpu::widget::canvas::Frame),
+    Wgpu(iced_wgpu::canvas::Frame),
     TinySkia(iced_tiny_skia::canvas::Frame),
 }
 
@@ -33,7 +33,7 @@ impl Frame {
     pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
         match renderer.backend() {
             Backend::Wgpu(_) => {
-                Frame::Wgpu(iced_wgpu::widget::canvas::Frame::new(size))
+                Frame::Wgpu(iced_wgpu::canvas::Frame::new(size))
             }
             Backend::TinySkia(_) => {
                 Frame::TinySkia(iced_tiny_skia::canvas::Frame::new(size))
@@ -131,7 +131,7 @@ impl Frame {
     pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
         let mut frame = match self {
             Self::Wgpu(_) => {
-                Self::Wgpu(iced_wgpu::widget::canvas::Frame::new(region.size()))
+                Self::Wgpu(iced_wgpu::canvas::Frame::new(region.size()))
             }
             Self::TinySkia(_) => Self::TinySkia(
                 iced_tiny_skia::canvas::Frame::new(region.size()),
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 2e4663ea69..6883a953ed 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -256,6 +256,9 @@ impl Backend {
                 // Not supported!
                 // TODO: Draw a placeholder (?) / Log it (?)
             }
+            _ => {
+                // Not supported!
+            }
         }
     }
 }
diff --git a/wgpu/src/widget/canvas/frame.rs b/wgpu/src/canvas.rs
similarity index 99%
rename from wgpu/src/widget/canvas/frame.rs
rename to wgpu/src/canvas.rs
index 987570ec00..e8d540c3ea 100644
--- a/wgpu/src/widget/canvas/frame.rs
+++ b/wgpu/src/canvas.rs
@@ -1,9 +1,8 @@
-use crate::primitive::{self, Primitive};
-use crate::widget::canvas::fill::{self, Fill};
-use crate::widget::canvas::{
+use iced_graphics::primitive::{self, Primitive};
+use iced_native::widget::canvas::fill::{self, Fill};
+use iced_native::widget::canvas::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
-
 use iced_native::{Gradient, Point, Rectangle, Size, Vector};
 
 use lyon::geom::euclid;
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 8be12602d0..31db16a8de 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -37,12 +37,13 @@
 #![forbid(rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-
 pub mod layer;
 pub mod settings;
-pub mod widget;
 pub mod window;
 
+#[cfg(feature = "canvas")]
+pub mod canvas;
+
 mod backend;
 mod buffer;
 mod quad;
diff --git a/wgpu/src/widget.rs b/wgpu/src/widget.rs
deleted file mode 100644
index 8d05041e6d..0000000000
--- a/wgpu/src/widget.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! Use the graphical widgets supported out-of-the-box.
-
-#[cfg(feature = "canvas")]
-#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub mod canvas;
-
-#[cfg(feature = "canvas")]
-#[doc(no_inline)]
-pub use canvas::Canvas;
diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
deleted file mode 100644
index 41444fcf45..0000000000
--- a/wgpu/src/widget/canvas.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-mod cache;
-mod frame;
-mod geometry;
-
-pub use cache::Cache;
-pub use frame::Frame;
-pub use geometry::Geometry;
-
-pub use iced_native::widget::canvas::event::{self, Event};
-pub use iced_native::widget::canvas::fill::{self, Fill};
-pub use iced_native::widget::canvas::gradient::{self, Gradient};
-pub use iced_native::widget::canvas::path::{self, Path};
-pub use iced_native::widget::canvas::stroke::{self, Stroke};
-pub use iced_native::widget::canvas::{
-    Canvas, Cursor, LineCap, LineDash, LineJoin, Program, Renderer, Style, Text,
-};
diff --git a/wgpu/src/widget/canvas/cache.rs b/wgpu/src/widget/canvas/cache.rs
deleted file mode 100644
index 09b26b900e..0000000000
--- a/wgpu/src/widget/canvas/cache.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::widget::canvas::{Frame, Geometry};
-use crate::Primitive;
-
-use iced_native::Size;
-use std::{cell::RefCell, sync::Arc};
-
-#[derive(Default)]
-enum State {
-    #[default]
-    Empty,
-    Filled {
-        bounds: Size,
-        primitive: Arc<Primitive>,
-    },
-}
-
-/// A simple cache that stores generated [`Geometry`] to avoid recomputation.
-///
-/// A [`Cache`] will not redraw its geometry unless the dimensions of its layer
-/// change or it is explicitly cleared.
-#[derive(Debug, Default)]
-pub struct Cache {
-    state: RefCell<State>,
-}
-
-impl Cache {
-    /// Creates a new empty [`Cache`].
-    pub fn new() -> Self {
-        Cache {
-            state: Default::default(),
-        }
-    }
-
-    /// Clears the [`Cache`], forcing a redraw the next time it is used.
-    pub fn clear(&self) {
-        *self.state.borrow_mut() = State::Empty;
-    }
-
-    /// Draws [`Geometry`] using the provided closure and stores it in the
-    /// [`Cache`].
-    ///
-    /// The closure will only be called when
-    /// - the bounds have changed since the previous draw call.
-    /// - the [`Cache`] is empty or has been explicitly cleared.
-    ///
-    /// Otherwise, the previously stored [`Geometry`] will be returned. The
-    /// [`Cache`] is not cleared in this case. In other words, it will keep
-    /// returning the stored [`Geometry`] if needed.
-    pub fn draw(
-        &self,
-        bounds: Size,
-        draw_fn: impl FnOnce(&mut Frame),
-    ) -> Geometry {
-        use std::ops::Deref;
-
-        if let State::Filled {
-            bounds: cached_bounds,
-            primitive,
-        } = self.state.borrow().deref()
-        {
-            if *cached_bounds == bounds {
-                return Geometry::from_primitive(Primitive::Cache {
-                    content: primitive.clone(),
-                });
-            }
-        }
-
-        let mut frame = Frame::new(bounds);
-        draw_fn(&mut frame);
-
-        let primitive = Arc::new(frame.into_primitive());
-
-        *self.state.borrow_mut() = State::Filled {
-            bounds,
-            primitive: primitive.clone(),
-        };
-
-        Geometry::from_primitive(Primitive::Cache { content: primitive })
-    }
-}
-
-impl std::fmt::Debug for State {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            State::Empty => write!(f, "Empty"),
-            State::Filled { primitive, bounds } => f
-                .debug_struct("Filled")
-                .field("primitive", primitive)
-                .field("bounds", bounds)
-                .finish(),
-        }
-    }
-}
diff --git a/wgpu/src/widget/canvas/geometry.rs b/wgpu/src/widget/canvas/geometry.rs
deleted file mode 100644
index e8ac621d22..0000000000
--- a/wgpu/src/widget/canvas/geometry.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use crate::Primitive;
-
-/// A bunch of shapes that can be drawn.
-///
-/// [`Geometry`] can be easily generated with a [`Frame`] or stored in a
-/// [`Cache`].
-///
-/// [`Frame`]: crate::widget::canvas::Frame
-/// [`Cache`]: crate::widget::canvas::Cache
-#[derive(Debug, Clone)]
-pub struct Geometry(Primitive);
-
-impl Geometry {
-    pub(crate) fn from_primitive(primitive: Primitive) -> Self {
-        Self(primitive)
-    }
-
-    /// Turns the [`Geometry`] into a [`Primitive`].
-    ///
-    /// This can be useful if you are building a custom widget.
-    pub fn into_primitive(self) -> Primitive {
-        self.0
-    }
-}

From 6cc48b5c62bac287b8f9f1c79c1fb7486c51b18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 3 Mar 2023 04:57:55 +0100
Subject: [PATCH 080/163] Move `Canvas` and `QRCode` to `iced` crate

Rename `canvas` modules to `geometry` in graphics subcrates
---
 Cargo.toml                                    |  9 +-
 examples/arc/src/main.rs                      |  2 +-
 examples/bezier_tool/src/main.rs              |  2 +-
 examples/color_palette/src/main.rs            |  2 +-
 examples/game_of_life/src/main.rs             |  2 +-
 examples/sierpinski_triangle/src/main.rs      |  2 +-
 examples/solar_system/src/main.rs             |  2 +-
 graphics/Cargo.toml                           |  6 +-
 graphics/src/backend.rs                       |  2 -
 graphics/src/geometry.rs                      | 36 ++++++++
 .../canvas => graphics/src/geometry}/fill.rs  |  5 +-
 .../canvas => graphics/src/geometry}/path.rs  |  0
 .../src/geometry}/path/arc.rs                 |  0
 .../src/geometry}/path/builder.rs             |  2 +-
 .../src/geometry}/stroke.rs                   |  2 +-
 .../canvas => graphics/src/geometry}/style.rs |  3 +-
 .../canvas => graphics/src/geometry}/text.rs  |  0
 graphics/src/lib.rs                           |  6 ++
 graphics/src/renderer.rs                      |  8 +-
 native/Cargo.toml                             |  5 --
 renderer/Cargo.toml                           |  8 +-
 renderer/src/backend.rs                       |  4 +-
 .../src/{widget/canvas.rs => geometry.rs}     | 23 ++---
 .../src/{widget/canvas => geometry}/cache.rs  |  2 +-
 renderer/src/lib.rs                           | 13 +--
 src/widget.rs                                 |  8 +-
 {native/src => src}/widget/canvas.rs          | 83 +++++++------------
 {native/src => src}/widget/canvas/cursor.rs   |  0
 {native/src => src}/widget/canvas/event.rs    |  8 +-
 {native/src => src}/widget/canvas/program.rs  |  8 +-
 {renderer/src => src}/widget/qr_code.rs       |  3 +-
 tiny_skia/Cargo.toml                          |  2 +-
 tiny_skia/src/backend.rs                      |  2 -
 tiny_skia/src/{canvas.rs => geometry.rs}      | 10 +--
 tiny_skia/src/lib.rs                          |  4 +-
 wgpu/Cargo.toml                               |  2 +-
 wgpu/src/backend.rs                           |  2 -
 wgpu/src/{canvas.rs => geometry.rs}           |  8 +-
 wgpu/src/lib.rs                               |  4 +-
 39 files changed, 141 insertions(+), 149 deletions(-)
 create mode 100644 graphics/src/geometry.rs
 rename {native/src/widget/canvas => graphics/src/geometry}/fill.rs (93%)
 rename {native/src/widget/canvas => graphics/src/geometry}/path.rs (100%)
 rename {native/src/widget/canvas => graphics/src/geometry}/path/arc.rs (100%)
 rename {native/src/widget/canvas => graphics/src/geometry}/path/builder.rs (99%)
 rename {native/src/widget/canvas => graphics/src/geometry}/stroke.rs (98%)
 rename {native/src/widget/canvas => graphics/src/geometry}/style.rs (88%)
 rename {native/src/widget/canvas => graphics/src/geometry}/text.rs (100%)
 rename renderer/src/{widget/canvas.rs => geometry.rs} (86%)
 rename renderer/src/{widget/canvas => geometry}/cache.rs (97%)
 rename {native/src => src}/widget/canvas.rs (73%)
 rename {native/src => src}/widget/canvas/cursor.rs (100%)
 rename {native/src => src}/widget/canvas/event.rs (73%)
 rename {native/src => src}/widget/canvas/program.rs (93%)
 rename {renderer/src => src}/widget/qr_code.rs (99%)
 rename tiny_skia/src/{canvas.rs => geometry.rs} (97%)
 rename wgpu/src/{canvas.rs => geometry.rs} (99%)

diff --git a/Cargo.toml b/Cargo.toml
index 942966e5c6..28938df911 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,9 +17,9 @@ image = ["iced_renderer/image", "image_rs"]
 # Enables the `Svg` widget
 svg = ["iced_renderer/svg"]
 # Enables the `Canvas` widget
-canvas = ["iced_renderer/canvas"]
+canvas = ["iced_renderer/geometry"]
 # Enables the `QRCode` widget
-qr_code = ["iced_renderer/qr_code"]
+qr_code = ["canvas", "qrcode"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -69,6 +69,11 @@ version = "0.24"
 package = "image"
 optional = true
 
+[dependencies.qrcode]
+version = "0.12"
+optional = true
+default-features = false
+
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 features = ["image", "svg", "canvas", "qr_code"]
diff --git a/examples/arc/src/main.rs b/examples/arc/src/main.rs
index d71ba6f6f2..80ad0b5b9e 100644
--- a/examples/arc/src/main.rs
+++ b/examples/arc/src/main.rs
@@ -69,7 +69,7 @@ impl Application for Arc {
     }
 }
 
-impl<Message> canvas::Program<Message, Renderer> for Arc {
+impl<Message> canvas::Program<Message> for Arc {
     type State = ();
 
     fn draw(
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index 5bb463c3ee..f1c83a16b1 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -92,7 +92,7 @@ mod bezier {
         curves: &'a [Curve],
     }
 
-    impl<'a> canvas::Program<Curve, Renderer> for Bezier<'a> {
+    impl<'a> canvas::Program<Curve> for Bezier<'a> {
         type State = Option<Pending>;
 
         fn update(
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index 1109a88388..5c4304ee39 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -237,7 +237,7 @@ impl Theme {
     }
 }
 
-impl<Message> canvas::Program<Message, Renderer> for Theme {
+impl<Message> canvas::Program<Message> for Theme {
     type State = ();
 
     fn draw(
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index cdb33aca38..eab8908bf7 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -393,7 +393,7 @@ mod grid {
         }
     }
 
-    impl canvas::Program<Message, Renderer> for Grid {
+    impl canvas::Program<Message> for Grid {
         type State = Interaction;
 
         fn update(
diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
index e85f839195..4faac6d62b 100644
--- a/examples/sierpinski_triangle/src/main.rs
+++ b/examples/sierpinski_triangle/src/main.rs
@@ -97,7 +97,7 @@ struct SierpinskiGraph {
     cache: canvas::Cache,
 }
 
-impl canvas::Program<Message, Renderer> for SierpinskiGraph {
+impl canvas::Program<Message> for SierpinskiGraph {
     type State = ();
 
     fn update(
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index 0023a69b73..f2606feb82 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -150,7 +150,7 @@ impl State {
     }
 }
 
-impl<Message> canvas::Program<Message, Renderer> for State {
+impl<Message> canvas::Program<Message> for State {
     type State = ();
 
     fn draw(
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 62e67cf8da..98e6f474ce 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -24,7 +24,7 @@ bmp = ["image_rs/bmp"]
 hdr = ["image_rs/hdr"]
 dds = ["image_rs/dds"]
 farbfeld = ["image_rs/farbfeld"]
-canvas = ["iced_native/canvas"]
+geometry = ["lyon_path"]
 opengl = []
 image_rs = ["kamadak-exif"]
 
@@ -65,6 +65,10 @@ optional = true
 version = "0.5"
 optional = true
 
+[dependencies.lyon_path]
+version = "1"
+optional = true
+
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index c44372e8e7..8658cffe82 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -10,8 +10,6 @@ use std::borrow::Cow;
 ///
 /// [`Renderer`]: crate::Renderer
 pub trait Backend {
-    type Geometry: Into<crate::Primitive>;
-
     /// Trims the measurements cache.
     ///
     /// This method is currently necessary to properly trim the text cache in
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
new file mode 100644
index 0000000000..29ac84d64d
--- /dev/null
+++ b/graphics/src/geometry.rs
@@ -0,0 +1,36 @@
+//! Draw 2D graphics for your users.
+//!
+//! A [`Canvas`] widget can be used to draw different kinds of 2D shapes in a
+//! [`Frame`]. It can be used for animation, data visualization, game graphics,
+//! and more!
+pub mod fill;
+pub mod path;
+pub mod stroke;
+
+mod style;
+mod text;
+
+pub use fill::Fill;
+pub use path::Path;
+pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
+pub use style::Style;
+pub use text::Text;
+
+pub use iced_native::gradient::{self, Gradient};
+
+use crate::Primitive;
+
+#[derive(Debug, Clone)]
+pub struct Geometry(pub Primitive);
+
+impl From<Geometry> for Primitive {
+    fn from(geometry: Geometry) -> Self {
+        geometry.0
+    }
+}
+
+pub trait Renderer: iced_native::Renderer {
+    type Geometry;
+
+    fn draw(&mut self, geometry: Vec<Self::Geometry>);
+}
diff --git a/native/src/widget/canvas/fill.rs b/graphics/src/geometry/fill.rs
similarity index 93%
rename from native/src/widget/canvas/fill.rs
rename to graphics/src/geometry/fill.rs
index 92b1e47ef2..109d5e990f 100644
--- a/native/src/widget/canvas/fill.rs
+++ b/graphics/src/geometry/fill.rs
@@ -1,8 +1,7 @@
 //! Fill [crate::widget::canvas::Geometry] with a certain style.
-use crate::widget::canvas::Gradient;
-use crate::Color;
+use crate::{Color, Gradient};
 
-pub use crate::widget::canvas::Style;
+pub use crate::geometry::Style;
 
 /// The style used to fill geometry.
 #[derive(Debug, Clone)]
diff --git a/native/src/widget/canvas/path.rs b/graphics/src/geometry/path.rs
similarity index 100%
rename from native/src/widget/canvas/path.rs
rename to graphics/src/geometry/path.rs
diff --git a/native/src/widget/canvas/path/arc.rs b/graphics/src/geometry/path/arc.rs
similarity index 100%
rename from native/src/widget/canvas/path/arc.rs
rename to graphics/src/geometry/path/arc.rs
diff --git a/native/src/widget/canvas/path/builder.rs b/graphics/src/geometry/path/builder.rs
similarity index 99%
rename from native/src/widget/canvas/path/builder.rs
rename to graphics/src/geometry/path/builder.rs
index 84fda05227..4a9c5e36cb 100644
--- a/native/src/widget/canvas/path/builder.rs
+++ b/graphics/src/geometry/path/builder.rs
@@ -1,4 +1,4 @@
-use crate::widget::canvas::path::{arc, Arc, Path};
+use crate::geometry::path::{arc, Arc, Path};
 use crate::{Point, Size};
 
 use lyon_path::builder::{self, SvgPathBuilder};
diff --git a/native/src/widget/canvas/stroke.rs b/graphics/src/geometry/stroke.rs
similarity index 98%
rename from native/src/widget/canvas/stroke.rs
rename to graphics/src/geometry/stroke.rs
index ab4727b269..b551a9c996 100644
--- a/native/src/widget/canvas/stroke.rs
+++ b/graphics/src/geometry/stroke.rs
@@ -1,5 +1,5 @@
 //! Create lines from a [crate::widget::canvas::Path] and assigns them various attributes/styles.
-pub use crate::widget::canvas::Style;
+pub use crate::geometry::Style;
 
 use crate::Color;
 
diff --git a/native/src/widget/canvas/style.rs b/graphics/src/geometry/style.rs
similarity index 88%
rename from native/src/widget/canvas/style.rs
rename to graphics/src/geometry/style.rs
index 2642fdb858..6794f2e753 100644
--- a/native/src/widget/canvas/style.rs
+++ b/graphics/src/geometry/style.rs
@@ -1,5 +1,4 @@
-use crate::widget::canvas::Gradient;
-use crate::Color;
+use crate::{Color, Gradient};
 
 /// The coloring style of some drawing.
 #[derive(Debug, Clone, PartialEq)]
diff --git a/native/src/widget/canvas/text.rs b/graphics/src/geometry/text.rs
similarity index 100%
rename from native/src/widget/canvas/text.rs
rename to graphics/src/geometry/text.rs
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 576b2d7812..e56f8ad844 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -33,6 +33,9 @@ pub mod primitive;
 pub mod renderer;
 pub mod window;
 
+#[cfg(feature = "geometry")]
+pub mod geometry;
+
 pub use antialiasing::Antialiasing;
 pub use backend::Backend;
 pub use error::Error;
@@ -41,6 +44,9 @@ pub use renderer::Renderer;
 pub use transformation::Transformation;
 pub use viewport::Viewport;
 
+#[cfg(feature = "geometry")]
+pub use geometry::Geometry;
+
 pub use iced_native::alignment;
 pub use iced_native::text;
 pub use iced_native::{
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 793ee7d7ec..cb57f429f2 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -215,15 +215,15 @@ where
     }
 }
 
-#[cfg(feature = "canvas")]
-impl<B, T> iced_native::widget::canvas::Renderer for Renderer<B, T>
+#[cfg(feature = "geometry")]
+impl<B, T> crate::geometry::Renderer for Renderer<B, T>
 where
     B: Backend,
 {
-    type Geometry = B::Geometry;
+    type Geometry = crate::Geometry;
 
     fn draw(&mut self, layers: Vec<Self::Geometry>) {
         self.primitives
-            .extend(layers.into_iter().map(B::Geometry::into));
+            .extend(layers.into_iter().map(crate::Geometry::into));
     }
 }
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 23533e33c1..1eedf0dac5 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -8,7 +8,6 @@ license = "MIT"
 repository = "https://github.com/iced-rs/iced"
 
 [features]
-canvas = ["lyon_path"]
 debug = []
 
 [dependencies]
@@ -29,7 +28,3 @@ features = ["thread-pool"]
 [dependencies.iced_style]
 version = "0.7"
 path = "../style"
-
-[dependencies.lyon_path]
-version = "1"
-optional = true
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 429b55c261..189f530976 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2021"
 [features]
 image = ["iced_wgpu/image", "iced_tiny_skia/image"]
 svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
-canvas = ["iced_wgpu/canvas", "iced_tiny_skia/canvas"]
-qr_code = ["canvas", "qrcode"]
+geometry = ["iced_wgpu/geometry", "iced_tiny_skia/geometry"]
 tracing = ["iced_wgpu/tracing"]
 
 [dependencies]
@@ -31,8 +30,3 @@ iced_wgpu = { version = "0.9", path = "../wgpu" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 iced_wgpu = { version = "0.9", path = "../wgpu", features = ["webgl"] }
-
-[dependencies.qrcode]
-version = "0.12"
-optional = true
-default-features = false
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 6c0b4e5c62..b0a409dc76 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -1,4 +1,4 @@
-use crate::{Font, Geometry, Point, Size};
+use crate::{Font, Point, Size};
 
 use iced_graphics::backend;
 use iced_graphics::text;
@@ -12,8 +12,6 @@ pub enum Backend {
 }
 
 impl iced_graphics::Backend for Backend {
-    type Geometry = Geometry;
-
     fn trim_measurements(&mut self) {
         match self {
             Self::Wgpu(backend) => backend.trim_measurements(),
diff --git a/renderer/src/widget/canvas.rs b/renderer/src/geometry.rs
similarity index 86%
rename from renderer/src/widget/canvas.rs
rename to renderer/src/geometry.rs
index 35c8fff960..e491ea734e 100644
--- a/renderer/src/widget/canvas.rs
+++ b/renderer/src/geometry.rs
@@ -2,22 +2,13 @@ mod cache;
 
 pub use cache::Cache;
 
-pub use iced_native::widget::canvas::event::{self, Event};
-pub use iced_native::widget::canvas::fill::{self, Fill};
-pub use iced_native::widget::canvas::gradient::{self, Gradient};
-pub use iced_native::widget::canvas::path::{self, Path};
-pub use iced_native::widget::canvas::stroke::{self, Stroke};
-pub use iced_native::widget::canvas::{
-    Canvas, Cursor, LineCap, LineDash, LineJoin, Program, Renderer, Style, Text,
-};
+pub use iced_graphics::geometry::*;
 
 use crate::{Backend, Point, Rectangle, Size, Vector};
 
-pub use crate::Geometry;
-
 pub enum Frame {
-    Wgpu(iced_wgpu::canvas::Frame),
-    TinySkia(iced_tiny_skia::canvas::Frame),
+    Wgpu(iced_wgpu::geometry::Frame),
+    TinySkia(iced_tiny_skia::geometry::Frame),
 }
 
 macro_rules! delegate {
@@ -33,10 +24,10 @@ impl Frame {
     pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
         match renderer.backend() {
             Backend::Wgpu(_) => {
-                Frame::Wgpu(iced_wgpu::canvas::Frame::new(size))
+                Frame::Wgpu(iced_wgpu::geometry::Frame::new(size))
             }
             Backend::TinySkia(_) => {
-                Frame::TinySkia(iced_tiny_skia::canvas::Frame::new(size))
+                Frame::TinySkia(iced_tiny_skia::geometry::Frame::new(size))
             }
         }
     }
@@ -131,10 +122,10 @@ impl Frame {
     pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
         let mut frame = match self {
             Self::Wgpu(_) => {
-                Self::Wgpu(iced_wgpu::canvas::Frame::new(region.size()))
+                Self::Wgpu(iced_wgpu::geometry::Frame::new(region.size()))
             }
             Self::TinySkia(_) => Self::TinySkia(
-                iced_tiny_skia::canvas::Frame::new(region.size()),
+                iced_tiny_skia::geometry::Frame::new(region.size()),
             ),
         };
 
diff --git a/renderer/src/widget/canvas/cache.rs b/renderer/src/geometry/cache.rs
similarity index 97%
rename from renderer/src/widget/canvas/cache.rs
rename to renderer/src/geometry/cache.rs
index 7d6b4811e7..1f1febddbb 100644
--- a/renderer/src/widget/canvas/cache.rs
+++ b/renderer/src/geometry/cache.rs
@@ -1,4 +1,4 @@
-use crate::widget::canvas::{Frame, Geometry};
+use crate::geometry::{Frame, Geometry};
 use crate::{Primitive, Renderer, Size};
 
 use std::cell::RefCell;
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index d9c85e82c4..aae3322d41 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,6 +1,8 @@
-pub mod widget;
 pub mod window;
 
+#[cfg(feature = "geometry")]
+pub mod geometry;
+
 mod backend;
 mod settings;
 
@@ -19,12 +21,3 @@ pub use iced_graphics::{
 /// [`iced`]: https://github.com/iced-rs/iced
 pub type Renderer<Theme = iced_native::Theme> =
     iced_graphics::Renderer<Backend, Theme>;
-
-#[derive(Debug, Clone)]
-pub struct Geometry(pub(crate) Primitive);
-
-impl From<Geometry> for Primitive {
-    fn from(geometry: Geometry) -> Self {
-        geometry.0
-    }
-}
diff --git a/src/widget.rs b/src/widget.rs
index f3a66101f7..19434e84b9 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -165,14 +165,14 @@ pub use vertical_slider::VerticalSlider;
 
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub use iced_renderer::widget::canvas;
+pub mod canvas;
 
 #[cfg(feature = "canvas")]
 #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
 /// Creates a new [`Canvas`].
-pub fn canvas<P, Message, Renderer>(program: P) -> Canvas<Message, Renderer, P>
+pub fn canvas<P, Message, Renderer>(program: P) -> Canvas<P, Message, Renderer>
 where
-    Renderer: canvas::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
     P: canvas::Program<Message, Renderer>,
 {
     Canvas::new(program)
@@ -193,7 +193,7 @@ pub mod image {
 
 #[cfg(feature = "qr_code")]
 #[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub use iced_renderer::widget::qr_code;
+pub mod qr_code;
 
 #[cfg(feature = "svg")]
 #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
diff --git a/native/src/widget/canvas.rs b/src/widget/canvas.rs
similarity index 73%
rename from native/src/widget/canvas.rs
rename to src/widget/canvas.rs
index 8a9addd285..bc5995c65e 100644
--- a/native/src/widget/canvas.rs
+++ b/src/widget/canvas.rs
@@ -1,35 +1,22 @@
 //! Draw 2D graphics for your users.
-//!
-//! A [`Canvas`] widget can be used to draw different kinds of 2D shapes in a
-//! [`Frame`]. It can be used for animation, data visualization, game graphics,
-//! and more!
 pub mod event;
-pub mod fill;
-pub mod path;
-pub mod stroke;
 
 mod cursor;
 mod program;
-mod style;
-mod text;
 
-pub use crate::gradient::{self, Gradient};
 pub use cursor::Cursor;
 pub use event::Event;
-pub use fill::Fill;
-pub use path::Path;
 pub use program::Program;
-pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
-pub use style::Style;
-pub use text::Text;
-
-use crate::layout::{self, Layout};
-use crate::mouse;
-use crate::renderer;
-use crate::widget::tree::{self, Tree};
-use crate::{
-    Clipboard, Element, Length, Point, Rectangle, Shell, Size, Vector, Widget,
-};
+
+pub use iced_renderer::geometry::*;
+
+use crate::{Length, Point, Rectangle, Size, Vector};
+
+use iced_native::layout::{self, Layout};
+use iced_native::mouse;
+use iced_native::renderer;
+use iced_native::widget::tree::{self, Tree};
+use iced_native::{Clipboard, Element, Shell, Widget};
 
 use std::marker::PhantomData;
 
@@ -39,14 +26,8 @@ use std::marker::PhantomData;
 /// If you want to get a quick overview, here's how we can draw a simple circle:
 ///
 /// ```no_run
-/// # mod iced {
-/// #     pub mod widget {
-/// #         pub use iced_graphics::widget::canvas;
-/// #     }
-/// #     pub use iced_native::{Color, Rectangle, Theme};
-/// # }
 /// use iced::widget::canvas::{self, Canvas, Cursor, Fill, Frame, Geometry, Path, Program};
-/// use iced::{Color, Rectangle, Theme};
+/// use iced::{Color, Rectangle, Theme, Renderer};
 ///
 /// // First, we define the data we need for drawing
 /// #[derive(Debug)]
@@ -58,9 +39,9 @@ use std::marker::PhantomData;
 /// impl Program<()> for Circle {
 ///     type State = ();
 ///
-///     fn draw(&self, _state: &(), _theme: &Theme, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
+///     fn draw(&self, _state: &(), renderer: &Renderer, _theme: &Theme, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
 ///         // We prepare a new `Frame`
-///         let mut frame = Frame::new(bounds.size());
+///         let mut frame = Frame::new(renderer, bounds.size());
 ///
 ///         // We create a `Path` representing a simple circle
 ///         let circle = Path::circle(frame.center(), self.radius);
@@ -77,9 +58,9 @@ use std::marker::PhantomData;
 /// let canvas = Canvas::new(Circle { radius: 50.0 });
 /// ```
 #[derive(Debug)]
-pub struct Canvas<Message, Renderer, P>
+pub struct Canvas<P, Message, Renderer = crate::Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     width: Length,
@@ -89,9 +70,9 @@ where
     theme_: PhantomData<Renderer>,
 }
 
-impl<Message, Renderer, P> Canvas<Message, Renderer, P>
+impl<P, Message, Renderer> Canvas<P, Message, Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     const DEFAULT_SIZE: f32 = 100.0;
@@ -120,10 +101,10 @@ where
     }
 }
 
-impl<Message, Renderer, P> Widget<Message, Renderer>
-    for Canvas<Message, Renderer, P>
+impl<P, Message, Renderer> Widget<Message, Renderer>
+    for Canvas<P, Message, Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     fn tag(&self) -> tree::Tag {
@@ -157,7 +138,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: crate::Event,
+        event: iced_native::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         _renderer: &Renderer,
@@ -167,9 +148,13 @@ where
         let bounds = layout.bounds();
 
         let canvas_event = match event {
-            crate::Event::Mouse(mouse_event) => Some(Event::Mouse(mouse_event)),
-            crate::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
-            crate::Event::Keyboard(keyboard_event) => {
+            iced_native::Event::Mouse(mouse_event) => {
+                Some(Event::Mouse(mouse_event))
+            }
+            iced_native::Event::Touch(touch_event) => {
+                Some(Event::Touch(touch_event))
+            }
+            iced_native::Event::Keyboard(keyboard_event) => {
                 Some(Event::Keyboard(keyboard_event))
             }
             _ => None,
@@ -238,22 +223,16 @@ where
     }
 }
 
-impl<'a, Message, Renderer, P> From<Canvas<Message, Renderer, P>>
+impl<'a, P, Message, Renderer> From<Canvas<P, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + self::Renderer,
+    Renderer: 'a + iced_renderer::geometry::Renderer,
     P: Program<Message, Renderer> + 'a,
 {
     fn from(
-        canvas: Canvas<Message, Renderer, P>,
+        canvas: Canvas<P, Message, Renderer>,
     ) -> Element<'a, Message, Renderer> {
         Element::new(canvas)
     }
 }
-
-pub trait Renderer: crate::Renderer {
-    type Geometry;
-
-    fn draw(&mut self, geometry: Vec<Self::Geometry>);
-}
diff --git a/native/src/widget/canvas/cursor.rs b/src/widget/canvas/cursor.rs
similarity index 100%
rename from native/src/widget/canvas/cursor.rs
rename to src/widget/canvas/cursor.rs
diff --git a/native/src/widget/canvas/event.rs b/src/widget/canvas/event.rs
similarity index 73%
rename from native/src/widget/canvas/event.rs
rename to src/widget/canvas/event.rs
index 1d726577aa..7c733a4d8a 100644
--- a/native/src/widget/canvas/event.rs
+++ b/src/widget/canvas/event.rs
@@ -1,9 +1,9 @@
 //! Handle events of a canvas.
-use crate::keyboard;
-use crate::mouse;
-use crate::touch;
+use iced_native::keyboard;
+use iced_native::mouse;
+use iced_native::touch;
 
-pub use crate::event::Status;
+pub use iced_native::event::Status;
 
 /// A [`Canvas`] event.
 ///
diff --git a/native/src/widget/canvas/program.rs b/src/widget/canvas/program.rs
similarity index 93%
rename from native/src/widget/canvas/program.rs
rename to src/widget/canvas/program.rs
index 17a5a13731..fd15663a6e 100644
--- a/native/src/widget/canvas/program.rs
+++ b/src/widget/canvas/program.rs
@@ -1,6 +1,6 @@
 use crate::widget::canvas::event::{self, Event};
 use crate::widget::canvas::mouse;
-use crate::widget::canvas::{Cursor, Renderer};
+use crate::widget::canvas::Cursor;
 use crate::Rectangle;
 
 /// The state and logic of a [`Canvas`].
@@ -9,9 +9,9 @@ use crate::Rectangle;
 /// application.
 ///
 /// [`Canvas`]: crate::widget::Canvas
-pub trait Program<Message, Renderer>
+pub trait Program<Message, Renderer = crate::Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
 {
     /// The internal state mutated by the [`Program`].
     type State: Default + 'static;
@@ -71,7 +71,7 @@ where
 
 impl<Message, Renderer, T> Program<Message, Renderer> for &T
 where
-    Renderer: self::Renderer,
+    Renderer: iced_renderer::geometry::Renderer,
     T: Program<Message, Renderer>,
 {
     type State = T::State;
diff --git a/renderer/src/widget/qr_code.rs b/src/widget/qr_code.rs
similarity index 99%
rename from renderer/src/widget/qr_code.rs
rename to src/widget/qr_code.rs
index aae4ec8863..66442d5d8c 100644
--- a/renderer/src/widget/qr_code.rs
+++ b/src/widget/qr_code.rs
@@ -2,9 +2,8 @@
 use crate::widget::canvas;
 use crate::Renderer;
 
-use iced_graphics::renderer;
-
 use iced_native::layout;
+use iced_native::renderer;
 use iced_native::widget::Tree;
 use iced_native::{
     Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 72181735f6..c4c36abad5 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [features]
 image = []
 svg = []
-canvas = ["iced_native/canvas"]
+geometry = ["iced_graphics/geometry"]
 
 [dependencies]
 raw-window-handle = "0.5"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 6883a953ed..050c6c75da 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -436,8 +436,6 @@ fn adjust_clip_mask(
 }
 
 impl iced_graphics::Backend for Backend {
-    type Geometry = ();
-
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache();
     }
diff --git a/tiny_skia/src/canvas.rs b/tiny_skia/src/geometry.rs
similarity index 97%
rename from tiny_skia/src/canvas.rs
rename to tiny_skia/src/geometry.rs
index 958063d253..73fc1ebdef 100644
--- a/tiny_skia/src/canvas.rs
+++ b/tiny_skia/src/geometry.rs
@@ -1,9 +1,9 @@
 use crate::{Point, Primitive, Rectangle, Size, Vector};
 
-use iced_native::widget::canvas::fill::{self, Fill};
-use iced_native::widget::canvas::stroke::{self, Stroke};
-use iced_native::widget::canvas::{Path, Style, Text};
-use iced_native::Gradient;
+use iced_graphics::geometry::fill::{self, Fill};
+use iced_graphics::geometry::stroke::{self, Stroke};
+use iced_graphics::geometry::{Path, Style, Text};
+use iced_graphics::Gradient;
 
 pub struct Frame {
     size: Size,
@@ -152,7 +152,7 @@ impl Frame {
 }
 
 fn convert_path(path: &Path) -> tiny_skia::Path {
-    use iced_native::widget::canvas::path::lyon_path;
+    use iced_graphics::geometry::path::lyon_path;
 
     let mut builder = tiny_skia::PathBuilder::new();
     let mut last_point = Default::default();
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index e66e6412fa..ef5c6b1db4 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -4,8 +4,8 @@ mod backend;
 mod settings;
 mod text;
 
-#[cfg(feature = "canvas")]
-pub mod canvas;
+#[cfg(feature = "geometry")]
+pub mod geometry;
 
 pub use iced_graphics::primitive;
 
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 0bcef71c29..2e39a9e710 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -21,7 +21,7 @@ bmp = ["iced_graphics/bmp"]
 hdr = ["iced_graphics/hdr"]
 dds = ["iced_graphics/dds"]
 farbfeld = ["iced_graphics/farbfeld"]
-canvas = ["iced_graphics/canvas", "lyon"]
+geometry = ["iced_graphics/geometry", "lyon"]
 spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 10dc5b4ff3..6f39a5febb 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -329,8 +329,6 @@ impl Backend {
 }
 
 impl iced_graphics::Backend for Backend {
-    type Geometry = ();
-
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache()
     }
diff --git a/wgpu/src/canvas.rs b/wgpu/src/geometry.rs
similarity index 99%
rename from wgpu/src/canvas.rs
rename to wgpu/src/geometry.rs
index e8d540c3ea..11e8126fdd 100644
--- a/wgpu/src/canvas.rs
+++ b/wgpu/src/geometry.rs
@@ -1,9 +1,9 @@
-use iced_graphics::primitive::{self, Primitive};
-use iced_native::widget::canvas::fill::{self, Fill};
-use iced_native::widget::canvas::{
+use iced_graphics::geometry::fill::{self, Fill};
+use iced_graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
-use iced_native::{Gradient, Point, Rectangle, Size, Vector};
+use iced_graphics::primitive::{self, Primitive};
+use iced_graphics::{Gradient, Point, Rectangle, Size, Vector};
 
 use lyon::geom::euclid;
 use lyon::tessellation;
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 31db16a8de..4439b18567 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -41,8 +41,8 @@ pub mod layer;
 pub mod settings;
 pub mod window;
 
-#[cfg(feature = "canvas")]
-pub mod canvas;
+#[cfg(feature = "geometry")]
+pub mod geometry;
 
 mod backend;
 mod buffer;

From c54409d1711e1f615c7ea4b02c082954e340632a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 3 Mar 2023 17:31:44 +0100
Subject: [PATCH 081/163] Remove `canvas` leftovers in `iced_native`

---
 native/src/widget.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/native/src/widget.rs b/native/src/widget.rs
index f107cd69d5..2b3ca7be07 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -83,14 +83,6 @@ pub use tree::Tree;
 #[doc(no_inline)]
 pub use vertical_slider::VerticalSlider;
 
-#[cfg(feature = "canvas")]
-#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub mod canvas;
-
-#[cfg(feature = "canvas")]
-#[doc(no_inline)]
-pub use canvas::Canvas;
-
 pub use action::Action;
 pub use id::Id;
 pub use operation::Operation;

From 3a0d34c0240f4421737a6a08761f99d6f8140d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Mar 2023 05:37:11 +0100
Subject: [PATCH 082/163] Create `iced_widget` subcrate and re-organize the
 whole codebase

---
 Cargo.toml                                    |  29 +-
 core/Cargo.toml                               |   1 +
 core/src/clipboard.rs                         |  23 ++
 {native => core}/src/element.rs               |  67 +++-
 {native => core}/src/event.rs                 |   2 +-
 {native => core}/src/hasher.rs                |   0
 {native => core}/src/image.rs                 |   0
 {native => core}/src/layout.rs                |   0
 {native => core}/src/layout/DRUID_LICENSE     |   0
 {native => core}/src/layout/flex.rs           |   0
 {native => core}/src/layout/limits.rs         |   0
 {native => core}/src/layout/node.rs           |   0
 core/src/lib.rs                               |  24 ++
 core/src/mouse.rs                             |   3 +
 {native => core}/src/mouse/click.rs           |   0
 {native => core}/src/overlay.rs               |   3 -
 {native => core}/src/overlay/element.rs       |   0
 {native => core}/src/overlay/group.rs         |   4 +-
 {native => core}/src/renderer.rs              |   1 +
 {native => core}/src/renderer/null.rs         |   4 +-
 {native => core}/src/shell.rs                 |   0
 {native => core}/src/svg.rs                   |   0
 {native => core}/src/text.rs                  |   0
 {native => core}/src/touch.rs                 |   0
 core/src/widget.rs                            | 145 +++++++
 {native => core}/src/widget/id.rs             |   2 +-
 {native => core}/src/widget/operation.rs      |   0
 .../src/widget/operation/focusable.rs         |   0
 .../src/widget/operation/scrollable.rs        |   0
 .../src/widget/operation/text_input.rs        |   0
 {native => core}/src/widget/text.rs           |  54 ++-
 {native => core}/src/widget/tree.rs           |   0
 core/src/window.rs                            |  10 +
 {native => core}/src/window/event.rs          |   0
 {native => core}/src/window/mode.rs           |   0
 {native => core}/src/window/redraw_request.rs |   0
 {native => core}/src/window/user_attention.rs |   0
 examples/component/Cargo.toml                 |   4 +-
 examples/component/src/main.rs                |  22 +-
 examples/custom_quad/Cargo.toml               |   3 +-
 examples/custom_quad/src/main.rs              |   8 +-
 examples/custom_widget/Cargo.toml             |   3 +-
 examples/custom_widget/src/main.rs            |   8 +-
 examples/events/Cargo.toml                    |   1 -
 examples/events/src/main.rs                   |   9 +-
 examples/geometry/Cargo.toml                  |   3 +-
 examples/geometry/src/main.rs                 |  38 +-
 examples/integration/Cargo.toml               |   1 +
 examples/integration/src/controls.rs          |  10 +-
 examples/integration/src/main.rs              |  91 ++---
 examples/integration/src/scene.rs             |   2 +-
 examples/lazy/Cargo.toml                      |   3 +-
 examples/lazy/src/main.rs                     |   3 +-
 examples/modal/Cargo.toml                     |   3 +-
 examples/modal/src/main.rs                    |  44 ++-
 examples/pane_grid/Cargo.toml                 |   4 +-
 examples/pane_grid/src/main.rs                |   8 +-
 examples/toast/Cargo.toml                     |   3 +-
 examples/toast/src/main.rs                    |  24 +-
 examples/url_handler/Cargo.toml               |   1 -
 examples/url_handler/src/main.rs              |  10 +-
 graphics/Cargo.toml                           |  10 +-
 graphics/src/backend.rs                       |   8 +-
 graphics/src/{window => }/compositor.rs       |   6 +-
 graphics/src/geometry.rs                      |   4 +-
 graphics/src/geometry/fill.rs                 |   2 +-
 graphics/src/geometry/path.rs                 |   2 +-
 graphics/src/geometry/path/arc.rs             |   2 +-
 graphics/src/geometry/path/builder.rs         |   3 +-
 graphics/src/geometry/stroke.rs               |   2 +-
 graphics/src/geometry/style.rs                |   2 +-
 graphics/src/geometry/text.rs                 |   4 +-
 graphics/src/image/raster.rs                  |   4 +-
 graphics/src/image/storage.rs                 |   2 +-
 graphics/src/image/vector.rs                  |   5 +-
 graphics/src/lib.rs                           |  11 +-
 graphics/src/overlay.rs                       |   2 -
 graphics/src/overlay/menu.rs                  |   3 -
 graphics/src/primitive.rs                     |   9 +-
 graphics/src/renderer.rs                      |  20 +-
 graphics/src/viewport.rs                      |   4 +-
 graphics/src/window.rs                        |  10 -
 graphics/src/window/gl_compositor.rs          |  71 ----
 lazy/Cargo.toml                               |  18 -
 native/Cargo.toml                             |   7 -
 native/src/clipboard.rs                       |  22 --
 native/src/command.rs                         |   4 +-
 native/src/debug/basic.rs                     |   2 +-
 native/src/lib.rs                             |  39 +-
 native/src/mouse.rs                           |   6 -
 native/src/program.rs                         |   6 +-
 native/src/program/state.rs                   |  18 +-
 native/src/runtime.rs                         |   4 +-
 native/src/subscription.rs                    |  17 +-
 native/src/user_interface.rs                  |  82 ++--
 native/src/widget.rs                          | 206 ----------
 native/src/widget/action.rs                   |   5 +-
 native/src/widget/helpers.rs                  | 317 ---------------
 native/src/window.rs                          |  13 +-
 native/src/window/action.rs                   |   4 +-
 renderer/Cargo.toml                           |   4 -
 renderer/src/backend.rs                       |  11 +-
 renderer/src/{window => }/compositor.rs       |   9 +-
 renderer/src/geometry.rs                      |   6 +-
 renderer/src/geometry/cache.rs                |   4 +-
 renderer/src/lib.rs                           |  14 +-
 renderer/src/settings.rs                      |   3 +-
 renderer/src/window.rs                        |   3 -
 src/advanced.rs                               |   9 +
 src/application.rs                            |  12 +-
 src/clipboard.rs                              |   3 -
 src/element.rs                                |   5 -
 src/error.rs                                  |  16 +-
 src/executor.rs                               |  14 -
 src/keyboard.rs                               |   2 -
 src/lib.rs                                    | 134 +++++--
 src/mouse.rs                                  |   2 -
 src/overlay.rs                                |  18 -
 src/result.rs                                 |   6 -
 src/touch.rs                                  |   2 +-
 src/widget.rs                                 | 239 ------------
 src/window.rs                                 |   5 +-
 style/src/lib.rs                              |   3 +-
 style/src/text.rs                             |   2 +-
 style/src/theme.rs                            |   2 +-
 tiny_skia/src/backend.rs                      |  18 +-
 tiny_skia/src/geometry.rs                     |  12 +-
 tiny_skia/src/lib.rs                          |  11 +-
 tiny_skia/src/settings.rs                     |   2 +-
 tiny_skia/src/text.rs                         |  11 +-
 tiny_skia/src/window/compositor.rs            |   9 +-
 wgpu/Cargo.toml                               |   4 -
 wgpu/src/backend.rs                           |  20 +-
 wgpu/src/geometry.rs                          |   8 +-
 wgpu/src/image.rs                             |  21 +-
 wgpu/src/image/atlas.rs                       |   4 +-
 wgpu/src/image/atlas/allocation.rs            |   3 +-
 wgpu/src/image/atlas/allocator.rs             |   4 +-
 wgpu/src/image/atlas/entry.rs                 |   5 +-
 wgpu/src/layer.rs                             |   9 +-
 wgpu/src/layer/image.rs                       |   6 +-
 wgpu/src/layer/mesh.rs                        |   4 +-
 wgpu/src/layer/text.rs                        |   3 +-
 wgpu/src/lib.rs                               |  15 +-
 wgpu/src/quad.rs                              |   6 +-
 wgpu/src/settings.rs                          |   5 +-
 wgpu/src/text.rs                              |  14 +-
 wgpu/src/triangle.rs                          |  24 +-
 wgpu/src/triangle/msaa.rs                     |   4 +-
 wgpu/src/window/compositor.rs                 |  10 +-
 widget/Cargo.toml                             |  37 ++
 {native/src/widget => widget/src}/button.rs   |  34 +-
 {src/widget => widget/src}/canvas.rs          |  48 +--
 {src/widget => widget/src}/canvas/cursor.rs   |   2 +-
 {src/widget => widget/src}/canvas/event.rs    |   8 +-
 {src/widget => widget/src}/canvas/program.rs  |  13 +-
 {native/src/widget => widget/src}/checkbox.rs |  36 +-
 {native/src/widget => widget/src}/column.rs   |  20 +-
 .../src/widget => widget/src}/container.rs    |  28 +-
 widget/src/helpers.rs                         | 362 ++++++++++++++++++
 {native/src/widget => widget/src}/image.rs    |  15 +-
 .../src/widget => widget/src}/image/viewer.rs |  14 +-
 {lazy => widget}/src/lazy.rs                  |  47 ++-
 {lazy/src => widget/src/lazy}/cache.rs        |   4 +-
 {lazy/src => widget/src/lazy}/component.rs    |  32 +-
 lazy/src/lib.rs => widget/src/lazy/helpers.rs |  37 +-
 {lazy/src => widget/src/lazy}/responsive.rs   |  40 +-
 widget/src/lib.rs                             | 122 ++++++
 widget/src/overlay.rs                         |   1 +
 {native => widget}/src/overlay/menu.rs        |  34 +-
 .../src/widget => widget/src}/pane_grid.rs    |  40 +-
 .../widget => widget/src}/pane_grid/axis.rs   |   2 +-
 .../src}/pane_grid/configuration.rs           |   2 +-
 .../src}/pane_grid/content.rs                 |  30 +-
 .../src}/pane_grid/direction.rs               |   0
 .../src}/pane_grid/draggable.rs               |   2 +-
 .../widget => widget/src}/pane_grid/node.rs   |   4 +-
 .../widget => widget/src}/pane_grid/pane.rs   |   0
 .../widget => widget/src}/pane_grid/split.rs  |   0
 .../widget => widget/src}/pane_grid/state.rs  |   6 +-
 .../src}/pane_grid/title_bar.rs               |  24 +-
 .../src/widget => widget/src}/pick_list.rs    |  33 +-
 .../src/widget => widget/src}/progress_bar.rs |  24 +-
 {src/widget => widget/src}/qr_code.rs         |  15 +-
 {native/src/widget => widget/src}/radio.rs    |  31 +-
 {native/src/widget => widget/src}/row.rs      |  20 +-
 {native/src/widget => widget/src}/rule.rs     |  20 +-
 .../src/widget => widget/src}/scrollable.rs   | 168 ++++----
 {native/src/widget => widget/src}/slider.rs   |  32 +-
 {native/src/widget => widget/src}/space.rs    |  13 +-
 {native/src/widget => widget/src}/svg.rs      |  14 +-
 widget/src/text.rs                            |   4 +
 .../src/widget => widget/src}/text_input.rs   |  39 +-
 .../src}/text_input/cursor.rs                 |   2 +-
 .../src}/text_input/editor.rs                 |   2 +-
 .../widget => widget/src}/text_input/value.rs |   0
 {native/src/widget => widget/src}/toggler.rs  |  30 +-
 {native/src/widget => widget/src}/tooltip.rs  |  37 +-
 .../widget => widget/src}/vertical_slider.rs  |  37 +-
 winit/Cargo.toml                              |   6 +-
 winit/src/application.rs                      |  77 ++--
 winit/src/application/state.rs                |  14 +-
 winit/src/clipboard.rs                        |   7 +-
 winit/src/conversion.rs                       |  11 +-
 winit/src/error.rs                            |   7 +-
 winit/src/lib.rs                              |   8 +-
 winit/src/proxy.rs                            |   2 +-
 winit/src/system.rs                           |   7 +-
 winit/src/window.rs                           |  52 +--
 209 files changed, 1963 insertions(+), 2187 deletions(-)
 create mode 100644 core/src/clipboard.rs
 rename {native => core}/src/element.rs (90%)
 rename {native => core}/src/event.rs (98%)
 rename {native => core}/src/hasher.rs (100%)
 rename {native => core}/src/image.rs (100%)
 rename {native => core}/src/layout.rs (100%)
 rename {native => core}/src/layout/DRUID_LICENSE (100%)
 rename {native => core}/src/layout/flex.rs (100%)
 rename {native => core}/src/layout/limits.rs (100%)
 rename {native => core}/src/layout/node.rs (100%)
 rename {native => core}/src/mouse/click.rs (100%)
 rename {native => core}/src/overlay.rs (99%)
 rename {native => core}/src/overlay/element.rs (100%)
 rename {native => core}/src/overlay/group.rs (97%)
 rename {native => core}/src/renderer.rs (99%)
 rename {native => core}/src/renderer/null.rs (94%)
 rename {native => core}/src/shell.rs (100%)
 rename {native => core}/src/svg.rs (100%)
 rename {native => core}/src/text.rs (100%)
 rename {native => core}/src/touch.rs (100%)
 create mode 100644 core/src/widget.rs
 rename {native => core}/src/widget/id.rs (97%)
 rename {native => core}/src/widget/operation.rs (100%)
 rename {native => core}/src/widget/operation/focusable.rs (100%)
 rename {native => core}/src/widget/operation/scrollable.rs (100%)
 rename {native => core}/src/widget/operation/text_input.rs (100%)
 rename {native => core}/src/widget/text.rs (87%)
 rename {native => core}/src/widget/tree.rs (100%)
 create mode 100644 core/src/window.rs
 rename {native => core}/src/window/event.rs (100%)
 rename {native => core}/src/window/mode.rs (100%)
 rename {native => core}/src/window/redraw_request.rs (100%)
 rename {native => core}/src/window/user_attention.rs (100%)
 rename graphics/src/{window => }/compositor.rs (96%)
 delete mode 100644 graphics/src/overlay.rs
 delete mode 100644 graphics/src/overlay/menu.rs
 delete mode 100644 graphics/src/window.rs
 delete mode 100644 graphics/src/window/gl_compositor.rs
 delete mode 100644 lazy/Cargo.toml
 delete mode 100644 native/src/mouse.rs
 delete mode 100644 native/src/widget/helpers.rs
 rename renderer/src/{window => }/compositor.rs (94%)
 delete mode 100644 renderer/src/window.rs
 create mode 100644 src/advanced.rs
 delete mode 100644 src/clipboard.rs
 delete mode 100644 src/element.rs
 delete mode 100644 src/executor.rs
 delete mode 100644 src/keyboard.rs
 delete mode 100644 src/mouse.rs
 delete mode 100644 src/overlay.rs
 delete mode 100644 src/result.rs
 delete mode 100644 src/widget.rs
 create mode 100644 widget/Cargo.toml
 rename {native/src/widget => widget/src}/button.rs (94%)
 rename {src/widget => widget/src}/canvas.rs (84%)
 rename {src/widget => widget/src}/canvas/cursor.rs (98%)
 rename {src/widget => widget/src}/canvas/event.rs (73%)
 rename {src/widget => widget/src}/canvas/program.rs (92%)
 rename {native/src/widget => widget/src}/checkbox.rs (91%)
 rename {native/src/widget => widget/src}/column.rs (95%)
 rename {native/src/widget => widget/src}/container.rs (94%)
 create mode 100644 widget/src/helpers.rs
 rename {native/src/widget => widget/src}/image.rs (96%)
 rename {native/src/widget => widget/src}/image/viewer.rs (98%)
 rename {lazy => widget}/src/lazy.rs (91%)
 rename {lazy/src => widget/src/lazy}/cache.rs (84%)
 rename {lazy/src => widget/src/lazy}/component.rs (96%)
 rename lazy/src/lib.rs => widget/src/lazy/helpers.rs (51%)
 rename {lazy/src => widget/src/lazy}/responsive.rs (93%)
 create mode 100644 widget/src/lib.rs
 create mode 100644 widget/src/overlay.rs
 rename {native => widget}/src/overlay/menu.rs (95%)
 rename {native/src/widget => widget/src}/pane_grid.rs (97%)
 rename {native/src/widget => widget/src}/pane_grid/axis.rs (99%)
 rename {native/src/widget => widget/src}/pane_grid/configuration.rs (94%)
 rename {native/src/widget => widget/src}/pane_grid/content.rs (94%)
 rename {native/src/widget => widget/src}/pane_grid/direction.rs (100%)
 rename {native/src/widget => widget/src}/pane_grid/draggable.rs (89%)
 rename {native/src/widget => widget/src}/pane_grid/node.rs (98%)
 rename {native/src/widget => widget/src}/pane_grid/pane.rs (100%)
 rename {native/src/widget => widget/src}/pane_grid/split.rs (100%)
 rename {native/src/widget => widget/src}/pane_grid/state.rs (98%)
 rename {native/src/widget => widget/src}/pane_grid/title_bar.rs (96%)
 rename {native/src/widget => widget/src}/pick_list.rs (97%)
 rename {native/src/widget => widget/src}/progress_bar.rs (89%)
 rename {src/widget => widget/src}/qr_code.rs (98%)
 rename {native/src/widget => widget/src}/radio.rs (92%)
 rename {native/src/widget => widget/src}/row.rs (94%)
 rename {native/src/widget => widget/src}/rule.rs (90%)
 rename {native/src/widget => widget/src}/scrollable.rs (91%)
 rename {native/src/widget => widget/src}/slider.rs (95%)
 rename {native/src/widget => widget/src}/space.rs (88%)
 rename {native/src/widget => widget/src}/svg.rs (95%)
 create mode 100644 widget/src/text.rs
 rename {native/src/widget => widget/src}/text_input.rs (97%)
 rename {native/src/widget => widget/src}/text_input/cursor.rs (99%)
 rename {native/src/widget => widget/src}/text_input/editor.rs (97%)
 rename {native/src/widget => widget/src}/text_input/value.rs (100%)
 rename {native/src/widget => widget/src}/toggler.rs (93%)
 rename {native/src/widget => widget/src}/tooltip.rs (93%)
 rename {native/src/widget => widget/src}/vertical_slider.rs (93%)

diff --git a/Cargo.toml b/Cargo.toml
index 28938df911..49a52311a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,13 +13,15 @@ categories = ["gui"]
 
 [features]
 # Enables the `Image` widget
-image = ["iced_renderer/image", "image_rs"]
+image = ["iced_widget/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_renderer/svg"]
+svg = ["iced_widget/svg"]
 # Enables the `Canvas` widget
-canvas = ["iced_renderer/geometry"]
+canvas = ["iced_widget/canvas"]
 # Enables the `QRCode` widget
-qr_code = ["canvas", "qrcode"]
+qr_code = ["iced_widget/qr_code"]
+# Enables lazy widgets
+lazy = ["iced_widget/lazy"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
@@ -32,11 +34,8 @@ smol = ["iced_futures/smol"]
 palette = ["iced_core/palette"]
 # Enables querying system information
 system = ["iced_winit/system"]
-# Enables chrome traces
-chrome-trace = [
-    "iced_winit/chrome-trace",
-    "iced_renderer/tracing",
-]
+# Enables the advanced module
+advanced = []
 
 [badges]
 maintenance = { status = "actively-developed" }
@@ -46,12 +45,12 @@ members = [
     "core",
     "futures",
     "graphics",
-    "lazy",
     "native",
     "renderer",
     "style",
     "tiny_skia",
     "wgpu",
+    "widget",
     "winit",
     "examples/*",
 ]
@@ -59,21 +58,15 @@ members = [
 [dependencies]
 iced_core = { version = "0.8", path = "core" }
 iced_futures = { version = "0.6", path = "futures" }
-iced_native = { version = "0.9", path = "native" }
-iced_renderer = { version = "0.1", path = "renderer" }
+iced_widget = { version = "0.1", path = "widget" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
-thiserror = "1.0"
+thiserror = "1"
 
 [dependencies.image_rs]
 version = "0.24"
 package = "image"
 optional = true
 
-[dependencies.qrcode]
-version = "0.12"
-optional = true
-default-features = false
-
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 features = ["image", "svg", "canvas", "qr_code"]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 7ccb7b7aca..9edc20f6a1 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -10,6 +10,7 @@ repository = "https://github.com/iced-rs/iced"
 [dependencies]
 bitflags = "1.2"
 thiserror = "1"
+twox-hash = { version = "1.5", default-features = false }
 
 [dependencies.palette]
 version = "0.6"
diff --git a/core/src/clipboard.rs b/core/src/clipboard.rs
new file mode 100644
index 0000000000..081b40046c
--- /dev/null
+++ b/core/src/clipboard.rs
@@ -0,0 +1,23 @@
+//! Access the clipboard.
+
+/// A buffer for short-term storage and transfer within and between
+/// applications.
+pub trait Clipboard {
+    /// Reads the current content of the [`Clipboard`] as text.
+    fn read(&self) -> Option<String>;
+
+    /// Writes the given text contents to the [`Clipboard`].
+    fn write(&mut self, contents: String);
+}
+
+/// A null implementation of the [`Clipboard`] trait.
+#[derive(Debug, Clone, Copy)]
+pub struct Null;
+
+impl Clipboard for Null {
+    fn read(&self) -> Option<String> {
+        None
+    }
+
+    fn write(&mut self, _contents: String) {}
+}
diff --git a/native/src/element.rs b/core/src/element.rs
similarity index 90%
rename from native/src/element.rs
rename to core/src/element.rs
index 0a677d20bb..98c5373786 100644
--- a/native/src/element.rs
+++ b/core/src/element.rs
@@ -90,41 +90,65 @@ impl<'a, Message, Renderer> Element<'a, Message, Renderer> {
     /// We compose the previous __messages__ with the index of the counter
     /// producing them. Let's implement our __view logic__ now:
     ///
-    /// ```
+    /// ```no_run
     /// # mod counter {
-    /// #     type Text<'a> = iced_native::widget::Text<'a, iced_native::renderer::Null>;
-    /// #
     /// #     #[derive(Debug, Clone, Copy)]
     /// #     pub enum Message {}
     /// #     pub struct Counter;
     /// #
     /// #     impl Counter {
-    /// #         pub fn view(&mut self) -> Text {
-    /// #             Text::new("")
+    /// #         pub fn view(
+    /// #             &self,
+    /// #         ) -> iced_core::Element<Message, iced_core::renderer::Null> {
+    /// #             unimplemented!()
     /// #         }
     /// #     }
     /// # }
     /// #
-    /// # mod iced_wgpu {
-    /// #     pub use iced_native::renderer::Null as Renderer;
-    /// # }
+    /// # mod iced {
+    /// #     pub use iced_core::renderer::Null as Renderer;
+    /// #     pub use iced_core::Element;
     /// #
-    /// # use counter::Counter;
+    /// #     pub mod widget {
+    /// #         pub struct Row<Message> {
+    /// #             _t: std::marker::PhantomData<Message>,
+    /// #         }
     /// #
-    /// # struct ManyCounters {
-    /// #     counters: Vec<Counter>,
-    /// # }
+    /// #         impl<Message> Row<Message> {
+    /// #             pub fn new() -> Self {
+    /// #                 unimplemented!()
+    /// #             }
     /// #
-    /// # #[derive(Debug, Clone, Copy)]
-    /// # pub enum Message {
-    /// #    Counter(usize, counter::Message)
+    /// #             pub fn spacing(mut self, _: u32) -> Self {
+    /// #                 unimplemented!()
+    /// #             }
+    /// #
+    /// #             pub fn push(
+    /// #                 mut self,
+    /// #                 _: iced_core::Element<Message, iced_core::renderer::Null>,
+    /// #             ) -> Self {
+    /// #                 unimplemented!()
+    /// #             }
+    /// #         }
+    /// #     }
     /// # }
-    /// use iced_native::Element;
-    /// use iced_native::widget::Row;
-    /// use iced_wgpu::Renderer;
+    /// #
+    /// use counter::Counter;
+    ///
+    /// use iced::widget::Row;
+    /// use iced::{Element, Renderer};
+    ///
+    /// struct ManyCounters {
+    ///     counters: Vec<Counter>,
+    /// }
+    ///
+    /// #[derive(Debug, Clone, Copy)]
+    /// pub enum Message {
+    ///     Counter(usize, counter::Message),
+    /// }
     ///
     /// impl ManyCounters {
-    ///     pub fn view(&mut self) -> Row<Message, Renderer> {
+    ///     pub fn view(&mut self) -> Row<Message> {
     ///         // We can quickly populate a `Row` by folding over our counters
     ///         self.counters.iter_mut().enumerate().fold(
     ///             Row::new().spacing(20),
@@ -137,9 +161,10 @@ impl<'a, Message, Renderer> Element<'a, Message, Renderer> {
     ///                     // Here we turn our `Element<counter::Message>` into
     ///                     // an `Element<Message>` by combining the `index` and the
     ///                     // message of the `element`.
-    ///                     element.map(move |message| Message::Counter(index, message))
+    ///                     element
+    ///                         .map(move |message| Message::Counter(index, message)),
     ///                 )
-    ///             }
+    ///             },
     ///         )
     ///     }
     /// }
diff --git a/native/src/event.rs b/core/src/event.rs
similarity index 98%
rename from native/src/event.rs
rename to core/src/event.rs
index bcfaf891bc..953cd73f94 100644
--- a/native/src/event.rs
+++ b/core/src/event.rs
@@ -62,7 +62,7 @@ impl Status {
     /// `Captured` takes precedence over `Ignored`:
     ///
     /// ```
-    /// use iced_native::event::Status;
+    /// use iced_core::event::Status;
     ///
     /// assert_eq!(Status::Ignored.merge(Status::Ignored), Status::Ignored);
     /// assert_eq!(Status::Ignored.merge(Status::Captured), Status::Captured);
diff --git a/native/src/hasher.rs b/core/src/hasher.rs
similarity index 100%
rename from native/src/hasher.rs
rename to core/src/hasher.rs
diff --git a/native/src/image.rs b/core/src/image.rs
similarity index 100%
rename from native/src/image.rs
rename to core/src/image.rs
diff --git a/native/src/layout.rs b/core/src/layout.rs
similarity index 100%
rename from native/src/layout.rs
rename to core/src/layout.rs
diff --git a/native/src/layout/DRUID_LICENSE b/core/src/layout/DRUID_LICENSE
similarity index 100%
rename from native/src/layout/DRUID_LICENSE
rename to core/src/layout/DRUID_LICENSE
diff --git a/native/src/layout/flex.rs b/core/src/layout/flex.rs
similarity index 100%
rename from native/src/layout/flex.rs
rename to core/src/layout/flex.rs
diff --git a/native/src/layout/limits.rs b/core/src/layout/limits.rs
similarity index 100%
rename from native/src/layout/limits.rs
rename to core/src/layout/limits.rs
diff --git a/native/src/layout/node.rs b/core/src/layout/node.rs
similarity index 100%
rename from native/src/layout/node.rs
rename to core/src/layout/node.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 1e4f0411d9..5bdcee6a4a 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -25,33 +25,57 @@
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 pub mod alignment;
+pub mod clipboard;
+pub mod event;
 pub mod font;
 pub mod gradient;
+pub mod image;
 pub mod keyboard;
+pub mod layout;
 pub mod mouse;
+pub mod overlay;
+pub mod renderer;
+pub mod svg;
+pub mod text;
 pub mod time;
+pub mod touch;
+pub mod widget;
+pub mod window;
 
 mod background;
 mod color;
 mod content_fit;
+mod element;
+mod hasher;
 mod length;
 mod padding;
 mod pixels;
 mod point;
 mod rectangle;
+mod shell;
 mod size;
 mod vector;
 
 pub use alignment::Alignment;
 pub use background::Background;
+pub use clipboard::Clipboard;
 pub use color::Color;
 pub use content_fit::ContentFit;
+pub use element::Element;
+pub use event::Event;
 pub use font::Font;
 pub use gradient::Gradient;
+pub use hasher::Hasher;
+pub use layout::Layout;
 pub use length::Length;
+pub use overlay::Overlay;
 pub use padding::Padding;
 pub use pixels::Pixels;
 pub use point::Point;
 pub use rectangle::Rectangle;
+pub use renderer::Renderer;
+pub use shell::Shell;
 pub use size::Size;
+pub use text::Text;
 pub use vector::Vector;
+pub use widget::Widget;
diff --git a/core/src/mouse.rs b/core/src/mouse.rs
index 48214f6558..0c405ce617 100644
--- a/core/src/mouse.rs
+++ b/core/src/mouse.rs
@@ -1,8 +1,11 @@
 //! Handle mouse events.
+pub mod click;
+
 mod button;
 mod event;
 mod interaction;
 
 pub use button::Button;
+pub use click::Click;
 pub use event::{Event, ScrollDelta};
 pub use interaction::Interaction;
diff --git a/native/src/mouse/click.rs b/core/src/mouse/click.rs
similarity index 100%
rename from native/src/mouse/click.rs
rename to core/src/mouse/click.rs
diff --git a/native/src/overlay.rs b/core/src/overlay.rs
similarity index 99%
rename from native/src/overlay.rs
rename to core/src/overlay.rs
index 6cada41655..b9f3c735a8 100644
--- a/native/src/overlay.rs
+++ b/core/src/overlay.rs
@@ -2,11 +2,8 @@
 mod element;
 mod group;
 
-pub mod menu;
-
 pub use element::Element;
 pub use group::Group;
-pub use menu::Menu;
 
 use crate::event::{self, Event};
 use crate::layout;
diff --git a/native/src/overlay/element.rs b/core/src/overlay/element.rs
similarity index 100%
rename from native/src/overlay/element.rs
rename to core/src/overlay/element.rs
diff --git a/native/src/overlay/group.rs b/core/src/overlay/group.rs
similarity index 97%
rename from native/src/overlay/group.rs
rename to core/src/overlay/group.rs
index 1126f0cf11..0c48df34a7 100644
--- a/native/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -1,12 +1,10 @@
-use iced_core::{Point, Rectangle, Size};
-
 use crate::event;
 use crate::layout;
 use crate::mouse;
 use crate::overlay;
 use crate::renderer;
 use crate::widget;
-use crate::{Clipboard, Event, Layout, Overlay, Shell};
+use crate::{Clipboard, Event, Layout, Overlay, Point, Rectangle, Shell, Size};
 
 /// An [`Overlay`] container that displays multiple overlay [`overlay::Element`]
 /// children.
diff --git a/native/src/renderer.rs b/core/src/renderer.rs
similarity index 99%
rename from native/src/renderer.rs
rename to core/src/renderer.rs
index 2ac7898298..d6247e39d2 100644
--- a/native/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -1,6 +1,7 @@
 //! Write your own renderer.
 #[cfg(debug_assertions)]
 mod null;
+
 #[cfg(debug_assertions)]
 pub use null::Null;
 
diff --git a/native/src/renderer/null.rs b/core/src/renderer/null.rs
similarity index 94%
rename from native/src/renderer/null.rs
rename to core/src/renderer/null.rs
index 150ee7864c..d93338aee8 100644
--- a/native/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -1,6 +1,6 @@
 use crate::renderer::{self, Renderer};
 use crate::text::{self, Text};
-use crate::{Background, Font, Point, Rectangle, Size, Theme, Vector};
+use crate::{Background, Font, Point, Rectangle, Size, Vector};
 
 use std::borrow::Cow;
 
@@ -18,7 +18,7 @@ impl Null {
 }
 
 impl Renderer for Null {
-    type Theme = Theme;
+    type Theme = ();
 
     fn with_layer(&mut self, _bounds: Rectangle, _f: impl FnOnce(&mut Self)) {}
 
diff --git a/native/src/shell.rs b/core/src/shell.rs
similarity index 100%
rename from native/src/shell.rs
rename to core/src/shell.rs
diff --git a/native/src/svg.rs b/core/src/svg.rs
similarity index 100%
rename from native/src/svg.rs
rename to core/src/svg.rs
diff --git a/native/src/text.rs b/core/src/text.rs
similarity index 100%
rename from native/src/text.rs
rename to core/src/text.rs
diff --git a/native/src/touch.rs b/core/src/touch.rs
similarity index 100%
rename from native/src/touch.rs
rename to core/src/touch.rs
diff --git a/core/src/widget.rs b/core/src/widget.rs
new file mode 100644
index 0000000000..70e2c2d9e6
--- /dev/null
+++ b/core/src/widget.rs
@@ -0,0 +1,145 @@
+//! Create custom widgets and operate on them.
+pub mod operation;
+pub mod text;
+pub mod tree;
+
+mod id;
+
+pub use id::Id;
+pub use operation::Operation;
+pub use text::Text;
+pub use tree::Tree;
+
+use crate::event::{self, Event};
+use crate::layout::{self, Layout};
+use crate::mouse;
+use crate::overlay;
+use crate::renderer;
+use crate::{Clipboard, Length, Point, Rectangle, Shell};
+
+/// A component that displays information and allows interaction.
+///
+/// If you want to build your own widgets, you will need to implement this
+/// trait.
+///
+/// # Examples
+/// The repository has some [examples] showcasing how to implement a custom
+/// widget:
+///
+/// - [`bezier_tool`], a Paint-like tool for drawing Bézier curves using
+/// [`lyon`].
+/// - [`custom_widget`], a demonstration of how to build a custom widget that
+/// draws a circle.
+/// - [`geometry`], a custom widget showcasing how to draw geometry with the
+/// `Mesh2D` primitive in [`iced_wgpu`].
+///
+/// [examples]: https://github.com/iced-rs/iced/tree/0.8/examples
+/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.8/examples/bezier_tool
+/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.8/examples/custom_widget
+/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.8/examples/geometry
+/// [`lyon`]: https://github.com/nical/lyon
+/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/wgpu
+pub trait Widget<Message, Renderer>
+where
+    Renderer: crate::Renderer,
+{
+    /// Returns the width of the [`Widget`].
+    fn width(&self) -> Length;
+
+    /// Returns the height of the [`Widget`].
+    fn height(&self) -> Length;
+
+    /// Returns the [`layout::Node`] of the [`Widget`].
+    ///
+    /// This [`layout::Node`] is used by the runtime to compute the [`Layout`] of the
+    /// user interface.
+    fn layout(
+        &self,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node;
+
+    /// Draws the [`Widget`] using the associated `Renderer`.
+    fn draw(
+        &self,
+        state: &Tree,
+        renderer: &mut Renderer,
+        theme: &Renderer::Theme,
+        style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+    );
+
+    /// Returns the [`Tag`] of the [`Widget`].
+    ///
+    /// [`Tag`]: tree::Tag
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::stateless()
+    }
+
+    /// Returns the [`State`] of the [`Widget`].
+    ///
+    /// [`State`]: tree::State
+    fn state(&self) -> tree::State {
+        tree::State::None
+    }
+
+    /// Returns the state [`Tree`] of the children of the [`Widget`].
+    fn children(&self) -> Vec<Tree> {
+        Vec::new()
+    }
+
+    /// Reconciliates the [`Widget`] with the provided [`Tree`].
+    fn diff(&self, _tree: &mut Tree) {}
+
+    /// Applies an [`Operation`] to the [`Widget`].
+    fn operate(
+        &self,
+        _state: &mut Tree,
+        _layout: Layout<'_>,
+        _renderer: &Renderer,
+        _operation: &mut dyn Operation<Message>,
+    ) {
+    }
+
+    /// Processes a runtime [`Event`].
+    ///
+    /// By default, it does nothing.
+    fn on_event(
+        &mut self,
+        _state: &mut Tree,
+        _event: Event,
+        _layout: Layout<'_>,
+        _cursor_position: Point,
+        _renderer: &Renderer,
+        _clipboard: &mut dyn Clipboard,
+        _shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        event::Status::Ignored
+    }
+
+    /// Returns the current [`mouse::Interaction`] of the [`Widget`].
+    ///
+    /// By default, it returns [`mouse::Interaction::Idle`].
+    fn mouse_interaction(
+        &self,
+        _state: &Tree,
+        _layout: Layout<'_>,
+        _cursor_position: Point,
+        _viewport: &Rectangle,
+        _renderer: &Renderer,
+    ) -> mouse::Interaction {
+        mouse::Interaction::Idle
+    }
+
+    /// Returns the overlay of the [`Widget`], if there is any.
+    fn overlay<'a>(
+        &'a mut self,
+        _state: &'a mut Tree,
+        _layout: Layout<'_>,
+        _renderer: &Renderer,
+    ) -> Option<overlay::Element<'a, Message, Renderer>> {
+        None
+    }
+}
diff --git a/native/src/widget/id.rs b/core/src/widget/id.rs
similarity index 97%
rename from native/src/widget/id.rs
rename to core/src/widget/id.rs
index 4b8fedf1e6..ae739bb73d 100644
--- a/native/src/widget/id.rs
+++ b/core/src/widget/id.rs
@@ -24,7 +24,7 @@ impl Id {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Internal {
+enum Internal {
     Unique(usize),
     Custom(borrow::Cow<'static, str>),
 }
diff --git a/native/src/widget/operation.rs b/core/src/widget/operation.rs
similarity index 100%
rename from native/src/widget/operation.rs
rename to core/src/widget/operation.rs
diff --git a/native/src/widget/operation/focusable.rs b/core/src/widget/operation/focusable.rs
similarity index 100%
rename from native/src/widget/operation/focusable.rs
rename to core/src/widget/operation/focusable.rs
diff --git a/native/src/widget/operation/scrollable.rs b/core/src/widget/operation/scrollable.rs
similarity index 100%
rename from native/src/widget/operation/scrollable.rs
rename to core/src/widget/operation/scrollable.rs
diff --git a/native/src/widget/operation/text_input.rs b/core/src/widget/operation/text_input.rs
similarity index 100%
rename from native/src/widget/operation/text_input.rs
rename to core/src/widget/operation/text_input.rs
diff --git a/native/src/widget/text.rs b/core/src/widget/text.rs
similarity index 87%
rename from native/src/widget/text.rs
rename to core/src/widget/text.rs
index aede754a87..485bb54209 100644
--- a/native/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -4,27 +4,13 @@ use crate::layout;
 use crate::renderer;
 use crate::text;
 use crate::widget::Tree;
-use crate::{Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget};
+use crate::{
+    Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget,
+};
 
 use std::borrow::Cow;
 
-pub use iced_style::text::{Appearance, StyleSheet};
-
 /// A paragraph of text.
-///
-/// # Example
-///
-/// ```
-/// # use iced_native::Color;
-/// #
-/// # type Text<'a> = iced_native::widget::Text<'a, iced_native::renderer::Null>;
-/// #
-/// Text::new("I <3 iced!")
-///     .size(40)
-///     .style(Color::from([0.0, 0.0, 1.0]));
-/// ```
-///
-/// ![Text drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/text.png?raw=true)
 #[allow(missing_debug_implementations)]
 pub struct Text<'a, Renderer>
 where
@@ -211,7 +197,7 @@ pub fn draw<Renderer>(
         alignment::Vertical::Bottom => bounds.y + bounds.height,
     };
 
-    renderer.fill_text(crate::text::Text {
+    renderer.fill_text(crate::Text {
         content,
         size: size.unwrap_or_else(|| renderer.default_size()),
         bounds: Rectangle { x, y, ..bounds },
@@ -252,12 +238,40 @@ where
     }
 }
 
+impl<'a, Renderer> From<&'a str> for Text<'a, Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    fn from(content: &'a str) -> Self {
+        Self::new(content)
+    }
+}
+
 impl<'a, Message, Renderer> From<&'a str> for Element<'a, Message, Renderer>
 where
     Renderer: text::Renderer + 'a,
     Renderer::Theme: StyleSheet,
 {
-    fn from(contents: &'a str) -> Self {
-        Text::new(contents).into()
+    fn from(content: &'a str) -> Self {
+        Text::from(content).into()
     }
 }
+
+/// The style sheet of some text.
+pub trait StyleSheet {
+    /// The supported style of the [`StyleSheet`].
+    type Style: Default + Copy;
+
+    /// Produces the [`Appearance`] of some text.
+    fn appearance(&self, style: Self::Style) -> Appearance;
+}
+
+/// The apperance of some text.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct Appearance {
+    /// The [`Color`] of the text.
+    ///
+    /// The default, `None`, means using the inherited color.
+    pub color: Option<Color>,
+}
diff --git a/native/src/widget/tree.rs b/core/src/widget/tree.rs
similarity index 100%
rename from native/src/widget/tree.rs
rename to core/src/widget/tree.rs
diff --git a/core/src/window.rs b/core/src/window.rs
new file mode 100644
index 0000000000..d829a4b4e0
--- /dev/null
+++ b/core/src/window.rs
@@ -0,0 +1,10 @@
+//! Build window-based GUI applications.
+mod event;
+mod mode;
+mod redraw_request;
+mod user_attention;
+
+pub use event::Event;
+pub use mode::Mode;
+pub use redraw_request::RedrawRequest;
+pub use user_attention::UserAttention;
diff --git a/native/src/window/event.rs b/core/src/window/event.rs
similarity index 100%
rename from native/src/window/event.rs
rename to core/src/window/event.rs
diff --git a/native/src/window/mode.rs b/core/src/window/mode.rs
similarity index 100%
rename from native/src/window/mode.rs
rename to core/src/window/mode.rs
diff --git a/native/src/window/redraw_request.rs b/core/src/window/redraw_request.rs
similarity index 100%
rename from native/src/window/redraw_request.rs
rename to core/src/window/redraw_request.rs
diff --git a/native/src/window/user_attention.rs b/core/src/window/user_attention.rs
similarity index 100%
rename from native/src/window/user_attention.rs
rename to core/src/window/user_attention.rs
diff --git a/examples/component/Cargo.toml b/examples/component/Cargo.toml
index dd435201f3..9db1e6b47f 100644
--- a/examples/component/Cargo.toml
+++ b/examples/component/Cargo.toml
@@ -6,6 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["debug"] }
-iced_native = { path = "../../native" }
-iced_lazy = { path = "../../lazy" }
+iced = { path = "../..", features = ["debug", "lazy"] }
diff --git a/examples/component/src/main.rs b/examples/component/src/main.rs
index c407bb06c6..e59588b104 100644
--- a/examples/component/src/main.rs
+++ b/examples/component/src/main.rs
@@ -47,9 +47,8 @@ impl Sandbox for Component {
 
 mod numeric_input {
     use iced::alignment::{self, Alignment};
-    use iced::widget::{self, button, row, text, text_input};
-    use iced::{Element, Length};
-    use iced_lazy::{self, Component};
+    use iced::widget::{button, component, row, text, text_input, Component};
+    use iced::{Element, Length, Renderer};
 
     pub struct NumericInput<Message> {
         value: Option<u32>,
@@ -82,13 +81,7 @@ mod numeric_input {
         }
     }
 
-    impl<Message, Renderer> Component<Message, Renderer> for NumericInput<Message>
-    where
-        Renderer: iced_native::text::Renderer + 'static,
-        Renderer::Theme: widget::button::StyleSheet
-            + widget::text_input::StyleSheet
-            + widget::text::StyleSheet,
-    {
+    impl<Message> Component<Message, Renderer> for NumericInput<Message> {
         type State = ();
         type Event = Event;
 
@@ -151,17 +144,12 @@ mod numeric_input {
         }
     }
 
-    impl<'a, Message, Renderer> From<NumericInput<Message>>
-        for Element<'a, Message, Renderer>
+    impl<'a, Message> From<NumericInput<Message>> for Element<'a, Message, Renderer>
     where
         Message: 'a,
-        Renderer: 'static + iced_native::text::Renderer,
-        Renderer::Theme: widget::button::StyleSheet
-            + widget::text_input::StyleSheet
-            + widget::text::StyleSheet,
     {
         fn from(numeric_input: NumericInput<Message>) -> Self {
-            iced_lazy::component(numeric_input)
+            component(numeric_input)
         }
     }
 }
diff --git a/examples/custom_quad/Cargo.toml b/examples/custom_quad/Cargo.toml
index 39154786e1..f097c2ddf4 100644
--- a/examples/custom_quad/Cargo.toml
+++ b/examples/custom_quad/Cargo.toml
@@ -6,5 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../.." }
-iced_native = { path = "../../native" }
+iced = { path = "../..", features = ["advanced"] }
diff --git a/examples/custom_quad/src/main.rs b/examples/custom_quad/src/main.rs
index 6509887c52..b07f42ce87 100644
--- a/examples/custom_quad/src/main.rs
+++ b/examples/custom_quad/src/main.rs
@@ -1,9 +1,9 @@
 //! This example showcases a drawing a quad.
 mod quad {
-    use iced_native::layout::{self, Layout};
-    use iced_native::renderer;
-    use iced_native::widget::{self, Widget};
-    use iced_native::{Color, Element, Length, Point, Rectangle, Size};
+    use iced::advanced::layout::{self, Layout};
+    use iced::advanced::renderer;
+    use iced::advanced::widget::{self, Widget};
+    use iced::{Color, Element, Length, Point, Rectangle, Size};
 
     pub struct CustomQuad {
         size: f32,
diff --git a/examples/custom_widget/Cargo.toml b/examples/custom_widget/Cargo.toml
index 067aab4a2d..dda0efe8e8 100644
--- a/examples/custom_widget/Cargo.toml
+++ b/examples/custom_widget/Cargo.toml
@@ -6,5 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../.." }
-iced_native = { path = "../../native" }
+iced = { path = "../..", features = ["advanced"] }
diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs
index f6bb3b1e6f..7854548c02 100644
--- a/examples/custom_widget/src/main.rs
+++ b/examples/custom_widget/src/main.rs
@@ -9,10 +9,10 @@ mod circle {
     // Of course, you can choose to make the implementation renderer-agnostic,
     // if you wish to, by creating your own `Renderer` trait, which could be
     // implemented by `iced_wgpu` and other renderers.
-    use iced_native::layout::{self, Layout};
-    use iced_native::renderer;
-    use iced_native::widget::{self, Widget};
-    use iced_native::{Color, Element, Length, Point, Rectangle, Size};
+    use iced::advanced::layout::{self, Layout};
+    use iced::advanced::renderer;
+    use iced::advanced::widget::{self, Widget};
+    use iced::{Color, Element, Length, Point, Rectangle, Size};
 
     pub struct Circle {
         radius: f32,
diff --git a/examples/events/Cargo.toml b/examples/events/Cargo.toml
index 8c56e4711f..15ffc0af12 100644
--- a/examples/events/Cargo.toml
+++ b/examples/events/Cargo.toml
@@ -7,4 +7,3 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["debug"] }
-iced_native = { path = "../../native" }
diff --git a/examples/events/src/main.rs b/examples/events/src/main.rs
index 1b97018e1b..7f3a5e1d5f 100644
--- a/examples/events/src/main.rs
+++ b/examples/events/src/main.rs
@@ -1,12 +1,13 @@
 use iced::alignment;
 use iced::executor;
+use iced::subscription;
 use iced::widget::{button, checkbox, container, text, Column};
 use iced::window;
+use iced::Event;
 use iced::{
     Alignment, Application, Command, Element, Length, Settings, Subscription,
     Theme,
 };
-use iced_native::Event;
 
 pub fn main() -> iced::Result {
     Events::run(Settings {
@@ -17,13 +18,13 @@ pub fn main() -> iced::Result {
 
 #[derive(Debug, Default)]
 struct Events {
-    last: Vec<iced_native::Event>,
+    last: Vec<Event>,
     enabled: bool,
 }
 
 #[derive(Debug, Clone)]
 enum Message {
-    EventOccurred(iced_native::Event),
+    EventOccurred(Event),
     Toggled(bool),
     Exit,
 }
@@ -70,7 +71,7 @@ impl Application for Events {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        iced_native::subscription::events().map(Message::EventOccurred)
+        subscription::events().map(Message::EventOccurred)
     }
 
     fn view(&self) -> Element<Message> {
diff --git a/examples/geometry/Cargo.toml b/examples/geometry/Cargo.toml
index 22ede0e00d..79fe52d5a7 100644
--- a/examples/geometry/Cargo.toml
+++ b/examples/geometry/Cargo.toml
@@ -6,6 +6,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../.." }
-iced_native = { path = "../../native" }
+iced = { path = "../..", features = ["advanced"] }
 iced_graphics = { path = "../../graphics" }
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index a77772d5b3..5cb41184d9 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -1,23 +1,13 @@
 //! This example showcases a simple native custom widget that renders using
 //! arbitrary low-level geometry.
 mod rainbow {
-    // For now, to implement a custom native widget you will need to add
-    // `iced_native` and `iced_wgpu` to your dependencies.
-    //
-    // Then, you simply need to define your widget type and implement the
-    // `iced_native::Widget` trait with the `iced_wgpu::Renderer`.
-    //
-    // Of course, you can choose to make the implementation renderer-agnostic,
-    // if you wish to, by creating your own `Renderer` trait, which could be
-    // implemented by `iced_wgpu` and other renderers.
     use iced_graphics::primitive::{ColoredVertex2D, Primitive};
-    use iced_graphics::renderer::{self, Renderer};
-    use iced_graphics::Backend;
 
-    use iced_native::layout;
-    use iced_native::widget::{self, Widget};
-    use iced_native::{
-        Element, Layout, Length, Point, Rectangle, Size, Vector,
+    use iced::advanced::layout::{self, Layout};
+    use iced::advanced::renderer;
+    use iced::advanced::widget::{self, Widget};
+    use iced::{
+        Element, Length, Point, Rectangle, Renderer, Size, Theme, Vector,
     };
 
     #[derive(Debug, Clone, Copy, Default)]
@@ -27,10 +17,7 @@ mod rainbow {
         Rainbow
     }
 
-    impl<Message, B, T> Widget<Message, Renderer<B, T>> for Rainbow
-    where
-        B: Backend,
-    {
+    impl<Message> Widget<Message, Renderer> for Rainbow {
         fn width(&self) -> Length {
             Length::Fill
         }
@@ -41,7 +28,7 @@ mod rainbow {
 
         fn layout(
             &self,
-            _renderer: &Renderer<B, T>,
+            _renderer: &Renderer,
             limits: &layout::Limits,
         ) -> layout::Node {
             let size = limits.width(Length::Fill).resolve(Size::ZERO);
@@ -52,15 +39,15 @@ mod rainbow {
         fn draw(
             &self,
             _tree: &widget::Tree,
-            renderer: &mut Renderer<B, T>,
-            _theme: &T,
+            renderer: &mut Renderer,
+            _theme: &Theme,
             _style: &renderer::Style,
             layout: Layout<'_>,
             cursor_position: Point,
             _viewport: &Rectangle,
         ) {
+            use iced::advanced::Renderer as _;
             use iced_graphics::primitive::Mesh2D;
-            use iced_native::Renderer as _;
 
             let b = layout.bounds();
 
@@ -151,10 +138,7 @@ mod rainbow {
         }
     }
 
-    impl<'a, Message, B, T> From<Rainbow> for Element<'a, Message, Renderer<B, T>>
-    where
-        B: Backend,
-    {
+    impl<'a, Message> From<Rainbow> for Element<'a, Message, Renderer> {
         fn from(rainbow: Rainbow) -> Self {
             Self::new(rainbow)
         }
diff --git a/examples/integration/Cargo.toml b/examples/integration/Cargo.toml
index 200306aaa9..6039024228 100644
--- a/examples/integration/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -8,6 +8,7 @@ publish = false
 [dependencies]
 iced_winit = { path = "../../winit" }
 iced_wgpu = { path = "../../wgpu", features = ["webgl"] }
+iced_widget = { path = "../../widget" }
 env_logger = "0.8"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/examples/integration/src/controls.rs b/examples/integration/src/controls.rs
index 533cb6e2a4..16e2170966 100644
--- a/examples/integration/src/controls.rs
+++ b/examples/integration/src/controls.rs
@@ -1,6 +1,8 @@
 use iced_wgpu::Renderer;
-use iced_winit::widget::{slider, text_input, Column, Row, Text};
-use iced_winit::{Alignment, Color, Command, Element, Length, Program};
+use iced_widget::{slider, text_input, Column, Row, Text};
+use iced_winit::core::{Alignment, Color, Element, Length};
+use iced_winit::native::{Command, Program};
+use iced_winit::style::Theme;
 
 pub struct Controls {
     background_color: Color,
@@ -27,7 +29,7 @@ impl Controls {
 }
 
 impl Program for Controls {
-    type Renderer = Renderer;
+    type Renderer = Renderer<Theme>;
     type Message = Message;
 
     fn update(&mut self, message: Message) -> Command<Message> {
@@ -43,7 +45,7 @@ impl Program for Controls {
         Command::none()
     }
 
-    fn view(&self) -> Element<Message, Renderer> {
+    fn view(&self) -> Element<Message, Renderer<Theme>> {
         let background_color = self.background_color;
         let text = &self.text;
 
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index a7a90ced11..c1f1f076d3 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -4,11 +4,14 @@ mod scene;
 use controls::Controls;
 use scene::Scene;
 
-use iced_wgpu::{wgpu, Backend, Renderer, Settings, Viewport};
-use iced_winit::{
-    conversion, futures, program, renderer, winit, Clipboard, Color, Debug,
-    Size,
-};
+use iced_wgpu::graphics::Viewport;
+use iced_wgpu::{wgpu, Backend, Renderer, Settings};
+use iced_winit::core::renderer;
+use iced_winit::core::{Color, Size};
+use iced_winit::native::program;
+use iced_winit::native::Debug;
+use iced_winit::style::Theme;
+use iced_winit::{conversion, futures, winit, Clipboard};
 
 use winit::{
     dpi::PhysicalPosition,
@@ -73,43 +76,45 @@ pub fn main() {
     let instance = wgpu::Instance::new(backend);
     let surface = unsafe { instance.create_surface(&window) };
 
-    let (format, (device, queue)) = futures::executor::block_on(async {
-        let adapter = wgpu::util::initialize_adapter_from_env_or_default(
-            &instance,
-            backend,
-            Some(&surface),
-        )
-        .await
-        .expect("No suitable GPU adapters found on the system!");
-
-        let adapter_features = adapter.features();
-
-        #[cfg(target_arch = "wasm32")]
-        let needed_limits = wgpu::Limits::downlevel_webgl2_defaults()
-            .using_resolution(adapter.limits());
-
-        #[cfg(not(target_arch = "wasm32"))]
-        let needed_limits = wgpu::Limits::default();
-
-        (
-            surface
-                .get_supported_formats(&adapter)
-                .first()
-                .copied()
-                .expect("Get preferred format"),
-            adapter
-                .request_device(
-                    &wgpu::DeviceDescriptor {
-                        label: None,
-                        features: adapter_features & wgpu::Features::default(),
-                        limits: needed_limits,
-                    },
-                    None,
-                )
-                .await
-                .expect("Request device"),
-        )
-    });
+    let (format, (device, queue)) =
+        futures::futures::executor::block_on(async {
+            let adapter = wgpu::util::initialize_adapter_from_env_or_default(
+                &instance,
+                backend,
+                Some(&surface),
+            )
+            .await
+            .expect("No suitable GPU adapters found on the system!");
+
+            let adapter_features = adapter.features();
+
+            #[cfg(target_arch = "wasm32")]
+            let needed_limits = wgpu::Limits::downlevel_webgl2_defaults()
+                .using_resolution(adapter.limits());
+
+            #[cfg(not(target_arch = "wasm32"))]
+            let needed_limits = wgpu::Limits::default();
+
+            (
+                surface
+                    .get_supported_formats(&adapter)
+                    .first()
+                    .copied()
+                    .expect("Get preferred format"),
+                adapter
+                    .request_device(
+                        &wgpu::DeviceDescriptor {
+                            label: None,
+                            features: adapter_features
+                                & wgpu::Features::default(),
+                            limits: needed_limits,
+                        },
+                        None,
+                    )
+                    .await
+                    .expect("Request device"),
+            )
+        });
 
     surface.configure(
         &device,
@@ -188,7 +193,7 @@ pub fn main() {
                             viewport.scale_factor(),
                         ),
                         &mut renderer,
-                        &iced_wgpu::Theme::Dark,
+                        &Theme::Dark,
                         &renderer::Style { text_color: Color::WHITE },
                         &mut clipboard,
                         &mut debug,
diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
index 3e41fbda5a..90c7efbfa7 100644
--- a/examples/integration/src/scene.rs
+++ b/examples/integration/src/scene.rs
@@ -1,5 +1,5 @@
 use iced_wgpu::wgpu;
-use iced_winit::Color;
+use iced_winit::core::Color;
 
 pub struct Scene {
     pipeline: wgpu::RenderPipeline,
diff --git a/examples/lazy/Cargo.toml b/examples/lazy/Cargo.toml
index 79255c2563..e03e89a960 100644
--- a/examples/lazy/Cargo.toml
+++ b/examples/lazy/Cargo.toml
@@ -6,5 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["debug"] }
-iced_lazy = { path = "../../lazy" }
+iced = { path = "../..", features = ["debug", "lazy"] }
diff --git a/examples/lazy/src/main.rs b/examples/lazy/src/main.rs
index 6512106f23..e1cdaefeb4 100644
--- a/examples/lazy/src/main.rs
+++ b/examples/lazy/src/main.rs
@@ -1,10 +1,9 @@
 use iced::theme;
 use iced::widget::{
-    button, column, horizontal_space, pick_list, row, scrollable, text,
+    button, column, horizontal_space, lazy, pick_list, row, scrollable, text,
     text_input,
 };
 use iced::{Element, Length, Sandbox, Settings};
-use iced_lazy::lazy;
 
 use std::collections::HashSet;
 use std::hash::Hash;
diff --git a/examples/modal/Cargo.toml b/examples/modal/Cargo.toml
index 8770acac6c..3ac61e6a04 100644
--- a/examples/modal/Cargo.toml
+++ b/examples/modal/Cargo.toml
@@ -6,5 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = [] }
-iced_native = { path = "../../native" }
+iced = { path = "../..", features = ["advanced"] }
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 54555684a0..214ec97e05 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -178,12 +178,15 @@ impl App {
 }
 
 mod modal {
-    use iced_native::alignment::Alignment;
-    use iced_native::widget::{self, Tree};
-    use iced_native::{
-        event, layout, mouse, overlay, renderer, Clipboard, Color, Element,
-        Event, Layout, Length, Point, Rectangle, Shell, Size, Widget,
-    };
+    use iced::advanced::layout::{self, Layout};
+    use iced::advanced::overlay;
+    use iced::advanced::renderer;
+    use iced::advanced::widget::{self, Widget};
+    use iced::advanced::{self, Clipboard, Shell};
+    use iced::alignment::Alignment;
+    use iced::event;
+    use iced::mouse;
+    use iced::{Color, Element, Event, Length, Point, Rectangle, Size};
 
     /// A widget that centers a modal element over some base element
     pub struct Modal<'a, Message, Renderer> {
@@ -218,14 +221,17 @@ mod modal {
     impl<'a, Message, Renderer> Widget<Message, Renderer>
         for Modal<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: advanced::Renderer,
         Message: Clone,
     {
-        fn children(&self) -> Vec<Tree> {
-            vec![Tree::new(&self.base), Tree::new(&self.modal)]
+        fn children(&self) -> Vec<widget::Tree> {
+            vec![
+                widget::Tree::new(&self.base),
+                widget::Tree::new(&self.modal),
+            ]
         }
 
-        fn diff(&self, tree: &mut Tree) {
+        fn diff(&self, tree: &mut widget::Tree) {
             tree.diff_children(&[&self.base, &self.modal]);
         }
 
@@ -247,7 +253,7 @@ mod modal {
 
         fn on_event(
             &mut self,
-            state: &mut Tree,
+            state: &mut widget::Tree,
             event: Event,
             layout: Layout<'_>,
             cursor_position: Point,
@@ -268,9 +274,9 @@ mod modal {
 
         fn draw(
             &self,
-            state: &Tree,
+            state: &widget::Tree,
             renderer: &mut Renderer,
-            theme: &<Renderer as iced_native::Renderer>::Theme,
+            theme: &<Renderer as advanced::Renderer>::Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
             cursor_position: Point,
@@ -289,7 +295,7 @@ mod modal {
 
         fn overlay<'b>(
             &'b mut self,
-            state: &'b mut Tree,
+            state: &'b mut widget::Tree,
             layout: Layout<'_>,
             _renderer: &Renderer,
         ) -> Option<overlay::Element<'b, Message, Renderer>> {
@@ -306,7 +312,7 @@ mod modal {
 
         fn mouse_interaction(
             &self,
-            state: &Tree,
+            state: &widget::Tree,
             layout: Layout<'_>,
             cursor_position: Point,
             viewport: &Rectangle,
@@ -323,7 +329,7 @@ mod modal {
 
         fn operate(
             &self,
-            state: &mut Tree,
+            state: &mut widget::Tree,
             layout: Layout<'_>,
             renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
@@ -339,7 +345,7 @@ mod modal {
 
     struct Overlay<'a, 'b, Message, Renderer> {
         content: &'b mut Element<'a, Message, Renderer>,
-        tree: &'b mut Tree,
+        tree: &'b mut widget::Tree,
         size: Size,
         on_blur: Option<Message>,
     }
@@ -347,7 +353,7 @@ mod modal {
     impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
         for Overlay<'a, 'b, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: advanced::Renderer,
         Message: Clone,
     {
         fn layout(
@@ -469,7 +475,7 @@ mod modal {
     impl<'a, Message, Renderer> From<Modal<'a, Message, Renderer>>
         for Element<'a, Message, Renderer>
     where
-        Renderer: 'a + iced_native::Renderer,
+        Renderer: 'a + advanced::Renderer,
         Message: 'a + Clone,
     {
         fn from(modal: Modal<'a, Message, Renderer>) -> Self {
diff --git a/examples/pane_grid/Cargo.toml b/examples/pane_grid/Cargo.toml
index dfd6dfa991..4c0bf072c1 100644
--- a/examples/pane_grid/Cargo.toml
+++ b/examples/pane_grid/Cargo.toml
@@ -6,6 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["debug"] }
-iced_native = { path = "../../native" }
-iced_lazy = { path = "../../lazy" }
+iced = { path = "../..", features = ["debug", "lazy"] }
diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index c9f1376cc0..dfb80853f4 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -1,14 +1,16 @@
 use iced::alignment::{self, Alignment};
+use iced::event::{self, Event};
 use iced::executor;
 use iced::keyboard;
+use iced::subscription;
 use iced::theme::{self, Theme};
 use iced::widget::pane_grid::{self, PaneGrid};
-use iced::widget::{button, column, container, row, scrollable, text};
+use iced::widget::{
+    button, column, container, responsive, row, scrollable, text,
+};
 use iced::{
     Application, Color, Command, Element, Length, Settings, Size, Subscription,
 };
-use iced_lazy::responsive;
-use iced_native::{event, subscription, Event};
 
 pub fn main() -> iced::Result {
     Example::run(Settings::default())
diff --git a/examples/toast/Cargo.toml b/examples/toast/Cargo.toml
index f1f986aabc..f703572c53 100644
--- a/examples/toast/Cargo.toml
+++ b/examples/toast/Cargo.toml
@@ -6,5 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = [] }
-iced_native = { path = "../../native" }
+iced = { path = "../..", features = ["advanced"] }
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index e74b3ee62c..78fb9de10b 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -176,17 +176,23 @@ mod toast {
     use std::fmt;
     use std::time::{Duration, Instant};
 
+    use iced::advanced;
+    use iced::advanced::layout::{self, Layout};
+    use iced::advanced::overlay;
+    use iced::advanced::renderer;
+    use iced::advanced::widget::{self, Operation, Tree};
+    use iced::advanced::{Clipboard, Shell, Widget};
+    use iced::event::{self, Event};
+    use iced::mouse;
     use iced::theme;
     use iced::widget::{
         button, column, container, horizontal_rule, horizontal_space, row, text,
     };
+    use iced::window;
     use iced::{
         Alignment, Element, Length, Point, Rectangle, Renderer, Size, Theme,
         Vector,
     };
-    use iced_native::widget::{tree, Operation, Tree};
-    use iced_native::{event, layout, mouse, overlay, renderer, window};
-    use iced_native::{Clipboard, Event, Layout, Shell, Widget};
 
     pub const DEFAULT_TIMEOUT: u64 = 5;
 
@@ -324,13 +330,13 @@ mod toast {
             self.content.as_widget().layout(renderer, limits)
         }
 
-        fn tag(&self) -> tree::Tag {
+        fn tag(&self) -> widget::tree::Tag {
             struct Marker(Vec<Instant>);
-            iced_native::widget::tree::Tag::of::<Marker>()
+            widget::tree::Tag::of::<Marker>()
         }
 
-        fn state(&self) -> tree::State {
-            iced_native::widget::tree::State::new(Vec::<Option<Instant>>::new())
+        fn state(&self) -> widget::tree::State {
+            widget::tree::State::new(Vec::<Option<Instant>>::new())
         }
 
         fn children(&self) -> Vec<Tree> {
@@ -584,7 +590,7 @@ mod toast {
         fn draw(
             &self,
             renderer: &mut Renderer,
-            theme: &<Renderer as iced_native::Renderer>::Theme,
+            theme: &<Renderer as advanced::Renderer>::Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
             cursor_position: Point,
@@ -613,7 +619,7 @@ mod toast {
             &mut self,
             layout: Layout<'_>,
             renderer: &Renderer,
-            operation: &mut dyn iced_native::widget::Operation<Message>,
+            operation: &mut dyn widget::Operation<Message>,
         ) {
             operation.container(None, &mut |operation| {
                 self.toasts
diff --git a/examples/url_handler/Cargo.toml b/examples/url_handler/Cargo.toml
index 63c7ec2783..4dcff92d7c 100644
--- a/examples/url_handler/Cargo.toml
+++ b/examples/url_handler/Cargo.toml
@@ -7,4 +7,3 @@ publish = false
 
 [dependencies]
 iced = { path = "../.." }
-iced_native = { path = "../../native" }
diff --git a/examples/url_handler/src/main.rs b/examples/url_handler/src/main.rs
index 3257b5190a..f63fa06a24 100644
--- a/examples/url_handler/src/main.rs
+++ b/examples/url_handler/src/main.rs
@@ -1,12 +1,10 @@
+use iced::event::{Event, MacOS, PlatformSpecific};
 use iced::executor;
+use iced::subscription;
 use iced::widget::{container, text};
 use iced::{
     Application, Command, Element, Length, Settings, Subscription, Theme,
 };
-use iced_native::{
-    event::{MacOS, PlatformSpecific},
-    Event,
-};
 
 pub fn main() -> iced::Result {
     App::run(Settings::default())
@@ -19,7 +17,7 @@ struct App {
 
 #[derive(Debug, Clone)]
 enum Message {
-    EventOccurred(iced_native::Event),
+    EventOccurred(Event),
 }
 
 impl Application for App {
@@ -52,7 +50,7 @@ impl Application for App {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        iced_native::subscription::events().map(Message::EventOccurred)
+        subscription::events().map(Message::EventOccurred)
     }
 
     fn view(&self) -> Element<Message> {
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 98e6f474ce..4bb22b6ce8 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -39,13 +39,9 @@ bitflags = "1.2"
 version = "1.4"
 features = ["derive"]
 
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
-[dependencies.iced_style]
-version = "0.7"
-path = "../style"
+[dependencies.iced_core]
+version = "0.8"
+path = "../core"
 
 [dependencies.tiny-skia]
 version = "0.8"
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 8658cffe82..dd2888ab8f 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -1,8 +1,8 @@
 //! Write a graphics backend.
-use iced_native::image;
-use iced_native::svg;
-use iced_native::text;
-use iced_native::{Font, Point, Size};
+use iced_core::image;
+use iced_core::svg;
+use iced_core::text;
+use iced_core::{Font, Point, Size};
 
 use std::borrow::Cow;
 
diff --git a/graphics/src/window/compositor.rs b/graphics/src/compositor.rs
similarity index 96%
rename from graphics/src/window/compositor.rs
rename to graphics/src/compositor.rs
index 15f8dab55f..d55e801a54 100644
--- a/graphics/src/window/compositor.rs
+++ b/graphics/src/compositor.rs
@@ -1,6 +1,8 @@
 //! A compositor is responsible for initializing a renderer and managing window
 //! surfaces.
-use crate::{Color, Error, Viewport};
+use crate::{Error, Viewport};
+
+use iced_core::Color;
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use thiserror::Error;
@@ -11,7 +13,7 @@ pub trait Compositor: Sized {
     type Settings: Default;
 
     /// The iced renderer of the backend.
-    type Renderer: iced_native::Renderer;
+    type Renderer: iced_core::Renderer;
 
     /// The surface of the backend.
     type Surface;
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 29ac84d64d..8db1594a72 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -16,7 +16,7 @@ pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
 pub use style::Style;
 pub use text::Text;
 
-pub use iced_native::gradient::{self, Gradient};
+pub use iced_core::gradient::{self, Gradient};
 
 use crate::Primitive;
 
@@ -29,7 +29,7 @@ impl From<Geometry> for Primitive {
     }
 }
 
-pub trait Renderer: iced_native::Renderer {
+pub trait Renderer: iced_core::Renderer {
     type Geometry;
 
     fn draw(&mut self, geometry: Vec<Self::Geometry>);
diff --git a/graphics/src/geometry/fill.rs b/graphics/src/geometry/fill.rs
index 109d5e990f..2e8c1669be 100644
--- a/graphics/src/geometry/fill.rs
+++ b/graphics/src/geometry/fill.rs
@@ -1,5 +1,5 @@
 //! Fill [crate::widget::canvas::Geometry] with a certain style.
-use crate::{Color, Gradient};
+use iced_core::{Color, Gradient};
 
 pub use crate::geometry::Style;
 
diff --git a/graphics/src/geometry/path.rs b/graphics/src/geometry/path.rs
index 30c387c50d..c3127bdfd0 100644
--- a/graphics/src/geometry/path.rs
+++ b/graphics/src/geometry/path.rs
@@ -9,7 +9,7 @@ pub use builder::Builder;
 
 pub use lyon_path;
 
-use crate::{Point, Size};
+use iced_core::{Point, Size};
 
 /// An immutable set of points that may or may not be connected.
 ///
diff --git a/graphics/src/geometry/path/arc.rs b/graphics/src/geometry/path/arc.rs
index e0747d3e07..2cdebb6624 100644
--- a/graphics/src/geometry/path/arc.rs
+++ b/graphics/src/geometry/path/arc.rs
@@ -1,5 +1,5 @@
 //! Build and draw curves.
-use crate::{Point, Vector};
+use iced_core::{Point, Vector};
 
 /// A segment of a differentiable curve.
 #[derive(Debug, Clone, Copy)]
diff --git a/graphics/src/geometry/path/builder.rs b/graphics/src/geometry/path/builder.rs
index 4a9c5e36cb..794dd3bcfa 100644
--- a/graphics/src/geometry/path/builder.rs
+++ b/graphics/src/geometry/path/builder.rs
@@ -1,5 +1,6 @@
 use crate::geometry::path::{arc, Arc, Path};
-use crate::{Point, Size};
+
+use iced_core::{Point, Size};
 
 use lyon_path::builder::{self, SvgPathBuilder};
 use lyon_path::geom;
diff --git a/graphics/src/geometry/stroke.rs b/graphics/src/geometry/stroke.rs
index b551a9c996..2d760a6ccc 100644
--- a/graphics/src/geometry/stroke.rs
+++ b/graphics/src/geometry/stroke.rs
@@ -1,7 +1,7 @@
 //! Create lines from a [crate::widget::canvas::Path] and assigns them various attributes/styles.
 pub use crate::geometry::Style;
 
-use crate::Color;
+use iced_core::Color;
 
 /// The style of a stroke.
 #[derive(Debug, Clone)]
diff --git a/graphics/src/geometry/style.rs b/graphics/src/geometry/style.rs
index 6794f2e753..be9ee376de 100644
--- a/graphics/src/geometry/style.rs
+++ b/graphics/src/geometry/style.rs
@@ -1,4 +1,4 @@
-use crate::{Color, Gradient};
+use iced_core::{Color, Gradient};
 
 /// The coloring style of some drawing.
 #[derive(Debug, Clone, PartialEq)]
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index 8c0b2dfb31..06e0b4d0e2 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -1,5 +1,5 @@
-use crate::alignment;
-use crate::{Color, Font, Point};
+use iced_core::alignment;
+use iced_core::{Color, Font, Point};
 
 /// A bunch of text that can be drawn to a canvas
 #[derive(Debug, Clone)]
diff --git a/graphics/src/image/raster.rs b/graphics/src/image/raster.rs
index da46c30f6d..03211160e8 100644
--- a/graphics/src/image/raster.rs
+++ b/graphics/src/image/raster.rs
@@ -1,8 +1,8 @@
 //! Raster image loading and caching.
 use crate::image::Storage;
-use crate::Size;
 
-use iced_native::image;
+use iced_core::image;
+use iced_core::Size;
 
 use bitflags::bitflags;
 use std::collections::{HashMap, HashSet};
diff --git a/graphics/src/image/storage.rs b/graphics/src/image/storage.rs
index 1b5b5c3556..4caa61410f 100644
--- a/graphics/src/image/storage.rs
+++ b/graphics/src/image/storage.rs
@@ -1,5 +1,5 @@
 //! Store images.
-use crate::Size;
+use iced_core::Size;
 
 use std::fmt::Debug;
 
diff --git a/graphics/src/image/vector.rs b/graphics/src/image/vector.rs
index c950ccd63f..32729acdaa 100644
--- a/graphics/src/image/vector.rs
+++ b/graphics/src/image/vector.rs
@@ -1,9 +1,8 @@
 //! Vector image loading and caching
 use crate::image::Storage;
-use crate::Color;
 
-use iced_native::svg;
-use iced_native::Size;
+use iced_core::svg;
+use iced_core::{Color, Size};
 
 use resvg::tiny_skia;
 use resvg::usvg;
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index e56f8ad844..c6f9cf5717 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -27,17 +27,17 @@ mod transformation;
 mod viewport;
 
 pub mod backend;
+pub mod compositor;
 pub mod image;
-pub mod overlay;
 pub mod primitive;
 pub mod renderer;
-pub mod window;
 
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
 pub use antialiasing::Antialiasing;
 pub use backend::Backend;
+pub use compositor::Compositor;
 pub use error::Error;
 pub use primitive::Primitive;
 pub use renderer::Renderer;
@@ -47,9 +47,4 @@ pub use viewport::Viewport;
 #[cfg(feature = "geometry")]
 pub use geometry::Geometry;
 
-pub use iced_native::alignment;
-pub use iced_native::text;
-pub use iced_native::{
-    Alignment, Background, Color, Font, Gradient, Point, Rectangle, Size,
-    Vector,
-};
+pub use iced_core as core;
diff --git a/graphics/src/overlay.rs b/graphics/src/overlay.rs
deleted file mode 100644
index bc0ed744f3..0000000000
--- a/graphics/src/overlay.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Display interactive elements on top of other widgets.
-pub mod menu;
diff --git a/graphics/src/overlay/menu.rs b/graphics/src/overlay/menu.rs
deleted file mode 100644
index 8b489e5efd..0000000000
--- a/graphics/src/overlay/menu.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//! Build and show dropdown menus.
-
-pub use iced_style::menu::{Appearance, StyleSheet};
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index f900b3fdae..195b62daa5 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,8 +1,7 @@
-use crate::alignment;
-
-use iced_native::image;
-use iced_native::svg;
-use iced_native::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
+use iced_core::alignment;
+use iced_core::image;
+use iced_core::svg;
+use iced_core::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
 
 use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index cb57f429f2..7bc462ef45 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,15 +1,15 @@
 //! Create a renderer from a [`Backend`].
 use crate::backend::{self, Backend};
-use crate::{Primitive, Vector};
+use crate::Primitive;
 
-use iced_native::image;
-use iced_native::layout;
-use iced_native::renderer;
-use iced_native::svg;
-use iced_native::text::{self, Text};
-use iced_native::{Background, Color, Element, Font, Point, Rectangle, Size};
-
-pub use iced_native::renderer::Style;
+use iced_core::image;
+use iced_core::layout;
+use iced_core::renderer;
+use iced_core::svg;
+use iced_core::text::{self, Text};
+use iced_core::{
+    Background, Color, Element, Font, Point, Rectangle, Size, Vector,
+};
 
 use std::borrow::Cow;
 use std::marker::PhantomData;
@@ -52,7 +52,7 @@ impl<B: Backend, T> Renderer<B, T> {
     }
 }
 
-impl<B, T> iced_native::Renderer for Renderer<B, T>
+impl<B, T> iced_core::Renderer for Renderer<B, T>
 where
     B: Backend,
 {
diff --git a/graphics/src/viewport.rs b/graphics/src/viewport.rs
index 2c0b541adc..5792555df7 100644
--- a/graphics/src/viewport.rs
+++ b/graphics/src/viewport.rs
@@ -1,4 +1,6 @@
-use crate::{Size, Transformation};
+use crate::Transformation;
+
+use iced_core::Size;
 
 /// A viewing region for displaying computer graphics.
 #[derive(Debug, Clone)]
diff --git a/graphics/src/window.rs b/graphics/src/window.rs
deleted file mode 100644
index a38b81f36a..0000000000
--- a/graphics/src/window.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-//! Draw graphics to window surfaces.
-pub mod compositor;
-
-#[cfg(feature = "opengl")]
-pub mod gl_compositor;
-
-pub use compositor::Compositor;
-
-#[cfg(feature = "opengl")]
-pub use gl_compositor::GLCompositor;
diff --git a/graphics/src/window/gl_compositor.rs b/graphics/src/window/gl_compositor.rs
deleted file mode 100644
index 3e6dfd9edc..0000000000
--- a/graphics/src/window/gl_compositor.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-//! A compositor is responsible for initializing a renderer and managing window
-//! surfaces.
-use crate::window::compositor::Information;
-use crate::{Color, Error, Size, Viewport};
-
-use core::ffi::c_void;
-
-/// A basic OpenGL compositor.
-///
-/// A compositor is responsible for initializing a renderer and managing window
-/// surfaces.
-///
-/// For now, this compositor only deals with a single global surface
-/// for drawing. However, the trait will most likely change in the near future
-/// to handle multiple surfaces at once.
-///
-/// If you implement an OpenGL renderer, you can implement this trait to ease
-/// integration with existing windowing shells, like `iced_glutin`.
-pub trait GLCompositor: Sized {
-    /// The renderer of the [`GLCompositor`].
-    ///
-    /// This should point to your renderer type, which could be a type alias
-    /// of the [`Renderer`] provided in this crate with with a specific
-    /// [`Backend`].
-    ///
-    /// [`Renderer`]: crate::Renderer
-    /// [`Backend`]: crate::Backend
-    type Renderer: iced_native::Renderer;
-
-    /// The settings of the [`GLCompositor`].
-    ///
-    /// It's up to you to decide the configuration supported by your renderer!
-    type Settings: Default;
-
-    /// Creates a new [`GLCompositor`] and [`Renderer`] with the given
-    /// [`Settings`] and an OpenGL address loader function.
-    ///
-    /// # Safety
-    /// The `loader_function` should resolve to valid OpenGL bindings.
-    ///
-    /// [`Renderer`]: crate::Renderer
-    /// [`Backend`]: crate::Backend
-    /// [`Settings`]: Self::Settings
-    #[allow(unsafe_code)]
-    unsafe fn new(
-        settings: Self::Settings,
-        loader_function: impl FnMut(&str) -> *const c_void,
-    ) -> Result<(Self, Self::Renderer), Error>;
-
-    /// Returns the amount of samples that should be used when configuring
-    /// an OpenGL context for this [`GLCompositor`].
-    fn sample_count(settings: &Self::Settings) -> u32;
-
-    /// Resizes the viewport of the [`GLCompositor`].
-    fn resize_viewport(&mut self, physical_size: Size<u32>);
-
-    /// Returns [`Information`] used by this [`GLCompositor`].
-    fn fetch_information(&self) -> Information;
-
-    /// Presents the primitives of the [`Renderer`] to the next frame of the
-    /// [`GLCompositor`].
-    ///
-    /// [`Renderer`]: crate::Renderer
-    fn present<T: AsRef<str>>(
-        &mut self,
-        renderer: &mut Self::Renderer,
-        viewport: &Viewport,
-        background_color: Color,
-        overlay: &[T],
-    );
-}
diff --git a/lazy/Cargo.toml b/lazy/Cargo.toml
deleted file mode 100644
index c739b312f8..0000000000
--- a/lazy/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "iced_lazy"
-version = "0.5.0"
-authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2021"
-description = "Lazy widgets for Iced"
-license = "MIT"
-repository = "https://github.com/iced-rs/iced"
-documentation = "https://docs.rs/iced_lazy"
-keywords = ["gui", "ui", "graphics", "interface", "widgets"]
-categories = ["gui"]
-
-[dependencies]
-ouroboros = "0.13"
-
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 1eedf0dac5..bc4e7ca19c 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -11,9 +11,6 @@ repository = "https://github.com/iced-rs/iced"
 debug = []
 
 [dependencies]
-twox-hash = { version = "1.5", default-features = false }
-unicode-segmentation = "1.6"
-num-traits = "0.2"
 thiserror = "1"
 
 [dependencies.iced_core]
@@ -24,7 +21,3 @@ path = "../core"
 version = "0.6"
 path = "../futures"
 features = ["thread-pool"]
-
-[dependencies.iced_style]
-version = "0.7"
-path = "../style"
diff --git a/native/src/clipboard.rs b/native/src/clipboard.rs
index c9105bc094..e727c4a740 100644
--- a/native/src/clipboard.rs
+++ b/native/src/clipboard.rs
@@ -3,28 +3,6 @@ use iced_futures::MaybeSend;
 
 use std::fmt;
 
-/// A buffer for short-term storage and transfer within and between
-/// applications.
-pub trait Clipboard {
-    /// Reads the current content of the [`Clipboard`] as text.
-    fn read(&self) -> Option<String>;
-
-    /// Writes the given text contents to the [`Clipboard`].
-    fn write(&mut self, contents: String);
-}
-
-/// A null implementation of the [`Clipboard`] trait.
-#[derive(Debug, Clone, Copy)]
-pub struct Null;
-
-impl Clipboard for Null {
-    fn read(&self) -> Option<String> {
-        None
-    }
-
-    fn write(&mut self, _contents: String) {}
-}
-
 /// A clipboard action to be performed by some [`Command`].
 ///
 /// [`Command`]: crate::Command
diff --git a/native/src/command.rs b/native/src/command.rs
index ca9d0b64ad..39bee8f6d8 100644
--- a/native/src/command.rs
+++ b/native/src/command.rs
@@ -28,7 +28,9 @@ impl<T> Command<T> {
     }
 
     /// Creates a [`Command`] that performs a [`widget::Operation`].
-    pub fn widget(operation: impl widget::Operation<T> + 'static) -> Self {
+    pub fn widget(
+        operation: impl iced_core::widget::Operation<T> + 'static,
+    ) -> Self {
         Self(iced_futures::Command::single(Action::Widget(
             widget::Action::new(operation),
         )))
diff --git a/native/src/debug/basic.rs b/native/src/debug/basic.rs
index 92f614da5f..32f725a1d6 100644
--- a/native/src/debug/basic.rs
+++ b/native/src/debug/basic.rs
@@ -1,5 +1,5 @@
 #![allow(missing_docs)]
-use crate::time;
+use crate::core::time;
 
 use std::collections::VecDeque;
 
diff --git a/native/src/lib.rs b/native/src/lib.rs
index c98827e76f..0fc4f324c1 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -42,32 +42,19 @@
     clippy::useless_conversion
 )]
 #![forbid(unsafe_code, rust_2018_idioms)]
-#![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 pub mod clipboard;
 pub mod command;
-pub mod event;
 pub mod font;
-pub mod image;
 pub mod keyboard;
-pub mod layout;
-pub mod mouse;
-pub mod overlay;
 pub mod program;
-pub mod renderer;
 pub mod subscription;
-pub mod svg;
 pub mod system;
-pub mod text;
-pub mod touch;
 pub mod user_interface;
 pub mod widget;
 pub mod window;
 
-mod element;
-mod hasher;
 mod runtime;
-mod shell;
 
 // We disable debug capabilities on release builds unless the `debug` feature
 // is explicitly enabled.
@@ -78,35 +65,13 @@ mod debug;
 #[path = "debug/null.rs"]
 mod debug;
 
-pub use iced_core::alignment;
-pub use iced_core::gradient;
-pub use iced_core::time;
-pub use iced_core::{
-    color, Alignment, Background, Color, ContentFit, Length, Padding, Pixels,
-    Point, Rectangle, Size, Vector,
-};
-pub use iced_futures::{executor, futures};
-pub use iced_style::application;
-pub use iced_style::theme;
+pub use iced_core as core;
+pub use iced_futures as futures;
 
-#[doc(no_inline)]
-pub use executor::Executor;
-
-pub use clipboard::Clipboard;
 pub use command::Command;
 pub use debug::Debug;
-pub use element::Element;
-pub use event::Event;
 pub use font::Font;
-pub use gradient::Gradient;
-pub use hasher::Hasher;
-pub use layout::Layout;
-pub use overlay::Overlay;
 pub use program::Program;
-pub use renderer::Renderer;
 pub use runtime::Runtime;
-pub use shell::Shell;
 pub use subscription::Subscription;
-pub use theme::Theme;
 pub use user_interface::UserInterface;
-pub use widget::Widget;
diff --git a/native/src/mouse.rs b/native/src/mouse.rs
deleted file mode 100644
index 9ee406cfe2..0000000000
--- a/native/src/mouse.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Track mouse events.
-
-pub mod click;
-
-pub use click::Click;
-pub use iced_core::mouse::*;
diff --git a/native/src/program.rs b/native/src/program.rs
index 25cab3329e..44585cc55d 100644
--- a/native/src/program.rs
+++ b/native/src/program.rs
@@ -1,6 +1,8 @@
 //! Build interactive programs using The Elm Architecture.
-use crate::text;
-use crate::{Command, Element, Renderer};
+use crate::Command;
+
+use iced_core::text;
+use iced_core::{Element, Renderer};
 
 mod state;
 
diff --git a/native/src/program/state.rs b/native/src/program/state.rs
index 8ae1cacbc8..2fa9934d8f 100644
--- a/native/src/program/state.rs
+++ b/native/src/program/state.rs
@@ -1,9 +1,9 @@
-use crate::application;
-use crate::event::{self, Event};
-use crate::mouse;
-use crate::renderer;
+use crate::core::event::{self, Event};
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::{Clipboard, Point, Size};
 use crate::user_interface::{self, UserInterface};
-use crate::{Clipboard, Command, Debug, Point, Program, Size};
+use crate::{Command, Debug, Program};
 
 /// The execution state of a [`Program`]. It leverages caching, event
 /// processing, and rendering primitive storage.
@@ -22,7 +22,6 @@ where
 impl<P> State<P>
 where
     P: Program + 'static,
-    <P::Renderer as crate::Renderer>::Theme: application::StyleSheet,
 {
     /// Creates a new [`State`] with the provided [`Program`], initializing its
     /// primitive with the given logical bounds and renderer.
@@ -91,7 +90,7 @@ where
         bounds: Size,
         cursor_position: Point,
         renderer: &mut P::Renderer,
-        theme: &<P::Renderer as crate::Renderer>::Theme,
+        theme: &<P::Renderer as iced_core::Renderer>::Theme,
         style: &renderer::Style,
         clipboard: &mut dyn Clipboard,
         debug: &mut Debug,
@@ -182,10 +181,7 @@ fn build_user_interface<'a, P: Program>(
     renderer: &mut P::Renderer,
     size: Size,
     debug: &mut Debug,
-) -> UserInterface<'a, P::Message, P::Renderer>
-where
-    <P::Renderer as crate::Renderer>::Theme: application::StyleSheet,
-{
+) -> UserInterface<'a, P::Message, P::Renderer> {
     debug.view_started();
     let view = program.view();
     debug.view_finished();
diff --git a/native/src/runtime.rs b/native/src/runtime.rs
index 5b0a692550..1b81314f07 100644
--- a/native/src/runtime.rs
+++ b/native/src/runtime.rs
@@ -1,6 +1,6 @@
 //! Run commands and subscriptions.
-use crate::event::{self, Event};
-use crate::Hasher;
+use iced_core::event::{self, Event};
+use iced_core::Hasher;
 
 /// A native runtime with a generic executor and receiver of results.
 ///
diff --git a/native/src/subscription.rs b/native/src/subscription.rs
index 16e78e8296..b16bcb0370 100644
--- a/native/src/subscription.rs
+++ b/native/src/subscription.rs
@@ -1,10 +1,9 @@
 //! Listen to external events in your application.
-use crate::event::{self, Event};
-use crate::window;
-use crate::Hasher;
-
-use iced_futures::futures::{self, Future, Stream};
-use iced_futures::{BoxStream, MaybeSend};
+use crate::core::event::{self, Event};
+use crate::core::window;
+use crate::core::Hasher;
+use crate::futures::futures::{self, Future, Stream};
+use crate::futures::{BoxStream, MaybeSend};
 
 use std::hash::Hash;
 
@@ -144,7 +143,9 @@ where
 ///
 /// ```
 /// use iced_native::subscription::{self, Subscription};
-/// use iced_native::futures::channel::mpsc;
+/// use iced_native::futures::futures;
+///
+/// use futures::channel::mpsc;
 ///
 /// pub enum Event {
 ///     Ready(mpsc::Sender<Input>),
@@ -174,7 +175,7 @@ where
 ///                 (Some(Event::Ready(sender)), State::Ready(receiver))
 ///             }
 ///             State::Ready(mut receiver) => {
-///                 use iced_native::futures::StreamExt;
+///                 use futures::StreamExt;
 ///
 ///                 // Read next input sent from `Application`
 ///                 let input = receiver.select_next_some().await;
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index 68ccda55dd..315027fa08 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -1,14 +1,12 @@
 //! Implement your own event loop to drive a user interface.
-use crate::application;
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::widget;
-use crate::window;
-use crate::{
-    Clipboard, Element, Layout, Point, Rectangle, Shell, Size, Vector,
-};
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::window;
+use crate::core::{Clipboard, Point, Rectangle, Size, Vector};
+use crate::core::{Element, Layout, Shell};
 
 /// A set of interactive graphical elements with a specific [`Layout`].
 ///
@@ -34,8 +32,7 @@ pub struct UserInterface<'a, Message, Renderer> {
 
 impl<'a, Message, Renderer> UserInterface<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
-    Renderer::Theme: application::StyleSheet,
+    Renderer: iced_core::Renderer,
 {
     /// Builds a user interface for an [`Element`].
     ///
@@ -48,24 +45,21 @@ where
     /// is naive way to set up our application loop:
     ///
     /// ```no_run
-    /// use iced_native::Size;
-    /// use iced_native::user_interface::{self, UserInterface};
-    /// use iced_wgpu::Renderer;
-    ///
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::renderer::Null as Renderer;
+    /// #     pub use iced_native::core::renderer::Null as Renderer;
     /// # }
     /// #
-    /// # use iced_native::widget::Column;
-    /// #
     /// # pub struct Counter;
     /// #
     /// # impl Counter {
     /// #     pub fn new() -> Self { Counter }
-    /// #     pub fn view(&self) -> Column<(), Renderer> {
-    /// #         Column::new()
-    /// #     }
+    /// #     pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
+    /// #     pub fn update(&mut self, _: ()) {}
     /// # }
+    /// use iced_native::core::Size;
+    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_wgpu::Renderer;
+    ///
     /// // Initialization
     /// let mut counter = Counter::new();
     /// let mut cache = user_interface::Cache::new();
@@ -124,25 +118,21 @@ where
     /// completing [the previous example](#example):
     ///
     /// ```no_run
-    /// use iced_native::{clipboard, Size, Point};
-    /// use iced_native::user_interface::{self, UserInterface};
-    /// use iced_wgpu::Renderer;
-    ///
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::renderer::Null as Renderer;
+    /// #     pub use iced_native::core::renderer::Null as Renderer;
     /// # }
     /// #
-    /// # use iced_native::widget::Column;
-    /// #
     /// # pub struct Counter;
     /// #
     /// # impl Counter {
     /// #     pub fn new() -> Self { Counter }
-    /// #     pub fn view(&self) -> Column<(), Renderer> {
-    /// #         Column::new()
-    /// #     }
-    /// #     pub fn update(&mut self, message: ()) {}
+    /// #     pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
+    /// #     pub fn update(&mut self, _: ()) {}
     /// # }
+    /// use iced_native::core::{clipboard, Size, Point};
+    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_wgpu::Renderer;
+    ///
     /// let mut counter = Counter::new();
     /// let mut cache = user_interface::Cache::new();
     /// let mut renderer = Renderer::new();
@@ -357,27 +347,24 @@ where
     /// [completing the last example](#example-1):
     ///
     /// ```no_run
-    /// use iced_native::clipboard;
-    /// use iced_native::renderer;
-    /// use iced_native::user_interface::{self, UserInterface};
-    /// use iced_native::{Size, Point, Theme};
-    /// use iced_wgpu::Renderer;
-    ///
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::renderer::Null as Renderer;
+    /// #     pub use iced_native::core::renderer::Null as Renderer;
+    /// #     pub type Theme = ();
     /// # }
     /// #
-    /// # use iced_native::widget::Column;
-    /// #
     /// # pub struct Counter;
     /// #
     /// # impl Counter {
     /// #     pub fn new() -> Self { Counter }
-    /// #     pub fn view(&self) -> Column<(), Renderer> {
-    /// #         Column::new()
-    /// #     }
-    /// #     pub fn update(&mut self, message: ()) {}
+    /// #     pub fn view(&self) -> Element<(), Renderer> { unimplemented!() }
+    /// #     pub fn update(&mut self, _: ()) {}
     /// # }
+    /// use iced_native::core::clipboard;
+    /// use iced_native::core::renderer;
+    /// use iced_native::core::{Element, Size, Point};
+    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_wgpu::{Renderer, Theme};
+    ///
     /// let mut counter = Counter::new();
     /// let mut cache = user_interface::Cache::new();
     /// let mut renderer = Renderer::new();
@@ -386,6 +373,7 @@ where
     /// let mut clipboard = clipboard::Null;
     /// let mut events = Vec::new();
     /// let mut messages = Vec::new();
+    /// let mut theme = Theme::default();
     ///
     /// loop {
     ///     // Obtain system events...
@@ -407,7 +395,7 @@ where
     ///     );
     ///
     ///     // Draw the user interface
-    ///     let mouse_cursor = user_interface.draw(&mut renderer, &Theme::default(), &renderer::Style::default(), cursor_position);
+    ///     let mouse_cursor = user_interface.draw(&mut renderer, &theme, &renderer::Style::default(), cursor_position);
     ///
     ///     cache = user_interface.into_cache();
     ///
diff --git a/native/src/widget.rs b/native/src/widget.rs
index 2b3ca7be07..0fdade5446 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -11,212 +11,6 @@
 //! source of inspiration.
 //!
 //! [renderer]: crate::renderer
-pub mod button;
-pub mod checkbox;
-pub mod column;
-pub mod container;
-pub mod helpers;
-pub mod image;
-pub mod operation;
-pub mod pane_grid;
-pub mod pick_list;
-pub mod progress_bar;
-pub mod radio;
-pub mod row;
-pub mod rule;
-pub mod scrollable;
-pub mod slider;
-pub mod space;
-pub mod svg;
-pub mod text;
-pub mod text_input;
-pub mod toggler;
-pub mod tooltip;
-pub mod tree;
-pub mod vertical_slider;
-
 mod action;
-mod id;
-
-#[doc(no_inline)]
-pub use button::Button;
-#[doc(no_inline)]
-pub use checkbox::Checkbox;
-#[doc(no_inline)]
-pub use column::Column;
-#[doc(no_inline)]
-pub use container::Container;
-#[doc(no_inline)]
-pub use helpers::*;
-#[doc(no_inline)]
-pub use image::Image;
-#[doc(no_inline)]
-pub use pane_grid::PaneGrid;
-#[doc(no_inline)]
-pub use pick_list::PickList;
-#[doc(no_inline)]
-pub use progress_bar::ProgressBar;
-#[doc(no_inline)]
-pub use radio::Radio;
-#[doc(no_inline)]
-pub use row::Row;
-#[doc(no_inline)]
-pub use rule::Rule;
-#[doc(no_inline)]
-pub use scrollable::Scrollable;
-#[doc(no_inline)]
-pub use slider::Slider;
-#[doc(no_inline)]
-pub use space::Space;
-#[doc(no_inline)]
-pub use svg::Svg;
-#[doc(no_inline)]
-pub use text::Text;
-#[doc(no_inline)]
-pub use text_input::TextInput;
-#[doc(no_inline)]
-pub use toggler::Toggler;
-#[doc(no_inline)]
-pub use tooltip::Tooltip;
-#[doc(no_inline)]
-pub use tree::Tree;
-#[doc(no_inline)]
-pub use vertical_slider::VerticalSlider;
 
 pub use action::Action;
-pub use id::Id;
-pub use operation::Operation;
-
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::{Clipboard, Layout, Length, Point, Rectangle, Shell};
-
-/// A component that displays information and allows interaction.
-///
-/// If you want to build your own widgets, you will need to implement this
-/// trait.
-///
-/// # Examples
-/// The repository has some [examples] showcasing how to implement a custom
-/// widget:
-///
-/// - [`bezier_tool`], a Paint-like tool for drawing Bézier curves using
-/// [`lyon`].
-/// - [`custom_widget`], a demonstration of how to build a custom widget that
-/// draws a circle.
-/// - [`geometry`], a custom widget showcasing how to draw geometry with the
-/// `Mesh2D` primitive in [`iced_wgpu`].
-///
-/// [examples]: https://github.com/iced-rs/iced/tree/0.8/examples
-/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.8/examples/bezier_tool
-/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.8/examples/custom_widget
-/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.8/examples/geometry
-/// [`lyon`]: https://github.com/nical/lyon
-/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/wgpu
-pub trait Widget<Message, Renderer>
-where
-    Renderer: crate::Renderer,
-{
-    /// Returns the width of the [`Widget`].
-    fn width(&self) -> Length;
-
-    /// Returns the height of the [`Widget`].
-    fn height(&self) -> Length;
-
-    /// Returns the [`layout::Node`] of the [`Widget`].
-    ///
-    /// This [`layout::Node`] is used by the runtime to compute the [`Layout`] of the
-    /// user interface.
-    fn layout(
-        &self,
-        renderer: &Renderer,
-        limits: &layout::Limits,
-    ) -> layout::Node;
-
-    /// Draws the [`Widget`] using the associated `Renderer`.
-    fn draw(
-        &self,
-        state: &Tree,
-        renderer: &mut Renderer,
-        theme: &Renderer::Theme,
-        style: &renderer::Style,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        viewport: &Rectangle,
-    );
-
-    /// Returns the [`Tag`] of the [`Widget`].
-    ///
-    /// [`Tag`]: tree::Tag
-    fn tag(&self) -> tree::Tag {
-        tree::Tag::stateless()
-    }
-
-    /// Returns the [`State`] of the [`Widget`].
-    ///
-    /// [`State`]: tree::State
-    fn state(&self) -> tree::State {
-        tree::State::None
-    }
-
-    /// Returns the state [`Tree`] of the children of the [`Widget`].
-    fn children(&self) -> Vec<Tree> {
-        Vec::new()
-    }
-
-    /// Reconciliates the [`Widget`] with the provided [`Tree`].
-    fn diff(&self, _tree: &mut Tree) {}
-
-    /// Applies an [`Operation`] to the [`Widget`].
-    fn operate(
-        &self,
-        _state: &mut Tree,
-        _layout: Layout<'_>,
-        _renderer: &Renderer,
-        _operation: &mut dyn Operation<Message>,
-    ) {
-    }
-
-    /// Processes a runtime [`Event`].
-    ///
-    /// By default, it does nothing.
-    fn on_event(
-        &mut self,
-        _state: &mut Tree,
-        _event: Event,
-        _layout: Layout<'_>,
-        _cursor_position: Point,
-        _renderer: &Renderer,
-        _clipboard: &mut dyn Clipboard,
-        _shell: &mut Shell<'_, Message>,
-    ) -> event::Status {
-        event::Status::Ignored
-    }
-
-    /// Returns the current [`mouse::Interaction`] of the [`Widget`].
-    ///
-    /// By default, it returns [`mouse::Interaction::Idle`].
-    fn mouse_interaction(
-        &self,
-        _state: &Tree,
-        _layout: Layout<'_>,
-        _cursor_position: Point,
-        _viewport: &Rectangle,
-        _renderer: &Renderer,
-    ) -> mouse::Interaction {
-        mouse::Interaction::Idle
-    }
-
-    /// Returns the overlay of the [`Widget`], if there is any.
-    fn overlay<'a>(
-        &'a mut self,
-        _state: &'a mut Tree,
-        _layout: Layout<'_>,
-        _renderer: &Renderer,
-    ) -> Option<overlay::Element<'a, Message, Renderer>> {
-        None
-    }
-}
diff --git a/native/src/widget/action.rs b/native/src/widget/action.rs
index 3f1b6b6cf6..f50d7aec25 100644
--- a/native/src/widget/action.rs
+++ b/native/src/widget/action.rs
@@ -1,8 +1,7 @@
-use crate::widget::operation::{
+use iced_core::widget::operation::{
     self, Focusable, Operation, Scrollable, TextInput,
 };
-use crate::widget::Id;
-
+use iced_core::widget::Id;
 use iced_futures::MaybeSend;
 
 use std::any::Any;
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
deleted file mode 100644
index d13eca7598..0000000000
--- a/native/src/widget/helpers.rs
+++ /dev/null
@@ -1,317 +0,0 @@
-//! Helper functions to create pure widgets.
-use crate::overlay;
-use crate::widget;
-use crate::{Element, Length, Pixels};
-
-use std::borrow::Cow;
-use std::ops::RangeInclusive;
-
-/// Creates a [`Column`] with the given children.
-///
-/// [`Column`]: widget::Column
-#[macro_export]
-macro_rules! column {
-    () => (
-        $crate::widget::Column::new()
-    );
-    ($($x:expr),+ $(,)?) => (
-        $crate::widget::Column::with_children(vec![$($crate::Element::from($x)),+])
-    );
-}
-
-/// Creates a [`Row`] with the given children.
-///
-/// [`Row`]: widget::Row
-#[macro_export]
-macro_rules! row {
-    () => (
-        $crate::widget::Row::new()
-    );
-    ($($x:expr),+ $(,)?) => (
-        $crate::widget::Row::with_children(vec![$($crate::Element::from($x)),+])
-    );
-}
-
-/// Creates a new [`Container`] with the provided content.
-///
-/// [`Container`]: widget::Container
-pub fn container<'a, Message, Renderer>(
-    content: impl Into<Element<'a, Message, Renderer>>,
-) -> widget::Container<'a, Message, Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::container::StyleSheet,
-{
-    widget::Container::new(content)
-}
-
-/// Creates a new [`Column`] with the given children.
-///
-/// [`Column`]: widget::Column
-pub fn column<Message, Renderer>(
-    children: Vec<Element<'_, Message, Renderer>>,
-) -> widget::Column<'_, Message, Renderer> {
-    widget::Column::with_children(children)
-}
-
-/// Creates a new [`Row`] with the given children.
-///
-/// [`Row`]: widget::Row
-pub fn row<Message, Renderer>(
-    children: Vec<Element<'_, Message, Renderer>>,
-) -> widget::Row<'_, Message, Renderer> {
-    widget::Row::with_children(children)
-}
-
-/// Creates a new [`Scrollable`] with the provided content.
-///
-/// [`Scrollable`]: widget::Scrollable
-pub fn scrollable<'a, Message, Renderer>(
-    content: impl Into<Element<'a, Message, Renderer>>,
-) -> widget::Scrollable<'a, Message, Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::scrollable::StyleSheet,
-{
-    widget::Scrollable::new(content)
-}
-
-/// Creates a new [`Button`] with the provided content.
-///
-/// [`Button`]: widget::Button
-pub fn button<'a, Message, Renderer>(
-    content: impl Into<Element<'a, Message, Renderer>>,
-) -> widget::Button<'a, Message, Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::button::StyleSheet,
-    <Renderer::Theme as widget::button::StyleSheet>::Style: Default,
-{
-    widget::Button::new(content)
-}
-
-/// Creates a new [`Tooltip`] with the provided content, tooltip text, and [`tooltip::Position`].
-///
-/// [`Tooltip`]: widget::Tooltip
-/// [`tooltip::Position`]: widget::tooltip::Position
-pub fn tooltip<'a, Message, Renderer>(
-    content: impl Into<Element<'a, Message, Renderer>>,
-    tooltip: impl ToString,
-    position: widget::tooltip::Position,
-) -> widget::Tooltip<'a, Message, Renderer>
-where
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::container::StyleSheet + widget::text::StyleSheet,
-{
-    widget::Tooltip::new(content, tooltip.to_string(), position)
-}
-
-/// Creates a new [`Text`] widget with the provided content.
-///
-/// [`Text`]: widget::Text
-pub fn text<'a, Renderer>(text: impl ToString) -> widget::Text<'a, Renderer>
-where
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::text::StyleSheet,
-{
-    widget::Text::new(text.to_string())
-}
-
-/// Creates a new [`Checkbox`].
-///
-/// [`Checkbox`]: widget::Checkbox
-pub fn checkbox<'a, Message, Renderer>(
-    label: impl Into<String>,
-    is_checked: bool,
-    f: impl Fn(bool) -> Message + 'a,
-) -> widget::Checkbox<'a, Message, Renderer>
-where
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::checkbox::StyleSheet + widget::text::StyleSheet,
-{
-    widget::Checkbox::new(label, is_checked, f)
-}
-
-/// Creates a new [`Radio`].
-///
-/// [`Radio`]: widget::Radio
-pub fn radio<Message, Renderer, V>(
-    label: impl Into<String>,
-    value: V,
-    selected: Option<V>,
-    on_click: impl FnOnce(V) -> Message,
-) -> widget::Radio<Message, Renderer>
-where
-    Message: Clone,
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::radio::StyleSheet,
-    V: Copy + Eq,
-{
-    widget::Radio::new(value, label, selected, on_click)
-}
-
-/// Creates a new [`Toggler`].
-///
-/// [`Toggler`]: widget::Toggler
-pub fn toggler<'a, Message, Renderer>(
-    label: impl Into<Option<String>>,
-    is_checked: bool,
-    f: impl Fn(bool) -> Message + 'a,
-) -> widget::Toggler<'a, Message, Renderer>
-where
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::toggler::StyleSheet,
-{
-    widget::Toggler::new(label, is_checked, f)
-}
-
-/// Creates a new [`TextInput`].
-///
-/// [`TextInput`]: widget::TextInput
-pub fn text_input<'a, Message, Renderer>(
-    placeholder: &str,
-    value: &str,
-    on_change: impl Fn(String) -> Message + 'a,
-) -> widget::TextInput<'a, Message, Renderer>
-where
-    Message: Clone,
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::text_input::StyleSheet,
-{
-    widget::TextInput::new(placeholder, value, on_change)
-}
-
-/// Creates a new [`Slider`].
-///
-/// [`Slider`]: widget::Slider
-pub fn slider<'a, T, Message, Renderer>(
-    range: std::ops::RangeInclusive<T>,
-    value: T,
-    on_change: impl Fn(T) -> Message + 'a,
-) -> widget::Slider<'a, T, Message, Renderer>
-where
-    T: Copy + From<u8> + std::cmp::PartialOrd,
-    Message: Clone,
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::slider::StyleSheet,
-{
-    widget::Slider::new(range, value, on_change)
-}
-
-/// Creates a new [`VerticalSlider`].
-///
-/// [`VerticalSlider`]: widget::VerticalSlider
-pub fn vertical_slider<'a, T, Message, Renderer>(
-    range: std::ops::RangeInclusive<T>,
-    value: T,
-    on_change: impl Fn(T) -> Message + 'a,
-) -> widget::VerticalSlider<'a, T, Message, Renderer>
-where
-    T: Copy + From<u8> + std::cmp::PartialOrd,
-    Message: Clone,
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::slider::StyleSheet,
-{
-    widget::VerticalSlider::new(range, value, on_change)
-}
-
-/// Creates a new [`PickList`].
-///
-/// [`PickList`]: widget::PickList
-pub fn pick_list<'a, Message, Renderer, T>(
-    options: impl Into<Cow<'a, [T]>>,
-    selected: Option<T>,
-    on_selected: impl Fn(T) -> Message + 'a,
-) -> widget::PickList<'a, T, Message, Renderer>
-where
-    T: ToString + Eq + 'static,
-    [T]: ToOwned<Owned = Vec<T>>,
-    Renderer: crate::text::Renderer,
-    Renderer::Theme: widget::pick_list::StyleSheet
-        + widget::scrollable::StyleSheet
-        + overlay::menu::StyleSheet
-        + widget::container::StyleSheet,
-    <Renderer::Theme as overlay::menu::StyleSheet>::Style:
-        From<<Renderer::Theme as widget::pick_list::StyleSheet>::Style>,
-{
-    widget::PickList::new(options, selected, on_selected)
-}
-
-/// Creates a new [`Image`].
-///
-/// [`Image`]: widget::Image
-pub fn image<Handle>(handle: impl Into<Handle>) -> widget::Image<Handle> {
-    widget::Image::new(handle.into())
-}
-
-/// Creates a new horizontal [`Space`] with the given [`Length`].
-///
-/// [`Space`]: widget::Space
-pub fn horizontal_space(width: impl Into<Length>) -> widget::Space {
-    widget::Space::with_width(width)
-}
-
-/// Creates a new vertical [`Space`] with the given [`Length`].
-///
-/// [`Space`]: widget::Space
-pub fn vertical_space(height: impl Into<Length>) -> widget::Space {
-    widget::Space::with_height(height)
-}
-
-/// Creates a horizontal [`Rule`] with the given height.
-///
-/// [`Rule`]: widget::Rule
-pub fn horizontal_rule<Renderer>(
-    height: impl Into<Pixels>,
-) -> widget::Rule<Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::rule::StyleSheet,
-{
-    widget::Rule::horizontal(height)
-}
-
-/// Creates a vertical [`Rule`] with the given width.
-///
-/// [`Rule`]: widget::Rule
-pub fn vertical_rule<Renderer>(
-    width: impl Into<Pixels>,
-) -> widget::Rule<Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::rule::StyleSheet,
-{
-    widget::Rule::vertical(width)
-}
-
-/// Creates a new [`ProgressBar`].
-///
-/// It expects:
-///   * an inclusive range of possible values, and
-///   * the current value of the [`ProgressBar`].
-///
-/// [`ProgressBar`]: widget::ProgressBar
-pub fn progress_bar<Renderer>(
-    range: RangeInclusive<f32>,
-    value: f32,
-) -> widget::ProgressBar<Renderer>
-where
-    Renderer: crate::Renderer,
-    Renderer::Theme: widget::progress_bar::StyleSheet,
-{
-    widget::ProgressBar::new(range, value)
-}
-
-/// Creates a new [`Svg`] widget from the given [`Handle`].
-///
-/// [`Svg`]: widget::Svg
-/// [`Handle`]: widget::svg::Handle
-pub fn svg<Renderer>(
-    handle: impl Into<widget::svg::Handle>,
-) -> widget::Svg<Renderer>
-where
-    Renderer: crate::svg::Renderer,
-    Renderer::Theme: widget::svg::StyleSheet,
-{
-    widget::Svg::new(handle)
-}
diff --git a/native/src/window.rs b/native/src/window.rs
index a5cdc8ceda..97a96e5439 100644
--- a/native/src/window.rs
+++ b/native/src/window.rs
@@ -1,18 +1,11 @@
 //! Build window-based GUI applications.
 mod action;
-mod event;
-mod mode;
-mod redraw_request;
-mod user_attention;
 
 pub use action::Action;
-pub use event::Event;
-pub use mode::Mode;
-pub use redraw_request::RedrawRequest;
-pub use user_attention::UserAttention;
 
+use crate::core::time::Instant;
+use crate::core::window::Event;
 use crate::subscription::{self, Subscription};
-use crate::time::Instant;
 
 /// Subscribes to the frames of the window of the running application.
 ///
@@ -24,7 +17,7 @@ use crate::time::Instant;
 /// animations without missing any frames.
 pub fn frames() -> Subscription<Instant> {
     subscription::raw_events(|event, _status| match event {
-        crate::Event::Window(Event::RedrawRequested(at)) => Some(at),
+        iced_core::Event::Window(Event::RedrawRequested(at)) => Some(at),
         _ => None,
     })
 }
diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index ce36d129d7..c1dbd84f2e 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -1,6 +1,6 @@
-use crate::window::{Mode, UserAttention};
+use crate::core::window::{Mode, UserAttention};
+use crate::futures::MaybeSend;
 
-use iced_futures::MaybeSend;
 use std::fmt;
 
 /// An operation to be performed on some window.
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 189f530976..d0420ad04e 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -13,10 +13,6 @@ tracing = ["iced_wgpu/tracing"]
 raw-window-handle = "0.5"
 thiserror = "1"
 
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index b0a409dc76..bf5da322af 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -1,7 +1,6 @@
-use crate::{Font, Point, Size};
-
-use iced_graphics::backend;
-use iced_graphics::text;
+use crate::core::text;
+use crate::core::{Font, Point, Size};
+use crate::graphics::backend;
 
 use std::borrow::Cow;
 
@@ -99,7 +98,7 @@ impl backend::Text for Backend {
 
 #[cfg(feature = "image")]
 impl backend::Image for Backend {
-    fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
+    fn dimensions(&self, handle: &crate::core::image::Handle) -> Size<u32> {
         match self {
             Self::Wgpu(backend) => backend.dimensions(handle),
             Self::TinySkia(backend) => backend.dimensions(handle),
@@ -111,7 +110,7 @@ impl backend::Image for Backend {
 impl backend::Svg for Backend {
     fn viewport_dimensions(
         &self,
-        handle: &iced_native::svg::Handle,
+        handle: &crate::core::svg::Handle,
     ) -> Size<u32> {
         match self {
             Self::Wgpu(backend) => backend.viewport_dimensions(handle),
diff --git a/renderer/src/window/compositor.rs b/renderer/src/compositor.rs
similarity index 94%
rename from renderer/src/window/compositor.rs
rename to renderer/src/compositor.rs
index a11374eda6..0cdcb2938f 100644
--- a/renderer/src/window/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -1,9 +1,10 @@
-use crate::{Backend, Color, Error, Renderer, Settings, Viewport};
+use crate::core::Color;
+use crate::graphics::compositor::{Information, SurfaceError};
+use crate::graphics::{Error, Viewport};
+use crate::{Backend, Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 
-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>),
@@ -14,7 +15,7 @@ pub enum Surface {
     TinySkia(iced_tiny_skia::window::Surface),
 }
 
-impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
+impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
     type Surface = Surface;
diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index e491ea734e..361fc86bcb 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -2,9 +2,9 @@ mod cache;
 
 pub use cache::Cache;
 
-pub use iced_graphics::geometry::*;
-
-use crate::{Backend, Point, Rectangle, Size, Vector};
+use crate::core::{Point, Rectangle, Size, Vector};
+use crate::graphics::geometry::{Fill, Geometry, Path, Stroke, Text};
+use crate::Backend;
 
 pub enum Frame {
     Wgpu(iced_wgpu::geometry::Frame),
diff --git a/renderer/src/geometry/cache.rs b/renderer/src/geometry/cache.rs
index 1f1febddbb..2a3534d02a 100644
--- a/renderer/src/geometry/cache.rs
+++ b/renderer/src/geometry/cache.rs
@@ -1,5 +1,7 @@
+use crate::core::Size;
 use crate::geometry::{Frame, Geometry};
-use crate::{Primitive, Renderer, Size};
+use crate::graphics::Primitive;
+use crate::Renderer;
 
 use std::cell::RefCell;
 use std::sync::Arc;
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index aae3322d41..22ec7bd1d8 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,4 +1,4 @@
-pub mod window;
+pub mod compositor;
 
 #[cfg(feature = "geometry")]
 pub mod geometry;
@@ -6,18 +6,14 @@ pub mod geometry;
 mod backend;
 mod settings;
 
-pub use iced_graphics::primitive;
+pub use iced_graphics as graphics;
+pub use iced_graphics::core;
 
 pub use backend::Backend;
-pub use primitive::Primitive;
+pub use compositor::Compositor;
 pub use settings::Settings;
 
-pub use iced_graphics::{
-    Antialiasing, Color, Error, Font, Point, Rectangle, Size, Vector, Viewport,
-};
-
 /// The default graphics renderer for [`iced`].
 ///
 /// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme = iced_native::Theme> =
-    iced_graphics::Renderer<Backend, Theme>;
+pub type Renderer<Theme> = iced_graphics::Renderer<Backend, Theme>;
diff --git a/renderer/src/settings.rs b/renderer/src/settings.rs
index c4dc248b10..d32c87d37a 100644
--- a/renderer/src/settings.rs
+++ b/renderer/src/settings.rs
@@ -1,4 +1,5 @@
-use crate::{Antialiasing, Font};
+use crate::core::Font;
+use crate::graphics::Antialiasing;
 
 /// The settings of a [`Backend`].
 ///
diff --git a/renderer/src/window.rs b/renderer/src/window.rs
deleted file mode 100644
index a7c8911b15..0000000000
--- a/renderer/src/window.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod compositor;
-
-pub use compositor::Compositor;
diff --git a/src/advanced.rs b/src/advanced.rs
new file mode 100644
index 0000000000..714076e0c8
--- /dev/null
+++ b/src/advanced.rs
@@ -0,0 +1,9 @@
+//! Leverage advanced concepts like custom widgets.
+pub use crate::core::image;
+pub use crate::core::layout::{self, Layout};
+pub use crate::core::overlay::{self, Overlay};
+pub use crate::core::renderer::{self, Renderer};
+pub use crate::core::svg;
+pub use crate::core::text::{self, Text};
+pub use crate::core::widget::{self, Widget};
+pub use crate::core::{Clipboard, Shell};
diff --git a/src/application.rs b/src/application.rs
index b9871556e6..f5cf3317ea 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -1,7 +1,7 @@
 //! Build interactive cross-platform applications.
 use crate::{Command, Element, Executor, Settings, Subscription};
 
-pub use iced_native::application::{Appearance, StyleSheet};
+pub use crate::style::application::{Appearance, StyleSheet};
 
 /// An interactive cross-platform application.
 ///
@@ -198,24 +198,24 @@ pub trait Application: Sized {
             default_font: settings.default_font,
             default_text_size: settings.default_text_size,
             antialiasing: if settings.antialiasing {
-                Some(crate::renderer::Antialiasing::MSAAx4)
+                Some(crate::graphics::Antialiasing::MSAAx4)
             } else {
                 None
             },
             ..crate::renderer::Settings::default()
         };
 
-        Ok(crate::runtime::application::run::<
+        Ok(crate::shell::application::run::<
             Instance<Self>,
             Self::Executor,
-            crate::renderer::window::Compositor<Self::Theme>,
+            crate::renderer::Compositor<Self::Theme>,
         >(settings.into(), renderer_settings)?)
     }
 }
 
 struct Instance<A: Application>(A);
 
-impl<A> iced_winit::Program for Instance<A>
+impl<A> crate::native::Program for Instance<A>
 where
     A: Application,
 {
@@ -231,7 +231,7 @@ where
     }
 }
 
-impl<A> crate::runtime::Application for Instance<A>
+impl<A> crate::shell::Application for Instance<A>
 where
     A: Application,
 {
diff --git a/src/clipboard.rs b/src/clipboard.rs
deleted file mode 100644
index dde170514b..0000000000
--- a/src/clipboard.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//! Access the clipboard.
-#[cfg(not(target_arch = "wasm32"))]
-pub use crate::runtime::clipboard::{read, write};
diff --git a/src/element.rs b/src/element.rs
deleted file mode 100644
index 2eb1bb4db3..0000000000
--- a/src/element.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-/// A generic widget.
-///
-/// This is an alias of an `iced_native` element with a default `Renderer`.
-pub type Element<'a, Message, Renderer = crate::Renderer> =
-    crate::runtime::Element<'a, Message, Renderer>;
diff --git a/src/error.rs b/src/error.rs
index 5326718f1b..111bedf245 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,6 @@
-use iced_futures::futures;
+use crate::futures;
+use crate::graphics;
+use crate::shell;
 
 /// An error that occurred while running an application.
 #[derive(Debug, thiserror::Error)]
@@ -13,19 +15,19 @@ pub enum Error {
 
     /// The application graphics context could not be created.
     #[error("the application graphics context could not be created")]
-    GraphicsCreationFailed(iced_renderer::Error),
+    GraphicsCreationFailed(graphics::Error),
 }
 
-impl From<iced_winit::Error> for Error {
-    fn from(error: iced_winit::Error) -> Error {
+impl From<shell::Error> for Error {
+    fn from(error: shell::Error) -> Error {
         match error {
-            iced_winit::Error::ExecutorCreationFailed(error) => {
+            shell::Error::ExecutorCreationFailed(error) => {
                 Error::ExecutorCreationFailed(error)
             }
-            iced_winit::Error::WindowCreationFailed(error) => {
+            shell::Error::WindowCreationFailed(error) => {
                 Error::WindowCreationFailed(Box::new(error))
             }
-            iced_winit::Error::GraphicsCreationFailed(error) => {
+            shell::Error::GraphicsCreationFailed(error) => {
                 Error::GraphicsCreationFailed(error)
             }
         }
diff --git a/src/executor.rs b/src/executor.rs
deleted file mode 100644
index 36ae274ec0..0000000000
--- a/src/executor.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-//! Choose your preferred executor to power your application.
-pub use crate::runtime::Executor;
-
-/// A default cross-platform executor.
-///
-/// - On native platforms, it will use:
-///   - `iced_futures::backend::native::tokio` when the `tokio` feature is enabled.
-///   - `iced_futures::backend::native::async-std` when the `async-std` feature is
-///     enabled.
-///   - `iced_futures::backend::native::smol` when the `smol` feature is enabled.
-///   - `iced_futures::backend::native::thread_pool` otherwise.
-///
-/// - On Wasm, it will use `iced_futures::backend::wasm::wasm_bindgen`.
-pub type Default = iced_futures::backend::default::Executor;
diff --git a/src/keyboard.rs b/src/keyboard.rs
deleted file mode 100644
index 2134a66bc3..0000000000
--- a/src/keyboard.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Listen and react to keyboard events.
-pub use crate::runtime::keyboard::{Event, KeyCode, Modifiers};
diff --git a/src/lib.rs b/src/lib.rs
index bb162f2d6f..b71b7781d5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -164,51 +164,133 @@
 #![forbid(rust_2018_idioms, unsafe_code)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
+use iced_widget::graphics;
+use iced_widget::renderer;
+use iced_widget::style;
+use iced_winit as shell;
+use iced_winit::core;
+use iced_winit::native;
+
+pub use iced_futures::futures;
 
-mod element;
 mod error;
-mod result;
 mod sandbox;
 
 pub mod application;
-pub mod clipboard;
-pub mod executor;
-pub mod keyboard;
-pub mod mouse;
-pub mod overlay;
 pub mod settings;
 pub mod time;
-pub mod touch;
-pub mod widget;
 pub mod window;
 
-use iced_renderer as renderer;
-use iced_winit as runtime;
+#[cfg(feature = "advanced")]
+pub mod advanced;
+
+pub use style::theme;
+
+pub use crate::core::alignment;
+pub use crate::core::event;
+pub use crate::core::{
+    color, Alignment, Background, Color, ContentFit, Length, Padding, Point,
+    Rectangle, Size, Vector,
+};
+pub use crate::native::Command;
+pub use native::subscription;
+
+pub mod clipboard {
+    //! Access the clipboard.
+    pub use crate::shell::clipboard::{read, write};
+}
+
+pub mod executor {
+    //! Choose your preferred executor to power your application.
+    pub use iced_futures::Executor;
+
+    /// A default cross-platform executor.
+    ///
+    /// - On native platforms, it will use:
+    ///   - `iced_futures::backend::native::tokio` when the `tokio` feature is enabled.
+    ///   - `iced_futures::backend::native::async-std` when the `async-std` feature is
+    ///     enabled.
+    ///   - `iced_futures::backend::native::smol` when the `smol` feature is enabled.
+    ///   - `iced_futures::backend::native::thread_pool` otherwise.
+    ///
+    /// - On Wasm, it will use `iced_futures::backend::wasm::wasm_bindgen`.
+    pub type Default = iced_futures::backend::default::Executor;
+}
+
+pub mod font {
+    //! Load and use fonts.
+    pub use crate::core::font::*;
+    pub use crate::native::font::*;
+}
+
+pub mod keyboard {
+    //! Listen and react to keyboard events.
+    pub use crate::core::keyboard::{Event, KeyCode, Modifiers};
+}
+
+pub mod mouse {
+    //! Listen and react to mouse events.
+    pub use crate::core::mouse::{Button, Event, Interaction, ScrollDelta};
+}
 
-pub use iced_native::theme;
-pub use runtime::event;
-pub use runtime::font;
-pub use runtime::subscription;
+#[cfg(feature = "system")]
+pub mod system {
+    //! Retrieve system information.
+    pub use crate::native::system::Information;
+    pub use crate::shell::system::*;
+}
+
+pub mod overlay {
+    //! Display interactive elements on top of other widgets.
+
+    /// A generic [`Overlay`].
+    ///
+    /// This is an alias of an `iced_native` element with a default `Renderer`.
+    ///
+    /// [`Overlay`]: iced_native::Overlay
+    pub type Element<'a, Message, Renderer = crate::Renderer> =
+        crate::core::overlay::Element<'a, Message, Renderer>;
+
+    pub use iced_widget::overlay::*;
+}
+
+pub mod touch {
+    //! Listen and react to touch events.
+    pub use crate::core::touch::{Event, Finger};
+}
+
+pub mod widget {
+    //! Use the built-in widgets or create your own.
+    pub use iced_widget::*;
+
+    // We hide the re-exported modules by `iced_widget`
+    mod core {}
+    mod graphics {}
+    mod native {}
+    mod renderer {}
+    mod style {}
+}
 
 pub use application::Application;
-pub use element::Element;
 pub use error::Error;
 pub use event::Event;
 pub use executor::Executor;
 pub use font::Font;
-pub use renderer::Renderer;
-pub use result::Result;
 pub use sandbox::Sandbox;
 pub use settings::Settings;
 pub use subscription::Subscription;
 pub use theme::Theme;
 
-pub use runtime::alignment;
-pub use runtime::futures;
-pub use runtime::{
-    color, Alignment, Background, Color, Command, ContentFit, Length, Padding,
-    Point, Rectangle, Size, Vector,
-};
+/// The default renderer.
+pub type Renderer<Theme = style::Theme> = renderer::Renderer<Theme>;
 
-#[cfg(feature = "system")]
-pub use runtime::system;
+/// A generic widget.
+///
+/// This is an alias of an `iced_native` element with a default `Renderer`.
+pub type Element<'a, Message, Renderer = crate::Renderer> =
+    crate::core::Element<'a, Message, Renderer>;
+
+/// The result of running an [`Application`].
+///
+/// [`Application`]: crate::Application
+pub type Result = std::result::Result<(), Error>;
diff --git a/src/mouse.rs b/src/mouse.rs
deleted file mode 100644
index d61ed09a06..0000000000
--- a/src/mouse.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Listen and react to mouse events.
-pub use crate::runtime::mouse::{Button, Event, Interaction, ScrollDelta};
diff --git a/src/overlay.rs b/src/overlay.rs
deleted file mode 100644
index c0f4c49202..0000000000
--- a/src/overlay.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-//! Display interactive elements on top of other widgets.
-
-/// A generic [`Overlay`].
-///
-/// This is an alias of an `iced_native` element with a default `Renderer`.
-///
-/// [`Overlay`]: iced_native::Overlay
-pub type Element<'a, Message, Renderer = crate::Renderer> =
-    iced_native::overlay::Element<'a, Message, Renderer>;
-
-pub mod menu {
-    //! Build and show dropdown menus.
-    pub use iced_native::overlay::menu::{Appearance, State, StyleSheet};
-
-    /// A widget that produces a message when clicked.
-    pub type Menu<'a, Message, Renderer = crate::Renderer> =
-        iced_native::overlay::Menu<'a, Message, Renderer>;
-}
diff --git a/src/result.rs b/src/result.rs
deleted file mode 100644
index ef565bd6cb..0000000000
--- a/src/result.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use crate::Error;
-
-/// The result of running an [`Application`].
-///
-/// [`Application`]: crate::Application
-pub type Result = std::result::Result<(), Error>;
diff --git a/src/touch.rs b/src/touch.rs
index 0b77c386ee..f2bdfca827 100644
--- a/src/touch.rs
+++ b/src/touch.rs
@@ -1,2 +1,2 @@
 //! Listen and react to touch events.
-pub use crate::runtime::touch::{Event, Finger};
+pub use crate::core::touch::{Event, Finger};
diff --git a/src/widget.rs b/src/widget.rs
deleted file mode 100644
index 19434e84b9..0000000000
--- a/src/widget.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-//! Display information and interactive controls in your application.
-pub use iced_native::widget::helpers::*;
-
-pub use iced_native::{column, row};
-
-/// A container that distributes its contents vertically.
-pub type Column<'a, Message, Renderer = crate::Renderer> =
-    iced_native::widget::Column<'a, Message, Renderer>;
-
-/// A container that distributes its contents horizontally.
-pub type Row<'a, Message, Renderer = crate::Renderer> =
-    iced_native::widget::Row<'a, Message, Renderer>;
-
-pub mod text {
-    //! Write some text for your users to read.
-    pub use iced_native::widget::text::{Appearance, StyleSheet};
-
-    /// A paragraph of text.
-    pub type Text<'a, Renderer = crate::Renderer> =
-        iced_native::widget::Text<'a, Renderer>;
-}
-
-pub mod button {
-    //! Allow your users to perform actions by pressing a button.
-    pub use iced_native::widget::button::{Appearance, StyleSheet};
-
-    /// A widget that produces a message when clicked.
-    pub type Button<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Button<'a, Message, Renderer>;
-}
-
-pub mod checkbox {
-    //! Show toggle controls using checkboxes.
-    pub use iced_native::widget::checkbox::{Appearance, Icon, StyleSheet};
-
-    /// A box that can be checked.
-    pub type Checkbox<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Checkbox<'a, Message, Renderer>;
-}
-
-pub mod container {
-    //! Decorate content and apply alignment.
-    pub use iced_native::widget::container::{Appearance, StyleSheet};
-
-    /// An element decorating some content.
-    pub type Container<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Container<'a, Message, Renderer>;
-}
-
-pub mod pane_grid {
-    //! Let your users split regions of your application and organize layout dynamically.
-    //!
-    //! [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
-    //!
-    //! # Example
-    //! The [`pane_grid` example] showcases how to use a [`PaneGrid`] with resizing,
-    //! drag and drop, and hotkey support.
-    //!
-    //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.8/examples/pane_grid
-    pub use iced_native::widget::pane_grid::{
-        Axis, Configuration, Direction, DragEvent, Line, Node, Pane,
-        ResizeEvent, Split, State, StyleSheet,
-    };
-
-    /// A collection of panes distributed using either vertical or horizontal splits
-    /// to completely fill the space available.
-    ///
-    /// [![Pane grid - Iced](https://thumbs.gfycat.com/MixedFlatJellyfish-small.gif)](https://gfycat.com/mixedflatjellyfish)
-    pub type PaneGrid<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::PaneGrid<'a, Message, Renderer>;
-
-    /// The content of a [`Pane`].
-    pub type Content<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::pane_grid::Content<'a, Message, Renderer>;
-
-    /// The title bar of a [`Pane`].
-    pub type TitleBar<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::pane_grid::TitleBar<'a, Message, Renderer>;
-}
-
-pub mod pick_list {
-    //! Display a dropdown list of selectable values.
-    pub use iced_native::widget::pick_list::{
-        Appearance, Handle, Icon, StyleSheet,
-    };
-
-    /// A widget allowing the selection of a single value from a list of options.
-    pub type PickList<'a, T, Message, Renderer = crate::Renderer> =
-        iced_native::widget::PickList<'a, T, Message, Renderer>;
-}
-
-pub mod radio {
-    //! Create choices using radio buttons.
-    pub use iced_native::widget::radio::{Appearance, StyleSheet};
-
-    /// A circular button representing a choice.
-    pub type Radio<Message, Renderer = crate::Renderer> =
-        iced_native::widget::Radio<Message, Renderer>;
-}
-
-pub mod scrollable {
-    //! Navigate an endless amount of content with a scrollbar.
-    pub use iced_native::widget::scrollable::{
-        snap_to, style::Scrollbar, style::Scroller, Id, Properties,
-        RelativeOffset, StyleSheet,
-    };
-
-    /// A widget that can vertically display an infinite amount of content
-    /// with a scrollbar.
-    pub type Scrollable<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Scrollable<'a, Message, Renderer>;
-}
-
-pub mod toggler {
-    //! Show toggle controls using togglers.
-    pub use iced_native::widget::toggler::{Appearance, StyleSheet};
-
-    /// A toggler widget.
-    pub type Toggler<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Toggler<'a, Message, Renderer>;
-}
-
-pub mod text_input {
-    //! Display fields that can be filled with text.
-    pub use iced_native::widget::text_input::{
-        focus, move_cursor_to, move_cursor_to_end, move_cursor_to_front,
-        select_all, Appearance, Id, StyleSheet,
-    };
-
-    /// A field that can be filled with text.
-    pub type TextInput<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::TextInput<'a, Message, Renderer>;
-}
-
-pub mod tooltip {
-    //! Display a widget over another.
-    pub use iced_native::widget::tooltip::Position;
-
-    /// A widget allowing the selection of a single value from a list of options.
-    pub type Tooltip<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::Tooltip<'a, Message, Renderer>;
-}
-
-pub use iced_native::widget::progress_bar;
-pub use iced_native::widget::rule;
-pub use iced_native::widget::slider;
-pub use iced_native::widget::vertical_slider;
-pub use iced_native::widget::Space;
-
-pub use button::Button;
-pub use checkbox::Checkbox;
-pub use container::Container;
-pub use pane_grid::PaneGrid;
-pub use pick_list::PickList;
-pub use progress_bar::ProgressBar;
-pub use radio::Radio;
-pub use rule::Rule;
-pub use scrollable::Scrollable;
-pub use slider::Slider;
-pub use text::Text;
-pub use text_input::TextInput;
-pub use toggler::Toggler;
-pub use tooltip::Tooltip;
-pub use vertical_slider::VerticalSlider;
-
-#[cfg(feature = "canvas")]
-#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub mod canvas;
-
-#[cfg(feature = "canvas")]
-#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-/// Creates a new [`Canvas`].
-pub fn canvas<P, Message, Renderer>(program: P) -> Canvas<P, Message, Renderer>
-where
-    Renderer: iced_renderer::geometry::Renderer,
-    P: canvas::Program<Message, Renderer>,
-{
-    Canvas::new(program)
-}
-
-#[cfg(feature = "image")]
-#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
-pub mod image {
-    //! Display images in your user interface.
-    pub use iced_native::image::Handle;
-
-    /// A frame that displays an image.
-    pub type Image = iced_native::widget::Image<Handle>;
-
-    pub use iced_native::widget::image::viewer;
-    pub use viewer::Viewer;
-}
-
-#[cfg(feature = "qr_code")]
-#[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub mod qr_code;
-
-#[cfg(feature = "svg")]
-#[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
-pub mod svg {
-    //! Display vector graphics in your application.
-    pub use iced_native::svg::Handle;
-    pub use iced_native::widget::svg::{Appearance, StyleSheet, Svg};
-}
-
-#[cfg(feature = "canvas")]
-#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-pub use canvas::Canvas;
-
-#[cfg(feature = "image")]
-#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
-pub use image::Image;
-
-#[cfg(feature = "qr_code")]
-#[cfg_attr(docsrs, doc(cfg(feature = "qr_code")))]
-pub use qr_code::QRCode;
-
-#[cfg(feature = "svg")]
-#[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
-pub use svg::Svg;
-
-use crate::Command;
-use iced_native::widget::operation;
-
-/// Focuses the previous focusable widget.
-pub fn focus_previous<Message>() -> Command<Message>
-where
-    Message: 'static,
-{
-    Command::widget(operation::focusable::focus_previous())
-}
-
-/// Focuses the next focusable widget.
-pub fn focus_next<Message>() -> Command<Message>
-where
-    Message: 'static,
-{
-    Command::widget(operation::focusable::focus_next())
-}
diff --git a/src/window.rs b/src/window.rs
index 2018053fbb..2623906552 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -8,5 +8,6 @@ pub use icon::Icon;
 pub use position::Position;
 pub use settings::Settings;
 
-#[cfg(not(target_arch = "wasm32"))]
-pub use crate::runtime::window::*;
+pub use crate::core::window::*;
+pub use crate::native::window::*;
+pub use crate::shell::window::*;
diff --git a/style/src/lib.rs b/style/src/lib.rs
index 59eb1eb8f9..286ff9db22 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -18,7 +18,7 @@
 #![deny(missing_docs, unused_results)]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-pub use iced_core::{Background, Color};
+pub use iced_core as core;
 
 pub mod application;
 pub mod button;
@@ -33,7 +33,6 @@ pub mod rule;
 pub mod scrollable;
 pub mod slider;
 pub mod svg;
-pub mod text;
 pub mod text_input;
 pub mod theme;
 pub mod toggler;
diff --git a/style/src/text.rs b/style/src/text.rs
index f31c23068c..d5a16bef62 100644
--- a/style/src/text.rs
+++ b/style/src/text.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of text.
-use iced_core::Color;
+use crate::core::Color;
 
 /// The style sheet of some text.
 pub trait StyleSheet {
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4ba4facfe0..b507d096c8 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,6 +8,7 @@ use crate::application;
 use crate::button;
 use crate::checkbox;
 use crate::container;
+use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
@@ -17,7 +18,6 @@ use crate::rule;
 use crate::scrollable;
 use crate::slider;
 use crate::svg;
-use crate::text;
 use crate::text_input;
 use crate::toggler;
 
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 050c6c75da..d364e36a6b 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,9 +1,9 @@
-use crate::{Color, Font, Primitive, Settings, Size, Viewport};
-
-use iced_graphics::alignment;
-use iced_graphics::backend;
-use iced_graphics::text;
-use iced_graphics::{Background, Rectangle, Vector};
+use crate::core::alignment;
+use crate::core::text;
+use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
+use crate::graphics::backend;
+use crate::graphics::{Primitive, Viewport};
+use crate::Settings;
 
 use std::borrow::Cow;
 
@@ -470,7 +470,7 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        point: iced_native::Point,
+        point: Point,
         nearest_only: bool,
     ) -> Option<text::Hit> {
         self.text_pipeline.hit_test(
@@ -490,7 +490,7 @@ impl backend::Text for Backend {
 
 #[cfg(feature = "image")]
 impl backend::Image for Backend {
-    fn dimensions(&self, _handle: &iced_native::image::Handle) -> Size<u32> {
+    fn dimensions(&self, _handle: &crate::core::image::Handle) -> Size<u32> {
         // TODO
         Size::new(0, 0)
     }
@@ -500,7 +500,7 @@ impl backend::Image for Backend {
 impl backend::Svg for Backend {
     fn viewport_dimensions(
         &self,
-        _handle: &iced_native::svg::Handle,
+        _handle: &crate::core::svg::Handle,
     ) -> Size<u32> {
         // TODO
         Size::new(0, 0)
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 73fc1ebdef..c66621dd8c 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -1,9 +1,9 @@
-use crate::{Point, Primitive, Rectangle, Size, Vector};
-
-use iced_graphics::geometry::fill::{self, Fill};
-use iced_graphics::geometry::stroke::{self, Stroke};
-use iced_graphics::geometry::{Path, Style, Text};
-use iced_graphics::Gradient;
+use crate::core::Gradient;
+use crate::core::{Point, Rectangle, Size, Vector};
+use crate::graphics::geometry::fill::{self, Fill};
+use crate::graphics::geometry::stroke::{self, Stroke};
+use crate::graphics::geometry::{Path, Style, Text};
+use crate::graphics::Primitive;
 
 pub struct Frame {
     size: Size,
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index ef5c6b1db4..bf83e4004d 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -7,19 +7,14 @@ mod text;
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
-pub use iced_graphics::primitive;
+pub use iced_graphics as graphics;
+pub use iced_graphics::core;
 
 pub use backend::Backend;
-pub use primitive::Primitive;
 pub use settings::Settings;
 
-pub use iced_graphics::{
-    Color, Error, Font, Point, Rectangle, Size, Vector, Viewport,
-};
-
 /// A [`tiny-skia`] graphics renderer for [`iced`].
 ///
 /// [`tiny-skia`]: https://github.com/RazrFalcon/tiny-skia
 /// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme = iced_native::Theme> =
-    iced_graphics::Renderer<Backend, Theme>;
+pub type Renderer<Theme> = iced_graphics::Renderer<Backend, Theme>;
diff --git a/tiny_skia/src/settings.rs b/tiny_skia/src/settings.rs
index 88098345f2..9e4be0c495 100644
--- a/tiny_skia/src/settings.rs
+++ b/tiny_skia/src/settings.rs
@@ -1,4 +1,4 @@
-use crate::Font;
+use crate::core::Font;
 
 /// The settings of a [`Backend`].
 ///
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index da3a06bfb3..7a5034c2aa 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -1,7 +1,6 @@
-pub use iced_native::text::Hit;
-
-use iced_native::alignment;
-use iced_native::{Color, Font, Rectangle, Size};
+use crate::core::alignment;
+use crate::core::text::Hit;
+use crate::core::{Color, Font, Point, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
@@ -189,8 +188,8 @@ impl Pipeline {
         content: &str,
         size: f32,
         font: iced_native::Font,
-        bounds: iced_native::Size,
-        point: iced_native::Point,
+        bounds: Size,
+        point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
         self.system.as_ref().unwrap().with(|fields| {
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 76f371e17e..cea1cabfb4 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -1,6 +1,7 @@
-use crate::{Backend, Color, Error, Primitive, Renderer, Settings, Viewport};
-
-use iced_graphics::window::compositor::{self, Information, SurfaceError};
+use crate::core::Color;
+use crate::graphics::compositor::{self, Information, SurfaceError};
+use crate::graphics::{Error, Primitive, Viewport};
+use crate::{Backend, Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
@@ -15,7 +16,7 @@ pub struct Surface {
     buffer: Vec<u32>,
 }
 
-impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
+impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
     type Surface = Surface;
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 2e39a9e710..f3ea66dd93 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -48,10 +48,6 @@ features = ["std"]
 version = "1.9"
 features = ["derive"]
 
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 6f39a5febb..9c9a1b7637 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,10 +1,11 @@
+use crate::core;
+use crate::core::{Color, Font, Point, Size};
+use crate::graphics::backend;
+use crate::graphics::{Primitive, Transformation, Viewport};
 use crate::quad;
 use crate::text;
 use crate::triangle;
-use crate::{Layer, Primitive, Settings, Transformation};
-
-use iced_graphics::backend;
-use iced_graphics::{Color, Font, Size, Viewport};
+use crate::{Layer, Settings};
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
@@ -363,9 +364,9 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        point: iced_native::Point,
+        point: Point,
         nearest_only: bool,
-    ) -> Option<text::Hit> {
+    ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
@@ -383,17 +384,14 @@ impl backend::Text for Backend {
 
 #[cfg(feature = "image")]
 impl backend::Image for Backend {
-    fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
+    fn dimensions(&self, handle: &core::image::Handle) -> Size<u32> {
         self.image_pipeline.dimensions(handle)
     }
 }
 
 #[cfg(feature = "svg")]
 impl backend::Svg for Backend {
-    fn viewport_dimensions(
-        &self,
-        handle: &iced_native::svg::Handle,
-    ) -> Size<u32> {
+    fn viewport_dimensions(&self, handle: &core::svg::Handle) -> Size<u32> {
         self.image_pipeline.viewport_dimensions(handle)
     }
 }
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 11e8126fdd..59ec31fef6 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -1,9 +1,9 @@
-use iced_graphics::geometry::fill::{self, Fill};
-use iced_graphics::geometry::{
+use crate::core::{Gradient, Point, Rectangle, Size, Vector};
+use crate::graphics::geometry::fill::{self, Fill};
+use crate::graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
-use iced_graphics::primitive::{self, Primitive};
-use iced_graphics::{Gradient, Point, Rectangle, Size, Vector};
+use crate::graphics::primitive::{self, Primitive};
 
 use lyon::geom::euclid;
 use lyon::tessellation;
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 2159a3ec65..5eaa9a8651 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -1,16 +1,17 @@
 mod atlas;
 
-#[cfg(feature = "image")]
-use iced_graphics::image::raster;
-
-#[cfg(feature = "svg")]
-use iced_graphics::image::vector;
+use atlas::Atlas;
 
+use crate::core::{Rectangle, Size};
+use crate::graphics::Transformation;
 use crate::layer;
-use crate::{Buffer, Transformation};
-use atlas::Atlas;
+use crate::Buffer;
+
+#[cfg(feature = "image")]
+use crate::graphics::image::raster;
 
-use iced_native::{Rectangle, Size};
+#[cfg(feature = "svg")]
+use crate::graphics::image::vector;
 
 use std::cell::RefCell;
 use std::mem;
@@ -18,10 +19,10 @@ use std::mem;
 use bytemuck::{Pod, Zeroable};
 
 #[cfg(feature = "image")]
-use iced_native::image;
+use crate::core::image;
 
 #[cfg(feature = "svg")]
-use iced_native::svg;
+use crate::core::svg;
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 7df67abdc0..0a17ca33bf 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -12,8 +12,8 @@ use allocator::Allocator;
 
 pub const SIZE: u32 = 2048;
 
-use iced_graphics::image;
-use iced_graphics::Size;
+use crate::core::Size;
+use crate::graphics::image;
 
 use std::num::NonZeroU32;
 
diff --git a/wgpu/src/image/atlas/allocation.rs b/wgpu/src/image/atlas/allocation.rs
index 43aba87596..1128977117 100644
--- a/wgpu/src/image/atlas/allocation.rs
+++ b/wgpu/src/image/atlas/allocation.rs
@@ -1,7 +1,6 @@
+use crate::core::Size;
 use crate::image::atlas::{self, allocator};
 
-use iced_graphics::Size;
-
 #[derive(Debug)]
 pub enum Allocation {
     Partial {
diff --git a/wgpu/src/image/atlas/allocator.rs b/wgpu/src/image/atlas/allocator.rs
index 03effdcb2f..204a5c266a 100644
--- a/wgpu/src/image/atlas/allocator.rs
+++ b/wgpu/src/image/atlas/allocator.rs
@@ -46,10 +46,10 @@ impl Region {
         (rectangle.min.x as u32, rectangle.min.y as u32)
     }
 
-    pub fn size(&self) -> iced_graphics::Size<u32> {
+    pub fn size(&self) -> crate::core::Size<u32> {
         let size = self.allocation.rectangle.size();
 
-        iced_graphics::Size::new(size.width as u32, size.height as u32)
+        crate::core::Size::new(size.width as u32, size.height as u32)
     }
 }
 
diff --git a/wgpu/src/image/atlas/entry.rs b/wgpu/src/image/atlas/entry.rs
index 69c05a50ef..4b06bd951d 100644
--- a/wgpu/src/image/atlas/entry.rs
+++ b/wgpu/src/image/atlas/entry.rs
@@ -1,8 +1,7 @@
+use crate::core::Size;
+use crate::graphics::image;
 use crate::image::atlas;
 
-use iced_graphics::image;
-use iced_graphics::Size;
-
 #[derive(Debug)]
 pub enum Entry {
     Contiguous(atlas::Allocation),
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 69fcf8995e..cb9d5e2f69 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -10,12 +10,9 @@ pub use mesh::Mesh;
 pub use quad::Quad;
 pub use text::Text;
 
-use crate::Primitive;
-
-use iced_graphics::alignment;
-use iced_graphics::{
-    Background, Color, Font, Point, Rectangle, Size, Vector, Viewport,
-};
+use crate::core::alignment;
+use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
+use crate::graphics::{Primitive, Viewport};
 
 /// A group of primitives that should be clipped together.
 #[derive(Debug)]
diff --git a/wgpu/src/layer/image.rs b/wgpu/src/layer/image.rs
index 3eff239779..0de589f8e8 100644
--- a/wgpu/src/layer/image.rs
+++ b/wgpu/src/layer/image.rs
@@ -1,6 +1,6 @@
-use crate::{Color, Rectangle};
-
-use iced_native::{image, svg};
+use crate::core::image;
+use crate::core::svg;
+use crate::core::{Color, Rectangle};
 
 /// A raster or vector image.
 #[derive(Debug, Clone)]
diff --git a/wgpu/src/layer/mesh.rs b/wgpu/src/layer/mesh.rs
index 5c1e41ad26..9dd143919b 100644
--- a/wgpu/src/layer/mesh.rs
+++ b/wgpu/src/layer/mesh.rs
@@ -1,6 +1,6 @@
 //! A collection of triangle primitives.
-use crate::primitive;
-use crate::{Gradient, Point, Rectangle};
+use crate::core::{Gradient, Point, Rectangle};
+use crate::graphics::primitive;
 
 /// A mesh of triangles.
 #[derive(Debug, Clone, Copy)]
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index 38d626168a..fdbdaafb59 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
-use crate::{alignment, Color, Font, Rectangle};
+use crate::core::alignment;
+use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
 #[derive(Debug, Clone, Copy)]
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 4439b18567..473f362177 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -50,25 +50,17 @@ mod quad;
 mod text;
 mod triangle;
 
-pub use iced_graphics::primitive;
-pub use iced_graphics::{
-    Antialiasing, Color, Error, Font, Gradient, Point, Rectangle, Size, Vector,
-    Viewport,
-};
-pub use iced_native::alignment;
+pub use iced_graphics as graphics;
+pub use iced_graphics::core;
 
-pub use iced_native::Theme;
 pub use wgpu;
 
 pub use backend::Backend;
 pub use layer::Layer;
-pub use primitive::Primitive;
 pub use settings::Settings;
 
 use buffer::Buffer;
 
-use iced_graphics::Transformation;
-
 #[cfg(any(feature = "image", feature = "svg"))]
 mod image;
 
@@ -76,5 +68,4 @@ mod image;
 ///
 /// [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
 /// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme = iced_native::Theme> =
-    iced_graphics::Renderer<Backend, Theme>;
+pub type Renderer<Theme> = iced_graphics::Renderer<Backend, Theme>;
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 8a568968b1..b55216d739 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,7 +1,7 @@
+use crate::core::Rectangle;
+use crate::graphics::Transformation;
 use crate::layer;
-use crate::{Buffer, Transformation};
-
-use iced_native::Rectangle;
+use crate::Buffer;
 
 use bytemuck::{Pod, Zeroable};
 use std::mem;
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index bd9cf473f5..7c0750efbf 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -1,7 +1,6 @@
 //! Configure a renderer.
-pub use crate::Antialiasing;
-
-use crate::Font;
+use crate::core::Font;
+use crate::graphics::Antialiasing;
 
 /// The settings of a [`Backend`].
 ///
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 0dc8a64cae..d7a27f3a8c 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,10 +1,8 @@
+use crate::core::alignment;
+use crate::core::text::Hit;
+use crate::core::{Color, Font, Point, Rectangle, Size};
 use crate::layer::Text;
 
-pub use iced_native::text::Hit;
-
-use iced_native::alignment;
-use iced_native::{Color, Font, Rectangle, Size};
-
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -269,9 +267,9 @@ impl Pipeline {
         &self,
         content: &str,
         size: f32,
-        font: iced_native::Font,
-        bounds: iced_native::Size,
-        point: iced_native::Point,
+        font: Font,
+        bounds: Size,
+        point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
         self.system.as_ref().unwrap().with(|fields| {
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 706e428258..9fa521d74d 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -2,11 +2,9 @@
 mod msaa;
 
 use crate::buffer::r#static::Buffer;
+use crate::core::{Gradient, Size};
+use crate::graphics::{Antialiasing, Transformation};
 use crate::layer::mesh::{self, Mesh};
-use crate::settings;
-use crate::Transformation;
-
-use iced_graphics::Size;
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
@@ -137,7 +135,7 @@ impl Layer {
                     gradient_vertex_offset += written_bytes;
 
                     match gradient {
-                        iced_graphics::Gradient::Linear(linear) => {
+                        Gradient::Linear(linear) => {
                             use glam::{IVec4, Vec4};
 
                             let start_offset = self.gradient.color_stop_offset;
@@ -319,7 +317,7 @@ impl Pipeline {
     pub fn new(
         device: &wgpu::Device,
         format: wgpu::TextureFormat,
-        antialiasing: Option<settings::Antialiasing>,
+        antialiasing: Option<Antialiasing>,
     ) -> Pipeline {
         Pipeline {
             blit: antialiasing.map(|a| msaa::Blit::new(device, format, a)),
@@ -453,7 +451,7 @@ fn primitive_state() -> wgpu::PrimitiveState {
 }
 
 fn multisample_state(
-    antialiasing: Option<settings::Antialiasing>,
+    antialiasing: Option<Antialiasing>,
 ) -> wgpu::MultisampleState {
     wgpu::MultisampleState {
         count: antialiasing.map(|a| a.sample_count()).unwrap_or(1),
@@ -465,11 +463,11 @@ fn multisample_state(
 mod solid {
     use crate::buffer::dynamic;
     use crate::buffer::r#static::Buffer;
-    use crate::settings;
+    use crate::graphics::primitive;
+    use crate::graphics::{Antialiasing, Transformation};
     use crate::triangle;
+
     use encase::ShaderType;
-    use iced_graphics::primitive;
-    use iced_graphics::Transformation;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -550,7 +548,7 @@ mod solid {
         pub fn new(
             device: &wgpu::Device,
             format: wgpu::TextureFormat,
-            antialiasing: Option<settings::Antialiasing>,
+            antialiasing: Option<Antialiasing>,
         ) -> Self {
             let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
@@ -633,7 +631,7 @@ mod solid {
 mod gradient {
     use crate::buffer::dynamic;
     use crate::buffer::r#static::Buffer;
-    use crate::settings;
+    use crate::graphics::Antialiasing;
     use crate::triangle;
 
     use encase::ShaderType;
@@ -755,7 +753,7 @@ mod gradient {
         pub(super) fn new(
             device: &wgpu::Device,
             format: wgpu::TextureFormat,
-            antialiasing: Option<settings::Antialiasing>,
+            antialiasing: Option<Antialiasing>,
         ) -> Self {
             let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index a3016ff8fb..7144125c69 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -1,4 +1,4 @@
-use crate::settings;
+use crate::graphics;
 
 #[derive(Debug)]
 pub struct Blit {
@@ -14,7 +14,7 @@ impl Blit {
     pub fn new(
         device: &wgpu::Device,
         format: wgpu::TextureFormat,
-        antialiasing: settings::Antialiasing,
+        antialiasing: graphics::Antialiasing,
     ) -> Blit {
         let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
             address_mode_u: wgpu::AddressMode::ClampToEdge,
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 3a4a71233a..a67ac3c044 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -1,10 +1,12 @@
 //! Connect a window with a renderer.
-use crate::{Backend, Color, Error, Primitive, Renderer, Settings, Viewport};
+use crate::core::Color;
+use crate::graphics;
+use crate::graphics::compositor;
+use crate::graphics::{Error, Primitive, Viewport};
+use crate::{Backend, Renderer, Settings};
 
 use futures::stream::{self, StreamExt};
 
-use iced_graphics::window::compositor;
-use iced_native::futures;
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 
 use std::marker::PhantomData;
@@ -184,7 +186,7 @@ pub fn present<Theme, T: AsRef<str>>(
     }
 }
 
-impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
+impl<Theme> graphics::Compositor for Compositor<Theme> {
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
     type Surface = wgpu::Surface;
diff --git a/widget/Cargo.toml b/widget/Cargo.toml
new file mode 100644
index 0000000000..fb617079c8
--- /dev/null
+++ b/widget/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "iced_widget"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+lazy = ["ouroboros"]
+image = ["iced_renderer/image"]
+svg = ["iced_renderer/svg"]
+canvas = ["iced_renderer/geometry"]
+qr_code = ["canvas", "qrcode"]
+
+[dependencies]
+unicode-segmentation = "1.6"
+num-traits = "0.2"
+thiserror = "1"
+
+[dependencies.iced_native]
+version = "0.9"
+path = "../native"
+
+[dependencies.iced_renderer]
+version = "0.1"
+path = "../renderer"
+
+[dependencies.iced_style]
+version = "0.7"
+path = "../style"
+
+[dependencies.ouroboros]
+version = "0.13"
+optional = true
+
+[dependencies.qrcode]
+version = "0.12"
+optional = true
+default-features = false
diff --git a/native/src/widget/button.rs b/widget/src/button.rs
similarity index 94%
rename from native/src/widget/button.rs
rename to widget/src/button.rs
index 3938717305..d6fd399753 100644
--- a/native/src/widget/button.rs
+++ b/widget/src/button.rs
@@ -1,15 +1,15 @@
 //! Allow your users to perform actions by pressing a button.
 //!
 //! A [`Button`] has some local [`State`].
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::touch;
-use crate::widget::tree::{self, Tree};
-use crate::widget::Operation;
-use crate::{
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::touch;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::widget::Operation;
+use crate::core::{
     Background, Clipboard, Color, Element, Layout, Length, Padding, Point,
     Rectangle, Shell, Vector, Widget,
 };
@@ -20,7 +20,7 @@ pub use iced_style::button::{Appearance, StyleSheet};
 ///
 /// ```
 /// # type Button<'a, Message> =
-/// #     iced_native::widget::Button<'a, Message, iced_native::renderer::Null>;
+/// #     iced_widget::Button<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// #[derive(Clone)]
 /// enum Message {
@@ -35,7 +35,7 @@ pub use iced_style::button::{Appearance, StyleSheet};
 ///
 /// ```
 /// # type Button<'a, Message> =
-/// #     iced_native::widget::Button<'a, Message, iced_native::renderer::Null>;
+/// #     iced_widget::Button<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// #[derive(Clone)]
 /// enum Message {
@@ -51,9 +51,9 @@ pub use iced_style::button::{Appearance, StyleSheet};
 /// }
 /// ```
 #[allow(missing_debug_implementations)]
-pub struct Button<'a, Message, Renderer>
+pub struct Button<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     content: Element<'a, Message, Renderer>,
@@ -66,7 +66,7 @@ where
 
 impl<'a, Message, Renderer> Button<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// Creates a new [`Button`] with the given content.
@@ -121,7 +121,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Button<'a, Message, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -279,7 +279,7 @@ impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: Clone + 'a,
-    Renderer: crate::Renderer + 'a,
+    Renderer: crate::core::Renderer + 'a,
     Renderer::Theme: StyleSheet,
 {
     fn from(button: Button<'a, Message, Renderer>) -> Self {
@@ -355,7 +355,7 @@ pub fn update<'a, Message: Clone>(
 }
 
 /// Draws a [`Button`].
-pub fn draw<'a, Renderer: crate::Renderer>(
+pub fn draw<'a, Renderer: crate::core::Renderer>(
     renderer: &mut Renderer,
     bounds: Rectangle,
     cursor_position: Point,
diff --git a/src/widget/canvas.rs b/widget/src/canvas.rs
similarity index 84%
rename from src/widget/canvas.rs
rename to widget/src/canvas.rs
index bc5995c65e..171c4534d8 100644
--- a/src/widget/canvas.rs
+++ b/widget/src/canvas.rs
@@ -8,15 +8,17 @@ pub use cursor::Cursor;
 pub use event::Event;
 pub use program::Program;
 
-pub use iced_renderer::geometry::*;
-
-use crate::{Length, Point, Rectangle, Size, Vector};
-
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::renderer;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::{Clipboard, Element, Shell, Widget};
+pub use crate::graphics::geometry::*;
+pub use crate::renderer::geometry::*;
+
+use crate::core;
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{Clipboard, Element, Shell, Widget};
+use crate::core::{Length, Point, Rectangle, Size, Vector};
+use crate::graphics::geometry;
 
 use std::marker::PhantomData;
 
@@ -26,9 +28,11 @@ use std::marker::PhantomData;
 /// If you want to get a quick overview, here's how we can draw a simple circle:
 ///
 /// ```no_run
-/// use iced::widget::canvas::{self, Canvas, Cursor, Fill, Frame, Geometry, Path, Program};
-/// use iced::{Color, Rectangle, Theme, Renderer};
-///
+/// # use iced_widget::canvas::{self, Canvas, Cursor, Fill, Frame, Geometry, Path, Program};
+/// # use iced_widget::core::{Color, Rectangle};
+/// # use iced_widget::style::Theme;
+/// #
+/// # pub type Renderer = iced_widget::renderer::Renderer<Theme>;
 /// // First, we define the data we need for drawing
 /// #[derive(Debug)]
 /// struct Circle {
@@ -60,7 +64,7 @@ use std::marker::PhantomData;
 #[derive(Debug)]
 pub struct Canvas<P, Message, Renderer = crate::Renderer>
 where
-    Renderer: iced_renderer::geometry::Renderer,
+    Renderer: geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     width: Length,
@@ -72,7 +76,7 @@ where
 
 impl<P, Message, Renderer> Canvas<P, Message, Renderer>
 where
-    Renderer: iced_renderer::geometry::Renderer,
+    Renderer: geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     const DEFAULT_SIZE: f32 = 100.0;
@@ -104,7 +108,7 @@ where
 impl<P, Message, Renderer> Widget<Message, Renderer>
     for Canvas<P, Message, Renderer>
 where
-    Renderer: iced_renderer::geometry::Renderer,
+    Renderer: geometry::Renderer,
     P: Program<Message, Renderer>,
 {
     fn tag(&self) -> tree::Tag {
@@ -138,7 +142,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: core::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         _renderer: &Renderer,
@@ -148,13 +152,9 @@ where
         let bounds = layout.bounds();
 
         let canvas_event = match event {
-            iced_native::Event::Mouse(mouse_event) => {
-                Some(Event::Mouse(mouse_event))
-            }
-            iced_native::Event::Touch(touch_event) => {
-                Some(Event::Touch(touch_event))
-            }
-            iced_native::Event::Keyboard(keyboard_event) => {
+            core::Event::Mouse(mouse_event) => Some(Event::Mouse(mouse_event)),
+            core::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
+            core::Event::Keyboard(keyboard_event) => {
                 Some(Event::Keyboard(keyboard_event))
             }
             _ => None,
@@ -227,7 +227,7 @@ impl<'a, P, Message, Renderer> From<Canvas<P, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + iced_renderer::geometry::Renderer,
+    Renderer: 'a + geometry::Renderer,
     P: Program<Message, Renderer> + 'a,
 {
     fn from(
diff --git a/src/widget/canvas/cursor.rs b/widget/src/canvas/cursor.rs
similarity index 98%
rename from src/widget/canvas/cursor.rs
rename to widget/src/canvas/cursor.rs
index ef6a7771f0..5a65e9a79e 100644
--- a/src/widget/canvas/cursor.rs
+++ b/widget/src/canvas/cursor.rs
@@ -1,4 +1,4 @@
-use crate::{Point, Rectangle};
+use crate::core::{Point, Rectangle};
 
 /// The mouse cursor state.
 #[derive(Debug, Clone, Copy, PartialEq)]
diff --git a/src/widget/canvas/event.rs b/widget/src/canvas/event.rs
similarity index 73%
rename from src/widget/canvas/event.rs
rename to widget/src/canvas/event.rs
index 7c733a4d8a..4508c18453 100644
--- a/src/widget/canvas/event.rs
+++ b/widget/src/canvas/event.rs
@@ -1,9 +1,9 @@
 //! Handle events of a canvas.
-use iced_native::keyboard;
-use iced_native::mouse;
-use iced_native::touch;
+use crate::core::keyboard;
+use crate::core::mouse;
+use crate::core::touch;
 
-pub use iced_native::event::Status;
+pub use crate::core::event::Status;
 
 /// A [`Canvas`] event.
 ///
diff --git a/src/widget/canvas/program.rs b/widget/src/canvas/program.rs
similarity index 92%
rename from src/widget/canvas/program.rs
rename to widget/src/canvas/program.rs
index fd15663a6e..efb33c5678 100644
--- a/src/widget/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -1,7 +1,8 @@
-use crate::widget::canvas::event::{self, Event};
-use crate::widget::canvas::mouse;
-use crate::widget::canvas::Cursor;
-use crate::Rectangle;
+use crate::canvas::event::{self, Event};
+use crate::canvas::mouse;
+use crate::canvas::Cursor;
+use crate::core::Rectangle;
+use crate::graphics::geometry;
 
 /// The state and logic of a [`Canvas`].
 ///
@@ -11,7 +12,7 @@ use crate::Rectangle;
 /// [`Canvas`]: crate::widget::Canvas
 pub trait Program<Message, Renderer = crate::Renderer>
 where
-    Renderer: iced_renderer::geometry::Renderer,
+    Renderer: geometry::Renderer,
 {
     /// The internal state mutated by the [`Program`].
     type State: Default + 'static;
@@ -71,7 +72,7 @@ where
 
 impl<Message, Renderer, T> Program<Message, Renderer> for &T
 where
-    Renderer: iced_renderer::geometry::Renderer,
+    Renderer: geometry::Renderer,
     T: Program<Message, Renderer>,
 {
     type State = T::State;
diff --git a/native/src/widget/checkbox.rs b/widget/src/checkbox.rs
similarity index 91%
rename from native/src/widget/checkbox.rs
rename to widget/src/checkbox.rs
index cd8b9c6b16..6a062f94e6 100644
--- a/native/src/widget/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -1,16 +1,17 @@
 //! Show toggle controls using checkboxes.
-use crate::alignment;
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::text;
-use crate::touch;
-use crate::widget::{self, Row, Text, Tree};
-use crate::{
+use crate::core::alignment;
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::text;
+use crate::core::touch;
+use crate::core::widget::Tree;
+use crate::core::{
     Alignment, Clipboard, Element, Layout, Length, Pixels, Point, Rectangle,
     Shell, Widget,
 };
+use crate::{Row, Text};
 
 pub use iced_style::checkbox::{Appearance, StyleSheet};
 
@@ -30,7 +31,8 @@ pub struct Icon<Font> {
 /// # Example
 ///
 /// ```
-/// # type Checkbox<'a, Message> = iced_native::widget::Checkbox<'a, Message, iced_native::renderer::Null>;
+/// # type Checkbox<'a, Message> =
+/// #     iced_widget::Checkbox<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// pub enum Message {
 ///     CheckboxToggled(bool),
@@ -43,10 +45,10 @@ pub struct Icon<Font> {
 ///
 /// ![Checkbox drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/checkbox.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct Checkbox<'a, Message, Renderer>
+pub struct Checkbox<'a, Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     is_checked: bool,
     on_toggle: Box<dyn Fn(bool) -> Message + 'a>,
@@ -63,7 +65,7 @@ where
 impl<'a, Message, Renderer> Checkbox<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     /// The default size of a [`Checkbox`].
     const DEFAULT_SIZE: f32 = 20.0;
@@ -153,7 +155,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Checkbox<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn width(&self) -> Length {
         self.width
@@ -289,14 +291,14 @@ where
         {
             let label_layout = children.next().unwrap();
 
-            widget::text::draw(
+            crate::text::draw(
                 renderer,
                 style,
                 label_layout,
                 &self.label,
                 self.text_size,
                 self.font,
-                widget::text::Appearance {
+                crate::text::Appearance {
                     color: custom_style.text_color,
                 },
                 alignment::Horizontal::Left,
@@ -311,7 +313,7 @@ impl<'a, Message, Renderer> From<Checkbox<'a, Message, Renderer>>
 where
     Message: 'a,
     Renderer: 'a + text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn from(
         checkbox: Checkbox<'a, Message, Renderer>,
diff --git a/native/src/widget/column.rs b/widget/src/column.rs
similarity index 95%
rename from native/src/widget/column.rs
rename to widget/src/column.rs
index ebe579d5b7..8f363ec65f 100644
--- a/native/src/widget/column.rs
+++ b/widget/src/column.rs
@@ -1,18 +1,18 @@
 //! Distribute content vertically.
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::widget::{Operation, Tree};
-use crate::{
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::{Operation, Tree};
+use crate::core::{
     Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Point,
     Rectangle, Shell, Widget,
 };
 
 /// A container that distributes its contents vertically.
 #[allow(missing_debug_implementations)]
-pub struct Column<'a, Message, Renderer> {
+pub struct Column<'a, Message, Renderer = crate::Renderer> {
     spacing: f32,
     padding: Padding,
     width: Length,
@@ -102,7 +102,7 @@ impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> {
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Column<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
 {
     fn children(&self) -> Vec<Tree> {
         self.children.iter().map(Tree::new).collect()
@@ -256,7 +256,7 @@ impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: crate::Renderer + 'a,
+    Renderer: crate::core::Renderer + 'a,
 {
     fn from(column: Column<'a, Message, Renderer>) -> Self {
         Self::new(column)
diff --git a/native/src/widget/container.rs b/widget/src/container.rs
similarity index 94%
rename from native/src/widget/container.rs
rename to widget/src/container.rs
index b77bf50d23..9d932772d1 100644
--- a/native/src/widget/container.rs
+++ b/widget/src/container.rs
@@ -1,12 +1,12 @@
 //! Decorate content and apply alignment.
-use crate::alignment::{self, Alignment};
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::widget::{self, Operation, Tree};
-use crate::{
+use crate::core::alignment::{self, Alignment};
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::{self, Operation, Tree};
+use crate::core::{
     Background, Clipboard, Color, Element, Layout, Length, Padding, Pixels,
     Point, Rectangle, Shell, Widget,
 };
@@ -17,9 +17,9 @@ pub use iced_style::container::{Appearance, StyleSheet};
 ///
 /// It is normally used for alignment purposes.
 #[allow(missing_debug_implementations)]
-pub struct Container<'a, Message, Renderer>
+pub struct Container<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     id: Option<Id>,
@@ -36,7 +36,7 @@ where
 
 impl<'a, Message, Renderer> Container<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// Creates an empty [`Container`].
@@ -131,7 +131,7 @@ where
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Container<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn children(&self) -> Vec<Tree> {
@@ -276,7 +276,7 @@ impl<'a, Message, Renderer> From<Container<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(
@@ -326,7 +326,7 @@ pub fn draw_background<Renderer>(
     appearance: &Appearance,
     bounds: Rectangle,
 ) where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
 {
     if appearance.background.is_some() || appearance.border_width > 0.0 {
         renderer.fill_quad(
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
new file mode 100644
index 0000000000..1a73c16f13
--- /dev/null
+++ b/widget/src/helpers.rs
@@ -0,0 +1,362 @@
+//! Helper functions to create pure widgets.
+use crate::button::{self, Button};
+use crate::checkbox::{self, Checkbox};
+use crate::container::{self, Container};
+use crate::core;
+use crate::core::widget::operation;
+use crate::core::{Element, Length, Pixels};
+use crate::native::Command;
+use crate::overlay;
+use crate::pick_list::{self, PickList};
+use crate::progress_bar::{self, ProgressBar};
+use crate::radio::{self, Radio};
+use crate::rule::{self, Rule};
+use crate::scrollable::{self, Scrollable};
+use crate::slider::{self, Slider};
+use crate::text::{self, Text};
+use crate::text_input::{self, TextInput};
+use crate::toggler::{self, Toggler};
+use crate::tooltip::{self, Tooltip};
+use crate::{Column, Row, Space, VerticalSlider};
+
+use std::borrow::Cow;
+use std::ops::RangeInclusive;
+
+/// Creates a [`Column`] with the given children.
+///
+/// [`Column`]: widget::Column
+#[macro_export]
+macro_rules! column {
+    () => (
+        $crate::Column::new()
+    );
+    ($($x:expr),+ $(,)?) => (
+        $crate::Column::with_children(vec![$($crate::core::Element::from($x)),+])
+    );
+}
+
+/// Creates a [`Row`] with the given children.
+///
+/// [`Row`]: widget::Row
+#[macro_export]
+macro_rules! row {
+    () => (
+        $crate::Row::new()
+    );
+    ($($x:expr),+ $(,)?) => (
+        $crate::Row::with_children(vec![$($crate::core::Element::from($x)),+])
+    );
+}
+
+/// Creates a new [`Container`] with the provided content.
+///
+/// [`Container`]: widget::Container
+pub fn container<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> Container<'a, Message, Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: container::StyleSheet,
+{
+    Container::new(content)
+}
+
+/// Creates a new [`Column`] with the given children.
+///
+/// [`Column`]: widget::Column
+pub fn column<Message, Renderer>(
+    children: Vec<Element<'_, Message, Renderer>>,
+) -> Column<'_, Message, Renderer> {
+    Column::with_children(children)
+}
+
+/// Creates a new [`Row`] with the given children.
+///
+/// [`Row`]: widget::Row
+pub fn row<Message, Renderer>(
+    children: Vec<Element<'_, Message, Renderer>>,
+) -> Row<'_, Message, Renderer> {
+    Row::with_children(children)
+}
+
+/// Creates a new [`Scrollable`] with the provided content.
+///
+/// [`Scrollable`]: widget::Scrollable
+pub fn scrollable<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> Scrollable<'a, Message, Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: scrollable::StyleSheet,
+{
+    Scrollable::new(content)
+}
+
+/// Creates a new [`Button`] with the provided content.
+///
+/// [`Button`]: widget::Button
+pub fn button<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> Button<'a, Message, Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: button::StyleSheet,
+    <Renderer::Theme as button::StyleSheet>::Style: Default,
+{
+    Button::new(content)
+}
+
+/// Creates a new [`Tooltip`] with the provided content, tooltip text, and [`tooltip::Position`].
+///
+/// [`Tooltip`]: widget::Tooltip
+/// [`tooltip::Position`]: widget::tooltip::Position
+pub fn tooltip<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+    tooltip: impl ToString,
+    position: tooltip::Position,
+) -> crate::Tooltip<'a, Message, Renderer>
+where
+    Renderer: core::text::Renderer,
+    Renderer::Theme: container::StyleSheet + text::StyleSheet,
+{
+    Tooltip::new(content, tooltip.to_string(), position)
+}
+
+/// Creates a new [`Text`] widget with the provided content.
+///
+/// [`Text`]: widget::Text
+pub fn text<'a, Renderer>(text: impl ToString) -> Text<'a, Renderer>
+where
+    Renderer: core::text::Renderer,
+    Renderer::Theme: text::StyleSheet,
+{
+    Text::new(text.to_string())
+}
+
+/// Creates a new [`Checkbox`].
+///
+/// [`Checkbox`]: widget::Checkbox
+pub fn checkbox<'a, Message, Renderer>(
+    label: impl Into<String>,
+    is_checked: bool,
+    f: impl Fn(bool) -> Message + 'a,
+) -> Checkbox<'a, Message, Renderer>
+where
+    Renderer: core::text::Renderer,
+    Renderer::Theme: checkbox::StyleSheet + text::StyleSheet,
+{
+    Checkbox::new(label, is_checked, f)
+}
+
+/// Creates a new [`Radio`].
+///
+/// [`Radio`]: widget::Radio
+pub fn radio<Message, Renderer, V>(
+    label: impl Into<String>,
+    value: V,
+    selected: Option<V>,
+    on_click: impl FnOnce(V) -> Message,
+) -> Radio<Message, Renderer>
+where
+    Message: Clone,
+    Renderer: core::text::Renderer,
+    Renderer::Theme: radio::StyleSheet,
+    V: Copy + Eq,
+{
+    Radio::new(value, label, selected, on_click)
+}
+
+/// Creates a new [`Toggler`].
+///
+/// [`Toggler`]: widget::Toggler
+pub fn toggler<'a, Message, Renderer>(
+    label: impl Into<Option<String>>,
+    is_checked: bool,
+    f: impl Fn(bool) -> Message + 'a,
+) -> Toggler<'a, Message, Renderer>
+where
+    Renderer: core::text::Renderer,
+    Renderer::Theme: toggler::StyleSheet,
+{
+    Toggler::new(label, is_checked, f)
+}
+
+/// Creates a new [`TextInput`].
+///
+/// [`TextInput`]: widget::TextInput
+pub fn text_input<'a, Message, Renderer>(
+    placeholder: &str,
+    value: &str,
+    on_change: impl Fn(String) -> Message + 'a,
+) -> TextInput<'a, Message, Renderer>
+where
+    Message: Clone,
+    Renderer: core::text::Renderer,
+    Renderer::Theme: text_input::StyleSheet,
+{
+    TextInput::new(placeholder, value, on_change)
+}
+
+/// Creates a new [`Slider`].
+///
+/// [`Slider`]: widget::Slider
+pub fn slider<'a, T, Message, Renderer>(
+    range: std::ops::RangeInclusive<T>,
+    value: T,
+    on_change: impl Fn(T) -> Message + 'a,
+) -> Slider<'a, T, Message, Renderer>
+where
+    T: Copy + From<u8> + std::cmp::PartialOrd,
+    Message: Clone,
+    Renderer: core::Renderer,
+    Renderer::Theme: slider::StyleSheet,
+{
+    Slider::new(range, value, on_change)
+}
+
+/// Creates a new [`VerticalSlider`].
+///
+/// [`VerticalSlider`]: widget::VerticalSlider
+pub fn vertical_slider<'a, T, Message, Renderer>(
+    range: std::ops::RangeInclusive<T>,
+    value: T,
+    on_change: impl Fn(T) -> Message + 'a,
+) -> VerticalSlider<'a, T, Message, Renderer>
+where
+    T: Copy + From<u8> + std::cmp::PartialOrd,
+    Message: Clone,
+    Renderer: core::Renderer,
+    Renderer::Theme: slider::StyleSheet,
+{
+    VerticalSlider::new(range, value, on_change)
+}
+
+/// Creates a new [`PickList`].
+///
+/// [`PickList`]: widget::PickList
+pub fn pick_list<'a, Message, Renderer, T>(
+    options: impl Into<Cow<'a, [T]>>,
+    selected: Option<T>,
+    on_selected: impl Fn(T) -> Message + 'a,
+) -> PickList<'a, T, Message, Renderer>
+where
+    T: ToString + Eq + 'static,
+    [T]: ToOwned<Owned = Vec<T>>,
+    Renderer: core::text::Renderer,
+    Renderer::Theme: pick_list::StyleSheet
+        + scrollable::StyleSheet
+        + overlay::menu::StyleSheet
+        + container::StyleSheet,
+    <Renderer::Theme as overlay::menu::StyleSheet>::Style:
+        From<<Renderer::Theme as pick_list::StyleSheet>::Style>,
+{
+    PickList::new(options, selected, on_selected)
+}
+
+/// Creates a new horizontal [`Space`] with the given [`Length`].
+///
+/// [`Space`]: widget::Space
+pub fn horizontal_space(width: impl Into<Length>) -> Space {
+    Space::with_width(width)
+}
+
+/// Creates a new vertical [`Space`] with the given [`Length`].
+///
+/// [`Space`]: widget::Space
+pub fn vertical_space(height: impl Into<Length>) -> Space {
+    Space::with_height(height)
+}
+
+/// Creates a horizontal [`Rule`] with the given height.
+///
+/// [`Rule`]: widget::Rule
+pub fn horizontal_rule<Renderer>(height: impl Into<Pixels>) -> Rule<Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: rule::StyleSheet,
+{
+    Rule::horizontal(height)
+}
+
+/// Creates a vertical [`Rule`] with the given width.
+///
+/// [`Rule`]: widget::Rule
+pub fn vertical_rule<Renderer>(width: impl Into<Pixels>) -> Rule<Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: rule::StyleSheet,
+{
+    Rule::vertical(width)
+}
+
+/// Creates a new [`ProgressBar`].
+///
+/// It expects:
+///   * an inclusive range of possible values, and
+///   * the current value of the [`ProgressBar`].
+///
+/// [`ProgressBar`]: widget::ProgressBar
+pub fn progress_bar<Renderer>(
+    range: RangeInclusive<f32>,
+    value: f32,
+) -> ProgressBar<Renderer>
+where
+    Renderer: core::Renderer,
+    Renderer::Theme: progress_bar::StyleSheet,
+{
+    ProgressBar::new(range, value)
+}
+
+/// Creates a new [`Image`].
+///
+/// [`Image`]: widget::Image
+#[cfg(feature = "image")]
+#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
+pub fn image<Handle>(handle: impl Into<Handle>) -> crate::Image<Handle> {
+    crate::Image::new(handle.into())
+}
+
+/// Creates a new [`Svg`] widget from the given [`Handle`].
+///
+/// [`Svg`]: widget::Svg
+/// [`Handle`]: widget::svg::Handle
+#[cfg(feature = "svg")]
+#[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
+pub fn svg<Renderer>(
+    handle: impl Into<core::svg::Handle>,
+) -> crate::Svg<Renderer>
+where
+    Renderer: core::svg::Renderer,
+    Renderer::Theme: crate::svg::StyleSheet,
+{
+    crate::Svg::new(handle)
+}
+
+/// Creates a new [`Canvas`].
+#[cfg(feature = "canvas")]
+#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
+pub fn canvas<P, Message, Renderer>(
+    program: P,
+) -> crate::Canvas<P, Message, Renderer>
+where
+    Renderer: crate::graphics::geometry::Renderer,
+    P: crate::canvas::Program<Message, Renderer>,
+{
+    crate::Canvas::new(program)
+}
+
+/// Focuses the previous focusable widget.
+pub fn focus_previous<Message>() -> Command<Message>
+where
+    Message: 'static,
+{
+    Command::widget(operation::focusable::focus_previous())
+}
+
+/// Focuses the next focusable widget.
+pub fn focus_next<Message>() -> Command<Message>
+where
+    Message: 'static,
+{
+    Command::widget(operation::focusable::focus_next())
+}
diff --git a/native/src/widget/image.rs b/widget/src/image.rs
similarity index 96%
rename from native/src/widget/image.rs
rename to widget/src/image.rs
index 73257a747f..22a3a1a16e 100644
--- a/native/src/widget/image.rs
+++ b/widget/src/image.rs
@@ -2,16 +2,18 @@
 pub mod viewer;
 pub use viewer::Viewer;
 
-use crate::image;
-use crate::layout;
-use crate::renderer;
-use crate::widget::Tree;
-use crate::{
+use crate::core::image;
+use crate::core::layout;
+use crate::core::renderer;
+use crate::core::widget::Tree;
+use crate::core::{
     ContentFit, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
 };
 
 use std::hash::Hash;
 
+pub use image::Handle;
+
 /// Creates a new [`Viewer`] with the given image `Handle`.
 pub fn viewer<Handle>(handle: Handle) -> Viewer<Handle> {
     Viewer::new(handle)
@@ -22,8 +24,7 @@ pub fn viewer<Handle>(handle: Handle) -> Viewer<Handle> {
 /// # Example
 ///
 /// ```
-/// # use iced_native::widget::Image;
-/// # use iced_native::image;
+/// # use iced_widget::image::{self, Image};
 /// #
 /// let image = Image::<image::Handle>::new("resources/ferris.png");
 /// ```
diff --git a/native/src/widget/image/viewer.rs b/widget/src/image/viewer.rs
similarity index 98%
rename from native/src/widget/image/viewer.rs
rename to widget/src/image/viewer.rs
index 1f8d5d7a49..0d60d81829 100644
--- a/native/src/widget/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -1,11 +1,11 @@
 //! Zoom and pan on an image.
-use crate::event::{self, Event};
-use crate::image;
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::widget::tree::{self, Tree};
-use crate::{
+use crate::core::event::{self, Event};
+use crate::core::image;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
     Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
     Vector, Widget,
 };
diff --git a/lazy/src/lazy.rs b/widget/src/lazy.rs
similarity index 91%
rename from lazy/src/lazy.rs
rename to widget/src/lazy.rs
index 5e909a498c..b08ed8cb9d 100644
--- a/lazy/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -1,12 +1,25 @@
-use iced_native::event;
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::overlay;
-use iced_native::renderer;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::widget::{self, Widget};
-use iced_native::Element;
-use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell, Size};
+#![allow(clippy::await_holding_refcell_ref, clippy::type_complexity)]
+pub(crate) mod helpers;
+
+pub mod component;
+pub mod responsive;
+
+pub use component::Component;
+pub use responsive::Responsive;
+
+mod cache;
+
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::widget::{self, Widget};
+use crate::core::Element;
+use crate::core::{
+    self, Clipboard, Hasher, Length, Point, Rectangle, Shell, Size,
+};
 
 use ouroboros::self_referencing;
 use std::cell::RefCell;
@@ -41,7 +54,7 @@ where
 
     fn with_element<T>(
         &self,
-        f: impl FnOnce(&Element<Message, Renderer>) -> T,
+        f: impl FnOnce(&Element<'_, Message, Renderer>) -> T,
     ) -> T {
         f(self
             .element
@@ -55,7 +68,7 @@ where
 
     fn with_element_mut<T>(
         &self,
-        f: impl FnOnce(&mut Element<Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Element<'_, Message, Renderer>) -> T,
     ) -> T {
         f(self
             .element
@@ -79,7 +92,7 @@ where
     View: Into<Element<'static, Message, Renderer>> + 'static,
     Dependency: Hash + 'a,
     Message: 'static,
-    Renderer: iced_native::Renderer + 'static,
+    Renderer: core::Renderer + 'static,
 {
     fn tag(&self) -> tree::Tag {
         struct Tag<T>(T);
@@ -163,7 +176,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -304,7 +317,7 @@ impl<'a, Message, Renderer> Overlay<'a, Message, Renderer> {
 impl<'a, Message, Renderer> overlay::Overlay<Message, Renderer>
     for Overlay<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn layout(
         &self,
@@ -353,7 +366,7 @@ where
 
     fn on_event(
         &mut self,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -370,7 +383,7 @@ where
                 shell,
             )
         })
-        .unwrap_or(iced_native::event::Status::Ignored)
+        .unwrap_or(event::Status::Ignored)
     }
 
     fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
@@ -386,7 +399,7 @@ impl<'a, Message, Renderer, Dependency, View>
     for Element<'a, Message, Renderer>
 where
     View: Into<Element<'static, Message, Renderer>> + 'static,
-    Renderer: iced_native::Renderer + 'static,
+    Renderer: core::Renderer + 'static,
     Message: 'static,
     Dependency: Hash + 'a,
 {
diff --git a/lazy/src/cache.rs b/widget/src/lazy/cache.rs
similarity index 84%
rename from lazy/src/cache.rs
rename to widget/src/lazy/cache.rs
index 5b4a39f696..e7b876142d 100644
--- a/lazy/src/cache.rs
+++ b/widget/src/lazy/cache.rs
@@ -1,5 +1,5 @@
-use iced_native::overlay;
-use iced_native::Element;
+use crate::core::overlay;
+use crate::core::Element;
 
 use ouroboros::self_referencing;
 
diff --git a/lazy/src/component.rs b/widget/src/lazy/component.rs
similarity index 96%
rename from lazy/src/component.rs
rename to widget/src/lazy/component.rs
index b23da9f7b4..0b8070af2c 100644
--- a/lazy/src/component.rs
+++ b/widget/src/lazy/component.rs
@@ -1,13 +1,13 @@
 //! Build and reuse custom widgets using The Elm Architecture.
-use iced_native::event;
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::overlay;
-use iced_native::renderer;
-use iced_native::widget;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::{
-    Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
+use crate::core::event;
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
+    self, Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
 
 use ouroboros::self_referencing;
@@ -67,7 +67,7 @@ where
     C: Component<Message, Renderer> + 'a,
     C::State: 'static,
     Message: 'a,
-    Renderer: iced_native::Renderer + 'a,
+    Renderer: core::Renderer + 'a,
 {
     Element::new(Instance {
         state: RefCell::new(Some(
@@ -159,7 +159,7 @@ impl<'a, Message, Renderer, Event, S> Widget<Message, Renderer>
     for Instance<'a, Message, Renderer, Event, S>
 where
     S: 'static + Default,
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn tag(&self) -> tree::Tag {
         struct Tag<T>(T);
@@ -203,7 +203,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: core::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -447,7 +447,7 @@ impl<'a, 'b, Message, Renderer, Event, S>
 impl<'a, 'b, Message, Renderer, Event, S> overlay::Overlay<Message, Renderer>
     for OverlayInstance<'a, 'b, Message, Renderer, Event, S>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
     S: 'static + Default,
 {
     fn layout(
@@ -497,13 +497,13 @@ where
 
     fn on_event(
         &mut self,
-        event: iced_native::Event,
+        event: core::Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
-    ) -> iced_native::event::Status {
+    ) -> event::Status {
         let mut local_messages = Vec::new();
         let mut local_shell = Shell::new(&mut local_messages);
 
@@ -518,7 +518,7 @@ where
                     &mut local_shell,
                 )
             })
-            .unwrap_or(iced_native::event::Status::Ignored);
+            .unwrap_or(event::Status::Ignored);
 
         local_shell.revalidate_layout(|| shell.invalidate_layout());
 
diff --git a/lazy/src/lib.rs b/widget/src/lazy/helpers.rs
similarity index 51%
rename from lazy/src/lib.rs
rename to widget/src/lazy/helpers.rs
index 41a2877361..be60bb78b2 100644
--- a/lazy/src/lib.rs
+++ b/widget/src/lazy/helpers.rs
@@ -1,34 +1,7 @@
-#![doc(
-    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
-)]
-#![deny(
-    missing_debug_implementations,
-    unused_results,
-    clippy::extra_unused_lifetimes,
-    clippy::from_over_into,
-    clippy::needless_borrow,
-    clippy::new_without_default,
-    clippy::useless_conversion
-)]
-#![forbid(unsafe_code)]
-#![allow(
-    clippy::await_holding_refcell_ref,
-    clippy::inherent_to_string,
-    clippy::type_complexity
-)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
-mod lazy;
+use crate::core::{self, Element, Size};
+use crate::lazy::component::{self, Component};
+use crate::lazy::{Lazy, Responsive};
 
-pub mod component;
-pub mod responsive;
-
-pub use component::Component;
-pub use lazy::Lazy;
-pub use responsive::Responsive;
-
-mod cache;
-
-use iced_native::{Element, Size};
 use std::hash::Hash;
 
 pub fn lazy<'a, Message, Renderer, Dependency, View>(
@@ -51,7 +24,7 @@ where
     C: Component<Message, Renderer> + 'a,
     C::State: 'static,
     Message: 'a,
-    Renderer: iced_native::Renderer + 'a,
+    Renderer: core::Renderer + 'a,
 {
     component::view(component)
 }
@@ -60,7 +33,7 @@ pub fn responsive<'a, Message, Renderer>(
     f: impl Fn(Size) -> Element<'a, Message, Renderer> + 'a,
 ) -> Responsive<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     Responsive::new(f)
 }
diff --git a/lazy/src/responsive.rs b/widget/src/lazy/responsive.rs
similarity index 93%
rename from lazy/src/responsive.rs
rename to widget/src/lazy/responsive.rs
index 57c07de119..7b2fc37c4e 100644
--- a/lazy/src/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -1,13 +1,14 @@
-use iced_native::event;
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::overlay;
-use iced_native::renderer;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::widget::{self, horizontal_space};
-use iced_native::{
-    Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
+    self, Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
+use crate::horizontal_space;
 
 use ouroboros::self_referencing;
 use std::cell::{RefCell, RefMut};
@@ -19,14 +20,14 @@ use std::ops::Deref;
 /// A [`Responsive`] widget will always try to fill all the available space of
 /// its parent.
 #[allow(missing_debug_implementations)]
-pub struct Responsive<'a, Message, Renderer> {
+pub struct Responsive<'a, Message, Renderer = crate::Renderer> {
     view: Box<dyn Fn(Size) -> Element<'a, Message, Renderer> + 'a>,
     content: RefCell<Content<'a, Message, Renderer>>,
 }
 
 impl<'a, Message, Renderer> Responsive<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     /// Creates a new [`Responsive`] widget with a closure that produces its
     /// contents.
@@ -56,7 +57,7 @@ struct Content<'a, Message, Renderer> {
 
 impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn update(
         &mut self,
@@ -114,7 +115,7 @@ struct State {
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Responsive<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn tag(&self) -> tree::Tag {
         tree::Tag::of::<State>()
@@ -168,7 +169,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -271,7 +272,8 @@ where
             content: self.content.borrow_mut(),
             tree: state.tree.borrow_mut(),
             types: PhantomData,
-            overlay_builder: |content: &mut RefMut<Content<_, _>>, tree| {
+            overlay_builder: |content: &mut RefMut<'_, Content<'_, _, _>>,
+                              tree| {
                 content.update(
                     tree,
                     renderer,
@@ -309,7 +311,7 @@ where
 impl<'a, Message, Renderer> From<Responsive<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer + 'a,
+    Renderer: core::Renderer + 'a,
     Message: 'a,
 {
     fn from(responsive: Responsive<'a, Message, Renderer>) -> Self {
@@ -347,7 +349,7 @@ impl<'a, 'b, Message, Renderer> Overlay<'a, 'b, Message, Renderer> {
 impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
     for Overlay<'a, 'b, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn layout(
         &self,
@@ -396,7 +398,7 @@ where
 
     fn on_event(
         &mut self,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -413,7 +415,7 @@ where
                 shell,
             )
         })
-        .unwrap_or(iced_native::event::Status::Ignored)
+        .unwrap_or(event::Status::Ignored)
     }
 
     fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
new file mode 100644
index 0000000000..4c1e7c1c0a
--- /dev/null
+++ b/widget/src/lib.rs
@@ -0,0 +1,122 @@
+//! Use the built-in widgets or create your own.
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
+)]
+#![deny(
+    missing_debug_implementations,
+    //missing_docs,
+    unused_results,
+    clippy::extra_unused_lifetimes,
+    clippy::from_over_into,
+    clippy::needless_borrow,
+    clippy::new_without_default,
+    clippy::useless_conversion
+)]
+#![forbid(unsafe_code, rust_2018_idioms)]
+#![allow(clippy::inherent_to_string, clippy::type_complexity)]
+pub use iced_native as native;
+pub use iced_native::core;
+pub use iced_renderer as renderer;
+pub use iced_renderer::graphics;
+pub use iced_style as style;
+
+mod column;
+mod row;
+
+pub mod button;
+pub mod checkbox;
+pub mod container;
+pub mod overlay;
+pub mod pane_grid;
+pub mod pick_list;
+pub mod progress_bar;
+pub mod radio;
+pub mod rule;
+pub mod scrollable;
+pub mod slider;
+pub mod space;
+pub mod text;
+pub mod text_input;
+pub mod toggler;
+pub mod tooltip;
+pub mod vertical_slider;
+
+mod helpers;
+
+pub use helpers::*;
+
+#[cfg(feature = "lazy")]
+mod lazy;
+
+#[cfg(feature = "lazy")]
+pub use crate::lazy::{Component, Lazy, Responsive};
+
+#[cfg(feature = "lazy")]
+pub use crate::lazy::helpers::*;
+
+#[doc(no_inline)]
+pub use button::Button;
+#[doc(no_inline)]
+pub use checkbox::Checkbox;
+#[doc(no_inline)]
+pub use column::Column;
+#[doc(no_inline)]
+pub use container::Container;
+#[doc(no_inline)]
+pub use pane_grid::PaneGrid;
+#[doc(no_inline)]
+pub use pick_list::PickList;
+#[doc(no_inline)]
+pub use progress_bar::ProgressBar;
+#[doc(no_inline)]
+pub use radio::Radio;
+#[doc(no_inline)]
+pub use row::Row;
+#[doc(no_inline)]
+pub use rule::Rule;
+#[doc(no_inline)]
+pub use scrollable::Scrollable;
+#[doc(no_inline)]
+pub use slider::Slider;
+#[doc(no_inline)]
+pub use space::Space;
+#[doc(no_inline)]
+pub use text::Text;
+#[doc(no_inline)]
+pub use text_input::TextInput;
+#[doc(no_inline)]
+pub use toggler::Toggler;
+#[doc(no_inline)]
+pub use tooltip::Tooltip;
+#[doc(no_inline)]
+pub use vertical_slider::VerticalSlider;
+
+#[cfg(feature = "svg")]
+pub mod svg;
+
+#[cfg(feature = "svg")]
+#[doc(no_inline)]
+pub use svg::Svg;
+
+#[cfg(feature = "image")]
+pub mod image;
+
+#[cfg(feature = "image")]
+#[doc(no_inline)]
+pub use image::Image;
+
+#[cfg(feature = "canvas")]
+pub mod canvas;
+
+#[cfg(feature = "canvas")]
+#[doc(no_inline)]
+pub use canvas::Canvas;
+
+#[cfg(feature = "qr_code")]
+pub mod qr_code;
+
+#[cfg(feature = "qr_code")]
+#[doc(no_inline)]
+pub use qr_code::QRCode;
+
+type Renderer<Theme = style::Theme> = renderer::Renderer<Theme>;
diff --git a/widget/src/overlay.rs b/widget/src/overlay.rs
new file mode 100644
index 0000000000..b9a0e3e05d
--- /dev/null
+++ b/widget/src/overlay.rs
@@ -0,0 +1 @@
+pub mod menu;
diff --git a/native/src/overlay/menu.rs b/widget/src/overlay/menu.rs
similarity index 95%
rename from native/src/overlay/menu.rs
rename to widget/src/overlay/menu.rs
index bd58a12263..c322c8bae4 100644
--- a/native/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -1,25 +1,25 @@
 //! Build and show dropdown menus.
-use crate::alignment;
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::text::{self, Text};
-use crate::touch;
-use crate::widget::container::{self, Container};
-use crate::widget::scrollable::{self, Scrollable};
-use crate::widget::Tree;
-use crate::{
-    Clipboard, Color, Element, Layout, Length, Padding, Pixels, Point,
-    Rectangle, Shell, Size, Vector, Widget,
+use crate::container::{self, Container};
+use crate::core::alignment;
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::text::{self, Text};
+use crate::core::touch;
+use crate::core::widget::Tree;
+use crate::core::{
+    Clipboard, Color, Length, Padding, Pixels, Point, Rectangle, Size, Vector,
 };
+use crate::core::{Element, Shell, Widget};
+use crate::scrollable::{self, Scrollable};
 
 pub use iced_style::menu::{Appearance, StyleSheet};
 
 /// A list of selectable options.
 #[allow(missing_debug_implementations)]
-pub struct Menu<'a, T, Renderer>
+pub struct Menu<'a, T, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -137,7 +137,7 @@ impl Default for State {
 
 struct Overlay<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet + container::StyleSheet,
 {
     state: &'a mut Tree,
@@ -193,7 +193,7 @@ where
     }
 }
 
-impl<'a, Message, Renderer> crate::Overlay<Message, Renderer>
+impl<'a, Message, Renderer> crate::core::Overlay<Message, Renderer>
     for Overlay<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
diff --git a/native/src/widget/pane_grid.rs b/widget/src/pane_grid.rs
similarity index 97%
rename from native/src/widget/pane_grid.rs
rename to widget/src/pane_grid.rs
index bcb17ebddc..a97cef6096 100644
--- a/native/src/widget/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -30,18 +30,18 @@ pub use split::Split;
 pub use state::State;
 pub use title_bar::TitleBar;
 
-pub use iced_style::pane_grid::{Line, StyleSheet};
-
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay::{self, Group};
-use crate::renderer;
-use crate::touch;
-use crate::widget;
-use crate::widget::container;
-use crate::widget::tree::{self, Tree};
-use crate::{
+pub use crate::style::pane_grid::{Line, StyleSheet};
+
+use crate::container;
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay::{self, Group};
+use crate::core::renderer;
+use crate::core::touch;
+use crate::core::widget;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
     Clipboard, Color, Element, Layout, Length, Pixels, Point, Rectangle, Shell,
     Size, Vector, Widget,
 };
@@ -68,10 +68,10 @@ use crate::{
 /// ## Example
 ///
 /// ```
-/// # use iced_native::widget::{pane_grid, text};
+/// # use iced_widget::{pane_grid, text};
 /// #
 /// # type PaneGrid<'a, Message> =
-/// #     iced_native::widget::PaneGrid<'a, Message, iced_native::renderer::Null>;
+/// #     iced_widget::PaneGrid<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// enum PaneState {
 ///     SomePane,
@@ -96,9 +96,9 @@ use crate::{
 ///     .on_resize(10, Message::PaneResized);
 /// ```
 #[allow(missing_debug_implementations)]
-pub struct PaneGrid<'a, Message, Renderer>
+pub struct PaneGrid<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet + container::StyleSheet,
 {
     contents: Contents<'a, Content<'a, Message, Renderer>>,
@@ -113,7 +113,7 @@ where
 
 impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet + container::StyleSheet,
 {
     /// Creates a [`PaneGrid`] with the given [`State`] and view function.
@@ -232,7 +232,7 @@ where
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for PaneGrid<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet + container::StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -468,7 +468,7 @@ impl<'a, Message, Renderer> From<PaneGrid<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet + container::StyleSheet,
 {
     fn from(
@@ -755,7 +755,7 @@ pub fn draw<Renderer, T>(
         &Rectangle,
     ),
 ) where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     let picked_pane = action.picked_pane();
diff --git a/native/src/widget/pane_grid/axis.rs b/widget/src/pane_grid/axis.rs
similarity index 99%
rename from native/src/widget/pane_grid/axis.rs
rename to widget/src/pane_grid/axis.rs
index 02bde06493..a304923004 100644
--- a/native/src/widget/pane_grid/axis.rs
+++ b/widget/src/pane_grid/axis.rs
@@ -1,4 +1,4 @@
-use crate::Rectangle;
+use crate::core::Rectangle;
 
 /// A fixed reference line for the measurement of coordinates.
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
diff --git a/native/src/widget/pane_grid/configuration.rs b/widget/src/pane_grid/configuration.rs
similarity index 94%
rename from native/src/widget/pane_grid/configuration.rs
rename to widget/src/pane_grid/configuration.rs
index 7d68fb4625..ddbc3bc2f2 100644
--- a/native/src/widget/pane_grid/configuration.rs
+++ b/widget/src/pane_grid/configuration.rs
@@ -1,4 +1,4 @@
-use crate::widget::pane_grid::Axis;
+use crate::pane_grid::Axis;
 
 /// The arrangement of a [`PaneGrid`].
 ///
diff --git a/native/src/widget/pane_grid/content.rs b/widget/src/pane_grid/content.rs
similarity index 94%
rename from native/src/widget/pane_grid/content.rs
rename to widget/src/pane_grid/content.rs
index c9b0df078f..035ef05b4e 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -1,20 +1,20 @@
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::widget::container;
-use crate::widget::pane_grid::{Draggable, TitleBar};
-use crate::widget::{self, Tree};
-use crate::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
+use crate::container;
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::{self, Tree};
+use crate::core::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
+use crate::pane_grid::{Draggable, TitleBar};
 
 /// The content of a [`Pane`].
 ///
 /// [`Pane`]: crate::widget::pane_grid::Pane
 #[allow(missing_debug_implementations)]
-pub struct Content<'a, Message, Renderer>
+pub struct Content<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     title_bar: Option<TitleBar<'a, Message, Renderer>>,
@@ -24,7 +24,7 @@ where
 
 impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     /// Creates a new [`Content`] with the provided body.
@@ -57,7 +57,7 @@ where
 
 impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     pub(super) fn state(&self) -> Tree {
@@ -342,7 +342,7 @@ where
 
 impl<'a, Message, Renderer> Draggable for &Content<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     fn can_be_dragged_at(
@@ -364,7 +364,7 @@ where
 impl<'a, T, Message, Renderer> From<T> for Content<'a, Message, Renderer>
 where
     T: Into<Element<'a, Message, Renderer>>,
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     fn from(element: T) -> Self {
diff --git a/native/src/widget/pane_grid/direction.rs b/widget/src/pane_grid/direction.rs
similarity index 100%
rename from native/src/widget/pane_grid/direction.rs
rename to widget/src/pane_grid/direction.rs
diff --git a/native/src/widget/pane_grid/draggable.rs b/widget/src/pane_grid/draggable.rs
similarity index 89%
rename from native/src/widget/pane_grid/draggable.rs
rename to widget/src/pane_grid/draggable.rs
index 6044871d54..a9274dadda 100644
--- a/native/src/widget/pane_grid/draggable.rs
+++ b/widget/src/pane_grid/draggable.rs
@@ -1,4 +1,4 @@
-use crate::{Layout, Point};
+use crate::core::{Layout, Point};
 
 /// A pane that can be dragged.
 pub trait Draggable {
diff --git a/native/src/widget/pane_grid/node.rs b/widget/src/pane_grid/node.rs
similarity index 98%
rename from native/src/widget/pane_grid/node.rs
rename to widget/src/pane_grid/node.rs
index cc304b96a7..3976acd8b1 100644
--- a/native/src/widget/pane_grid/node.rs
+++ b/widget/src/pane_grid/node.rs
@@ -1,5 +1,5 @@
-use crate::widget::pane_grid::{Axis, Pane, Split};
-use crate::{Rectangle, Size};
+use crate::core::{Rectangle, Size};
+use crate::pane_grid::{Axis, Pane, Split};
 
 use std::collections::BTreeMap;
 
diff --git a/native/src/widget/pane_grid/pane.rs b/widget/src/pane_grid/pane.rs
similarity index 100%
rename from native/src/widget/pane_grid/pane.rs
rename to widget/src/pane_grid/pane.rs
diff --git a/native/src/widget/pane_grid/split.rs b/widget/src/pane_grid/split.rs
similarity index 100%
rename from native/src/widget/pane_grid/split.rs
rename to widget/src/pane_grid/split.rs
diff --git a/native/src/widget/pane_grid/state.rs b/widget/src/pane_grid/state.rs
similarity index 98%
rename from native/src/widget/pane_grid/state.rs
rename to widget/src/pane_grid/state.rs
index c4ae0a0e22..a6e2ec7fa6 100644
--- a/native/src/widget/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -1,10 +1,8 @@
 //! The state of a [`PaneGrid`].
 //!
 //! [`PaneGrid`]: crate::widget::PaneGrid
-use crate::widget::pane_grid::{
-    Axis, Configuration, Direction, Node, Pane, Split,
-};
-use crate::{Point, Size};
+use crate::core::{Point, Size};
+use crate::pane_grid::{Axis, Configuration, Direction, Node, Pane, Split};
 
 use std::collections::HashMap;
 
diff --git a/native/src/widget/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
similarity index 96%
rename from native/src/widget/pane_grid/title_bar.rs
rename to widget/src/pane_grid/title_bar.rs
index 107078ef07..2129937be8 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -1,11 +1,11 @@
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::widget::container;
-use crate::widget::{self, Tree};
-use crate::{
+use crate::container;
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::{self, Tree};
+use crate::core::{
     Clipboard, Element, Layout, Padding, Point, Rectangle, Shell, Size,
 };
 
@@ -13,9 +13,9 @@ use crate::{
 ///
 /// [`Pane`]: crate::widget::pane_grid::Pane
 #[allow(missing_debug_implementations)]
-pub struct TitleBar<'a, Message, Renderer>
+pub struct TitleBar<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     content: Element<'a, Message, Renderer>,
@@ -27,7 +27,7 @@ where
 
 impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     /// Creates a new [`TitleBar`] with the given content.
@@ -84,7 +84,7 @@ where
 
 impl<'a, Message, Renderer> TitleBar<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     pub(super) fn state(&self) -> Tree {
diff --git a/native/src/widget/pick_list.rs b/widget/src/pick_list.rs
similarity index 97%
rename from native/src/widget/pick_list.rs
rename to widget/src/pick_list.rs
index 8ff82f3b07..cd23cdd235 100644
--- a/native/src/widget/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -1,28 +1,29 @@
 //! Display a dropdown list of selectable values.
-use crate::alignment;
-use crate::event::{self, Event};
-use crate::keyboard;
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::overlay::menu::{self, Menu};
-use crate::renderer;
-use crate::text::{self, Text};
-use crate::touch;
-use crate::widget::container;
-use crate::widget::scrollable;
-use crate::widget::tree::{self, Tree};
-use crate::{
+use crate::container;
+use crate::core::alignment;
+use crate::core::event::{self, Event};
+use crate::core::keyboard;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::text::{self, Text};
+use crate::core::touch;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
     Clipboard, Element, Layout, Length, Padding, Pixels, Point, Rectangle,
     Shell, Size, Widget,
 };
+use crate::overlay::menu::{self, Menu};
+use crate::scrollable;
+
 use std::borrow::Cow;
 
-pub use iced_style::pick_list::{Appearance, StyleSheet};
+pub use crate::style::pick_list::{Appearance, StyleSheet};
 
 /// A widget for selecting a single value from a list of options.
 #[allow(missing_debug_implementations)]
-pub struct PickList<'a, T, Message, Renderer>
+pub struct PickList<'a, T, Message, Renderer = crate::Renderer>
 where
     [T]: ToOwned<Owned = Vec<T>>,
     Renderer: text::Renderer,
diff --git a/native/src/widget/progress_bar.rs b/widget/src/progress_bar.rs
similarity index 89%
rename from native/src/widget/progress_bar.rs
rename to widget/src/progress_bar.rs
index dd46fa76ce..896d40feed 100644
--- a/native/src/widget/progress_bar.rs
+++ b/widget/src/progress_bar.rs
@@ -1,8 +1,10 @@
 //! Provide progress feedback to your users.
-use crate::layout;
-use crate::renderer;
-use crate::widget::Tree;
-use crate::{Color, Element, Layout, Length, Point, Rectangle, Size, Widget};
+use crate::core::layout;
+use crate::core::renderer;
+use crate::core::widget::Tree;
+use crate::core::{
+    Color, Element, Layout, Length, Point, Rectangle, Size, Widget,
+};
 
 use std::ops::RangeInclusive;
 
@@ -12,7 +14,9 @@ pub use iced_style::progress_bar::{Appearance, StyleSheet};
 ///
 /// # Example
 /// ```
-/// # type ProgressBar = iced_native::widget::ProgressBar<iced_native::renderer::Null>;
+/// # type ProgressBar =
+/// #     iced_widget::ProgressBar<iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
+/// #
 /// let value = 50.0;
 ///
 /// ProgressBar::new(0.0..=100.0, value);
@@ -20,9 +24,9 @@ pub use iced_style::progress_bar::{Appearance, StyleSheet};
 ///
 /// ![Progress bar drawn with `iced_wgpu`](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png)
 #[allow(missing_debug_implementations)]
-pub struct ProgressBar<Renderer>
+pub struct ProgressBar<Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     range: RangeInclusive<f32>,
@@ -34,7 +38,7 @@ where
 
 impl<Renderer> ProgressBar<Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// The default height of a [`ProgressBar`].
@@ -79,7 +83,7 @@ where
 
 impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn width(&self) -> Length {
@@ -157,7 +161,7 @@ impl<'a, Message, Renderer> From<ProgressBar<Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(
diff --git a/src/widget/qr_code.rs b/widget/src/qr_code.rs
similarity index 98%
rename from src/widget/qr_code.rs
rename to widget/src/qr_code.rs
index 66442d5d8c..7709125f90 100644
--- a/src/widget/qr_code.rs
+++ b/widget/src/qr_code.rs
@@ -1,13 +1,12 @@
 //! Encode and display information in a QR code.
-use crate::widget::canvas;
-use crate::Renderer;
-
-use iced_native::layout;
-use iced_native::renderer;
-use iced_native::widget::Tree;
-use iced_native::{
+use crate::canvas;
+use crate::core::layout;
+use crate::core::renderer::{self, Renderer as _};
+use crate::core::widget::Tree;
+use crate::core::{
     Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
 };
+use crate::Renderer;
 use thiserror::Error;
 
 const DEFAULT_CELL_SIZE: u16 = 4;
@@ -78,8 +77,6 @@ impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
         _cursor_position: Point,
         _viewport: &Rectangle,
     ) {
-        use iced_native::Renderer as _;
-
         let bounds = layout.bounds();
         let side_length = self.state.width + 2 * QUIET_ZONE;
 
diff --git a/native/src/widget/radio.rs b/widget/src/radio.rs
similarity index 92%
rename from native/src/widget/radio.rs
rename to widget/src/radio.rs
index 5f60eaefad..e5c67f3d31 100644
--- a/native/src/widget/radio.rs
+++ b/widget/src/radio.rs
@@ -1,16 +1,17 @@
 //! Create choices using radio buttons.
-use crate::alignment;
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::text;
-use crate::touch;
-use crate::widget::{self, Row, Text, Tree};
-use crate::{
+use crate::core::alignment;
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::text;
+use crate::core::touch;
+use crate::core::widget::Tree;
+use crate::core::{
     Alignment, Clipboard, Color, Element, Layout, Length, Pixels, Point,
     Rectangle, Shell, Widget,
 };
+use crate::{Row, Text};
 
 pub use iced_style::radio::{Appearance, StyleSheet};
 
@@ -19,7 +20,7 @@ pub use iced_style::radio::{Appearance, StyleSheet};
 /// # Example
 /// ```
 /// # type Radio<Message> =
-/// #     iced_native::widget::Radio<Message, iced_native::renderer::Null>;
+/// #     iced_widget::Radio<Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 /// pub enum Choice {
@@ -41,7 +42,7 @@ pub use iced_style::radio::{Appearance, StyleSheet};
 ///
 /// ![Radio buttons drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/radio.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct Radio<Message, Renderer>
+pub struct Radio<Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -144,7 +145,7 @@ impl<Message, Renderer> Widget<Message, Renderer> for Radio<Message, Renderer>
 where
     Message: Clone,
     Renderer: text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn width(&self) -> Length {
         self.width
@@ -269,14 +270,14 @@ where
         {
             let label_layout = children.next().unwrap();
 
-            widget::text::draw(
+            crate::text::draw(
                 renderer,
                 style,
                 label_layout,
                 &self.label,
                 self.text_size,
                 self.font,
-                widget::text::Appearance {
+                crate::text::Appearance {
                     color: custom_style.text_color,
                 },
                 alignment::Horizontal::Left,
@@ -291,7 +292,7 @@ impl<'a, Message, Renderer> From<Radio<Message, Renderer>>
 where
     Message: 'a + Clone,
     Renderer: 'a + text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn from(radio: Radio<Message, Renderer>) -> Element<'a, Message, Renderer> {
         Element::new(radio)
diff --git a/native/src/widget/row.rs b/widget/src/row.rs
similarity index 94%
rename from native/src/widget/row.rs
rename to widget/src/row.rs
index 286c1c2d8c..3ce363f8d6 100644
--- a/native/src/widget/row.rs
+++ b/widget/src/row.rs
@@ -1,18 +1,18 @@
 //! Distribute content horizontally.
-use crate::event::{self, Event};
-use crate::layout::{self, Layout};
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::widget::{Operation, Tree};
-use crate::{
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::{Operation, Tree};
+use crate::core::{
     Alignment, Clipboard, Element, Length, Padding, Pixels, Point, Rectangle,
     Shell, Widget,
 };
 
 /// A container that distributes its contents horizontally.
 #[allow(missing_debug_implementations)]
-pub struct Row<'a, Message, Renderer> {
+pub struct Row<'a, Message, Renderer = crate::Renderer> {
     spacing: f32,
     padding: Padding,
     width: Length,
@@ -94,7 +94,7 @@ impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> {
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Row<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
 {
     fn children(&self) -> Vec<Tree> {
         self.children.iter().map(Tree::new).collect()
@@ -245,7 +245,7 @@ impl<'a, Message, Renderer> From<Row<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: crate::Renderer + 'a,
+    Renderer: crate::core::Renderer + 'a,
 {
     fn from(row: Row<'a, Message, Renderer>) -> Self {
         Self::new(row)
diff --git a/native/src/widget/rule.rs b/widget/src/rule.rs
similarity index 90%
rename from native/src/widget/rule.rs
rename to widget/src/rule.rs
index 1ab6a0d300..3749d7cea2 100644
--- a/native/src/widget/rule.rs
+++ b/widget/src/rule.rs
@@ -1,18 +1,18 @@
 //! Display a horizontal or vertical rule for dividing content.
-use crate::layout;
-use crate::renderer;
-use crate::widget::Tree;
-use crate::{
+use crate::core::layout;
+use crate::core::renderer;
+use crate::core::widget::Tree;
+use crate::core::{
     Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget,
 };
 
-pub use iced_style::rule::{Appearance, FillMode, StyleSheet};
+pub use crate::style::rule::{Appearance, FillMode, StyleSheet};
 
 /// Display a horizontal or vertical rule for dividing content.
 #[allow(missing_debug_implementations)]
-pub struct Rule<Renderer>
+pub struct Rule<Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     width: Length,
@@ -23,7 +23,7 @@ where
 
 impl<Renderer> Rule<Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// Creates a horizontal [`Rule`] with the given height.
@@ -58,7 +58,7 @@ where
 
 impl<Message, Renderer> Widget<Message, Renderer> for Rule<Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn width(&self) -> Length {
@@ -138,7 +138,7 @@ impl<'a, Message, Renderer> From<Rule<Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(rule: Rule<Renderer>) -> Element<'a, Message, Renderer> {
diff --git a/native/src/widget/scrollable.rs b/widget/src/scrollable.rs
similarity index 91%
rename from native/src/widget/scrollable.rs
rename to widget/src/scrollable.rs
index c1df8c39dc..49c780deac 100644
--- a/native/src/widget/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -1,35 +1,29 @@
 //! Navigate an endless amount of content with a scrollbar.
-use crate::event::{self, Event};
-use crate::keyboard;
-use crate::layout;
-use crate::mouse;
-use crate::overlay;
-use crate::renderer;
-use crate::touch;
-use crate::widget;
-use crate::widget::operation::{self, Operation};
-use crate::widget::tree::{self, Tree};
-use crate::{
-    Background, Clipboard, Color, Command, Element, Layout, Length, Pixels,
-    Point, Rectangle, Shell, Size, Vector, Widget,
+use crate::core::event::{self, Event};
+use crate::core::keyboard;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::touch;
+use crate::core::widget;
+use crate::core::widget::operation::{self, Operation};
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
+    Background, Clipboard, Color, Element, Layout, Length, Pixels, Point,
+    Rectangle, Shell, Size, Vector, Widget,
 };
+use crate::native::Command;
 
-pub use iced_style::scrollable::StyleSheet;
+pub use crate::style::scrollable::{Scrollbar, Scroller, StyleSheet};
 pub use operation::scrollable::RelativeOffset;
 
-pub mod style {
-    //! The styles of a [`Scrollable`].
-    //!
-    //! [`Scrollable`]: crate::widget::Scrollable
-    pub use iced_style::scrollable::{Scrollbar, Scroller};
-}
-
 /// A widget that can vertically display an infinite amount of content with a
 /// scrollbar.
 #[allow(missing_debug_implementations)]
-pub struct Scrollable<'a, Message, Renderer>
+pub struct Scrollable<'a, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     id: Option<Id>,
@@ -43,7 +37,7 @@ where
 
 impl<'a, Message, Renderer> Scrollable<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// Creates a new [`Scrollable`].
@@ -153,7 +147,7 @@ impl Properties {
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Scrollable<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -345,7 +339,7 @@ impl<'a, Message, Renderer> From<Scrollable<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(
@@ -763,7 +757,7 @@ pub fn draw<Renderer>(
     style: &<Renderer::Theme as StyleSheet>::Style,
     draw_content: impl FnOnce(&mut Renderer, Layout<'_>, Point, &Rectangle),
 ) where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
@@ -809,8 +803,8 @@ pub fn draw<Renderer>(
 
         let draw_scrollbar =
             |renderer: &mut Renderer,
-             style: style::Scrollbar,
-             scrollbar: &Scrollbar| {
+             style: Scrollbar,
+             scrollbar: &internals::Scrollbar| {
                 //track
                 if style.background.is_some()
                     || (style.border_color != Color::TRANSPARENT
@@ -1068,8 +1062,8 @@ impl State {
 #[derive(Debug)]
 /// State of both [`Scrollbar`]s.
 struct Scrollbars {
-    y: Option<Scrollbar>,
-    x: Option<Scrollbar>,
+    y: Option<internals::Scrollbar>,
+    x: Option<internals::Scrollbar>,
 }
 
 impl Scrollbars {
@@ -1139,10 +1133,10 @@ impl Scrollbars {
                 height: scroller_height,
             };
 
-            Some(Scrollbar {
+            Some(internals::Scrollbar {
                 total_bounds: total_scrollbar_bounds,
                 bounds: scrollbar_bounds,
-                scroller: Scroller {
+                scroller: internals::Scroller {
                     bounds: scroller_bounds,
                 },
             })
@@ -1199,10 +1193,10 @@ impl Scrollbars {
                 height: scroller_width,
             };
 
-            Some(Scrollbar {
+            Some(internals::Scrollbar {
                 total_bounds: total_scrollbar_bounds,
                 bounds: scrollbar_bounds,
-                scroller: Scroller {
+                scroller: internals::Scroller {
                     bounds: scroller_bounds,
                 },
             })
@@ -1264,64 +1258,68 @@ impl Scrollbars {
     }
 }
 
-/// The scrollbar of a [`Scrollable`].
-#[derive(Debug, Copy, Clone)]
-struct Scrollbar {
-    /// The total bounds of the [`Scrollbar`], including the scrollbar, the scroller,
-    /// and the scrollbar margin.
-    total_bounds: Rectangle,
+pub(super) mod internals {
+    use crate::core::{Point, Rectangle};
 
-    /// The bounds of just the [`Scrollbar`].
-    bounds: Rectangle,
+    /// The scrollbar of a [`Scrollable`].
+    #[derive(Debug, Copy, Clone)]
+    pub struct Scrollbar {
+        /// The total bounds of the [`Scrollbar`], including the scrollbar, the scroller,
+        /// and the scrollbar margin.
+        pub total_bounds: Rectangle,
 
-    /// The state of this scrollbar's [`Scroller`].
-    scroller: Scroller,
-}
+        /// The bounds of just the [`Scrollbar`].
+        pub bounds: Rectangle,
 
-impl Scrollbar {
-    /// Returns whether the mouse is over the scrollbar or not.
-    fn is_mouse_over(&self, cursor_position: Point) -> bool {
-        self.total_bounds.contains(cursor_position)
+        /// The state of this scrollbar's [`Scroller`].
+        pub scroller: Scroller,
     }
 
-    /// Returns the y-axis scrolled percentage from the cursor position.
-    fn scroll_percentage_y(
-        &self,
-        grabbed_at: f32,
-        cursor_position: Point,
-    ) -> f32 {
-        if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
-            // cursor position is unavailable! Set to either end or beginning of scrollbar depending
-            // on where the thumb currently is in the track
-            (self.scroller.bounds.y / self.total_bounds.height).round()
-        } else {
-            (cursor_position.y
-                - self.bounds.y
-                - self.scroller.bounds.height * grabbed_at)
-                / (self.bounds.height - self.scroller.bounds.height)
+    impl Scrollbar {
+        /// Returns whether the mouse is over the scrollbar or not.
+        pub fn is_mouse_over(&self, cursor_position: Point) -> bool {
+            self.total_bounds.contains(cursor_position)
         }
-    }
 
-    /// Returns the x-axis scrolled percentage from the cursor position.
-    fn scroll_percentage_x(
-        &self,
-        grabbed_at: f32,
-        cursor_position: Point,
-    ) -> f32 {
-        if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
-            (self.scroller.bounds.x / self.total_bounds.width).round()
-        } else {
-            (cursor_position.x
-                - self.bounds.x
-                - self.scroller.bounds.width * grabbed_at)
-                / (self.bounds.width - self.scroller.bounds.width)
+        /// Returns the y-axis scrolled percentage from the cursor position.
+        pub fn scroll_percentage_y(
+            &self,
+            grabbed_at: f32,
+            cursor_position: Point,
+        ) -> f32 {
+            if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
+                // cursor position is unavailable! Set to either end or beginning of scrollbar depending
+                // on where the thumb currently is in the track
+                (self.scroller.bounds.y / self.total_bounds.height).round()
+            } else {
+                (cursor_position.y
+                    - self.bounds.y
+                    - self.scroller.bounds.height * grabbed_at)
+                    / (self.bounds.height - self.scroller.bounds.height)
+            }
+        }
+
+        /// Returns the x-axis scrolled percentage from the cursor position.
+        pub fn scroll_percentage_x(
+            &self,
+            grabbed_at: f32,
+            cursor_position: Point,
+        ) -> f32 {
+            if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
+                (self.scroller.bounds.x / self.total_bounds.width).round()
+            } else {
+                (cursor_position.x
+                    - self.bounds.x
+                    - self.scroller.bounds.width * grabbed_at)
+                    / (self.bounds.width - self.scroller.bounds.width)
+            }
         }
     }
-}
 
-/// The handle of a [`Scrollbar`].
-#[derive(Debug, Clone, Copy)]
-struct Scroller {
-    /// The bounds of the [`Scroller`].
-    bounds: Rectangle,
+    /// The handle of a [`Scrollbar`].
+    #[derive(Debug, Clone, Copy)]
+    pub struct Scroller {
+        /// The bounds of the [`Scroller`].
+        pub bounds: Rectangle,
+    }
 }
diff --git a/native/src/widget/slider.rs b/widget/src/slider.rs
similarity index 95%
rename from native/src/widget/slider.rs
rename to widget/src/slider.rs
index d3715b1c0d..70a84fc61b 100644
--- a/native/src/widget/slider.rs
+++ b/widget/src/slider.rs
@@ -1,13 +1,13 @@
 //! Display an interactive selector of a single value from a range of values.
 //!
 //! A [`Slider`] has some local [`State`].
-use crate::event::{self, Event};
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::touch;
-use crate::widget::tree::{self, Tree};
-use crate::{
+use crate::core::event::{self, Event};
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::touch;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
     Background, Clipboard, Color, Element, Layout, Length, Pixels, Point,
     Rectangle, Shell, Size, Widget,
 };
@@ -26,10 +26,8 @@ pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
 ///
 /// # Example
 /// ```
-/// # use iced_native::widget::slider;
-/// # use iced_native::renderer::Null;
-/// #
-/// # type Slider<'a, T, Message> = slider::Slider<'a, T, Message, Null>;
+/// # type Slider<'a, T, Message> =
+/// #     iced_widget::Slider<'a, Message, T, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// #[derive(Clone)]
 /// pub enum Message {
@@ -43,9 +41,9 @@ pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
 ///
 /// ![Slider drawn by Coffee's renderer](https://github.com/hecrj/coffee/blob/bda9818f823dfcb8a7ad0ff4940b4d4b387b5208/images/ui/slider.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct Slider<'a, T, Message, Renderer>
+pub struct Slider<'a, T, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     range: RangeInclusive<T>,
@@ -62,7 +60,7 @@ impl<'a, T, Message, Renderer> Slider<'a, T, Message, Renderer>
 where
     T: Copy + From<u8> + std::cmp::PartialOrd,
     Message: Clone,
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// The default height of a [`Slider`].
@@ -148,7 +146,7 @@ impl<'a, T, Message, Renderer> Widget<Message, Renderer>
 where
     T: Copy + Into<f64> + num_traits::FromPrimitive,
     Message: Clone,
-    Renderer: crate::Renderer,
+    Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -245,7 +243,7 @@ impl<'a, T, Message, Renderer> From<Slider<'a, T, Message, Renderer>>
 where
     T: 'a + Copy + Into<f64> + num_traits::FromPrimitive,
     Message: 'a + Clone,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + crate::core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(
@@ -354,7 +352,7 @@ pub fn draw<T, R>(
     style: &<R::Theme as StyleSheet>::Style,
 ) where
     T: Into<f64> + Copy,
-    R: crate::Renderer,
+    R: crate::core::Renderer,
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
diff --git a/native/src/widget/space.rs b/widget/src/space.rs
similarity index 88%
rename from native/src/widget/space.rs
rename to widget/src/space.rs
index a6fc977e01..e1e09d5a92 100644
--- a/native/src/widget/space.rs
+++ b/widget/src/space.rs
@@ -1,8 +1,9 @@
 //! Distribute content vertically.
-use crate::layout;
-use crate::renderer;
-use crate::widget::Tree;
-use crate::{Element, Layout, Length, Point, Rectangle, Size, Widget};
+use crate::core;
+use crate::core::layout;
+use crate::core::renderer;
+use crate::core::widget::Tree;
+use crate::core::{Element, Layout, Length, Point, Rectangle, Size, Widget};
 
 /// An amount of empty space.
 ///
@@ -41,7 +42,7 @@ impl Space {
 
 impl<Message, Renderer> Widget<Message, Renderer> for Space
 where
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
 {
     fn width(&self) -> Length {
         self.width
@@ -76,7 +77,7 @@ where
 
 impl<'a, Message, Renderer> From<Space> for Element<'a, Message, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
     Message: 'a,
 {
     fn from(space: Space) -> Element<'a, Message, Renderer> {
diff --git a/native/src/widget/svg.rs b/widget/src/svg.rs
similarity index 95%
rename from native/src/widget/svg.rs
rename to widget/src/svg.rs
index f5ed0a6c88..89017fcff3 100644
--- a/native/src/widget/svg.rs
+++ b/widget/src/svg.rs
@@ -1,15 +1,15 @@
 //! Display vector graphics in your application.
-use crate::layout;
-use crate::renderer;
-use crate::svg;
-use crate::widget::Tree;
-use crate::{
+use crate::core::layout;
+use crate::core::renderer;
+use crate::core::svg;
+use crate::core::widget::Tree;
+use crate::core::{
     ContentFit, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
 };
 
 use std::path::PathBuf;
 
-pub use iced_style::svg::{Appearance, StyleSheet};
+pub use crate::style::svg::{Appearance, StyleSheet};
 pub use svg::Handle;
 
 /// A vector graphics image.
@@ -19,7 +19,7 @@ pub use svg::Handle;
 /// [`Svg`] images can have a considerable rendering cost when resized,
 /// specially when they are complex.
 #[allow(missing_debug_implementations)]
-pub struct Svg<Renderer>
+pub struct Svg<Renderer = crate::Renderer>
 where
     Renderer: svg::Renderer,
     Renderer::Theme: StyleSheet,
diff --git a/widget/src/text.rs b/widget/src/text.rs
new file mode 100644
index 0000000000..04c31edcd3
--- /dev/null
+++ b/widget/src/text.rs
@@ -0,0 +1,4 @@
+pub use crate::core::widget::text::*;
+
+pub type Text<'a, Renderer = crate::Renderer> =
+    crate::core::widget::Text<'a, Renderer>;
diff --git a/native/src/widget/text_input.rs b/widget/src/text_input.rs
similarity index 97%
rename from native/src/widget/text_input.rs
rename to widget/src/text_input.rs
index 65a9bd3b21..67d80e2b69 100644
--- a/native/src/widget/text_input.rs
+++ b/widget/src/text_input.rs
@@ -11,23 +11,24 @@ pub use value::Value;
 
 use editor::Editor;
 
-use crate::alignment;
-use crate::event::{self, Event};
-use crate::keyboard;
-use crate::layout;
-use crate::mouse::{self, click};
-use crate::renderer;
-use crate::text::{self, Text};
-use crate::time::{Duration, Instant};
-use crate::touch;
-use crate::widget;
-use crate::widget::operation::{self, Operation};
-use crate::widget::tree::{self, Tree};
-use crate::window;
-use crate::{
-    Clipboard, Color, Command, Element, Layout, Length, Padding, Pixels, Point,
+use crate::core::alignment;
+use crate::core::event::{self, Event};
+use crate::core::keyboard;
+use crate::core::layout;
+use crate::core::mouse::{self, click};
+use crate::core::renderer;
+use crate::core::text::{self, Text};
+use crate::core::time::{Duration, Instant};
+use crate::core::touch;
+use crate::core::widget;
+use crate::core::widget::operation::{self, Operation};
+use crate::core::widget::tree::{self, Tree};
+use crate::core::window;
+use crate::core::{
+    Clipboard, Color, Element, Layout, Length, Padding, Pixels, Point,
     Rectangle, Shell, Size, Vector, Widget,
 };
+use crate::native::Command;
 
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
@@ -35,7 +36,9 @@ pub use iced_style::text_input::{Appearance, StyleSheet};
 ///
 /// # Example
 /// ```
-/// # pub type TextInput<'a, Message> = iced_native::widget::TextInput<'a, Message, iced_native::renderer::Null>;
+/// # pub type TextInput<'a, Message> =
+/// #     iced_widget::TextInput<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
+/// #
 /// #[derive(Debug, Clone)]
 /// enum Message {
 ///     TextInputChanged(String),
@@ -52,7 +55,7 @@ pub use iced_style::text_input::{Appearance, StyleSheet};
 /// ```
 /// ![Text input drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/text_input.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct TextInput<'a, Message, Renderer>
+pub struct TextInput<'a, Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -1109,7 +1112,7 @@ impl operation::TextInput for State {
 }
 
 mod platform {
-    use crate::keyboard;
+    use crate::core::keyboard;
 
     pub fn is_jump_modifier_pressed(modifiers: keyboard::Modifiers) -> bool {
         if cfg!(target_os = "macos") {
diff --git a/native/src/widget/text_input/cursor.rs b/widget/src/text_input/cursor.rs
similarity index 99%
rename from native/src/widget/text_input/cursor.rs
rename to widget/src/text_input/cursor.rs
index 4f3b159b9d..9680dfd746 100644
--- a/native/src/widget/text_input/cursor.rs
+++ b/widget/src/text_input/cursor.rs
@@ -1,5 +1,5 @@
 //! Track the cursor of a text input.
-use crate::widget::text_input::Value;
+use crate::text_input::Value;
 
 /// The cursor of a text input.
 #[derive(Debug, Copy, Clone)]
diff --git a/native/src/widget/text_input/editor.rs b/widget/src/text_input/editor.rs
similarity index 97%
rename from native/src/widget/text_input/editor.rs
rename to widget/src/text_input/editor.rs
index d53fa8d964..f1fd641f31 100644
--- a/native/src/widget/text_input/editor.rs
+++ b/widget/src/text_input/editor.rs
@@ -1,4 +1,4 @@
-use crate::widget::text_input::{Cursor, Value};
+use crate::text_input::{Cursor, Value};
 
 pub struct Editor<'a> {
     value: &'a mut Value,
diff --git a/native/src/widget/text_input/value.rs b/widget/src/text_input/value.rs
similarity index 100%
rename from native/src/widget/text_input/value.rs
rename to widget/src/text_input/value.rs
diff --git a/native/src/widget/toggler.rs b/widget/src/toggler.rs
similarity index 93%
rename from native/src/widget/toggler.rs
rename to widget/src/toggler.rs
index d9c80ebe31..f23f9b27a0 100644
--- a/native/src/widget/toggler.rs
+++ b/widget/src/toggler.rs
@@ -1,24 +1,26 @@
 //! Show toggle controls using togglers.
-use crate::alignment;
-use crate::event;
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::text;
-use crate::widget::{self, Row, Text, Tree};
-use crate::{
+use crate::core::alignment;
+use crate::core::event;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::text;
+use crate::core::widget::Tree;
+use crate::core::{
     Alignment, Clipboard, Element, Event, Layout, Length, Pixels, Point,
     Rectangle, Shell, Widget,
 };
+use crate::{Row, Text};
 
-pub use iced_style::toggler::{Appearance, StyleSheet};
+pub use crate::style::toggler::{Appearance, StyleSheet};
 
 /// A toggler widget.
 ///
 /// # Example
 ///
 /// ```
-/// # type Toggler<'a, Message> = iced_native::widget::Toggler<'a, Message, iced_native::renderer::Null>;
+/// # type Toggler<'a, Message> =
+/// #     iced_widget::Toggler<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// pub enum Message {
 ///     TogglerToggled(bool),
@@ -29,7 +31,7 @@ pub use iced_style::toggler::{Appearance, StyleSheet};
 /// Toggler::new(String::from("Toggle me!"), is_toggled, |b| Message::TogglerToggled(b));
 /// ```
 #[allow(missing_debug_implementations)]
-pub struct Toggler<'a, Message, Renderer>
+pub struct Toggler<'a, Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -136,7 +138,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Toggler<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn width(&self) -> Length {
         self.width
@@ -237,7 +239,7 @@ where
         if let Some(label) = &self.label {
             let label_layout = children.next().unwrap();
 
-            crate::widget::text::draw(
+            crate::text::draw(
                 renderer,
                 style,
                 label_layout,
@@ -314,7 +316,7 @@ impl<'a, Message, Renderer> From<Toggler<'a, Message, Renderer>>
 where
     Message: 'a,
     Renderer: 'a + text::Renderer,
-    Renderer::Theme: StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: StyleSheet + crate::text::StyleSheet,
 {
     fn from(
         toggler: Toggler<'a, Message, Renderer>,
diff --git a/native/src/widget/tooltip.rs b/widget/src/tooltip.rs
similarity index 93%
rename from native/src/widget/tooltip.rs
rename to widget/src/tooltip.rs
index 2a24c05566..084650d104 100644
--- a/native/src/widget/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -1,26 +1,27 @@
 //! Display a widget over another.
-use crate::event;
-use crate::layout;
-use crate::mouse;
-use crate::renderer;
-use crate::text;
-use crate::widget;
-use crate::widget::container;
-use crate::widget::overlay;
-use crate::widget::{Text, Tree};
-use crate::{
-    Clipboard, Element, Event, Layout, Length, Padding, Pixels, Point,
-    Rectangle, Shell, Size, Vector, Widget,
+use crate::container;
+use crate::core;
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::text;
+use crate::core::widget::Tree;
+use crate::core::{
+    Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Shell, Size,
+    Vector, Widget,
 };
+use crate::Text;
 
 use std::borrow::Cow;
 
 /// An element to display a widget over another.
 #[allow(missing_debug_implementations)]
-pub struct Tooltip<'a, Message, Renderer: text::Renderer>
+pub struct Tooltip<'a, Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: container::StyleSheet + crate::text::StyleSheet,
 {
     content: Element<'a, Message, Renderer>,
     tooltip: Text<'a, Renderer>,
@@ -34,7 +35,7 @@ where
 impl<'a, Message, Renderer> Tooltip<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: container::StyleSheet + crate::text::StyleSheet,
 {
     /// The default padding of a [`Tooltip`] drawn by this renderer.
     const DEFAULT_PADDING: f32 = 5.0;
@@ -104,7 +105,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Tooltip<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
-    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: container::StyleSheet + crate::text::StyleSheet,
 {
     fn children(&self) -> Vec<Tree> {
         vec![Tree::new(&self.content)]
@@ -239,7 +240,7 @@ impl<'a, Message, Renderer> From<Tooltip<'a, Message, Renderer>>
 where
     Message: 'a,
     Renderer: 'a + text::Renderer,
-    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
+    Renderer::Theme: container::StyleSheet + crate::text::StyleSheet,
 {
     fn from(
         tooltip: Tooltip<'a, Message, Renderer>,
@@ -285,7 +286,7 @@ pub fn draw<Renderer>(
         &Rectangle,
     ),
 ) where
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
     Renderer::Theme: container::StyleSheet,
 {
     use container::StyleSheet;
diff --git a/native/src/widget/vertical_slider.rs b/widget/src/vertical_slider.rs
similarity index 93%
rename from native/src/widget/vertical_slider.rs
rename to widget/src/vertical_slider.rs
index f1687e38dd..64a9583c1b 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -3,13 +3,18 @@
 //! A [`VerticalSlider`] has some local [`State`].
 use std::ops::RangeInclusive;
 
-pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
-
-use crate::event::{self, Event};
-use crate::widget::tree::{self, Tree};
-use crate::{
-    layout, mouse, renderer, touch, Background, Clipboard, Color, Element,
-    Layout, Length, Pixels, Point, Rectangle, Shell, Size, Widget,
+pub use crate::style::slider::{Appearance, Handle, HandleShape, StyleSheet};
+
+use crate::core;
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::touch;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::{
+    Background, Clipboard, Color, Element, Length, Pixels, Point, Rectangle,
+    Shell, Size, Widget,
 };
 
 /// An vertical bar and a handle that selects a single value from a range of
@@ -22,10 +27,8 @@ use crate::{
 ///
 /// # Example
 /// ```
-/// # use iced_native::widget::vertical_slider;
-/// # use iced_native::renderer::Null;
-/// #
-/// # type VerticalSlider<'a, T, Message> = vertical_slider::VerticalSlider<'a, T, Message, Null>;
+/// # type VerticalSlider<'a, T, Message> =
+/// #     iced_widget::VerticalSlider<'a, T, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
 /// #[derive(Clone)]
 /// pub enum Message {
@@ -37,9 +40,9 @@ use crate::{
 /// VerticalSlider::new(0.0..=100.0, value, Message::SliderChanged);
 /// ```
 #[allow(missing_debug_implementations)]
-pub struct VerticalSlider<'a, T, Message, Renderer>
+pub struct VerticalSlider<'a, T, Message, Renderer = crate::Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     range: RangeInclusive<T>,
@@ -56,7 +59,7 @@ impl<'a, T, Message, Renderer> VerticalSlider<'a, T, Message, Renderer>
 where
     T: Copy + From<u8> + std::cmp::PartialOrd,
     Message: Clone,
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// The default width of a [`VerticalSlider`].
@@ -142,7 +145,7 @@ impl<'a, T, Message, Renderer> Widget<Message, Renderer>
 where
     T: Copy + Into<f64> + num_traits::FromPrimitive,
     Message: Clone,
-    Renderer: crate::Renderer,
+    Renderer: core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -239,7 +242,7 @@ impl<'a, T, Message, Renderer> From<VerticalSlider<'a, T, Message, Renderer>>
 where
     T: 'a + Copy + Into<f64> + num_traits::FromPrimitive,
     Message: 'a + Clone,
-    Renderer: 'a + crate::Renderer,
+    Renderer: 'a + core::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn from(
@@ -349,7 +352,7 @@ pub fn draw<T, R>(
     style: &<R::Theme as StyleSheet>::Style,
 ) where
     T: Into<f64> + Copy,
-    R: crate::Renderer,
+    R: core::Renderer,
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 60e464c6ca..21c14f68ba 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -35,9 +35,9 @@ path = "../native"
 version = "0.7"
 path = "../graphics"
 
-[dependencies.iced_futures]
-version = "0.6"
-path = "../futures"
+[dependencies.iced_style]
+version = "0.7"
+path = "../style"
 
 [dependencies.tracing]
 version = "0.1.37"
diff --git a/winit/src/application.rs b/winit/src/application.rs
index b52f01974a..c8162c9b53 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -5,25 +5,25 @@ mod state;
 
 pub use state::State;
 
-use crate::clipboard::{self, Clipboard};
 use crate::conversion;
-use crate::mouse;
-use crate::renderer;
-use crate::widget::operation;
-use crate::{
-    Command, Debug, Error, Event, Executor, Proxy, Runtime, Settings, Size,
-    Subscription,
-};
-
-use iced_futures::futures;
-use iced_futures::futures::channel::mpsc;
-use iced_graphics::window;
-use iced_graphics::window::compositor;
-use iced_native::program::Program;
-use iced_native::time::Instant;
-use iced_native::user_interface::{self, UserInterface};
-
-pub use iced_native::application::{Appearance, StyleSheet};
+use crate::core;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::time::Instant;
+use crate::core::widget::operation;
+use crate::core::window;
+use crate::core::{Event, Size};
+use crate::futures::futures;
+use crate::futures::Executor;
+use crate::graphics::compositor::{self, Compositor};
+use crate::native::clipboard;
+use crate::native::program::Program;
+use crate::native::user_interface::{self, UserInterface};
+use crate::native::{Command, Debug, Runtime, Subscription};
+use crate::style::application::{Appearance, StyleSheet};
+use crate::{Clipboard, Error, Proxy, Settings};
+
+use futures::channel::mpsc;
 
 use std::mem::ManuallyDrop;
 
@@ -45,7 +45,7 @@ use tracing::{info_span, instrument::Instrument};
 /// can be toggled by pressing `F12`.
 pub trait Application: Program
 where
-    <Self::Renderer as crate::Renderer>::Theme: StyleSheet,
+    <Self::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     /// The data needed to initialize your [`Application`].
     type Flags;
@@ -67,12 +67,12 @@ where
     fn title(&self) -> String;
 
     /// Returns the current `Theme` of the [`Application`].
-    fn theme(&self) -> <Self::Renderer as crate::Renderer>::Theme;
+    fn theme(&self) -> <Self::Renderer as core::Renderer>::Theme;
 
     /// Returns the `Style` variation of the `Theme`.
     fn style(
         &self,
-    ) -> <<Self::Renderer as crate::Renderer>::Theme as StyleSheet>::Style {
+    ) -> <<Self::Renderer as core::Renderer>::Theme as StyleSheet>::Style {
         Default::default()
     }
 
@@ -112,8 +112,8 @@ pub fn run<A, E, C>(
 where
     A: Application + 'static,
     E: Executor + 'static,
-    C: window::Compositor<Renderer = A::Renderer> + 'static,
-    <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+    C: Compositor<Renderer = A::Renderer> + 'static,
+    <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     use futures::task;
     use futures::Future;
@@ -278,10 +278,10 @@ async fn run_instance<A, E, C>(
 ) where
     A: Application + 'static,
     E: Executor + 'static,
-    C: window::Compositor<Renderer = A::Renderer> + 'static,
-    <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+    C: Compositor<Renderer = A::Renderer> + 'static,
+    <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
-    use iced_futures::futures::stream::StreamExt;
+    use futures::stream::StreamExt;
     use winit::event;
     use winit::event_loop::ControlFlow;
 
@@ -411,7 +411,7 @@ async fn run_instance<A, E, C>(
                 // Then, we can use the `interface_state` here to decide if a redraw
                 // is needed right away, or simply wait until a specific time.
                 let redraw_event = Event::Window(
-                    crate::window::Event::RedrawRequested(Instant::now()),
+                    window::Event::RedrawRequested(Instant::now()),
                 );
 
                 let (interface_state, _) = user_interface.update(
@@ -442,17 +442,14 @@ async fn run_instance<A, E, C>(
                 }
 
                 window.request_redraw();
-                runtime
-                    .broadcast((redraw_event, crate::event::Status::Ignored));
+                runtime.broadcast((redraw_event, core::event::Status::Ignored));
 
                 let _ = control_sender.start_send(match interface_state {
                     user_interface::State::Updated {
                         redraw_request: Some(redraw_request),
                     } => match redraw_request {
-                        crate::window::RedrawRequest::NextFrame => {
-                            ControlFlow::Poll
-                        }
-                        crate::window::RedrawRequest::At(at) => {
+                        window::RedrawRequest::NextFrame => ControlFlow::Poll,
+                        window::RedrawRequest::At(at) => {
                             ControlFlow::WaitUntil(at)
                         }
                     },
@@ -464,9 +461,9 @@ async fn run_instance<A, E, C>(
             event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
                 event::MacOS::ReceivedUrl(url),
             )) => {
-                use iced_native::event;
+                use crate::core::event;
 
-                events.push(iced_native::Event::PlatformSpecific(
+                events.push(Event::PlatformSpecific(
                     event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
                         url,
                     )),
@@ -615,7 +612,7 @@ pub fn build_user_interface<'a, A: Application>(
     debug: &mut Debug,
 ) -> UserInterface<'a, A::Message, A::Renderer>
 where
-    <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+    <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     #[cfg(feature = "trace")]
     let view_span = info_span!("Application", "VIEW").entered();
@@ -656,7 +653,7 @@ pub fn update<A: Application, E: Executor>(
     window: &winit::window::Window,
     graphics_info: impl FnOnce() -> compositor::Information + Copy,
 ) where
-    <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+    <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     for message in messages.drain(..) {
         #[cfg(feature = "trace")]
@@ -708,7 +705,7 @@ pub fn run_command<A, E>(
 ) where
     A: Application,
     E: Executor,
-    <A::Renderer as crate::Renderer>::Theme: StyleSheet,
+    <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     use iced_native::command;
     use iced_native::system;
@@ -767,7 +764,7 @@ pub fn run_command<A, E>(
                     let mode = if window.is_visible().unwrap_or(true) {
                         conversion::mode(window.fullscreen())
                     } else {
-                        window::Mode::Hidden
+                        core::window::Mode::Hidden
                     };
 
                     proxy
@@ -849,7 +846,7 @@ pub fn run_command<A, E>(
                 *cache = current_cache;
             }
             command::Action::LoadFont { bytes, tagger } => {
-                use crate::text::Renderer;
+                use crate::core::text::Renderer;
 
                 // TODO: Error handling (?)
                 renderer.load_font(bytes);
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index 8d6a1df11f..b727e03ca9 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -1,6 +1,10 @@
 use crate::application::{self, StyleSheet as _};
 use crate::conversion;
-use crate::{Application, Color, Debug, Point, Size, Viewport};
+use crate::core;
+use crate::core::{Color, Point, Size};
+use crate::graphics::Viewport;
+use crate::native::Debug;
+use crate::Application;
 
 use std::marker::PhantomData;
 use winit::event::{Touch, WindowEvent};
@@ -10,7 +14,7 @@ use winit::window::Window;
 #[allow(missing_debug_implementations)]
 pub struct State<A: Application>
 where
-    <A::Renderer as crate::Renderer>::Theme: application::StyleSheet,
+    <A::Renderer as core::Renderer>::Theme: application::StyleSheet,
 {
     title: String,
     scale_factor: f64,
@@ -18,14 +22,14 @@ where
     viewport_version: usize,
     cursor_position: winit::dpi::PhysicalPosition<f64>,
     modifiers: winit::event::ModifiersState,
-    theme: <A::Renderer as crate::Renderer>::Theme,
+    theme: <A::Renderer as core::Renderer>::Theme,
     appearance: application::Appearance,
     application: PhantomData<A>,
 }
 
 impl<A: Application> State<A>
 where
-    <A::Renderer as crate::Renderer>::Theme: application::StyleSheet,
+    <A::Renderer as core::Renderer>::Theme: application::StyleSheet,
 {
     /// Creates a new [`State`] for the provided [`Application`] and window.
     pub fn new(application: &A, window: &Window) -> Self {
@@ -98,7 +102,7 @@ where
     }
 
     /// Returns the current theme of the [`State`].
-    pub fn theme(&self) -> &<A::Renderer as crate::Renderer>::Theme {
+    pub fn theme(&self) -> &<A::Renderer as core::Renderer>::Theme {
         &self.theme
     }
 
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index c1fd8813ee..2250913080 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -1,7 +1,6 @@
 //! Access the clipboard.
-pub use iced_native::clipboard::Action;
-
-use crate::command::{self, Command};
+use crate::native::clipboard::Action;
+use crate::native::command::{self, Command};
 
 /// A buffer for short-term storage and transfer within and between
 /// applications.
@@ -56,7 +55,7 @@ impl Clipboard {
     }
 }
 
-impl iced_native::Clipboard for Clipboard {
+impl crate::core::Clipboard for Clipboard {
     fn read(&self) -> Option<String> {
         self.read()
     }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 1b2ead36a4..0759ad9dd7 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -2,11 +2,12 @@
 //!
 //! [`winit`]: https://github.com/rust-windowing/winit
 //! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
-use crate::keyboard;
-use crate::mouse;
-use crate::touch;
-use crate::window;
-use crate::{Event, Point, Position};
+use crate::core::keyboard;
+use crate::core::mouse;
+use crate::core::touch;
+use crate::core::window;
+use crate::core::{Event, Point};
+use crate::Position;
 
 /// Converts a winit window event into an iced event.
 pub fn window_event(
diff --git a/winit/src/error.rs b/winit/src/error.rs
index eaeafd51d4..7687fb1750 100644
--- a/winit/src/error.rs
+++ b/winit/src/error.rs
@@ -1,4 +1,5 @@
-use iced_futures::futures;
+use crate::futures::futures;
+use crate::graphics;
 
 /// An error that occurred while running an application.
 #[derive(Debug, thiserror::Error)]
@@ -13,10 +14,10 @@ pub enum Error {
 
     /// The application graphics context could not be created.
     #[error("the application graphics context could not be created")]
-    GraphicsCreationFailed(iced_graphics::Error),
+    GraphicsCreationFailed(graphics::Error),
 }
 
-impl From<iced_graphics::Error> for Error {
+impl From<graphics::Error> for Error {
     fn from(error: iced_graphics::Error) -> Error {
         Error::GraphicsCreationFailed(error)
     }
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 3a33e1741b..0d8c04d3d3 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -30,9 +30,11 @@
 #![forbid(rust_2018_idioms, unsafe_code)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-
-#[doc(no_inline)]
-pub use iced_native::*;
+pub use iced_graphics as graphics;
+pub use iced_native as native;
+pub use iced_native::core;
+pub use iced_native::futures;
+pub use iced_style as style;
 pub use winit;
 
 #[cfg(feature = "application")]
diff --git a/winit/src/proxy.rs b/winit/src/proxy.rs
index 7b9074d727..1d6c48bb25 100644
--- a/winit/src/proxy.rs
+++ b/winit/src/proxy.rs
@@ -1,4 +1,4 @@
-use iced_native::futures::{
+use crate::futures::futures::{
     channel::mpsc,
     task::{Context, Poll},
     Sink,
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 8a7b2a116d..3a6a8a8ec3 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -1,8 +1,7 @@
 //! Access the native system.
-use crate::command::{self, Command};
-pub use iced_native::system::*;
-
-use iced_graphics::window::compositor;
+use crate::graphics::compositor;
+use crate::native::command::{self, Command};
+use crate::native::system::{Action, Information};
 
 /// Query for available system information.
 pub fn fetch_information<Message>(
diff --git a/winit/src/window.rs b/winit/src/window.rs
index 961562bd7b..6ac58e2073 100644
--- a/winit/src/window.rs
+++ b/winit/src/window.rs
@@ -1,68 +1,58 @@
 //! Interact with the window of your application.
-use crate::command::{self, Command};
-use iced_native::window;
-
-pub use window::{frames, Event, Mode, RedrawRequest, UserAttention};
+use crate::core::window::{Mode, UserAttention};
+use crate::native::command::{self, Command};
+use crate::native::window::Action;
 
 /// Closes the current window and exits the application.
 pub fn close<Message>() -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Close))
+    Command::single(command::Action::Window(Action::Close))
 }
 
 /// Begins dragging the window while the left mouse button is held.
 pub fn drag<Message>() -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Drag))
+    Command::single(command::Action::Window(Action::Drag))
 }
 
 /// Resizes the window to the given logical dimensions.
 pub fn resize<Message>(width: u32, height: u32) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Resize {
-        width,
-        height,
-    }))
+    Command::single(command::Action::Window(Action::Resize { width, height }))
 }
 
 /// Maximizes the window.
 pub fn maximize<Message>(maximized: bool) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Maximize(
-        maximized,
-    )))
+    Command::single(command::Action::Window(Action::Maximize(maximized)))
 }
 
 /// Minimes the window.
 pub fn minimize<Message>(minimized: bool) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Minimize(
-        minimized,
-    )))
+    Command::single(command::Action::Window(Action::Minimize(minimized)))
 }
 
 /// Moves a window to the given logical coordinates.
 pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::Move { x, y }))
+    Command::single(command::Action::Window(Action::Move { x, y }))
 }
 
 /// Sets the [`Mode`] of the window.
 pub fn change_mode<Message>(mode: Mode) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::ChangeMode(mode)))
+    Command::single(command::Action::Window(Action::ChangeMode(mode)))
 }
 
 /// Fetches the current [`Mode`] of the window.
 pub fn fetch_mode<Message>(
     f: impl FnOnce(Mode) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::FetchMode(
-        Box::new(f),
-    )))
+    Command::single(command::Action::Window(Action::FetchMode(Box::new(f))))
 }
 
 /// Toggles the window to maximized or back.
 pub fn toggle_maximize<Message>() -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::ToggleMaximize))
+    Command::single(command::Action::Window(Action::ToggleMaximize))
 }
 
 /// Toggles the window decorations.
 pub fn toggle_decorations<Message>() -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::ToggleDecorations))
+    Command::single(command::Action::Window(Action::ToggleDecorations))
 }
 
 /// Request user attention to the window, this has no effect if the application
@@ -74,9 +64,9 @@ pub fn toggle_decorations<Message>() -> Command<Message> {
 pub fn request_user_attention<Message>(
     user_attention: Option<UserAttention>,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(
-        window::Action::RequestUserAttention(user_attention),
-    ))
+    Command::single(command::Action::Window(Action::RequestUserAttention(
+        user_attention,
+    )))
 }
 
 /// Brings the window to the front and sets input focus. Has no effect if the window is
@@ -86,21 +76,17 @@ pub fn request_user_attention<Message>(
 /// you are certain that's what the user wants. Focus stealing can cause an extremely disruptive
 /// user experience.
 pub fn gain_focus<Message>() -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::GainFocus))
+    Command::single(command::Action::Window(Action::GainFocus))
 }
 
 /// Changes whether or not the window will always be on top of other windows.
 pub fn change_always_on_top<Message>(on_top: bool) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::ChangeAlwaysOnTop(
-        on_top,
-    )))
+    Command::single(command::Action::Window(Action::ChangeAlwaysOnTop(on_top)))
 }
 
 /// Fetches an identifier unique to the window.
 pub fn fetch_id<Message>(
     f: impl FnOnce(u64) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(window::Action::FetchId(Box::new(
-        f,
-    ))))
+    Command::single(command::Action::Window(Action::FetchId(Box::new(f))))
 }

From 5fed065dc3aa3d2f9ff8d229cbffe003a89ba033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 4 Mar 2023 05:56:10 +0100
Subject: [PATCH 083/163] Update `glyphon` in `iced_wgpu`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 4cdd6c680a..50a81a9111 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -55,7 +55,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "810bc979f9005e2bd343b72b980e57e46174283f"
+rev = "edd23695ad53db5f89d455c3c130172fd107d6a2"
 
 [dependencies.encase]
 version = "0.3.0"

From f4cf488e0b083b5d7b7612c650917233163ee9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 04:15:10 +0100
Subject: [PATCH 084/163] Remove generic `Hasher` and `Event` from
 `subscription::Recipe`

---
 examples/download_progress/Cargo.toml      |   2 -
 examples/download_progress/src/download.rs |   2 +-
 examples/websocket/Cargo.toml              |   2 -
 examples/websocket/src/echo.rs             |   4 +-
 examples/websocket/src/echo/server.rs      |   2 +-
 futures/Cargo.toml                         |   4 +
 futures/src/backend/native/async_std.rs    |  14 +-
 futures/src/backend/native/smol.rs         |  14 +-
 futures/src/backend/native/tokio.rs        |  14 +-
 futures/src/lib.rs                         |   1 +
 futures/src/runtime.rs                     |  25 +-
 futures/src/subscription.rs                | 316 +++++++++++++++++----
 futures/src/subscription/tracker.rs        |  51 ++--
 native/src/lib.rs                          |   5 -
 native/src/runtime.rs                      |  18 --
 native/src/subscription.rs                 | 242 +---------------
 native/src/window.rs                       |   2 +-
 src/advanced.rs                            |   5 +
 src/lib.rs                                 |   8 +-
 winit/src/application.rs                   |  16 +-
 20 files changed, 341 insertions(+), 406 deletions(-)
 delete mode 100644 native/src/runtime.rs

diff --git a/examples/download_progress/Cargo.toml b/examples/download_progress/Cargo.toml
index f38679eac0..212832f474 100644
--- a/examples/download_progress/Cargo.toml
+++ b/examples/download_progress/Cargo.toml
@@ -7,8 +7,6 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["tokio"] }
-iced_native = { path = "../../native" }
-iced_futures = { path = "../../futures" }
 
 [dependencies.reqwest]
 version = "0.11"
diff --git a/examples/download_progress/src/download.rs b/examples/download_progress/src/download.rs
index 39dd843fb9..5ff951b39d 100644
--- a/examples/download_progress/src/download.rs
+++ b/examples/download_progress/src/download.rs
@@ -1,4 +1,4 @@
-use iced_native::subscription;
+use iced::subscription;
 
 use std::hash::Hash;
 
diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml
index c25f067b2c..03b240c62d 100644
--- a/examples/websocket/Cargo.toml
+++ b/examples/websocket/Cargo.toml
@@ -7,8 +7,6 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["tokio", "debug"] }
-iced_native = { path = "../../native" }
-iced_futures = { path = "../../futures" }
 once_cell = "1.15"
 
 [dependencies.async-tungstenite]
diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index e74768a66b..122c20dbf0 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -1,7 +1,7 @@
 pub mod server;
 
-use iced_futures::futures;
-use iced_native::subscription::{self, Subscription};
+use iced::futures;
+use iced::subscription::{self, Subscription};
 
 use futures::channel::mpsc;
 use futures::sink::SinkExt;
diff --git a/examples/websocket/src/echo/server.rs b/examples/websocket/src/echo/server.rs
index dd2349849a..168a635e01 100644
--- a/examples/websocket/src/echo/server.rs
+++ b/examples/websocket/src/echo/server.rs
@@ -1,4 +1,4 @@
-use iced_futures::futures;
+use iced::futures;
 
 use futures::channel::mpsc;
 use futures::{SinkExt, StreamExt};
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
index e4d355ee83..411e7c2ad8 100644
--- a/futures/Cargo.toml
+++ b/futures/Cargo.toml
@@ -16,6 +16,10 @@ thread-pool = ["futures/thread-pool"]
 [dependencies]
 log = "0.4"
 
+[dependencies.iced_core]
+version = "0.8"
+path = "../core"
+
 [dependencies.futures]
 version = "0.3"
 
diff --git a/futures/src/backend/native/async_std.rs b/futures/src/backend/native/async_std.rs
index b324dbf14c..52b0e9140d 100644
--- a/futures/src/backend/native/async_std.rs
+++ b/futures/src/backend/native/async_std.rs
@@ -18,28 +18,26 @@ impl crate::Executor for Executor {
 
 pub mod time {
     //! Listen and react to time.
+    use crate::core::Hasher;
     use crate::subscription::{self, Subscription};
 
     /// Returns a [`Subscription`] that produces messages at a set interval.
     ///
     /// The first message is produced after a `duration`, and then continues to
     /// produce more messages every `duration` after that.
-    pub fn every<H: std::hash::Hasher, E>(
+    pub fn every(
         duration: std::time::Duration,
-    ) -> Subscription<H, E, std::time::Instant> {
+    ) -> Subscription<std::time::Instant> {
         Subscription::from_recipe(Every(duration))
     }
 
     #[derive(Debug)]
     struct Every(std::time::Duration);
 
-    impl<H, E> subscription::Recipe<H, E> for Every
-    where
-        H: std::hash::Hasher,
-    {
+    impl subscription::Recipe for Every {
         type Output = std::time::Instant;
 
-        fn hash(&self, state: &mut H) {
+        fn hash(&self, state: &mut Hasher) {
             use std::hash::Hash;
 
             std::any::TypeId::of::<Self>().hash(state);
@@ -48,7 +46,7 @@ pub mod time {
 
         fn stream(
             self: Box<Self>,
-            _input: futures::stream::BoxStream<'static, E>,
+            _input: subscription::EventStream,
         ) -> futures::stream::BoxStream<'static, Self::Output> {
             use futures::stream::StreamExt;
 
diff --git a/futures/src/backend/native/smol.rs b/futures/src/backend/native/smol.rs
index d5201cde0f..30bc8291a0 100644
--- a/futures/src/backend/native/smol.rs
+++ b/futures/src/backend/native/smol.rs
@@ -19,28 +19,26 @@ impl crate::Executor for Executor {
 
 pub mod time {
     //! Listen and react to time.
+    use crate::core::Hasher;
     use crate::subscription::{self, Subscription};
 
     /// Returns a [`Subscription`] that produces messages at a set interval.
     ///
     /// The first message is produced after a `duration`, and then continues to
     /// produce more messages every `duration` after that.
-    pub fn every<H: std::hash::Hasher, E>(
+    pub fn every(
         duration: std::time::Duration,
-    ) -> Subscription<H, E, std::time::Instant> {
+    ) -> Subscription<std::time::Instant> {
         Subscription::from_recipe(Every(duration))
     }
 
     #[derive(Debug)]
     struct Every(std::time::Duration);
 
-    impl<H, E> subscription::Recipe<H, E> for Every
-    where
-        H: std::hash::Hasher,
-    {
+    impl subscription::Recipe for Every {
         type Output = std::time::Instant;
 
-        fn hash(&self, state: &mut H) {
+        fn hash(&self, state: &mut Hasher) {
             use std::hash::Hash;
 
             std::any::TypeId::of::<Self>().hash(state);
@@ -49,7 +47,7 @@ pub mod time {
 
         fn stream(
             self: Box<Self>,
-            _input: futures::stream::BoxStream<'static, E>,
+            _input: subscription::EventStream,
         ) -> futures::stream::BoxStream<'static, Self::Output> {
             use futures::stream::StreamExt;
 
diff --git a/futures/src/backend/native/tokio.rs b/futures/src/backend/native/tokio.rs
index dd818bd128..4698a10596 100644
--- a/futures/src/backend/native/tokio.rs
+++ b/futures/src/backend/native/tokio.rs
@@ -22,28 +22,26 @@ impl crate::Executor for Executor {
 
 pub mod time {
     //! Listen and react to time.
+    use crate::core::Hasher;
     use crate::subscription::{self, Subscription};
 
     /// Returns a [`Subscription`] that produces messages at a set interval.
     ///
     /// The first message is produced after a `duration`, and then continues to
     /// produce more messages every `duration` after that.
-    pub fn every<H: std::hash::Hasher, E>(
+    pub fn every(
         duration: std::time::Duration,
-    ) -> Subscription<H, E, std::time::Instant> {
+    ) -> Subscription<std::time::Instant> {
         Subscription::from_recipe(Every(duration))
     }
 
     #[derive(Debug)]
     struct Every(std::time::Duration);
 
-    impl<H, E> subscription::Recipe<H, E> for Every
-    where
-        H: std::hash::Hasher,
-    {
+    impl subscription::Recipe for Every {
         type Output = std::time::Instant;
 
-        fn hash(&self, state: &mut H) {
+        fn hash(&self, state: &mut Hasher) {
             use std::hash::Hash;
 
             std::any::TypeId::of::<Self>().hash(state);
@@ -52,7 +50,7 @@ pub mod time {
 
         fn stream(
             self: Box<Self>,
-            _input: futures::stream::BoxStream<'static, E>,
+            _input: subscription::EventStream,
         ) -> futures::stream::BoxStream<'static, Self::Output> {
             use futures::stream::StreamExt;
 
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
index c0982db7ad..39137de263 100644
--- a/futures/src/lib.rs
+++ b/futures/src/lib.rs
@@ -18,6 +18,7 @@
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 pub use futures;
+pub use iced_core as core;
 
 mod command;
 mod maybe_send;
diff --git a/futures/src/runtime.rs b/futures/src/runtime.rs
index 24f9f24121..2241a49472 100644
--- a/futures/src/runtime.rs
+++ b/futures/src/runtime.rs
@@ -1,6 +1,7 @@
 //! Run commands and keep track of subscriptions.
+use crate::core::event::{self, Event};
 use crate::subscription;
-use crate::{BoxFuture, Executor, MaybeSend, Subscription};
+use crate::{BoxFuture, Executor, MaybeSend};
 
 use futures::{channel::mpsc, Sink};
 use std::marker::PhantomData;
@@ -12,18 +13,15 @@ use std::marker::PhantomData;
 ///
 /// [`Command`]: crate::Command
 #[derive(Debug)]
-pub struct Runtime<Hasher, Event, Executor, Sender, Message> {
+pub struct Runtime<Executor, Sender, Message> {
     executor: Executor,
     sender: Sender,
-    subscriptions: subscription::Tracker<Hasher, Event>,
+    subscriptions: subscription::Tracker,
     _message: PhantomData<Message>,
 }
 
-impl<Hasher, Event, Executor, Sender, Message>
-    Runtime<Hasher, Event, Executor, Sender, Message>
+impl<Executor, Sender, Message> Runtime<Executor, Sender, Message>
 where
-    Hasher: std::hash::Hasher + Default,
-    Event: Send + Clone + 'static,
     Executor: self::Executor,
     Sender: Sink<Message, Error = mpsc::SendError>
         + Unpin
@@ -79,7 +77,9 @@ where
     /// [`Tracker::update`]: subscription::Tracker::update
     pub fn track(
         &mut self,
-        subscription: Subscription<Hasher, Event, Message>,
+        recipes: impl IntoIterator<
+            Item = Box<dyn subscription::Recipe<Output = Message>>,
+        >,
     ) {
         let Runtime {
             executor,
@@ -88,8 +88,9 @@ where
             ..
         } = self;
 
-        let futures = executor
-            .enter(|| subscriptions.update(subscription, sender.clone()));
+        let futures = executor.enter(|| {
+            subscriptions.update(recipes.into_iter(), sender.clone())
+        });
 
         for future in futures {
             executor.spawn(future);
@@ -102,7 +103,7 @@ where
     /// See [`Tracker::broadcast`] to learn more.
     ///
     /// [`Tracker::broadcast`]: subscription::Tracker::broadcast
-    pub fn broadcast(&mut self, event: Event) {
-        self.subscriptions.broadcast(event);
+    pub fn broadcast(&mut self, event: Event, status: event::Status) {
+        self.subscriptions.broadcast(event, status);
     }
 }
diff --git a/futures/src/subscription.rs b/futures/src/subscription.rs
index fe53fd7e1e..876f29c232 100644
--- a/futures/src/subscription.rs
+++ b/futures/src/subscription.rs
@@ -3,7 +3,18 @@ mod tracker;
 
 pub use tracker::Tracker;
 
-use crate::BoxStream;
+use crate::core::event::{self, Event};
+use crate::core::window;
+use crate::core::Hasher;
+use crate::futures::{Future, Stream};
+use crate::{BoxStream, MaybeSend};
+
+use std::hash::Hash;
+
+/// A stream of runtime events.
+///
+/// It is the input of a [`Subscription`].
+pub type EventStream = BoxStream<(Event, event::Status)>;
 
 /// A request to listen to external events.
 ///
@@ -16,19 +27,13 @@ use crate::BoxStream;
 /// For instance, you can use a [`Subscription`] to listen to a WebSocket
 /// connection, keyboard presses, mouse events, time ticks, etc.
 ///
-/// This type is normally aliased by runtimes with a specific `Event` and/or
-/// `Hasher`.
-///
 /// [`Command`]: crate::Command
 #[must_use = "`Subscription` must be returned to runtime to take effect"]
-pub struct Subscription<Hasher, Event, Output> {
-    recipes: Vec<Box<dyn Recipe<Hasher, Event, Output = Output>>>,
+pub struct Subscription<Message> {
+    recipes: Vec<Box<dyn Recipe<Output = Message>>>,
 }
 
-impl<H, E, O> Subscription<H, E, O>
-where
-    H: std::hash::Hasher,
-{
+impl<Message> Subscription<Message> {
     /// Returns an empty [`Subscription`] that will not produce any output.
     pub fn none() -> Self {
         Self {
@@ -38,7 +43,7 @@ where
 
     /// Creates a [`Subscription`] from a [`Recipe`] describing it.
     pub fn from_recipe(
-        recipe: impl Recipe<H, E, Output = O> + 'static,
+        recipe: impl Recipe<Output = Message> + 'static,
     ) -> Self {
         Self {
             recipes: vec![Box::new(recipe)],
@@ -48,7 +53,7 @@ where
     /// Batches all the provided subscriptions and returns the resulting
     /// [`Subscription`].
     pub fn batch(
-        subscriptions: impl IntoIterator<Item = Subscription<H, E, O>>,
+        subscriptions: impl IntoIterator<Item = Subscription<Message>>,
     ) -> Self {
         Self {
             recipes: subscriptions
@@ -59,18 +64,16 @@ where
     }
 
     /// Returns the different recipes of the [`Subscription`].
-    pub fn recipes(self) -> Vec<Box<dyn Recipe<H, E, Output = O>>> {
+    pub fn into_recipes(self) -> Vec<Box<dyn Recipe<Output = Message>>> {
         self.recipes
     }
 
     /// Adds a value to the [`Subscription`] context.
     ///
     /// The value will be part of the identity of a [`Subscription`].
-    pub fn with<T>(mut self, value: T) -> Subscription<H, E, (T, O)>
+    pub fn with<T>(mut self, value: T) -> Subscription<(T, Message)>
     where
-        H: 'static,
-        E: 'static,
-        O: 'static,
+        Message: 'static,
         T: std::hash::Hash + Clone + Send + Sync + 'static,
     {
         Subscription {
@@ -79,18 +82,16 @@ where
                 .drain(..)
                 .map(|recipe| {
                     Box::new(With::new(recipe, value.clone()))
-                        as Box<dyn Recipe<H, E, Output = (T, O)>>
+                        as Box<dyn Recipe<Output = (T, Message)>>
                 })
                 .collect(),
         }
     }
 
     /// Transforms the [`Subscription`] output with the given function.
-    pub fn map<A>(mut self, f: fn(O) -> A) -> Subscription<H, E, A>
+    pub fn map<A>(mut self, f: fn(Message) -> A) -> Subscription<A>
     where
-        H: 'static,
-        E: 'static,
-        O: 'static,
+        Message: 'static,
         A: 'static,
     {
         Subscription {
@@ -98,15 +99,14 @@ where
                 .recipes
                 .drain(..)
                 .map(|recipe| {
-                    Box::new(Map::new(recipe, f))
-                        as Box<dyn Recipe<H, E, Output = A>>
+                    Box::new(Map::new(recipe, f)) as Box<dyn Recipe<Output = A>>
                 })
                 .collect(),
         }
     }
 }
 
-impl<I, O, H> std::fmt::Debug for Subscription<I, O, H> {
+impl<Message> std::fmt::Debug for Subscription<Message> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Subscription").finish()
     }
@@ -129,7 +129,7 @@ impl<I, O, H> std::fmt::Debug for Subscription<I, O, H> {
 /// [examples]: https://github.com/iced-rs/iced/tree/0.8/examples
 /// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.8/examples/download_progress
 /// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.8/examples/stopwatch
-pub trait Recipe<Hasher: std::hash::Hasher, Event> {
+pub trait Recipe {
     /// The events that will be produced by a [`Subscription`] with this
     /// [`Recipe`].
     type Output;
@@ -141,45 +141,33 @@ pub trait Recipe<Hasher: std::hash::Hasher, Event> {
 
     /// Executes the [`Recipe`] and produces the stream of events of its
     /// [`Subscription`].
-    ///
-    /// It receives some stream of generic events, which is normally defined by
-    /// shells.
-    fn stream(
-        self: Box<Self>,
-        input: BoxStream<Event>,
-    ) -> BoxStream<Self::Output>;
+    fn stream(self: Box<Self>, input: EventStream) -> BoxStream<Self::Output>;
 }
 
-struct Map<Hasher, Event, A, B> {
-    recipe: Box<dyn Recipe<Hasher, Event, Output = A>>,
+struct Map<A, B> {
+    recipe: Box<dyn Recipe<Output = A>>,
     mapper: fn(A) -> B,
 }
 
-impl<H, E, A, B> Map<H, E, A, B> {
-    fn new(
-        recipe: Box<dyn Recipe<H, E, Output = A>>,
-        mapper: fn(A) -> B,
-    ) -> Self {
+impl<A, B> Map<A, B> {
+    fn new(recipe: Box<dyn Recipe<Output = A>>, mapper: fn(A) -> B) -> Self {
         Map { recipe, mapper }
     }
 }
 
-impl<H, E, A, B> Recipe<H, E> for Map<H, E, A, B>
+impl<A, B> Recipe for Map<A, B>
 where
     A: 'static,
     B: 'static,
-    H: std::hash::Hasher,
 {
     type Output = B;
 
-    fn hash(&self, state: &mut H) {
-        use std::hash::Hash;
-
+    fn hash(&self, state: &mut Hasher) {
         self.recipe.hash(state);
         self.mapper.hash(state);
     }
 
-    fn stream(self: Box<Self>, input: BoxStream<E>) -> BoxStream<Self::Output> {
+    fn stream(self: Box<Self>, input: EventStream) -> BoxStream<Self::Output> {
         use futures::StreamExt;
 
         let mapper = self.mapper;
@@ -188,34 +176,31 @@ where
     }
 }
 
-struct With<Hasher, Event, A, B> {
-    recipe: Box<dyn Recipe<Hasher, Event, Output = A>>,
+struct With<A, B> {
+    recipe: Box<dyn Recipe<Output = A>>,
     value: B,
 }
 
-impl<H, E, A, B> With<H, E, A, B> {
-    fn new(recipe: Box<dyn Recipe<H, E, Output = A>>, value: B) -> Self {
+impl<A, B> With<A, B> {
+    fn new(recipe: Box<dyn Recipe<Output = A>>, value: B) -> Self {
         With { recipe, value }
     }
 }
 
-impl<H, E, A, B> Recipe<H, E> for With<H, E, A, B>
+impl<A, B> Recipe for With<A, B>
 where
     A: 'static,
     B: 'static + std::hash::Hash + Clone + Send + Sync,
-    H: std::hash::Hasher,
 {
     type Output = (B, A);
 
-    fn hash(&self, state: &mut H) {
-        use std::hash::Hash;
-
+    fn hash(&self, state: &mut Hasher) {
         std::any::TypeId::of::<B>().hash(state);
         self.value.hash(state);
         self.recipe.hash(state);
     }
 
-    fn stream(self: Box<Self>, input: BoxStream<E>) -> BoxStream<Self::Output> {
+    fn stream(self: Box<Self>, input: EventStream) -> BoxStream<Self::Output> {
         use futures::StreamExt;
 
         let value = self.value;
@@ -227,3 +212,222 @@ where
         )
     }
 }
+
+/// Returns a [`Subscription`] to all the ignored runtime events.
+///
+/// This subscription will notify your application of any [`Event`] that was
+/// not captured by any widget.
+pub fn events() -> Subscription<Event> {
+    events_with(|event, status| match status {
+        event::Status::Ignored => Some(event),
+        event::Status::Captured => None,
+    })
+}
+
+/// Returns a [`Subscription`] that filters all the runtime events with the
+/// provided function, producing messages accordingly.
+///
+/// This subscription will call the provided function for every [`Event`]
+/// handled by the runtime. If the function:
+///
+/// - Returns `None`, the [`Event`] will be discarded.
+/// - Returns `Some` message, the `Message` will be produced.
+pub fn events_with<Message>(
+    f: fn(Event, event::Status) -> Option<Message>,
+) -> Subscription<Message>
+where
+    Message: 'static + MaybeSend,
+{
+    #[derive(Hash)]
+    struct EventsWith;
+
+    Subscription::from_recipe(Runner {
+        id: (EventsWith, f),
+        spawn: move |events| {
+            use futures::future;
+            use futures::stream::StreamExt;
+
+            events.filter_map(move |(event, status)| {
+                future::ready(match event {
+                    Event::Window(window::Event::RedrawRequested(_)) => None,
+                    _ => f(event, status),
+                })
+            })
+        },
+    })
+}
+
+/// Returns a [`Subscription`] that produces a message for every runtime event,
+/// including the redraw request events.
+///
+/// **Warning:** This [`Subscription`], if unfiltered, may produce messages in
+/// an infinite loop.
+pub fn raw_events<Message>(
+    f: fn(Event, event::Status) -> Option<Message>,
+) -> Subscription<Message>
+where
+    Message: 'static + MaybeSend,
+{
+    #[derive(Hash)]
+    struct RawEvents;
+
+    Subscription::from_recipe(Runner {
+        id: (RawEvents, f),
+        spawn: move |events| {
+            use futures::future;
+            use futures::stream::StreamExt;
+
+            events.filter_map(move |(event, status)| {
+                future::ready(f(event, status))
+            })
+        },
+    })
+}
+
+/// Returns a [`Subscription`] that will call the given function to create and
+/// asynchronously run the given [`Stream`].
+pub fn run<S, Message>(builder: fn() -> S) -> Subscription<Message>
+where
+    S: Stream<Item = Message> + MaybeSend + 'static,
+    Message: 'static,
+{
+    Subscription::from_recipe(Runner {
+        id: builder,
+        spawn: move |_| builder(),
+    })
+}
+
+/// Returns a [`Subscription`] that will create and asynchronously run the
+/// given [`Stream`].
+///
+/// The `id` will be used to uniquely identify the [`Subscription`].
+pub fn run_with_id<I, S, Message>(id: I, stream: S) -> Subscription<Message>
+where
+    I: Hash + 'static,
+    S: Stream<Item = Message> + MaybeSend + 'static,
+    Message: 'static,
+{
+    Subscription::from_recipe(Runner {
+        id,
+        spawn: move |_| stream,
+    })
+}
+
+/// Returns a [`Subscription`] that will create and asynchronously run a
+/// [`Stream`] that will call the provided closure to produce every `Message`.
+///
+/// The `id` will be used to uniquely identify the [`Subscription`].
+///
+/// # Creating an asynchronous worker with bidirectional communication
+/// You can leverage this helper to create a [`Subscription`] that spawns
+/// an asynchronous worker in the background and establish a channel of
+/// communication with an `iced` application.
+///
+/// You can achieve this by creating an `mpsc` channel inside the closure
+/// and returning the `Sender` as a `Message` for the `Application`:
+///
+/// ```
+/// use iced_futures::subscription::{self, Subscription};
+/// use iced_futures::futures;
+///
+/// use futures::channel::mpsc;
+///
+/// pub enum Event {
+///     Ready(mpsc::Sender<Input>),
+///     WorkFinished,
+///     // ...
+/// }
+///
+/// enum Input {
+///     DoSomeWork,
+///     // ...
+/// }
+///
+/// enum State {
+///     Starting,
+///     Ready(mpsc::Receiver<Input>),
+/// }
+///
+/// fn some_worker() -> Subscription<Event> {
+///     struct SomeWorker;
+///
+///     subscription::unfold(std::any::TypeId::of::<SomeWorker>(), State::Starting, |state| async move {
+///         match state {
+///             State::Starting => {
+///                 // Create channel
+///                 let (sender, receiver) = mpsc::channel(100);
+///
+///                 (Some(Event::Ready(sender)), State::Ready(receiver))
+///             }
+///             State::Ready(mut receiver) => {
+///                 use futures::StreamExt;
+///
+///                 // Read next input sent from `Application`
+///                 let input = receiver.select_next_some().await;
+///
+///                 match input {
+///                     Input::DoSomeWork => {
+///                         // Do some async work...
+///
+///                         // Finally, we can optionally return a message to tell the
+///                         // `Application` the work is done
+///                         (Some(Event::WorkFinished), State::Ready(receiver))
+///                     }
+///                 }
+///             }
+///         }
+///     })
+/// }
+/// ```
+///
+/// Check out the [`websocket`] example, which showcases this pattern to maintain a WebSocket
+/// connection open.
+///
+/// [`websocket`]: https://github.com/iced-rs/iced/tree/0.8/examples/websocket
+pub fn unfold<I, T, Fut, Message>(
+    id: I,
+    initial: T,
+    mut f: impl FnMut(T) -> Fut + MaybeSend + Sync + 'static,
+) -> Subscription<Message>
+where
+    I: Hash + 'static,
+    T: MaybeSend + 'static,
+    Fut: Future<Output = (Option<Message>, T)> + MaybeSend + 'static,
+    Message: 'static + MaybeSend,
+{
+    use futures::future::{self, FutureExt};
+    use futures::stream::StreamExt;
+
+    run_with_id(
+        id,
+        futures::stream::unfold(initial, move |state| f(state).map(Some))
+            .filter_map(future::ready),
+    )
+}
+
+struct Runner<I, F, S, Message>
+where
+    F: FnOnce(EventStream) -> S,
+    S: Stream<Item = Message>,
+{
+    id: I,
+    spawn: F,
+}
+
+impl<I, S, F, Message> Recipe for Runner<I, F, S, Message>
+where
+    I: Hash + 'static,
+    F: FnOnce(EventStream) -> S,
+    S: Stream<Item = Message> + MaybeSend + 'static,
+{
+    type Output = Message;
+
+    fn hash(&self, state: &mut Hasher) {
+        std::any::TypeId::of::<I>().hash(state);
+        self.id.hash(state);
+    }
+
+    fn stream(self: Box<Self>, input: EventStream) -> BoxStream<Self::Output> {
+        crate::boxed_stream((self.spawn)(input))
+    }
+}
diff --git a/futures/src/subscription/tracker.rs b/futures/src/subscription/tracker.rs
index 9fe110b0b5..ae71cd256f 100644
--- a/futures/src/subscription/tracker.rs
+++ b/futures/src/subscription/tracker.rs
@@ -1,38 +1,35 @@
-use crate::{BoxFuture, MaybeSend, Subscription};
+use crate::core::event::{self, Event};
+use crate::core::Hasher;
+use crate::subscription::Recipe;
+use crate::{BoxFuture, MaybeSend};
 
-use futures::{
-    channel::mpsc,
-    sink::{Sink, SinkExt},
-};
-use std::{collections::HashMap, marker::PhantomData};
+use futures::channel::mpsc;
+use futures::sink::{Sink, SinkExt};
+
+use std::collections::HashMap;
+use std::hash::Hasher as _;
 
 /// A registry of subscription streams.
 ///
 /// If you have an application that continuously returns a [`Subscription`],
 /// you can use a [`Tracker`] to keep track of the different recipes and keep
 /// its executions alive.
-#[derive(Debug)]
-pub struct Tracker<Hasher, Event> {
-    subscriptions: HashMap<u64, Execution<Event>>,
-    _hasher: PhantomData<Hasher>,
+#[derive(Debug, Default)]
+pub struct Tracker {
+    subscriptions: HashMap<u64, Execution>,
 }
 
 #[derive(Debug)]
-pub struct Execution<Event> {
+pub struct Execution {
     _cancel: futures::channel::oneshot::Sender<()>,
-    listener: Option<futures::channel::mpsc::Sender<Event>>,
+    listener: Option<futures::channel::mpsc::Sender<(Event, event::Status)>>,
 }
 
-impl<Hasher, Event> Tracker<Hasher, Event>
-where
-    Hasher: std::hash::Hasher + Default,
-    Event: 'static + Send + Clone,
-{
+impl Tracker {
     /// Creates a new empty [`Tracker`].
     pub fn new() -> Self {
         Self {
             subscriptions: HashMap::new(),
-            _hasher: PhantomData,
         }
     }
 
@@ -56,7 +53,7 @@ where
     /// [`Recipe`]: crate::subscription::Recipe
     pub fn update<Message, Receiver>(
         &mut self,
-        subscription: Subscription<Hasher, Event, Message>,
+        recipes: impl Iterator<Item = Box<dyn Recipe<Output = Message>>>,
         receiver: Receiver,
     ) -> Vec<BoxFuture<()>>
     where
@@ -70,8 +67,6 @@ where
         use futures::stream::StreamExt;
 
         let mut futures: Vec<BoxFuture<()>> = Vec::new();
-
-        let recipes = subscription.recipes();
         let mut alive = std::collections::HashSet::new();
 
         for recipe in recipes {
@@ -142,12 +137,12 @@ where
     /// currently open.
     ///
     /// [`Recipe::stream`]: crate::subscription::Recipe::stream
-    pub fn broadcast(&mut self, event: Event) {
+    pub fn broadcast(&mut self, event: Event, status: event::Status) {
         self.subscriptions
             .values_mut()
             .filter_map(|connection| connection.listener.as_mut())
             .for_each(|listener| {
-                if let Err(error) = listener.try_send(event.clone()) {
+                if let Err(error) = listener.try_send((event.clone(), status)) {
                     log::warn!(
                         "Error sending event to subscription: {:?}",
                         error
@@ -156,13 +151,3 @@ where
             });
     }
 }
-
-impl<Hasher, Event> Default for Tracker<Hasher, Event>
-where
-    Hasher: std::hash::Hasher + Default,
-    Event: 'static + Send + Clone,
-{
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 0fc4f324c1..2d2e5b3888 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -48,14 +48,11 @@ pub mod command;
 pub mod font;
 pub mod keyboard;
 pub mod program;
-pub mod subscription;
 pub mod system;
 pub mod user_interface;
 pub mod widget;
 pub mod window;
 
-mod runtime;
-
 // We disable debug capabilities on release builds unless the `debug` feature
 // is explicitly enabled.
 #[cfg(feature = "debug")]
@@ -72,6 +69,4 @@ pub use command::Command;
 pub use debug::Debug;
 pub use font::Font;
 pub use program::Program;
-pub use runtime::Runtime;
-pub use subscription::Subscription;
 pub use user_interface::UserInterface;
diff --git a/native/src/runtime.rs b/native/src/runtime.rs
deleted file mode 100644
index 1b81314f07..0000000000
--- a/native/src/runtime.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-//! Run commands and subscriptions.
-use iced_core::event::{self, Event};
-use iced_core::Hasher;
-
-/// A native runtime with a generic executor and receiver of results.
-///
-/// It can be used by shells to easily spawn a [`Command`] or track a
-/// [`Subscription`].
-///
-/// [`Command`]: crate::Command
-/// [`Subscription`]: crate::Subscription
-pub type Runtime<Executor, Receiver, Message> = iced_futures::Runtime<
-    Hasher,
-    (Event, event::Status),
-    Executor,
-    Receiver,
-    Message,
->;
diff --git a/native/src/subscription.rs b/native/src/subscription.rs
index b16bcb0370..d4176ab565 100644
--- a/native/src/subscription.rs
+++ b/native/src/subscription.rs
@@ -3,247 +3,7 @@ use crate::core::event::{self, Event};
 use crate::core::window;
 use crate::core::Hasher;
 use crate::futures::futures::{self, Future, Stream};
+use crate::futures::subscription::{EventStream, Recipe, Subscription};
 use crate::futures::{BoxStream, MaybeSend};
 
 use std::hash::Hash;
-
-/// A request to listen to external events.
-///
-/// Besides performing async actions on demand with [`Command`], most
-/// applications also need to listen to external events passively.
-///
-/// A [`Subscription`] is normally provided to some runtime, like a [`Command`],
-/// and it will generate events as long as the user keeps requesting it.
-///
-/// For instance, you can use a [`Subscription`] to listen to a WebSocket
-/// connection, keyboard presses, mouse events, time ticks, etc.
-///
-/// [`Command`]: crate::Command
-pub type Subscription<T> =
-    iced_futures::Subscription<Hasher, (Event, event::Status), T>;
-
-/// A stream of runtime events.
-///
-/// It is the input of a [`Subscription`] in the native runtime.
-pub type EventStream = BoxStream<(Event, event::Status)>;
-
-/// A native [`Subscription`] tracker.
-pub type Tracker =
-    iced_futures::subscription::Tracker<Hasher, (Event, event::Status)>;
-
-pub use iced_futures::subscription::Recipe;
-
-/// Returns a [`Subscription`] to all the ignored runtime events.
-///
-/// This subscription will notify your application of any [`Event`] that was
-/// not captured by any widget.
-pub fn events() -> Subscription<Event> {
-    events_with(|event, status| match status {
-        event::Status::Ignored => Some(event),
-        event::Status::Captured => None,
-    })
-}
-
-/// Returns a [`Subscription`] that filters all the runtime events with the
-/// provided function, producing messages accordingly.
-///
-/// This subscription will call the provided function for every [`Event`]
-/// handled by the runtime. If the function:
-///
-/// - Returns `None`, the [`Event`] will be discarded.
-/// - Returns `Some` message, the `Message` will be produced.
-pub fn events_with<Message>(
-    f: fn(Event, event::Status) -> Option<Message>,
-) -> Subscription<Message>
-where
-    Message: 'static + MaybeSend,
-{
-    #[derive(Hash)]
-    struct EventsWith;
-
-    Subscription::from_recipe(Runner {
-        id: (EventsWith, f),
-        spawn: move |events| {
-            use futures::future;
-            use futures::stream::StreamExt;
-
-            events.filter_map(move |(event, status)| {
-                future::ready(match event {
-                    Event::Window(window::Event::RedrawRequested(_)) => None,
-                    _ => f(event, status),
-                })
-            })
-        },
-    })
-}
-
-pub(crate) fn raw_events<Message>(
-    f: fn(Event, event::Status) -> Option<Message>,
-) -> Subscription<Message>
-where
-    Message: 'static + MaybeSend,
-{
-    #[derive(Hash)]
-    struct RawEvents;
-
-    Subscription::from_recipe(Runner {
-        id: (RawEvents, f),
-        spawn: move |events| {
-            use futures::future;
-            use futures::stream::StreamExt;
-
-            events.filter_map(move |(event, status)| {
-                future::ready(f(event, status))
-            })
-        },
-    })
-}
-
-/// Returns a [`Subscription`] that will call the given function to create and
-/// asynchronously run the given [`Stream`].
-pub fn run<S, Message>(builder: fn() -> S) -> Subscription<Message>
-where
-    S: Stream<Item = Message> + MaybeSend + 'static,
-    Message: 'static,
-{
-    Subscription::from_recipe(Runner {
-        id: builder,
-        spawn: move |_| builder(),
-    })
-}
-
-/// Returns a [`Subscription`] that will create and asynchronously run the
-/// given [`Stream`].
-///
-/// The `id` will be used to uniquely identify the [`Subscription`].
-pub fn run_with_id<I, S, Message>(id: I, stream: S) -> Subscription<Message>
-where
-    I: Hash + 'static,
-    S: Stream<Item = Message> + MaybeSend + 'static,
-    Message: 'static,
-{
-    Subscription::from_recipe(Runner {
-        id,
-        spawn: move |_| stream,
-    })
-}
-
-/// Returns a [`Subscription`] that will create and asynchronously run a
-/// [`Stream`] that will call the provided closure to produce every `Message`.
-///
-/// The `id` will be used to uniquely identify the [`Subscription`].
-///
-/// # Creating an asynchronous worker with bidirectional communication
-/// You can leverage this helper to create a [`Subscription`] that spawns
-/// an asynchronous worker in the background and establish a channel of
-/// communication with an `iced` application.
-///
-/// You can achieve this by creating an `mpsc` channel inside the closure
-/// and returning the `Sender` as a `Message` for the `Application`:
-///
-/// ```
-/// use iced_native::subscription::{self, Subscription};
-/// use iced_native::futures::futures;
-///
-/// use futures::channel::mpsc;
-///
-/// pub enum Event {
-///     Ready(mpsc::Sender<Input>),
-///     WorkFinished,
-///     // ...
-/// }
-///
-/// enum Input {
-///     DoSomeWork,
-///     // ...
-/// }
-///
-/// enum State {
-///     Starting,
-///     Ready(mpsc::Receiver<Input>),
-/// }
-///
-/// fn some_worker() -> Subscription<Event> {
-///     struct SomeWorker;
-///
-///     subscription::unfold(std::any::TypeId::of::<SomeWorker>(), State::Starting, |state| async move {
-///         match state {
-///             State::Starting => {
-///                 // Create channel
-///                 let (sender, receiver) = mpsc::channel(100);
-///
-///                 (Some(Event::Ready(sender)), State::Ready(receiver))
-///             }
-///             State::Ready(mut receiver) => {
-///                 use futures::StreamExt;
-///
-///                 // Read next input sent from `Application`
-///                 let input = receiver.select_next_some().await;
-///
-///                 match input {
-///                     Input::DoSomeWork => {
-///                         // Do some async work...
-///
-///                         // Finally, we can optionally return a message to tell the
-///                         // `Application` the work is done
-///                         (Some(Event::WorkFinished), State::Ready(receiver))
-///                     }
-///                 }
-///             }
-///         }
-///     })
-/// }
-/// ```
-///
-/// Check out the [`websocket`] example, which showcases this pattern to maintain a WebSocket
-/// connection open.
-///
-/// [`websocket`]: https://github.com/iced-rs/iced/tree/0.8/examples/websocket
-pub fn unfold<I, T, Fut, Message>(
-    id: I,
-    initial: T,
-    mut f: impl FnMut(T) -> Fut + MaybeSend + Sync + 'static,
-) -> Subscription<Message>
-where
-    I: Hash + 'static,
-    T: MaybeSend + 'static,
-    Fut: Future<Output = (Option<Message>, T)> + MaybeSend + 'static,
-    Message: 'static + MaybeSend,
-{
-    use futures::future::{self, FutureExt};
-    use futures::stream::StreamExt;
-
-    run_with_id(
-        id,
-        futures::stream::unfold(initial, move |state| f(state).map(Some))
-            .filter_map(future::ready),
-    )
-}
-
-struct Runner<I, F, S, Message>
-where
-    F: FnOnce(EventStream) -> S,
-    S: Stream<Item = Message>,
-{
-    id: I,
-    spawn: F,
-}
-
-impl<I, S, F, Message> Recipe<Hasher, (Event, event::Status)>
-    for Runner<I, F, S, Message>
-where
-    I: Hash + 'static,
-    F: FnOnce(EventStream) -> S,
-    S: Stream<Item = Message> + MaybeSend + 'static,
-{
-    type Output = Message;
-
-    fn hash(&self, state: &mut Hasher) {
-        std::any::TypeId::of::<I>().hash(state);
-        self.id.hash(state);
-    }
-
-    fn stream(self: Box<Self>, input: EventStream) -> BoxStream<Self::Output> {
-        iced_futures::boxed_stream((self.spawn)(input))
-    }
-}
diff --git a/native/src/window.rs b/native/src/window.rs
index 97a96e5439..aa3f35c71b 100644
--- a/native/src/window.rs
+++ b/native/src/window.rs
@@ -5,7 +5,7 @@ pub use action::Action;
 
 use crate::core::time::Instant;
 use crate::core::window::Event;
-use crate::subscription::{self, Subscription};
+use crate::futures::subscription::{self, Subscription};
 
 /// Subscribes to the frames of the window of the running application.
 ///
diff --git a/src/advanced.rs b/src/advanced.rs
index 714076e0c8..9621c3bc02 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -7,3 +7,8 @@ pub use crate::core::svg;
 pub use crate::core::text::{self, Text};
 pub use crate::core::widget::{self, Widget};
 pub use crate::core::{Clipboard, Shell};
+
+pub mod subscription {
+    //! Write your own subscriptions.
+    pub use crate::native::futures::subscription::{EventStream, Recipe};
+}
diff --git a/src/lib.rs b/src/lib.rs
index b71b7781d5..b9f87d5dd9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -193,7 +193,6 @@ pub use crate::core::{
     Rectangle, Size, Vector,
 };
 pub use crate::native::Command;
-pub use native::subscription;
 
 pub mod clipboard {
     //! Access the clipboard.
@@ -233,6 +232,13 @@ pub mod mouse {
     pub use crate::core::mouse::{Button, Event, Interaction, ScrollDelta};
 }
 
+pub mod subscription {
+    //! Listen to external events in your application.
+    pub use iced_futures::subscription::{
+        events, events_with, run, run_with_id, unfold, Subscription,
+    };
+}
+
 #[cfg(feature = "system")]
 pub mod system {
     //! Retrieve system information.
diff --git a/winit/src/application.rs b/winit/src/application.rs
index c8162c9b53..c95dbf621d 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -14,12 +14,12 @@ use crate::core::widget::operation;
 use crate::core::window;
 use crate::core::{Event, Size};
 use crate::futures::futures;
-use crate::futures::Executor;
+use crate::futures::{Executor, Runtime, Subscription};
 use crate::graphics::compositor::{self, Compositor};
 use crate::native::clipboard;
 use crate::native::program::Program;
 use crate::native::user_interface::{self, UserInterface};
-use crate::native::{Command, Debug, Runtime, Subscription};
+use crate::native::{Command, Debug};
 use crate::style::application::{Appearance, StyleSheet};
 use crate::{Clipboard, Error, Proxy, Settings};
 
@@ -316,7 +316,7 @@ async fn run_instance<A, E, C>(
         &window,
         || compositor.fetch_information(),
     );
-    runtime.track(application.subscription());
+    runtime.track(application.subscription().into_recipes());
 
     let mut user_interface = ManuallyDrop::new(build_user_interface(
         &application,
@@ -360,8 +360,10 @@ async fn run_instance<A, E, C>(
 
                 debug.event_processing_finished();
 
-                for event in events.drain(..).zip(statuses.into_iter()) {
-                    runtime.broadcast(event);
+                for (event, status) in
+                    events.drain(..).zip(statuses.into_iter())
+                {
+                    runtime.broadcast(event, status);
                 }
 
                 if !messages.is_empty()
@@ -442,7 +444,7 @@ async fn run_instance<A, E, C>(
                 }
 
                 window.request_redraw();
-                runtime.broadcast((redraw_event, core::event::Status::Ignored));
+                runtime.broadcast(redraw_event, core::event::Status::Ignored);
 
                 let _ = control_sender.start_send(match interface_state {
                     user_interface::State::Updated {
@@ -685,7 +687,7 @@ pub fn update<A: Application, E: Executor>(
     }
 
     let subscription = application.subscription();
-    runtime.track(subscription);
+    runtime.track(subscription.into_recipes());
 }
 
 /// Runs the actions of a [`Command`].

From cfb8abb6f5806e08ccc3a80233e1fb1768adeaf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 04:19:31 +0100
Subject: [PATCH 085/163] Use `no_run` for widget doc-tests

---
 native/src/subscription.rs    | 9 ---------
 widget/src/button.rs          | 2 +-
 widget/src/checkbox.rs        | 2 +-
 widget/src/image.rs           | 2 +-
 widget/src/pane_grid.rs       | 2 +-
 widget/src/progress_bar.rs    | 2 +-
 widget/src/radio.rs           | 2 +-
 widget/src/slider.rs          | 2 +-
 widget/src/text_input.rs      | 2 +-
 widget/src/toggler.rs         | 2 +-
 widget/src/vertical_slider.rs | 2 +-
 11 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 native/src/subscription.rs

diff --git a/native/src/subscription.rs b/native/src/subscription.rs
deleted file mode 100644
index d4176ab565..0000000000
--- a/native/src/subscription.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! Listen to external events in your application.
-use crate::core::event::{self, Event};
-use crate::core::window;
-use crate::core::Hasher;
-use crate::futures::futures::{self, Future, Stream};
-use crate::futures::subscription::{EventStream, Recipe, Subscription};
-use crate::futures::{BoxStream, MaybeSend};
-
-use std::hash::Hash;
diff --git a/widget/src/button.rs b/widget/src/button.rs
index d6fd399753..7eee69cbae 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -18,7 +18,7 @@ pub use iced_style::button::{Appearance, StyleSheet};
 
 /// A generic widget that produces a message when pressed.
 ///
-/// ```
+/// ```no_run
 /// # type Button<'a, Message> =
 /// #     iced_widget::Button<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 6a062f94e6..d1f886c6bf 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -30,7 +30,7 @@ pub struct Icon<Font> {
 ///
 /// # Example
 ///
-/// ```
+/// ```no_run
 /// # type Checkbox<'a, Message> =
 /// #     iced_widget::Checkbox<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/image.rs b/widget/src/image.rs
index 22a3a1a16e..abcb6ef22b 100644
--- a/widget/src/image.rs
+++ b/widget/src/image.rs
@@ -23,7 +23,7 @@ pub fn viewer<Handle>(handle: Handle) -> Viewer<Handle> {
 ///
 /// # Example
 ///
-/// ```
+/// ```no_run
 /// # use iced_widget::image::{self, Image};
 /// #
 /// let image = Image::<image::Handle>::new("resources/ferris.png");
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index a97cef6096..257c014441 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -67,7 +67,7 @@ use crate::core::{
 ///
 /// ## Example
 ///
-/// ```
+/// ```no_run
 /// # use iced_widget::{pane_grid, text};
 /// #
 /// # type PaneGrid<'a, Message> =
diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs
index 896d40feed..ef0d87d515 100644
--- a/widget/src/progress_bar.rs
+++ b/widget/src/progress_bar.rs
@@ -13,7 +13,7 @@ pub use iced_style::progress_bar::{Appearance, StyleSheet};
 /// A bar that displays progress.
 ///
 /// # Example
-/// ```
+/// ```no_run
 /// # type ProgressBar =
 /// #     iced_widget::ProgressBar<iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index e5c67f3d31..c2b6b017e7 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -18,7 +18,7 @@ pub use iced_style::radio::{Appearance, StyleSheet};
 /// A circular button representing a choice.
 ///
 /// # Example
-/// ```
+/// ```no_run
 /// # type Radio<Message> =
 /// #     iced_widget::Radio<Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index 70a84fc61b..e1153d2d60 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -25,7 +25,7 @@ pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
 /// to 1 unit.
 ///
 /// # Example
-/// ```
+/// ```no_run
 /// # type Slider<'a, T, Message> =
 /// #     iced_widget::Slider<'a, Message, T, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 67d80e2b69..d1c48fbdd5 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -35,7 +35,7 @@ pub use iced_style::text_input::{Appearance, StyleSheet};
 /// A field that can be filled with text.
 ///
 /// # Example
-/// ```
+/// ```no_run
 /// # pub type TextInput<'a, Message> =
 /// #     iced_widget::TextInput<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index f23f9b27a0..713a9c302f 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -18,7 +18,7 @@ pub use crate::style::toggler::{Appearance, StyleSheet};
 ///
 /// # Example
 ///
-/// ```
+/// ```no_run
 /// # type Toggler<'a, Message> =
 /// #     iced_widget::Toggler<'a, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 64a9583c1b..62dc997f32 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -26,7 +26,7 @@ use crate::core::{
 /// to 1 unit.
 ///
 /// # Example
-/// ```
+/// ```no_run
 /// # type VerticalSlider<'a, T, Message> =
 /// #     iced_widget::VerticalSlider<'a, T, Message, iced_widget::renderer::Renderer<iced_widget::style::Theme>>;
 /// #

From 43414bbdfb080b7aa3c702d944cc9d0c9c0fd14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 05:37:23 +0100
Subject: [PATCH 086/163] Fix `wasm-bindgen` backend in `iced_futures`

---
 futures/src/backend/wasm/wasm_bindgen.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/futures/src/backend/wasm/wasm_bindgen.rs b/futures/src/backend/wasm/wasm_bindgen.rs
index b726501ad1..2666f1b42d 100644
--- a/futures/src/backend/wasm/wasm_bindgen.rs
+++ b/futures/src/backend/wasm/wasm_bindgen.rs
@@ -16,6 +16,7 @@ impl crate::Executor for Executor {
 
 pub mod time {
     //! Listen and react to time.
+    use crate::core::Hasher;
     use crate::subscription::{self, Subscription};
     use crate::BoxStream;
 
@@ -23,22 +24,19 @@ pub mod time {
     ///
     /// The first message is produced after a `duration`, and then continues to
     /// produce more messages every `duration` after that.
-    pub fn every<H: std::hash::Hasher, E>(
+    pub fn every(
         duration: std::time::Duration,
-    ) -> Subscription<H, E, wasm_timer::Instant> {
+    ) -> Subscription<wasm_timer::Instant> {
         Subscription::from_recipe(Every(duration))
     }
 
     #[derive(Debug)]
     struct Every(std::time::Duration);
 
-    impl<H, E> subscription::Recipe<H, E> for Every
-    where
-        H: std::hash::Hasher,
-    {
+    impl subscription::Recipe for Every {
         type Output = wasm_timer::Instant;
 
-        fn hash(&self, state: &mut H) {
+        fn hash(&self, state: &mut Hasher) {
             use std::hash::Hash;
 
             std::any::TypeId::of::<Self>().hash(state);
@@ -47,7 +45,7 @@ pub mod time {
 
         fn stream(
             self: Box<Self>,
-            _input: BoxStream<E>,
+            _input: subscription::EventStream,
         ) -> BoxStream<Self::Output> {
             use futures::stream::StreamExt;
 

From 8af69be47e88896b3c5f70174db609eee0c67971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 06:23:40 +0100
Subject: [PATCH 087/163] Converge `Command` types from `iced_futures` and
 `iced_native`

---
 core/src/widget/operation.rs | 116 +++++++++++++++++++++++++-
 futures/src/command.rs       |  70 ----------------
 futures/src/lib.rs           |   2 -
 native/src/command.rs        |  59 +++++++++-----
 native/src/command/action.rs |   8 +-
 native/src/lib.rs            |   1 -
 native/src/widget.rs         |  16 ----
 native/src/widget/action.rs  | 153 -----------------------------------
 winit/src/application.rs     |   2 +-
 9 files changed, 161 insertions(+), 266 deletions(-)
 delete mode 100644 futures/src/command.rs
 delete mode 100644 native/src/widget.rs
 delete mode 100644 native/src/widget/action.rs

diff --git a/core/src/widget/operation.rs b/core/src/widget/operation.rs
index 53688a21c0..ad188c364d 100644
--- a/core/src/widget/operation.rs
+++ b/core/src/widget/operation.rs
@@ -11,6 +11,7 @@ use crate::widget::Id;
 
 use std::any::Any;
 use std::fmt;
+use std::rc::Rc;
 
 /// A piece of logic that can traverse the widget tree of an application in
 /// order to query or update some widget state.
@@ -68,9 +69,122 @@ where
     }
 }
 
+/// Maps the output of an [`Operation`] using the given function.
+pub fn map<A, B>(
+    operation: Box<dyn Operation<A>>,
+    f: impl Fn(A) -> B + 'static,
+) -> impl Operation<B>
+where
+    A: 'static,
+    B: 'static,
+{
+    #[allow(missing_debug_implementations)]
+    struct Map<A, B> {
+        operation: Box<dyn Operation<A>>,
+        f: Rc<dyn Fn(A) -> B>,
+    }
+
+    impl<A, B> Operation<B> for Map<A, B>
+    where
+        A: 'static,
+        B: 'static,
+    {
+        fn container(
+            &mut self,
+            id: Option<&Id>,
+            operate_on_children: &mut dyn FnMut(&mut dyn Operation<B>),
+        ) {
+            struct MapRef<'a, A> {
+                operation: &'a mut dyn Operation<A>,
+            }
+
+            impl<'a, A, B> Operation<B> for MapRef<'a, A> {
+                fn container(
+                    &mut self,
+                    id: Option<&Id>,
+                    operate_on_children: &mut dyn FnMut(&mut dyn Operation<B>),
+                ) {
+                    let Self { operation, .. } = self;
+
+                    operation.container(id, &mut |operation| {
+                        operate_on_children(&mut MapRef { operation });
+                    });
+                }
+
+                fn scrollable(
+                    &mut self,
+                    state: &mut dyn Scrollable,
+                    id: Option<&Id>,
+                ) {
+                    self.operation.scrollable(state, id);
+                }
+
+                fn focusable(
+                    &mut self,
+                    state: &mut dyn Focusable,
+                    id: Option<&Id>,
+                ) {
+                    self.operation.focusable(state, id);
+                }
+
+                fn text_input(
+                    &mut self,
+                    state: &mut dyn TextInput,
+                    id: Option<&Id>,
+                ) {
+                    self.operation.text_input(state, id);
+                }
+
+                fn custom(&mut self, state: &mut dyn Any, id: Option<&Id>) {
+                    self.operation.custom(state, id);
+                }
+            }
+
+            let Self { operation, .. } = self;
+
+            MapRef {
+                operation: operation.as_mut(),
+            }
+            .container(id, operate_on_children);
+        }
+
+        fn focusable(&mut self, state: &mut dyn Focusable, id: Option<&Id>) {
+            self.operation.focusable(state, id);
+        }
+
+        fn scrollable(&mut self, state: &mut dyn Scrollable, id: Option<&Id>) {
+            self.operation.scrollable(state, id);
+        }
+
+        fn text_input(&mut self, state: &mut dyn TextInput, id: Option<&Id>) {
+            self.operation.text_input(state, id);
+        }
+
+        fn custom(&mut self, state: &mut dyn Any, id: Option<&Id>) {
+            self.operation.custom(state, id);
+        }
+
+        fn finish(&self) -> Outcome<B> {
+            match self.operation.finish() {
+                Outcome::None => Outcome::None,
+                Outcome::Some(output) => Outcome::Some((self.f)(output)),
+                Outcome::Chain(next) => Outcome::Chain(Box::new(Map {
+                    operation: next,
+                    f: self.f.clone(),
+                })),
+            }
+        }
+    }
+
+    Map {
+        operation,
+        f: Rc::new(f),
+    }
+}
+
 /// Produces an [`Operation`] that applies the given [`Operation`] to the
 /// children of a container with the given [`Id`].
-pub fn scoped<T: 'static>(
+pub fn scope<T: 'static>(
     target: Id,
     operation: impl Operation<T> + 'static,
 ) -> impl Operation<T> {
diff --git a/futures/src/command.rs b/futures/src/command.rs
deleted file mode 100644
index 3d1ec3f9fb..0000000000
--- a/futures/src/command.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-/// A set of asynchronous actions to be performed by some runtime.
-#[must_use = "`Command` must be returned to runtime to take effect"]
-#[derive(Debug)]
-pub struct Command<T>(Internal<T>);
-
-#[derive(Debug)]
-enum Internal<T> {
-    None,
-    Single(T),
-    Batch(Vec<T>),
-}
-
-impl<T> Command<T> {
-    /// Creates an empty [`Command`].
-    ///
-    /// In other words, a [`Command`] that does nothing.
-    pub const fn none() -> Self {
-        Self(Internal::None)
-    }
-
-    /// Creates a [`Command`] that performs a single action.
-    pub const fn single(action: T) -> Self {
-        Self(Internal::Single(action))
-    }
-
-    /// Creates a [`Command`] that performs the actions of all the given
-    /// commands.
-    ///
-    /// Once this command is run, all the commands will be executed at once.
-    pub fn batch(commands: impl IntoIterator<Item = Command<T>>) -> Self {
-        let mut batch = Vec::new();
-
-        for Command(command) in commands {
-            match command {
-                Internal::None => {}
-                Internal::Single(command) => batch.push(command),
-                Internal::Batch(commands) => batch.extend(commands),
-            }
-        }
-
-        Self(Internal::Batch(batch))
-    }
-
-    /// Applies a transformation to the result of a [`Command`].
-    pub fn map<A>(self, f: impl Fn(T) -> A) -> Command<A>
-    where
-        T: 'static,
-    {
-        let Command(command) = self;
-
-        match command {
-            Internal::None => Command::none(),
-            Internal::Single(action) => Command::single(f(action)),
-            Internal::Batch(batch) => {
-                Command(Internal::Batch(batch.into_iter().map(f).collect()))
-            }
-        }
-    }
-
-    /// Returns all of the actions of the [`Command`].
-    pub fn actions(self) -> Vec<T> {
-        let Command(command) = self;
-
-        match command {
-            Internal::None => Vec::new(),
-            Internal::Single(action) => vec![action],
-            Internal::Batch(batch) => batch,
-        }
-    }
-}
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
index 39137de263..397fc2d2f9 100644
--- a/futures/src/lib.rs
+++ b/futures/src/lib.rs
@@ -20,7 +20,6 @@
 pub use futures;
 pub use iced_core as core;
 
-mod command;
 mod maybe_send;
 mod runtime;
 
@@ -28,7 +27,6 @@ pub mod backend;
 pub mod executor;
 pub mod subscription;
 
-pub use command::Command;
 pub use executor::Executor;
 pub use maybe_send::MaybeSend;
 pub use platform::*;
diff --git a/native/src/command.rs b/native/src/command.rs
index 39bee8f6d8..cd4c51ff05 100644
--- a/native/src/command.rs
+++ b/native/src/command.rs
@@ -3,37 +3,39 @@ mod action;
 
 pub use action::Action;
 
-use crate::widget;
-
-use iced_futures::MaybeSend;
+use crate::core::widget;
+use crate::futures::MaybeSend;
 
 use std::fmt;
 use std::future::Future;
 
 /// A set of asynchronous actions to be performed by some runtime.
 #[must_use = "`Command` must be returned to runtime to take effect"]
-pub struct Command<T>(iced_futures::Command<Action<T>>);
+pub struct Command<T>(Internal<Action<T>>);
+
+#[derive(Debug)]
+enum Internal<T> {
+    None,
+    Single(T),
+    Batch(Vec<T>),
+}
 
 impl<T> Command<T> {
     /// Creates an empty [`Command`].
     ///
     /// In other words, a [`Command`] that does nothing.
     pub const fn none() -> Self {
-        Self(iced_futures::Command::none())
+        Self(Internal::None)
     }
 
     /// Creates a [`Command`] that performs a single [`Action`].
     pub const fn single(action: Action<T>) -> Self {
-        Self(iced_futures::Command::single(action))
+        Self(Internal::Single(action))
     }
 
     /// Creates a [`Command`] that performs a [`widget::Operation`].
-    pub fn widget(
-        operation: impl iced_core::widget::Operation<T> + 'static,
-    ) -> Self {
-        Self(iced_futures::Command::single(Action::Widget(
-            widget::Action::new(operation),
-        )))
+    pub fn widget(operation: impl widget::Operation<T> + 'static) -> Self {
+        Self::single(Action::Widget(Box::new(operation)))
     }
 
     /// Creates a [`Command`] that performs the action of the given future.
@@ -51,9 +53,17 @@ impl<T> Command<T> {
     ///
     /// Once this command is run, all the commands will be executed at once.
     pub fn batch(commands: impl IntoIterator<Item = Command<T>>) -> Self {
-        Self(iced_futures::Command::batch(
-            commands.into_iter().map(|Command(command)| command),
-        ))
+        let mut batch = Vec::new();
+
+        for Command(command) in commands {
+            match command {
+                Internal::None => {}
+                Internal::Single(command) => batch.push(command),
+                Internal::Batch(commands) => batch.extend(commands),
+            }
+        }
+
+        Self(Internal::Batch(batch))
     }
 
     /// Applies a transformation to the result of a [`Command`].
@@ -65,16 +75,27 @@ impl<T> Command<T> {
         T: 'static,
         A: 'static,
     {
-        let Command(command) = self;
-
-        Command(command.map(move |action| action.map(f.clone())))
+        match self.0 {
+            Internal::None => Command::none(),
+            Internal::Single(action) => Command::single(action.map(f)),
+            Internal::Batch(batch) => Command(Internal::Batch(
+                batch
+                    .into_iter()
+                    .map(|action| action.map(f.clone()))
+                    .collect(),
+            )),
+        }
     }
 
     /// Returns all of the actions of the [`Command`].
     pub fn actions(self) -> Vec<Action<T>> {
         let Command(command) = self;
 
-        command.actions()
+        match command {
+            Internal::None => Vec::new(),
+            Internal::Single(action) => vec![action],
+            Internal::Batch(batch) => batch,
+        }
     }
 }
 
diff --git a/native/src/command/action.rs b/native/src/command/action.rs
index d1589c05fb..6c74f0efb2 100644
--- a/native/src/command/action.rs
+++ b/native/src/command/action.rs
@@ -1,7 +1,7 @@
 use crate::clipboard;
+use crate::core::widget;
 use crate::font;
 use crate::system;
-use crate::widget;
 use crate::window;
 
 use iced_futures::MaybeSend;
@@ -28,7 +28,7 @@ pub enum Action<T> {
     System(system::Action<T>),
 
     /// Run a widget action.
-    Widget(widget::Action<T>),
+    Widget(Box<dyn widget::Operation<T>>),
 
     /// Load a font from its bytes.
     LoadFont {
@@ -59,7 +59,9 @@ impl<T> Action<T> {
             Self::Clipboard(action) => Action::Clipboard(action.map(f)),
             Self::Window(window) => Action::Window(window.map(f)),
             Self::System(system) => Action::System(system.map(f)),
-            Self::Widget(widget) => Action::Widget(widget.map(f)),
+            Self::Widget(operation) => {
+                Action::Widget(Box::new(widget::operation::map(operation, f)))
+            }
             Self::LoadFont { bytes, tagger } => Action::LoadFont {
                 bytes,
                 tagger: Box::new(move |result| f(tagger(result))),
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 2d2e5b3888..aa45e57a3a 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -50,7 +50,6 @@ pub mod keyboard;
 pub mod program;
 pub mod system;
 pub mod user_interface;
-pub mod widget;
 pub mod window;
 
 // We disable debug capabilities on release builds unless the `debug` feature
diff --git a/native/src/widget.rs b/native/src/widget.rs
deleted file mode 100644
index 0fdade5446..0000000000
--- a/native/src/widget.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//! Use the built-in widgets or create your own.
-//!
-//! # Built-in widgets
-//! Every built-in drawable widget has its own module with a `Renderer` trait
-//! that must be implemented by a [renderer] before being able to use it as
-//! a [`Widget`].
-//!
-//! # Custom widgets
-//! If you want to implement a custom widget, you simply need to implement the
-//! [`Widget`] trait. You can use the API of the built-in widgets as a guide or
-//! source of inspiration.
-//!
-//! [renderer]: crate::renderer
-mod action;
-
-pub use action::Action;
diff --git a/native/src/widget/action.rs b/native/src/widget/action.rs
deleted file mode 100644
index f50d7aec25..0000000000
--- a/native/src/widget/action.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use iced_core::widget::operation::{
-    self, Focusable, Operation, Scrollable, TextInput,
-};
-use iced_core::widget::Id;
-use iced_futures::MaybeSend;
-
-use std::any::Any;
-use std::rc::Rc;
-
-/// An operation to be performed on the widget tree.
-#[allow(missing_debug_implementations)]
-pub struct Action<T>(Box<dyn Operation<T>>);
-
-impl<T> Action<T> {
-    /// Creates a new [`Action`] with the given [`Operation`].
-    pub fn new(operation: impl Operation<T> + 'static) -> Self {
-        Self(Box::new(operation))
-    }
-
-    /// Maps the output of an [`Action`] using the given function.
-    pub fn map<A>(
-        self,
-        f: impl Fn(T) -> A + 'static + MaybeSend + Sync,
-    ) -> Action<A>
-    where
-        T: 'static,
-        A: 'static,
-    {
-        Action(Box::new(Map {
-            operation: self.0,
-            f: Rc::new(f),
-        }))
-    }
-
-    /// Consumes the [`Action`] and returns the internal [`Operation`].
-    pub fn into_operation(self) -> Box<dyn Operation<T>> {
-        self.0
-    }
-}
-
-#[allow(missing_debug_implementations)]
-struct Map<A, B> {
-    operation: Box<dyn Operation<A>>,
-    f: Rc<dyn Fn(A) -> B>,
-}
-
-impl<A, B> Operation<B> for Map<A, B>
-where
-    A: 'static,
-    B: 'static,
-{
-    fn container(
-        &mut self,
-        id: Option<&Id>,
-        operate_on_children: &mut dyn FnMut(&mut dyn Operation<B>),
-    ) {
-        struct MapRef<'a, A> {
-            operation: &'a mut dyn Operation<A>,
-        }
-
-        impl<'a, A, B> Operation<B> for MapRef<'a, A> {
-            fn container(
-                &mut self,
-                id: Option<&Id>,
-                operate_on_children: &mut dyn FnMut(&mut dyn Operation<B>),
-            ) {
-                let Self { operation, .. } = self;
-
-                operation.container(id, &mut |operation| {
-                    operate_on_children(&mut MapRef { operation });
-                });
-            }
-
-            fn scrollable(
-                &mut self,
-                state: &mut dyn Scrollable,
-                id: Option<&Id>,
-            ) {
-                self.operation.scrollable(state, id);
-            }
-
-            fn focusable(
-                &mut self,
-                state: &mut dyn Focusable,
-                id: Option<&Id>,
-            ) {
-                self.operation.focusable(state, id);
-            }
-
-            fn text_input(
-                &mut self,
-                state: &mut dyn TextInput,
-                id: Option<&Id>,
-            ) {
-                self.operation.text_input(state, id);
-            }
-
-            fn custom(&mut self, state: &mut dyn Any, id: Option<&Id>) {
-                self.operation.custom(state, id);
-            }
-        }
-
-        let Self { operation, .. } = self;
-
-        MapRef {
-            operation: operation.as_mut(),
-        }
-        .container(id, operate_on_children);
-    }
-
-    fn focusable(
-        &mut self,
-        state: &mut dyn operation::Focusable,
-        id: Option<&Id>,
-    ) {
-        self.operation.focusable(state, id);
-    }
-
-    fn scrollable(
-        &mut self,
-        state: &mut dyn operation::Scrollable,
-        id: Option<&Id>,
-    ) {
-        self.operation.scrollable(state, id);
-    }
-
-    fn text_input(
-        &mut self,
-        state: &mut dyn operation::TextInput,
-        id: Option<&Id>,
-    ) {
-        self.operation.text_input(state, id);
-    }
-
-    fn custom(&mut self, state: &mut dyn Any, id: Option<&Id>) {
-        self.operation.custom(state, id);
-    }
-
-    fn finish(&self) -> operation::Outcome<B> {
-        match self.operation.finish() {
-            operation::Outcome::None => operation::Outcome::None,
-            operation::Outcome::Some(output) => {
-                operation::Outcome::Some((self.f)(output))
-            }
-            operation::Outcome::Chain(next) => {
-                operation::Outcome::Chain(Box::new(Map {
-                    operation: next,
-                    f: self.f.clone(),
-                }))
-            }
-        }
-    }
-}
diff --git a/winit/src/application.rs b/winit/src/application.rs
index c95dbf621d..d863c84648 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -818,7 +818,7 @@ pub fn run_command<A, E>(
             },
             command::Action::Widget(action) => {
                 let mut current_cache = std::mem::take(cache);
-                let mut current_operation = Some(action.into_operation());
+                let mut current_operation = Some(action);
 
                 let mut user_interface = build_user_interface(
                     application,

From 99e0a71504456976ba88040f5d1d3bbc347694ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 06:35:20 +0100
Subject: [PATCH 088/163] Rename `iced_native` to `iced_runtime`

---
 Cargo.toml                                    |  2 +-
 examples/integration/src/controls.rs          |  2 +-
 examples/integration/src/main.rs              |  4 +--
 native/src/window.rs                          | 23 ---------------
 {native => runtime}/Cargo.toml                |  2 +-
 {native => runtime}/README.md                 |  0
 {native => runtime}/src/clipboard.rs          | 15 +++++++++-
 {native => runtime}/src/command.rs            |  0
 {native => runtime}/src/command/action.rs     |  0
 {native => runtime}/src/debug/basic.rs        |  0
 {native => runtime}/src/debug/null.rs         |  0
 {native => runtime}/src/font.rs               |  0
 {native => runtime}/src/keyboard.rs           |  0
 {native => runtime}/src/lib.rs                |  0
 {native => runtime}/src/program.rs            |  0
 {native => runtime}/src/program/state.rs      |  0
 {native => runtime}/src/system.rs             |  0
 {native => runtime}/src/system/action.rs      |  0
 {native => runtime}/src/system/information.rs |  0
 {native => runtime}/src/user_interface.rs     | 24 ++++++++--------
 {winit => runtime}/src/window.rs              | 28 ++++++++++++++++---
 {native => runtime}/src/window/action.rs      |  0
 src/advanced.rs                               |  2 +-
 src/application.rs                            |  2 +-
 src/lib.rs                                    | 10 +++----
 src/window.rs                                 |  3 +-
 tiny_skia/Cargo.toml                          |  4 ---
 tiny_skia/src/text.rs                         |  2 +-
 widget/Cargo.toml                             |  4 +--
 widget/src/helpers.rs                         |  2 +-
 widget/src/lib.rs                             |  4 +--
 widget/src/scrollable.rs                      |  2 +-
 widget/src/text_input.rs                      |  2 +-
 winit/Cargo.toml                              |  6 ++--
 winit/src/application.rs                      | 14 +++++-----
 winit/src/application/state.rs                |  2 +-
 winit/src/clipboard.rs                        | 14 ----------
 winit/src/lib.rs                              |  7 ++---
 winit/src/system.rs                           |  4 +--
 39 files changed, 87 insertions(+), 97 deletions(-)
 delete mode 100644 native/src/window.rs
 rename {native => runtime}/Cargo.toml (95%)
 rename {native => runtime}/README.md (100%)
 rename {native => runtime}/src/clipboard.rs (67%)
 rename {native => runtime}/src/command.rs (100%)
 rename {native => runtime}/src/command/action.rs (100%)
 rename {native => runtime}/src/debug/basic.rs (100%)
 rename {native => runtime}/src/debug/null.rs (100%)
 rename {native => runtime}/src/font.rs (100%)
 rename {native => runtime}/src/keyboard.rs (100%)
 rename {native => runtime}/src/lib.rs (100%)
 rename {native => runtime}/src/program.rs (100%)
 rename {native => runtime}/src/program/state.rs (100%)
 rename {native => runtime}/src/system.rs (100%)
 rename {native => runtime}/src/system/action.rs (100%)
 rename {native => runtime}/src/system/information.rs (100%)
 rename {native => runtime}/src/user_interface.rs (96%)
 rename {winit => runtime}/src/window.rs (79%)
 rename {native => runtime}/src/window/action.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 49a52311a1..a677569a24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ members = [
     "core",
     "futures",
     "graphics",
-    "native",
+    "runtime",
     "renderer",
     "style",
     "tiny_skia",
diff --git a/examples/integration/src/controls.rs b/examples/integration/src/controls.rs
index 16e2170966..5849f730d1 100644
--- a/examples/integration/src/controls.rs
+++ b/examples/integration/src/controls.rs
@@ -1,7 +1,7 @@
 use iced_wgpu::Renderer;
 use iced_widget::{slider, text_input, Column, Row, Text};
 use iced_winit::core::{Alignment, Color, Element, Length};
-use iced_winit::native::{Command, Program};
+use iced_winit::runtime::{Command, Program};
 use iced_winit::style::Theme;
 
 pub struct Controls {
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index c1f1f076d3..9707eda78a 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -8,8 +8,8 @@ use iced_wgpu::graphics::Viewport;
 use iced_wgpu::{wgpu, Backend, Renderer, Settings};
 use iced_winit::core::renderer;
 use iced_winit::core::{Color, Size};
-use iced_winit::native::program;
-use iced_winit::native::Debug;
+use iced_winit::runtime::program;
+use iced_winit::runtime::Debug;
 use iced_winit::style::Theme;
 use iced_winit::{conversion, futures, winit, Clipboard};
 
diff --git a/native/src/window.rs b/native/src/window.rs
deleted file mode 100644
index aa3f35c71b..0000000000
--- a/native/src/window.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Build window-based GUI applications.
-mod action;
-
-pub use action::Action;
-
-use crate::core::time::Instant;
-use crate::core::window::Event;
-use crate::futures::subscription::{self, Subscription};
-
-/// Subscribes to the frames of the window of the running application.
-///
-/// The resulting [`Subscription`] will produce items at a rate equal to the
-/// refresh rate of the window. Note that this rate may be variable, as it is
-/// normally managed by the graphics driver and/or the OS.
-///
-/// In any case, this [`Subscription`] is useful to smoothly draw application-driven
-/// animations without missing any frames.
-pub fn frames() -> Subscription<Instant> {
-    subscription::raw_events(|event, _status| match event {
-        iced_core::Event::Window(Event::RedrawRequested(at)) => Some(at),
-        _ => None,
-    })
-}
diff --git a/native/Cargo.toml b/runtime/Cargo.toml
similarity index 95%
rename from native/Cargo.toml
rename to runtime/Cargo.toml
index bc4e7ca19c..2d3e8db3a2 100644
--- a/native/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "iced_native"
+name = "iced_runtime"
 version = "0.9.1"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
diff --git a/native/README.md b/runtime/README.md
similarity index 100%
rename from native/README.md
rename to runtime/README.md
diff --git a/native/src/clipboard.rs b/runtime/src/clipboard.rs
similarity index 67%
rename from native/src/clipboard.rs
rename to runtime/src/clipboard.rs
index e727c4a740..bc45091266 100644
--- a/native/src/clipboard.rs
+++ b/runtime/src/clipboard.rs
@@ -1,5 +1,6 @@
 //! Access the clipboard.
-use iced_futures::MaybeSend;
+use crate::command::{self, Command};
+use crate::futures::MaybeSend;
 
 use std::fmt;
 
@@ -38,3 +39,15 @@ impl<T> fmt::Debug for Action<T> {
         }
     }
 }
+
+/// Read the current contents of the clipboard.
+pub fn read<Message>(
+    f: impl Fn(Option<String>) -> Message + 'static,
+) -> Command<Message> {
+    Command::single(command::Action::Clipboard(Action::Read(Box::new(f))))
+}
+
+/// Write the given contents to the clipboard.
+pub fn write<Message>(contents: String) -> Command<Message> {
+    Command::single(command::Action::Clipboard(Action::Write(contents)))
+}
diff --git a/native/src/command.rs b/runtime/src/command.rs
similarity index 100%
rename from native/src/command.rs
rename to runtime/src/command.rs
diff --git a/native/src/command/action.rs b/runtime/src/command/action.rs
similarity index 100%
rename from native/src/command/action.rs
rename to runtime/src/command/action.rs
diff --git a/native/src/debug/basic.rs b/runtime/src/debug/basic.rs
similarity index 100%
rename from native/src/debug/basic.rs
rename to runtime/src/debug/basic.rs
diff --git a/native/src/debug/null.rs b/runtime/src/debug/null.rs
similarity index 100%
rename from native/src/debug/null.rs
rename to runtime/src/debug/null.rs
diff --git a/native/src/font.rs b/runtime/src/font.rs
similarity index 100%
rename from native/src/font.rs
rename to runtime/src/font.rs
diff --git a/native/src/keyboard.rs b/runtime/src/keyboard.rs
similarity index 100%
rename from native/src/keyboard.rs
rename to runtime/src/keyboard.rs
diff --git a/native/src/lib.rs b/runtime/src/lib.rs
similarity index 100%
rename from native/src/lib.rs
rename to runtime/src/lib.rs
diff --git a/native/src/program.rs b/runtime/src/program.rs
similarity index 100%
rename from native/src/program.rs
rename to runtime/src/program.rs
diff --git a/native/src/program/state.rs b/runtime/src/program/state.rs
similarity index 100%
rename from native/src/program/state.rs
rename to runtime/src/program/state.rs
diff --git a/native/src/system.rs b/runtime/src/system.rs
similarity index 100%
rename from native/src/system.rs
rename to runtime/src/system.rs
diff --git a/native/src/system/action.rs b/runtime/src/system/action.rs
similarity index 100%
rename from native/src/system/action.rs
rename to runtime/src/system/action.rs
diff --git a/native/src/system/information.rs b/runtime/src/system/information.rs
similarity index 100%
rename from native/src/system/information.rs
rename to runtime/src/system/information.rs
diff --git a/native/src/user_interface.rs b/runtime/src/user_interface.rs
similarity index 96%
rename from native/src/user_interface.rs
rename to runtime/src/user_interface.rs
index 315027fa08..2c76fd8a8a 100644
--- a/native/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -32,7 +32,7 @@ pub struct UserInterface<'a, Message, Renderer> {
 
 impl<'a, Message, Renderer> UserInterface<'a, Message, Renderer>
 where
-    Renderer: iced_core::Renderer,
+    Renderer: crate::core::Renderer,
 {
     /// Builds a user interface for an [`Element`].
     ///
@@ -46,7 +46,7 @@ where
     ///
     /// ```no_run
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::core::renderer::Null as Renderer;
+    /// #     pub use iced_runtime::core::renderer::Null as Renderer;
     /// # }
     /// #
     /// # pub struct Counter;
@@ -56,8 +56,8 @@ where
     /// #     pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_native::core::Size;
-    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_runtime::core::Size;
+    /// use iced_runtime::user_interface::{self, UserInterface};
     /// use iced_wgpu::Renderer;
     ///
     /// // Initialization
@@ -119,7 +119,7 @@ where
     ///
     /// ```no_run
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::core::renderer::Null as Renderer;
+    /// #     pub use iced_runtime::core::renderer::Null as Renderer;
     /// # }
     /// #
     /// # pub struct Counter;
@@ -129,8 +129,8 @@ where
     /// #     pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_native::core::{clipboard, Size, Point};
-    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_runtime::core::{clipboard, Size, Point};
+    /// use iced_runtime::user_interface::{self, UserInterface};
     /// use iced_wgpu::Renderer;
     ///
     /// let mut counter = Counter::new();
@@ -348,7 +348,7 @@ where
     ///
     /// ```no_run
     /// # mod iced_wgpu {
-    /// #     pub use iced_native::core::renderer::Null as Renderer;
+    /// #     pub use iced_runtime::core::renderer::Null as Renderer;
     /// #     pub type Theme = ();
     /// # }
     /// #
@@ -359,10 +359,10 @@ where
     /// #     pub fn view(&self) -> Element<(), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_native::core::clipboard;
-    /// use iced_native::core::renderer;
-    /// use iced_native::core::{Element, Size, Point};
-    /// use iced_native::user_interface::{self, UserInterface};
+    /// use iced_runtime::core::clipboard;
+    /// use iced_runtime::core::renderer;
+    /// use iced_runtime::core::{Element, Size, Point};
+    /// use iced_runtime::user_interface::{self, UserInterface};
     /// use iced_wgpu::{Renderer, Theme};
     ///
     /// let mut counter = Counter::new();
diff --git a/winit/src/window.rs b/runtime/src/window.rs
similarity index 79%
rename from winit/src/window.rs
rename to runtime/src/window.rs
index 6ac58e2073..236064f77c 100644
--- a/winit/src/window.rs
+++ b/runtime/src/window.rs
@@ -1,7 +1,27 @@
-//! Interact with the window of your application.
-use crate::core::window::{Mode, UserAttention};
-use crate::native::command::{self, Command};
-use crate::native::window::Action;
+//! Build window-based GUI applications.
+mod action;
+
+pub use action::Action;
+
+use crate::command::{self, Command};
+use crate::core::time::Instant;
+use crate::core::window::{Event, Mode, UserAttention};
+use crate::futures::subscription::{self, Subscription};
+
+/// Subscribes to the frames of the window of the running application.
+///
+/// The resulting [`Subscription`] will produce items at a rate equal to the
+/// refresh rate of the window. Note that this rate may be variable, as it is
+/// normally managed by the graphics driver and/or the OS.
+///
+/// In any case, this [`Subscription`] is useful to smoothly draw application-driven
+/// animations without missing any frames.
+pub fn frames() -> Subscription<Instant> {
+    subscription::raw_events(|event, _status| match event {
+        iced_core::Event::Window(Event::RedrawRequested(at)) => Some(at),
+        _ => None,
+    })
+}
 
 /// Closes the current window and exits the application.
 pub fn close<Message>() -> Command<Message> {
diff --git a/native/src/window/action.rs b/runtime/src/window/action.rs
similarity index 100%
rename from native/src/window/action.rs
rename to runtime/src/window/action.rs
diff --git a/src/advanced.rs b/src/advanced.rs
index 9621c3bc02..7afba85ccc 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -10,5 +10,5 @@ pub use crate::core::{Clipboard, Shell};
 
 pub mod subscription {
     //! Write your own subscriptions.
-    pub use crate::native::futures::subscription::{EventStream, Recipe};
+    pub use crate::runtime::futures::subscription::{EventStream, Recipe};
 }
diff --git a/src/application.rs b/src/application.rs
index f5cf3317ea..c9ddf840c3 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -215,7 +215,7 @@ pub trait Application: Sized {
 
 struct Instance<A: Application>(A);
 
-impl<A> crate::native::Program for Instance<A>
+impl<A> crate::runtime::Program for Instance<A>
 where
     A: Application,
 {
diff --git a/src/lib.rs b/src/lib.rs
index b9f87d5dd9..c59d505804 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -169,7 +169,7 @@ use iced_widget::renderer;
 use iced_widget::style;
 use iced_winit as shell;
 use iced_winit::core;
-use iced_winit::native;
+use iced_winit::runtime;
 
 pub use iced_futures::futures;
 
@@ -192,11 +192,11 @@ pub use crate::core::{
     color, Alignment, Background, Color, ContentFit, Length, Padding, Point,
     Rectangle, Size, Vector,
 };
-pub use crate::native::Command;
+pub use crate::runtime::Command;
 
 pub mod clipboard {
     //! Access the clipboard.
-    pub use crate::shell::clipboard::{read, write};
+    pub use crate::runtime::clipboard::{read, write};
 }
 
 pub mod executor {
@@ -219,7 +219,7 @@ pub mod executor {
 pub mod font {
     //! Load and use fonts.
     pub use crate::core::font::*;
-    pub use crate::native::font::*;
+    pub use crate::runtime::font::*;
 }
 
 pub mod keyboard {
@@ -242,7 +242,7 @@ pub mod subscription {
 #[cfg(feature = "system")]
 pub mod system {
     //! Retrieve system information.
-    pub use crate::native::system::Information;
+    pub use crate::runtime::system::Information;
     pub use crate::shell::system::*;
 }
 
diff --git a/src/window.rs b/src/window.rs
index 2623906552..824915b284 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -9,5 +9,4 @@ pub use position::Position;
 pub use settings::Settings;
 
 pub use crate::core::window::*;
-pub use crate::native::window::*;
-pub use crate::shell::window::*;
+pub use crate::runtime::window::*;
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index c4c36abad5..08e79bb8c6 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -17,10 +17,6 @@ rustc-hash = "1.1"
 ouroboros = "0.15"
 kurbo = "0.9"
 
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
 [dependencies.iced_graphics]
 version = "0.7"
 path = "../graphics"
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 7a5034c2aa..c4edadb333 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -187,7 +187,7 @@ impl Pipeline {
         &self,
         content: &str,
         size: f32,
-        font: iced_native::Font,
+        font: Font,
         bounds: Size,
         point: Point,
         _nearest_only: bool,
diff --git a/widget/Cargo.toml b/widget/Cargo.toml
index fb617079c8..4c23f3e86e 100644
--- a/widget/Cargo.toml
+++ b/widget/Cargo.toml
@@ -15,9 +15,9 @@ unicode-segmentation = "1.6"
 num-traits = "0.2"
 thiserror = "1"
 
-[dependencies.iced_native]
+[dependencies.iced_runtime]
 version = "0.9"
-path = "../native"
+path = "../runtime"
 
 [dependencies.iced_renderer]
 version = "0.1"
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 1a73c16f13..a43e7248a3 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -5,12 +5,12 @@ use crate::container::{self, Container};
 use crate::core;
 use crate::core::widget::operation;
 use crate::core::{Element, Length, Pixels};
-use crate::native::Command;
 use crate::overlay;
 use crate::pick_list::{self, PickList};
 use crate::progress_bar::{self, ProgressBar};
 use crate::radio::{self, Radio};
 use crate::rule::{self, Rule};
+use crate::runtime::Command;
 use crate::scrollable::{self, Scrollable};
 use crate::slider::{self, Slider};
 use crate::text::{self, Text};
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index 4c1e7c1c0a..a3e7c8bc35 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -14,10 +14,10 @@
 )]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-pub use iced_native as native;
-pub use iced_native::core;
 pub use iced_renderer as renderer;
 pub use iced_renderer::graphics;
+pub use iced_runtime as runtime;
+pub use iced_runtime::core;
 pub use iced_style as style;
 
 mod column;
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 49c780deac..5a7481f727 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -13,7 +13,7 @@ use crate::core::{
     Background, Clipboard, Color, Element, Layout, Length, Pixels, Point,
     Rectangle, Shell, Size, Vector, Widget,
 };
-use crate::native::Command;
+use crate::runtime::Command;
 
 pub use crate::style::scrollable::{Scrollbar, Scroller, StyleSheet};
 pub use operation::scrollable::RelativeOffset;
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index d1c48fbdd5..d066109aab 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -28,7 +28,7 @@ use crate::core::{
     Clipboard, Color, Element, Layout, Length, Padding, Pixels, Point,
     Rectangle, Shell, Size, Vector, Widget,
 };
-use crate::native::Command;
+use crate::runtime::Command;
 
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 21c14f68ba..bfd2209344 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["gui"]
 [features]
 trace = ["tracing", "tracing-core", "tracing-subscriber"]
 chrome-trace = ["trace", "tracing-chrome"]
-debug = ["iced_native/debug"]
+debug = ["iced_runtime/debug"]
 system = ["sysinfo"]
 application = []
 
@@ -27,9 +27,9 @@ version = "0.27"
 git = "https://github.com/iced-rs/winit.git"
 rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
 
-[dependencies.iced_native]
+[dependencies.iced_runtime]
 version = "0.9"
-path = "../native"
+path = "../runtime"
 
 [dependencies.iced_graphics]
 version = "0.7"
diff --git a/winit/src/application.rs b/winit/src/application.rs
index d863c84648..9666fcae05 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -16,10 +16,10 @@ use crate::core::{Event, Size};
 use crate::futures::futures;
 use crate::futures::{Executor, Runtime, Subscription};
 use crate::graphics::compositor::{self, Compositor};
-use crate::native::clipboard;
-use crate::native::program::Program;
-use crate::native::user_interface::{self, UserInterface};
-use crate::native::{Command, Debug};
+use crate::runtime::clipboard;
+use crate::runtime::program::Program;
+use crate::runtime::user_interface::{self, UserInterface};
+use crate::runtime::{Command, Debug};
 use crate::style::application::{Appearance, StyleSheet};
 use crate::{Clipboard, Error, Proxy, Settings};
 
@@ -709,9 +709,9 @@ pub fn run_command<A, E>(
     E: Executor,
     <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
-    use iced_native::command;
-    use iced_native::system;
-    use iced_native::window;
+    use crate::runtime::command;
+    use crate::runtime::system;
+    use crate::runtime::window;
 
     for action in command.actions() {
         match action {
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index b727e03ca9..c37ccca614 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -3,7 +3,7 @@ use crate::conversion;
 use crate::core;
 use crate::core::{Color, Point, Size};
 use crate::graphics::Viewport;
-use crate::native::Debug;
+use crate::runtime::Debug;
 use crate::Application;
 
 use std::marker::PhantomData;
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 2250913080..7271441d60 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -1,6 +1,4 @@
 //! Access the clipboard.
-use crate::native::clipboard::Action;
-use crate::native::command::{self, Command};
 
 /// A buffer for short-term storage and transfer within and between
 /// applications.
@@ -64,15 +62,3 @@ impl crate::core::Clipboard for Clipboard {
         self.write(contents)
     }
 }
-
-/// Read the current contents of the clipboard.
-pub fn read<Message>(
-    f: impl Fn(Option<String>) -> Message + 'static,
-) -> Command<Message> {
-    Command::single(command::Action::Clipboard(Action::Read(Box::new(f))))
-}
-
-/// Write the given contents to the clipboard.
-pub fn write<Message>(contents: String) -> Command<Message> {
-    Command::single(command::Action::Clipboard(Action::Write(contents)))
-}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 0d8c04d3d3..5cde510ac4 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -31,9 +31,9 @@
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 pub use iced_graphics as graphics;
-pub use iced_native as native;
-pub use iced_native::core;
-pub use iced_native::futures;
+pub use iced_runtime as runtime;
+pub use iced_runtime::core;
+pub use iced_runtime::futures;
 pub use iced_style as style;
 pub use winit;
 
@@ -42,7 +42,6 @@ pub mod application;
 pub mod clipboard;
 pub mod conversion;
 pub mod settings;
-pub mod window;
 
 #[cfg(feature = "system")]
 pub mod system;
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 3a6a8a8ec3..069efa29fd 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -1,7 +1,7 @@
 //! Access the native system.
 use crate::graphics::compositor;
-use crate::native::command::{self, Command};
-use crate::native::system::{Action, Information};
+use crate::runtime::command::{self, Command};
+use crate::runtime::system::{Action, Information};
 
 /// Query for available system information.
 pub fn fetch_information<Message>(

From 1c36446115dcb46c373fbc62b9e4f1941bd5a383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 06:36:36 +0100
Subject: [PATCH 089/163] Fix `README` of `iced_runtime`

---
 runtime/README.md | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/runtime/README.md b/runtime/README.md
index 996daa7687..497fd145dd 100644
--- a/runtime/README.md
+++ b/runtime/README.md
@@ -1,22 +1,10 @@
-# `iced_native`
+# `iced_runtime`
 [![Documentation](https://docs.rs/iced_native/badge.svg)][documentation]
 [![Crates.io](https://img.shields.io/crates/v/iced_native.svg)](https://crates.io/crates/iced_native)
 [![License](https://img.shields.io/crates/l/iced_native.svg)](https://github.com/iced-rs/iced/blob/master/LICENSE)
 [![Discord Server](https://img.shields.io/discord/628993209984614400?label=&labelColor=6A7EC2&logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/3xZJ65GAhd)
 
-`iced_native` takes [`iced_core`] and builds a native runtime on top of it, featuring:
-- A custom layout engine, greatly inspired by [`druid`]
-- Event handling for all the built-in widgets
-- A renderer-agnostic API
-
-To achieve this, it introduces a bunch of reusable interfaces:
-- A `Widget` trait, which is used to implement new widgets: from layout requirements to event and drawing logic.
-- A bunch of `Renderer` traits, meant to keep the crate renderer-agnostic.
-- A `Windowed` trait, leveraging [`raw-window-handle`], which can be implemented by graphical renderers that target _windows_. Window-based shells (like [`iced_winit`]) can use this trait to stay renderer-agnostic.
-
-<p align="center">
-  <img alt="The native target" src="../docs/graphs/native.png" width="80%">
-</p>
+`iced_runtime` takes [`iced_core`] and builds a native runtime on top of it.
 
 [documentation]: https://docs.rs/iced_native
 [`iced_core`]: ../core
@@ -25,10 +13,10 @@ To achieve this, it introduces a bunch of reusable interfaces:
 [`raw-window-handle`]: https://github.com/rust-windowing/raw-window-handle
 
 ## Installation
-Add `iced_native` as a dependency in your `Cargo.toml`:
+Add `iced_runtime` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_native = "0.9"
+iced_runtime = "0.9"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If

From 06bbcc310e6e759a0839df6ca391ea5e0f0ee609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Mar 2023 06:40:20 +0100
Subject: [PATCH 090/163] Move `webgl` feature selection for `wgpu` into
 `iced_wgpu`

---
 examples/integration/Cargo.toml |  2 +-
 renderer/Cargo.toml             | 10 ++++------
 wgpu/Cargo.toml                 |  4 +++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/integration/Cargo.toml b/examples/integration/Cargo.toml
index 6039024228..f429977fc4 100644
--- a/examples/integration/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 iced_winit = { path = "../../winit" }
-iced_wgpu = { path = "../../wgpu", features = ["webgl"] }
+iced_wgpu = { path = "../../wgpu" }
 iced_widget = { path = "../../widget" }
 env_logger = "0.8"
 
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index d0420ad04e..560bf2e143 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -17,12 +17,10 @@ thiserror = "1"
 version = "0.7"
 path = "../graphics"
 
+[dependencies.iced_wgpu]
+version = "0.9"
+path = "../wgpu"
+
 [dependencies.iced_tiny_skia]
 version = "0.1"
 path = "../tiny_skia"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-iced_wgpu = { version = "0.9", path = "../wgpu" }
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-iced_wgpu = { version = "0.9", path = "../wgpu", features = ["webgl"] }
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 50a81a9111..5601c0de43 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -23,7 +23,6 @@ dds = ["iced_graphics/dds"]
 farbfeld = ["iced_graphics/farbfeld"]
 geometry = ["iced_graphics/geometry", "lyon"]
 spirv = ["wgpu/spirv"]
-webgl = ["wgpu/webgl"]
 
 [dependencies]
 wgpu = "0.14"
@@ -36,6 +35,9 @@ once_cell = "1.0"
 rustc-hash = "1.1"
 ouroboros = "0.15"
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wgpu = { version = "0.14", features = ["webgl"] }
+
 [dependencies.twox-hash]
 version = "1.6"
 default-features = false

From 9b4bcd287a7f4822314e158990d1dc023d5aab51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 6 Mar 2023 22:10:13 +0100
Subject: [PATCH 091/163] Introduce backend feature flags in `iced_renderer`

---
 Cargo.toml                 |   6 ++
 renderer/Cargo.toml        |   6 +-
 renderer/src/backend.rs    |  76 +++++++++----------------
 renderer/src/compositor.rs | 112 +++++++++++++++++++++++++++----------
 renderer/src/geometry.rs   |  41 +++++++++-----
 renderer/src/lib.rs        |   3 +
 6 files changed, 149 insertions(+), 95 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a677569a24..38c35f43bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,11 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
+default = ["wgpu", "tiny-skia"]
+# Enable the `wgpu` GPU-accelerated renderer backend
+wgpu = ["iced_renderer/wgpu"]
+# Enable the `tiny-skia` software renderer backend
+tiny-skia = ["iced_renderer/tiny-skia"]
 # Enables the `Image` widget
 image = ["iced_widget/image", "image_rs"]
 # Enables the `Svg` widget
@@ -58,6 +63,7 @@ members = [
 [dependencies]
 iced_core = { version = "0.8", path = "core" }
 iced_futures = { version = "0.6", path = "futures" }
+iced_renderer = { version = "0.1", path = "renderer" }
 iced_widget = { version = "0.1", path = "widget" }
 iced_winit = { version = "0.8", path = "winit", features = ["application"] }
 thiserror = "1"
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 560bf2e143..629c11bae4 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -4,9 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
+wgpu = ["iced_wgpu"]
+tiny-skia = ["iced_tiny_skia"]
 image = ["iced_wgpu/image", "iced_tiny_skia/image"]
 svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
-geometry = ["iced_wgpu/geometry", "iced_tiny_skia/geometry"]
+geometry = ["iced_graphics/geometry", "iced_wgpu?/geometry", "iced_tiny_skia?/geometry"]
 tracing = ["iced_wgpu/tracing"]
 
 [dependencies]
@@ -20,7 +22,9 @@ path = "../graphics"
 [dependencies.iced_wgpu]
 version = "0.9"
 path = "../wgpu"
+optional = true
 
 [dependencies.iced_tiny_skia]
 version = "0.1"
 path = "../tiny_skia"
+optional = true
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index bf5da322af..e77b708bc1 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -6,16 +6,26 @@ use std::borrow::Cow;
 
 #[allow(clippy::large_enum_variant)]
 pub enum Backend {
+    #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::Backend),
+    #[cfg(feature = "tiny-skia")]
     TinySkia(iced_tiny_skia::Backend),
 }
 
+macro_rules! delegate {
+    ($backend:expr, $name:ident, $body:expr) => {
+        match $backend {
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu($name) => $body,
+            #[cfg(feature = "tiny-skia")]
+            Self::TinySkia($name) => $body,
+        }
+    };
+}
+
 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(),
-        }
+        delegate!(self, backend, backend.trim_measurements());
     }
 }
 
@@ -25,17 +35,11 @@ impl backend::Text for Backend {
     const ARROW_DOWN_ICON: char = '\u{e800}';
 
     fn default_font(&self) -> Font {
-        match self {
-            Self::Wgpu(backend) => backend.default_font(),
-            Self::TinySkia(backend) => backend.default_font(),
-        }
+        delegate!(self, backend, backend.default_font())
     }
 
     fn default_size(&self) -> f32 {
-        match self {
-            Self::Wgpu(backend) => backend.default_size(),
-            Self::TinySkia(backend) => backend.default_size(),
-        }
+        delegate!(self, backend, backend.default_size())
     }
 
     fn measure(
@@ -45,14 +49,7 @@ impl backend::Text for Backend {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        match self {
-            Self::Wgpu(backend) => {
-                backend.measure(contents, size, font, bounds)
-            }
-            Self::TinySkia(backend) => {
-                backend.measure(contents, size, font, bounds)
-            }
-        }
+        delegate!(self, backend, backend.measure(contents, size, font, bounds))
     }
 
     fn hit_test(
@@ -64,45 +61,29 @@ impl backend::Text for Backend {
         position: Point,
         nearest_only: bool,
     ) -> Option<text::Hit> {
-        match self {
-            Self::Wgpu(backend) => backend.hit_test(
-                contents,
-                size,
-                font,
-                bounds,
-                position,
-                nearest_only,
-            ),
-            Self::TinySkia(backend) => backend.hit_test(
+        delegate!(
+            self,
+            backend,
+            backend.hit_test(
                 contents,
                 size,
                 font,
                 bounds,
                 position,
-                nearest_only,
-            ),
-        }
+                nearest_only
+            )
+        )
     }
 
     fn load_font(&mut self, font: Cow<'static, [u8]>) {
-        match self {
-            Self::Wgpu(backend) => {
-                backend.load_font(font);
-            }
-            Self::TinySkia(backend) => {
-                backend.load_font(font);
-            }
-        }
+        delegate!(self, backend, backend.load_font(font));
     }
 }
 
 #[cfg(feature = "image")]
 impl backend::Image for Backend {
     fn dimensions(&self, handle: &crate::core::image::Handle) -> Size<u32> {
-        match self {
-            Self::Wgpu(backend) => backend.dimensions(handle),
-            Self::TinySkia(backend) => backend.dimensions(handle),
-        }
+        delegate!(self, backend, backend.dimensions(handle))
     }
 }
 
@@ -112,9 +93,6 @@ impl backend::Svg for Backend {
         &self,
         handle: &crate::core::svg::Handle,
     ) -> Size<u32> {
-        match self {
-            Self::Wgpu(backend) => backend.viewport_dimensions(handle),
-            Self::TinySkia(backend) => backend.viewport_dimensions(handle),
-        }
+        delegate!(self, backend, backend.viewport_dimensions(handle))
     }
 }
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 0cdcb2938f..218e7e332e 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -1,17 +1,21 @@
 use crate::core::Color;
 use crate::graphics::compositor::{Information, SurfaceError};
 use crate::graphics::{Error, Viewport};
-use crate::{Backend, Renderer, Settings};
+use crate::{Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 
 pub enum Compositor<Theme> {
+    #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::window::Compositor<Theme>),
+    #[cfg(feature = "tiny-skia")]
     TinySkia(iced_tiny_skia::window::Compositor<Theme>),
 }
 
 pub enum Surface {
+    #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::window::Surface),
+    #[cfg(feature = "tiny-skia")]
     TinySkia(iced_tiny_skia::window::Surface),
 }
 
@@ -22,32 +26,65 @@ impl<Theme> crate::graphics::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 {
-        //        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,
-            });
-
-        Ok((
-            Self::TinySkia(compositor),
-            Renderer::new(Backend::TinySkia(backend)),
-        ))
+        #[cfg(feature = "wgpu")]
+        let new_wgpu = |settings: Self::Settings, compatible_window| {
+            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(crate::Backend::Wgpu(backend)),
+            ))
+        };
+
+        #[cfg(feature = "tiny-skia")]
+        let new_tiny_skia = |settings: Self::Settings, _compatible_window| {
+            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,
+                },
+            );
+
+            Ok((
+                Self::TinySkia(compositor),
+                Renderer::new(crate::Backend::TinySkia(backend)),
+            ))
+        };
+
+        let fail = |_, _| Err(Error::GraphicsAdapterNotFound);
+
+        let candidates = &[
+            #[cfg(feature = "wgpu")]
+            new_wgpu,
+            #[cfg(feature = "tiny-skia")]
+            new_tiny_skia,
+            fail,
+        ];
+
+        let mut error = Error::GraphicsAdapterNotFound;
+
+        for candidate in candidates {
+            match candidate(settings, compatible_window) {
+                Ok((compositor, renderer)) => {
+                    return Ok((compositor, renderer))
+                }
+                Err(new_error) => {
+                    error = new_error;
+                }
+            }
+        }
+
+        Err(error)
     }
 
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
@@ -57,9 +94,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) -> Surface {
         match self {
+            #[cfg(feature = "wgpu")]
             Self::Wgpu(compositor) => {
                 Surface::Wgpu(compositor.create_surface(window, width, height))
             }
+            #[cfg(feature = "tiny-skia")]
             Self::TinySkia(compositor) => Surface::TinySkia(
                 compositor.create_surface(window, width, height),
             ),
@@ -73,19 +112,26 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) {
         match (self, surface) {
+            #[cfg(feature = "wgpu")]
             (Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
                 compositor.configure_surface(surface, width, height);
             }
+            #[cfg(feature = "tiny-skia")]
             (Self::TinySkia(compositor), Surface::TinySkia(surface)) => {
                 compositor.configure_surface(surface, width, height);
             }
-            _ => unreachable!(),
+            #[allow(unreachable_patterns)]
+            _ => panic!(
+                "The provided surface is not compatible with the compositor."
+            ),
         }
     }
 
     fn fetch_information(&self) -> Information {
         match self {
+            #[cfg(feature = "wgpu")]
             Self::Wgpu(compositor) => compositor.fetch_information(),
+            #[cfg(feature = "tiny-skia")]
             Self::TinySkia(compositor) => compositor.fetch_information(),
         }
     }
@@ -100,9 +146,10 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     ) -> Result<(), SurfaceError> {
         renderer.with_primitives(|backend, primitives| {
             match (self, backend, surface) {
+                #[cfg(feature = "wgpu")]
                 (
                     Self::Wgpu(compositor),
-                    Backend::Wgpu(backend),
+                    crate::Backend::Wgpu(backend),
                     Surface::Wgpu(surface),
                 ) => iced_wgpu::window::compositor::present(
                     compositor,
@@ -113,9 +160,10 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     background_color,
                     overlay,
                 ),
+                #[cfg(feature = "tiny-skia")]
                 (
                     Self::TinySkia(compositor),
-                    Backend::TinySkia(backend),
+                    crate::Backend::TinySkia(backend),
                     Surface::TinySkia(surface),
                 ) => iced_tiny_skia::window::compositor::present(
                     compositor,
@@ -126,7 +174,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     background_color,
                     overlay,
                 ),
-                _ => unreachable!(),
+                #[allow(unreachable_patterns)]
+                _ => panic!(
+                    "The provided renderer or surface are not compatible \
+                    with the compositor."
+                ),
             }
         })
     }
diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index 361fc86bcb..21ef2c0671 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -7,14 +7,18 @@ use crate::graphics::geometry::{Fill, Geometry, Path, Stroke, Text};
 use crate::Backend;
 
 pub enum Frame {
+    #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::geometry::Frame),
+    #[cfg(feature = "tiny-skia")]
     TinySkia(iced_tiny_skia::geometry::Frame),
 }
 
 macro_rules! delegate {
-    ($frame:expr, $name:ident => $body:expr) => {
+    ($frame:expr, $name:ident, $body:expr) => {
         match $frame {
+            #[cfg(feature = "wgpu")]
             Self::Wgpu($name) => $body,
+            #[cfg(feature = "tiny-skia")]
             Self::TinySkia($name) => $body,
         }
     };
@@ -23,9 +27,11 @@ macro_rules! delegate {
 impl Frame {
     pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
         match renderer.backend() {
+            #[cfg(feature = "wgpu")]
             Backend::Wgpu(_) => {
                 Frame::Wgpu(iced_wgpu::geometry::Frame::new(size))
             }
+            #[cfg(feature = "tiny-skia")]
             Backend::TinySkia(_) => {
                 Frame::TinySkia(iced_tiny_skia::geometry::Frame::new(size))
             }
@@ -35,31 +41,31 @@ impl Frame {
     /// Returns the width of the [`Frame`].
     #[inline]
     pub fn width(&self) -> f32 {
-        delegate!(self, frame => frame.width())
+        delegate!(self, frame, frame.width())
     }
 
     /// Returns the height of the [`Frame`].
     #[inline]
     pub fn height(&self) -> f32 {
-        delegate!(self, frame => frame.height())
+        delegate!(self, frame, frame.height())
     }
 
     /// Returns the dimensions of the [`Frame`].
     #[inline]
     pub fn size(&self) -> Size {
-        delegate!(self, frame => frame.size())
+        delegate!(self, frame, frame.size())
     }
 
     /// Returns the coordinate of the center of the [`Frame`].
     #[inline]
     pub fn center(&self) -> Point {
-        delegate!(self, frame => frame.center())
+        delegate!(self, frame, frame.center())
     }
 
     /// Draws the given [`Path`] on the [`Frame`] by filling it with the
     /// provided style.
     pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
-        delegate!(self, frame => frame.fill(path, fill));
+        delegate!(self, frame, frame.fill(path, fill));
     }
 
     /// Draws an axis-aligned rectangle given its top-left corner coordinate and
@@ -70,13 +76,13 @@ impl Frame {
         size: Size,
         fill: impl Into<Fill>,
     ) {
-        delegate!(self, frame => frame.fill_rectangle(top_left, size, fill));
+        delegate!(self, frame, frame.fill_rectangle(top_left, size, fill));
     }
 
     /// Draws the stroke of the given [`Path`] on the [`Frame`] with the
     /// provided style.
     pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
-        delegate!(self, frame => frame.stroke(path, stroke));
+        delegate!(self, frame, frame.stroke(path, stroke));
     }
 
     /// Draws the characters of the given [`Text`] on the [`Frame`], filling
@@ -95,7 +101,7 @@ impl Frame {
     ///
     /// [`Canvas`]: crate::widget::Canvas
     pub fn fill_text(&mut self, text: impl Into<Text>) {
-        delegate!(self, frame => frame.fill_text(text));
+        delegate!(self, frame, frame.fill_text(text));
     }
 
     /// Stores the current transform of the [`Frame`] and executes the given
@@ -105,11 +111,11 @@ impl Frame {
     /// operations in different coordinate systems.
     #[inline]
     pub fn with_save(&mut self, f: impl FnOnce(&mut Frame)) {
-        delegate!(self, frame => frame.push_transform());
+        delegate!(self, frame, frame.push_transform());
 
         f(self);
 
-        delegate!(self, frame => frame.pop_transform());
+        delegate!(self, frame, frame.pop_transform());
     }
 
     /// Executes the given drawing operations within a [`Rectangle`] region,
@@ -121,9 +127,11 @@ impl Frame {
     #[inline]
     pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
         let mut frame = match self {
+            #[cfg(feature = "wgpu")]
             Self::Wgpu(_) => {
                 Self::Wgpu(iced_wgpu::geometry::Frame::new(region.size()))
             }
+            #[cfg(feature = "tiny-skia")]
             Self::TinySkia(_) => Self::TinySkia(
                 iced_tiny_skia::geometry::Frame::new(region.size()),
             ),
@@ -134,12 +142,15 @@ impl Frame {
         let translation = Vector::new(region.x, region.y);
 
         match (self, frame) {
+            #[cfg(feature = "wgpu")]
             (Self::Wgpu(target), Self::Wgpu(frame)) => {
                 target.clip(frame, translation);
             }
+            #[cfg(feature = "tiny-skia")]
             (Self::TinySkia(target), Self::TinySkia(frame)) => {
                 target.clip(frame, translation);
             }
+            #[allow(unreachable_patterns)]
             _ => unreachable!(),
         };
     }
@@ -147,22 +158,22 @@ impl Frame {
     /// Applies a translation to the current transform of the [`Frame`].
     #[inline]
     pub fn translate(&mut self, translation: Vector) {
-        delegate!(self, frame => frame.translate(translation));
+        delegate!(self, frame, frame.translate(translation));
     }
 
     /// Applies a rotation in radians to the current transform of the [`Frame`].
     #[inline]
     pub fn rotate(&mut self, angle: f32) {
-        delegate!(self, frame => frame.rotate(angle));
+        delegate!(self, frame, frame.rotate(angle));
     }
 
     /// Applies a scaling to the current transform of the [`Frame`].
     #[inline]
     pub fn scale(&mut self, scale: f32) {
-        delegate!(self, frame => frame.scale(scale));
+        delegate!(self, frame, frame.scale(scale));
     }
 
     pub fn into_geometry(self) -> Geometry {
-        Geometry(delegate!(self, frame => frame.into_primitive()))
+        Geometry(delegate!(self, frame, frame.into_primitive()))
     }
 }
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 22ec7bd1d8..ba737b112d 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,3 +1,6 @@
+#[cfg(not(any(feature = "wgpu", feature = "tiny-skia")))]
+compile_error!("No backend selected. Enable at least one backend feature: `wgpu` or `tiny-skia`.");
+
 pub mod compositor;
 
 #[cfg(feature = "geometry")]

From 3a26baa564524b0f25c5cb180b592c8b004b68a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 03:47:49 +0100
Subject: [PATCH 092/163] Remove `image` abstractions in `iced_graphics`

---
 graphics/Cargo.toml                    |  23 +--
 graphics/src/image.rs                  |  98 +++++++++-
 graphics/src/image/raster.rs           | 242 -------------------------
 graphics/src/lib.rs                    |   4 +-
 wgpu/Cargo.toml                        |  20 +-
 wgpu/src/backend.rs                    |   2 +-
 wgpu/src/image.rs                      |  39 ++--
 wgpu/src/image/atlas.rs                | 190 ++++++++++---------
 wgpu/src/image/atlas/entry.rs          |   6 +-
 wgpu/src/image/raster.rs               | 121 +++++++++++++
 {graphics => wgpu}/src/image/vector.rs |  43 ++---
 11 files changed, 352 insertions(+), 436 deletions(-)
 delete mode 100644 graphics/src/image/raster.rs
 create mode 100644 wgpu/src/image/raster.rs
 rename {graphics => wgpu}/src/image/vector.rs (86%)

diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 4bb22b6ce8..a08c670735 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -11,22 +11,9 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-svg = ["resvg"]
-image = ["png", "jpeg", "jpeg_rayon", "gif", "webp", "bmp"]
-png = ["image_rs/png"]
-jpeg = ["image_rs/jpeg"]
-jpeg_rayon = ["image_rs/jpeg_rayon"]
-gif = ["image_rs/gif"]
-webp = ["image_rs/webp"]
-pnm = ["image_rs/pnm"]
-ico = ["image_rs/ico"]
-bmp = ["image_rs/bmp"]
-hdr = ["image_rs/hdr"]
-dds = ["image_rs/dds"]
-farbfeld = ["image_rs/farbfeld"]
 geometry = ["lyon_path"]
 opengl = []
-image_rs = ["kamadak-exif"]
+image = ["dep:image", "kamadak-exif"]
 
 [dependencies]
 glam = "0.21.3"
@@ -47,14 +34,8 @@ path = "../core"
 version = "0.8"
 optional = true
 
-[dependencies.image_rs]
+[dependencies.image]
 version = "0.24"
-package = "image"
-default-features = false
-optional = true
-
-[dependencies.resvg]
-version = "0.29"
 optional = true
 
 [dependencies.kamadak-exif]
diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index 04f4ff9d0a..2f634252cb 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -1,10 +1,94 @@
-//! Render images.
-#[cfg(feature = "image_rs")]
-pub mod raster;
+//! Load and operate on images.
+use crate::core::image::{Data, Handle};
 
-#[cfg(feature = "svg")]
-pub mod vector;
+use bitflags::bitflags;
 
-pub mod storage;
+pub use ::image as image_rs;
 
-pub use storage::Storage;
+pub fn load(handle: &Handle) -> image_rs::ImageResult<image_rs::DynamicImage> {
+    match handle.data() {
+        Data::Path(path) => {
+            let image = ::image::open(path)?;
+
+            let operation = std::fs::File::open(path)
+                .ok()
+                .map(std::io::BufReader::new)
+                .and_then(|mut reader| Operation::from_exif(&mut reader).ok())
+                .unwrap_or_else(Operation::empty);
+
+            Ok(operation.perform(image))
+        }
+        Data::Bytes(bytes) => {
+            let image = ::image::load_from_memory(bytes)?;
+            let operation =
+                Operation::from_exif(&mut std::io::Cursor::new(bytes))
+                    .ok()
+                    .unwrap_or_else(Operation::empty);
+
+            Ok(operation.perform(image))
+        }
+        Data::Rgba {
+            width,
+            height,
+            pixels,
+        } => {
+            if let Some(image) = image_rs::ImageBuffer::from_vec(
+                *width,
+                *height,
+                pixels.to_vec(),
+            ) {
+                Ok(image_rs::DynamicImage::ImageRgba8(image))
+            } else {
+                Err(image_rs::error::ImageError::Limits(
+                    image_rs::error::LimitError::from_kind(
+                        image_rs::error::LimitErrorKind::DimensionError,
+                    ),
+                ))
+            }
+        }
+    }
+}
+
+bitflags! {
+    struct Operation: u8 {
+        const FLIP_HORIZONTALLY = 0b001;
+        const ROTATE_180 = 0b010;
+        const FLIP_DIAGONALLY = 0b100;
+    }
+}
+
+impl Operation {
+    // Meaning of the returned value is described e.g. at:
+    // https://magnushoff.com/articles/jpeg-orientation/
+    fn from_exif<R>(reader: &mut R) -> Result<Self, exif::Error>
+    where
+        R: std::io::BufRead + std::io::Seek,
+    {
+        let exif = exif::Reader::new().read_from_container(reader)?;
+
+        Ok(exif
+            .get_field(exif::Tag::Orientation, exif::In::PRIMARY)
+            .and_then(|field| field.value.get_uint(0))
+            .and_then(|value| u8::try_from(value).ok())
+            .and_then(|value| Self::from_bits(value.saturating_sub(1)))
+            .unwrap_or_else(Self::empty))
+    }
+
+    fn perform(self, mut image: image::DynamicImage) -> image::DynamicImage {
+        use image::imageops;
+
+        if self.contains(Self::FLIP_DIAGONALLY) {
+            imageops::flip_vertical_in_place(&mut image)
+        }
+
+        if self.contains(Self::ROTATE_180) {
+            imageops::rotate180_in_place(&mut image);
+        }
+
+        if self.contains(Self::FLIP_HORIZONTALLY) {
+            imageops::flip_horizontal_in_place(&mut image);
+        }
+
+        image
+    }
+}
diff --git a/graphics/src/image/raster.rs b/graphics/src/image/raster.rs
deleted file mode 100644
index 03211160e8..0000000000
--- a/graphics/src/image/raster.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-//! Raster image loading and caching.
-use crate::image::Storage;
-
-use iced_core::image;
-use iced_core::Size;
-
-use bitflags::bitflags;
-use std::collections::{HashMap, HashSet};
-
-/// Entry in cache corresponding to an image handle
-#[derive(Debug)]
-pub enum Memory<T: Storage> {
-    /// Image data on host
-    Host(::image_rs::ImageBuffer<::image_rs::Rgba<u8>, Vec<u8>>),
-    /// Storage entry
-    Device(T::Entry),
-    /// Image not found
-    NotFound,
-    /// Invalid image data
-    Invalid,
-}
-
-impl<T: Storage> Memory<T> {
-    /// Width and height of image
-    pub fn dimensions(&self) -> Size<u32> {
-        use crate::image::storage::Entry;
-
-        match self {
-            Memory::Host(image) => {
-                let (width, height) = image.dimensions();
-
-                Size::new(width, height)
-            }
-            Memory::Device(entry) => entry.size(),
-            Memory::NotFound => Size::new(1, 1),
-            Memory::Invalid => Size::new(1, 1),
-        }
-    }
-}
-
-/// Caches image raster data
-#[derive(Debug)]
-pub struct Cache<T: Storage> {
-    map: HashMap<u64, Memory<T>>,
-    hits: HashSet<u64>,
-}
-
-impl<T: Storage> Cache<T> {
-    /// Load image
-    pub fn load(&mut self, handle: &image::Handle) -> &mut Memory<T> {
-        if self.contains(handle) {
-            return self.get(handle).unwrap();
-        }
-
-        let memory = match handle.data() {
-            image::Data::Path(path) => {
-                if let Ok(image) = image_rs::open(path) {
-                    let operation = std::fs::File::open(path)
-                        .ok()
-                        .map(std::io::BufReader::new)
-                        .and_then(|mut reader| {
-                            Operation::from_exif(&mut reader).ok()
-                        })
-                        .unwrap_or_else(Operation::empty);
-
-                    Memory::Host(operation.perform(image.to_rgba8()))
-                } else {
-                    Memory::NotFound
-                }
-            }
-            image::Data::Bytes(bytes) => {
-                if let Ok(image) = image_rs::load_from_memory(bytes) {
-                    let operation =
-                        Operation::from_exif(&mut std::io::Cursor::new(bytes))
-                            .ok()
-                            .unwrap_or_else(Operation::empty);
-
-                    Memory::Host(operation.perform(image.to_rgba8()))
-                } else {
-                    Memory::Invalid
-                }
-            }
-            image::Data::Rgba {
-                width,
-                height,
-                pixels,
-            } => {
-                if let Some(image) = image_rs::ImageBuffer::from_vec(
-                    *width,
-                    *height,
-                    pixels.to_vec(),
-                ) {
-                    Memory::Host(image)
-                } else {
-                    Memory::Invalid
-                }
-            }
-        };
-
-        self.insert(handle, memory);
-        self.get(handle).unwrap()
-    }
-
-    /// Load image and upload raster data
-    pub fn upload(
-        &mut self,
-        handle: &image::Handle,
-        state: &mut T::State<'_>,
-        storage: &mut T,
-    ) -> Option<&T::Entry> {
-        let memory = self.load(handle);
-
-        if let Memory::Host(image) = memory {
-            let (width, height) = image.dimensions();
-
-            let entry = storage.upload(width, height, image, state)?;
-
-            *memory = Memory::Device(entry);
-        }
-
-        if let Memory::Device(allocation) = memory {
-            Some(allocation)
-        } else {
-            None
-        }
-    }
-
-    /// Trim cache misses from cache
-    pub fn trim(&mut self, storage: &mut T, state: &mut T::State<'_>) {
-        let hits = &self.hits;
-
-        self.map.retain(|k, memory| {
-            let retain = hits.contains(k);
-
-            if !retain {
-                if let Memory::Device(entry) = memory {
-                    storage.remove(entry, state);
-                }
-            }
-
-            retain
-        });
-
-        self.hits.clear();
-    }
-
-    fn get(&mut self, handle: &image::Handle) -> Option<&mut Memory<T>> {
-        let _ = self.hits.insert(handle.id());
-
-        self.map.get_mut(&handle.id())
-    }
-
-    fn insert(&mut self, handle: &image::Handle, memory: Memory<T>) {
-        let _ = self.map.insert(handle.id(), memory);
-    }
-
-    fn contains(&self, handle: &image::Handle) -> bool {
-        self.map.contains_key(&handle.id())
-    }
-}
-
-impl<T: Storage> Default for Cache<T> {
-    fn default() -> Self {
-        Self {
-            map: HashMap::new(),
-            hits: HashSet::new(),
-        }
-    }
-}
-
-bitflags! {
-    struct Operation: u8 {
-        const FLIP_HORIZONTALLY = 0b001;
-        const ROTATE_180 = 0b010;
-        const FLIP_DIAGONALLY = 0b100;
-    }
-}
-
-impl Operation {
-    // Meaning of the returned value is described e.g. at:
-    // https://magnushoff.com/articles/jpeg-orientation/
-    fn from_exif<R>(reader: &mut R) -> Result<Self, exif::Error>
-    where
-        R: std::io::BufRead + std::io::Seek,
-    {
-        let exif = exif::Reader::new().read_from_container(reader)?;
-
-        Ok(exif
-            .get_field(exif::Tag::Orientation, exif::In::PRIMARY)
-            .and_then(|field| field.value.get_uint(0))
-            .and_then(|value| u8::try_from(value).ok())
-            .and_then(|value| Self::from_bits(value.saturating_sub(1)))
-            .unwrap_or_else(Self::empty))
-    }
-
-    fn perform<P>(
-        self,
-        image: image_rs::ImageBuffer<P, Vec<P::Subpixel>>,
-    ) -> image_rs::ImageBuffer<P, Vec<P::Subpixel>>
-    where
-        P: image_rs::Pixel + 'static,
-    {
-        use image_rs::imageops;
-
-        let mut image = if self.contains(Self::FLIP_DIAGONALLY) {
-            flip_diagonally(image)
-        } else {
-            image
-        };
-
-        if self.contains(Self::ROTATE_180) {
-            imageops::rotate180_in_place(&mut image);
-        }
-
-        if self.contains(Self::FLIP_HORIZONTALLY) {
-            imageops::flip_horizontal_in_place(&mut image);
-        }
-
-        image
-    }
-}
-
-fn flip_diagonally<I>(
-    image: I,
-) -> image_rs::ImageBuffer<I::Pixel, Vec<<I::Pixel as image_rs::Pixel>::Subpixel>>
-where
-    I: image_rs::GenericImage,
-    I::Pixel: 'static,
-{
-    let (width, height) = image.dimensions();
-    let mut out = image_rs::ImageBuffer::new(height, width);
-
-    for x in 0..width {
-        for y in 0..height {
-            let p = image.get_pixel(x, y);
-
-            out.put_pixel(y, x, p);
-        }
-    }
-
-    out
-}
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index c6f9cf5717..0c50db52d5 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -28,13 +28,15 @@ mod viewport;
 
 pub mod backend;
 pub mod compositor;
-pub mod image;
 pub mod primitive;
 pub mod renderer;
 
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
+#[cfg(feature = "image")]
+pub mod image;
+
 pub use antialiasing::Antialiasing;
 pub use backend::Backend;
 pub use compositor::Compositor;
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 5601c0de43..6a313d4f69 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -8,21 +8,9 @@ license = "MIT AND OFL-1.1"
 repository = "https://github.com/iced-rs/iced"
 
 [features]
-svg = ["iced_graphics/svg"]
-image = ["iced_graphics/image"]
-png = ["iced_graphics/png"]
-jpeg = ["iced_graphics/jpeg"]
-jpeg_rayon = ["iced_graphics/jpeg_rayon"]
-gif = ["iced_graphics/gif"]
-webp = ["iced_graphics/webp"]
-pnm = ["iced_graphics/pnm"]
-ico = ["iced_graphics/ico"]
-bmp = ["iced_graphics/bmp"]
-hdr = ["iced_graphics/hdr"]
-dds = ["iced_graphics/dds"]
-farbfeld = ["iced_graphics/farbfeld"]
 geometry = ["iced_graphics/geometry", "lyon"]
-spirv = ["wgpu/spirv"]
+image = ["iced_graphics/image"]
+svg = ["resvg"]
 
 [dependencies]
 wgpu = "0.14"
@@ -70,6 +58,10 @@ version = "0.21.3"
 version = "1.0"
 optional = true
 
+[dependencies.resvg]
+version = "0.29"
+optional = true
+
 [dependencies.tracing]
 version = "0.1.6"
 optional = true
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9c9a1b7637..88c585545c 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -119,7 +119,7 @@ impl Backend {
         self.triangle_pipeline.end_frame();
 
         #[cfg(any(feature = "image", feature = "svg"))]
-        self.image_pipeline.end_frame(device, queue, encoder);
+        self.image_pipeline.end_frame();
     }
 
     fn prepare_text(
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 5eaa9a8651..4163e3382f 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -1,5 +1,11 @@
 mod atlas;
 
+#[cfg(feature = "image")]
+mod raster;
+
+#[cfg(feature = "svg")]
+mod vector;
+
 use atlas::Atlas;
 
 use crate::core::{Rectangle, Size};
@@ -7,12 +13,6 @@ use crate::graphics::Transformation;
 use crate::layer;
 use crate::Buffer;
 
-#[cfg(feature = "image")]
-use crate::graphics::image::raster;
-
-#[cfg(feature = "svg")]
-use crate::graphics::image::vector;
-
 use std::cell::RefCell;
 use std::mem;
 
@@ -30,9 +30,9 @@ use tracing::info_span;
 #[derive(Debug)]
 pub struct Pipeline {
     #[cfg(feature = "image")]
-    raster_cache: RefCell<raster::Cache<Atlas>>,
+    raster_cache: RefCell<raster::Cache>,
     #[cfg(feature = "svg")]
-    vector_cache: RefCell<vector::Cache<Atlas>>,
+    vector_cache: RefCell<vector::Cache>,
 
     pipeline: wgpu::RenderPipeline,
     vertices: wgpu::Buffer,
@@ -368,8 +368,10 @@ impl Pipeline {
                 #[cfg(feature = "image")]
                 layer::Image::Raster { handle, bounds } => {
                     if let Some(atlas_entry) = raster_cache.upload(
+                        device,
+                        queue,
+                        encoder,
                         handle,
-                        &mut (device, queue, encoder),
                         &mut self.texture_atlas,
                     ) {
                         add_instances(
@@ -392,11 +394,13 @@ impl Pipeline {
                     let size = [bounds.width, bounds.height];
 
                     if let Some(atlas_entry) = vector_cache.upload(
+                        device,
+                        queue,
+                        encoder,
                         handle,
                         *color,
                         size,
                         _scale,
-                        &mut (device, queue, encoder),
                         &mut self.texture_atlas,
                     ) {
                         add_instances(
@@ -477,21 +481,12 @@ impl Pipeline {
         }
     }
 
-    pub fn end_frame(
-        &mut self,
-        device: &wgpu::Device,
-        queue: &wgpu::Queue,
-        encoder: &mut wgpu::CommandEncoder,
-    ) {
+    pub fn end_frame(&mut self) {
         #[cfg(feature = "image")]
-        self.raster_cache
-            .borrow_mut()
-            .trim(&mut self.texture_atlas, &mut (device, queue, encoder));
+        self.raster_cache.borrow_mut().trim(&mut self.texture_atlas);
 
         #[cfg(feature = "svg")]
-        self.vector_cache
-            .borrow_mut()
-            .trim(&mut self.texture_atlas, &mut (device, queue, encoder));
+        self.vector_cache.borrow_mut().trim(&mut self.texture_atlas);
 
         self.prepare_layer = 0;
     }
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 0a17ca33bf..c00b8cef34 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -13,7 +13,6 @@ use allocator::Allocator;
 pub const SIZE: u32 = 2048;
 
 use crate::core::Size;
-use crate::graphics::image;
 
 use std::num::NonZeroU32;
 
@@ -64,6 +63,97 @@ impl Atlas {
         self.layers.len()
     }
 
+    pub fn upload(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        encoder: &mut wgpu::CommandEncoder,
+        width: u32,
+        height: u32,
+        data: &[u8],
+    ) -> Option<Entry> {
+        let entry = {
+            let current_size = self.layers.len();
+            let entry = self.allocate(width, height)?;
+
+            // We grow the internal texture after allocating if necessary
+            let new_layers = self.layers.len() - current_size;
+            self.grow(new_layers, device, encoder);
+
+            entry
+        };
+
+        log::info!("Allocated atlas entry: {:?}", entry);
+
+        // It is a webgpu requirement that:
+        //   BufferCopyView.layout.bytes_per_row % wgpu::COPY_BYTES_PER_ROW_ALIGNMENT == 0
+        // So we calculate padded_width by rounding width up to the next
+        // multiple of wgpu::COPY_BYTES_PER_ROW_ALIGNMENT.
+        let align = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT;
+        let padding = (align - (4 * width) % align) % align;
+        let padded_width = (4 * width + padding) as usize;
+        let padded_data_size = padded_width * height as usize;
+
+        let mut padded_data = vec![0; padded_data_size];
+
+        for row in 0..height as usize {
+            let offset = row * padded_width;
+
+            padded_data[offset..offset + 4 * width as usize].copy_from_slice(
+                &data[row * 4 * width as usize..(row + 1) * 4 * width as usize],
+            )
+        }
+
+        match &entry {
+            Entry::Contiguous(allocation) => {
+                self.upload_allocation(
+                    &padded_data,
+                    width,
+                    height,
+                    padding,
+                    0,
+                    allocation,
+                    queue,
+                );
+            }
+            Entry::Fragmented { fragments, .. } => {
+                for fragment in fragments {
+                    let (x, y) = fragment.position;
+                    let offset = (y * padded_width as u32 + 4 * x) as usize;
+
+                    self.upload_allocation(
+                        &padded_data,
+                        width,
+                        height,
+                        padding,
+                        offset,
+                        &fragment.allocation,
+                        queue,
+                    );
+                }
+            }
+        }
+
+        log::info!("Current atlas: {:?}", self);
+
+        Some(entry)
+    }
+
+    pub fn remove(&mut self, entry: &Entry) {
+        log::info!("Removing atlas entry: {:?}", entry);
+
+        match entry {
+            Entry::Contiguous(allocation) => {
+                self.deallocate(allocation);
+            }
+            Entry::Fragmented { fragments, .. } => {
+                for fragment in fragments {
+                    self.deallocate(&fragment.allocation);
+                }
+            }
+        }
+    }
+
     fn allocate(&mut self, width: u32, height: u32) -> Option<Entry> {
         // Allocate one layer if texture fits perfectly
         if width == SIZE && height == SIZE {
@@ -296,101 +386,3 @@ impl Atlas {
             });
     }
 }
-
-impl image::Storage for Atlas {
-    type Entry = Entry;
-    type State<'a> = (
-        &'a wgpu::Device,
-        &'a wgpu::Queue,
-        &'a mut wgpu::CommandEncoder,
-    );
-
-    fn upload(
-        &mut self,
-        width: u32,
-        height: u32,
-        data: &[u8],
-        (device, queue, encoder): &mut Self::State<'_>,
-    ) -> Option<Self::Entry> {
-        let entry = {
-            let current_size = self.layers.len();
-            let entry = self.allocate(width, height)?;
-
-            // We grow the internal texture after allocating if necessary
-            let new_layers = self.layers.len() - current_size;
-            self.grow(new_layers, device, encoder);
-
-            entry
-        };
-
-        log::info!("Allocated atlas entry: {:?}", entry);
-
-        // It is a webgpu requirement that:
-        //   BufferCopyView.layout.bytes_per_row % wgpu::COPY_BYTES_PER_ROW_ALIGNMENT == 0
-        // So we calculate padded_width by rounding width up to the next
-        // multiple of wgpu::COPY_BYTES_PER_ROW_ALIGNMENT.
-        let align = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT;
-        let padding = (align - (4 * width) % align) % align;
-        let padded_width = (4 * width + padding) as usize;
-        let padded_data_size = padded_width * height as usize;
-
-        let mut padded_data = vec![0; padded_data_size];
-
-        for row in 0..height as usize {
-            let offset = row * padded_width;
-
-            padded_data[offset..offset + 4 * width as usize].copy_from_slice(
-                &data[row * 4 * width as usize..(row + 1) * 4 * width as usize],
-            )
-        }
-
-        match &entry {
-            Entry::Contiguous(allocation) => {
-                self.upload_allocation(
-                    &padded_data,
-                    width,
-                    height,
-                    padding,
-                    0,
-                    allocation,
-                    queue,
-                );
-            }
-            Entry::Fragmented { fragments, .. } => {
-                for fragment in fragments {
-                    let (x, y) = fragment.position;
-                    let offset = (y * padded_width as u32 + 4 * x) as usize;
-
-                    self.upload_allocation(
-                        &padded_data,
-                        width,
-                        height,
-                        padding,
-                        offset,
-                        &fragment.allocation,
-                        queue,
-                    );
-                }
-            }
-        }
-
-        log::info!("Current atlas: {:?}", self);
-
-        Some(entry)
-    }
-
-    fn remove(&mut self, entry: &Entry, _: &mut Self::State<'_>) {
-        log::info!("Removing atlas entry: {:?}", entry);
-
-        match entry {
-            Entry::Contiguous(allocation) => {
-                self.deallocate(allocation);
-            }
-            Entry::Fragmented { fragments, .. } => {
-                for fragment in fragments {
-                    self.deallocate(&fragment.allocation);
-                }
-            }
-        }
-    }
-}
diff --git a/wgpu/src/image/atlas/entry.rs b/wgpu/src/image/atlas/entry.rs
index 4b06bd951d..7e4c92a2c7 100644
--- a/wgpu/src/image/atlas/entry.rs
+++ b/wgpu/src/image/atlas/entry.rs
@@ -1,5 +1,4 @@
 use crate::core::Size;
-use crate::graphics::image;
 use crate::image::atlas;
 
 #[derive(Debug)]
@@ -11,8 +10,9 @@ pub enum Entry {
     },
 }
 
-impl image::storage::Entry for Entry {
-    fn size(&self) -> Size<u32> {
+impl Entry {
+    #[cfg(feature = "image")]
+    pub fn size(&self) -> Size<u32> {
         match self {
             Entry::Contiguous(allocation) => allocation.size(),
             Entry::Fragmented { size, .. } => *size,
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
new file mode 100644
index 0000000000..9b38dce4a2
--- /dev/null
+++ b/wgpu/src/image/raster.rs
@@ -0,0 +1,121 @@
+use crate::core::image;
+use crate::core::Size;
+use crate::graphics;
+use crate::graphics::image::image_rs;
+use crate::image::atlas::{self, Atlas};
+
+use std::collections::{HashMap, HashSet};
+
+/// Entry in cache corresponding to an image handle
+#[derive(Debug)]
+pub enum Memory {
+    /// Image data on host
+    Host(image_rs::ImageBuffer<image_rs::Rgba<u8>, Vec<u8>>),
+    /// Storage entry
+    Device(atlas::Entry),
+    /// Image not found
+    NotFound,
+    /// Invalid image data
+    Invalid,
+}
+
+impl Memory {
+    /// Width and height of image
+    pub fn dimensions(&self) -> Size<u32> {
+        match self {
+            Memory::Host(image) => {
+                let (width, height) = image.dimensions();
+
+                Size::new(width, height)
+            }
+            Memory::Device(entry) => entry.size(),
+            Memory::NotFound => Size::new(1, 1),
+            Memory::Invalid => Size::new(1, 1),
+        }
+    }
+}
+
+/// Caches image raster data
+#[derive(Debug, Default)]
+pub struct Cache {
+    map: HashMap<u64, Memory>,
+    hits: HashSet<u64>,
+}
+
+impl Cache {
+    /// Load image
+    pub fn load(&mut self, handle: &image::Handle) -> &mut Memory {
+        if self.contains(handle) {
+            return self.get(handle).unwrap();
+        }
+
+        let memory = match graphics::image::load(handle) {
+            Ok(image) => Memory::Host(image.to_rgba8()),
+            Err(image_rs::error::ImageError::IoError(_)) => Memory::NotFound,
+            Err(_) => Memory::Invalid,
+        };
+
+        self.insert(handle, memory);
+        self.get(handle).unwrap()
+    }
+
+    /// Load image and upload raster data
+    pub fn upload(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        encoder: &mut wgpu::CommandEncoder,
+        handle: &image::Handle,
+        atlas: &mut Atlas,
+    ) -> Option<&atlas::Entry> {
+        let memory = self.load(handle);
+
+        if let Memory::Host(image) = memory {
+            let (width, height) = image.dimensions();
+
+            let entry =
+                atlas.upload(device, queue, encoder, width, height, image)?;
+
+            *memory = Memory::Device(entry);
+        }
+
+        if let Memory::Device(allocation) = memory {
+            Some(allocation)
+        } else {
+            None
+        }
+    }
+
+    /// Trim cache misses from cache
+    pub fn trim(&mut self, atlas: &mut Atlas) {
+        let hits = &self.hits;
+
+        self.map.retain(|k, memory| {
+            let retain = hits.contains(k);
+
+            if !retain {
+                if let Memory::Device(entry) = memory {
+                    atlas.remove(entry);
+                }
+            }
+
+            retain
+        });
+
+        self.hits.clear();
+    }
+
+    fn get(&mut self, handle: &image::Handle) -> Option<&mut Memory> {
+        let _ = self.hits.insert(handle.id());
+
+        self.map.get_mut(&handle.id())
+    }
+
+    fn insert(&mut self, handle: &image::Handle, memory: Memory) {
+        let _ = self.map.insert(handle.id(), memory);
+    }
+
+    fn contains(&self, handle: &image::Handle) -> bool {
+        self.map.contains_key(&handle.id())
+    }
+}
diff --git a/graphics/src/image/vector.rs b/wgpu/src/image/vector.rs
similarity index 86%
rename from graphics/src/image/vector.rs
rename to wgpu/src/image/vector.rs
index 32729acdaa..3624e46be6 100644
--- a/graphics/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -1,8 +1,6 @@
-//! Vector image loading and caching
-use crate::image::Storage;
-
-use iced_core::svg;
-use iced_core::{Color, Size};
+use crate::core::svg;
+use crate::core::{Color, Size};
+use crate::image::atlas::{self, Atlas};
 
 use resvg::tiny_skia;
 use resvg::usvg;
@@ -32,17 +30,17 @@ impl Svg {
 }
 
 /// Caches svg vector and raster data
-#[derive(Debug)]
-pub struct Cache<T: Storage> {
+#[derive(Debug, Default)]
+pub struct Cache {
     svgs: HashMap<u64, Svg>,
-    rasterized: HashMap<(u64, u32, u32, ColorFilter), T::Entry>,
+    rasterized: HashMap<(u64, u32, u32, ColorFilter), atlas::Entry>,
     svg_hits: HashSet<u64>,
     rasterized_hits: HashSet<(u64, u32, u32, ColorFilter)>,
 }
 
 type ColorFilter = Option<[u8; 4]>;
 
-impl<T: Storage> Cache<T> {
+impl Cache {
     /// Load svg
     pub fn load(&mut self, handle: &svg::Handle) -> &Svg {
         if self.svgs.contains_key(&handle.id()) {
@@ -73,13 +71,15 @@ impl<T: Storage> Cache<T> {
     /// Load svg and upload raster data
     pub fn upload(
         &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        encoder: &mut wgpu::CommandEncoder,
         handle: &svg::Handle,
         color: Option<Color>,
         [width, height]: [f32; 2],
         scale: f32,
-        state: &mut T::State<'_>,
-        storage: &mut T,
-    ) -> Option<&T::Entry> {
+        atlas: &mut Atlas,
+    ) -> Option<&atlas::Entry> {
         let id = handle.id();
 
         let (width, height) = (
@@ -136,7 +136,9 @@ impl<T: Storage> Cache<T> {
                     });
                 }
 
-                let allocation = storage.upload(width, height, &rgba, state)?;
+                let allocation = atlas
+                    .upload(device, queue, encoder, width, height, &rgba)?;
+
                 log::debug!("allocating {} {}x{}", id, width, height);
 
                 let _ = self.svg_hits.insert(id);
@@ -150,7 +152,7 @@ impl<T: Storage> Cache<T> {
     }
 
     /// Load svg and upload raster data
-    pub fn trim(&mut self, storage: &mut T, state: &mut T::State<'_>) {
+    pub fn trim(&mut self, atlas: &mut Atlas) {
         let svg_hits = &self.svg_hits;
         let rasterized_hits = &self.rasterized_hits;
 
@@ -159,7 +161,7 @@ impl<T: Storage> Cache<T> {
             let retain = rasterized_hits.contains(k);
 
             if !retain {
-                storage.remove(entry, state);
+                atlas.remove(entry);
             }
 
             retain
@@ -169,17 +171,6 @@ impl<T: Storage> Cache<T> {
     }
 }
 
-impl<T: Storage> Default for Cache<T> {
-    fn default() -> Self {
-        Self {
-            svgs: HashMap::new(),
-            rasterized: HashMap::new(),
-            svg_hits: HashSet::new(),
-            rasterized_hits: HashSet::new(),
-        }
-    }
-}
-
 impl std::fmt::Debug for Svg {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

From bb49e17cabd45f3a21af98b4c5ecdddd507fd427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 05:06:26 +0100
Subject: [PATCH 093/163] Implement `raster` pipeline in `iced_tiny_skia`

---
 tiny_skia/Cargo.toml     |   2 +-
 tiny_skia/src/backend.rs |  28 ++++++++--
 tiny_skia/src/lib.rs     |   3 ++
 tiny_skia/src/raster.rs  | 107 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 tiny_skia/src/raster.rs

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 08e79bb8c6..647ec12acc 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-image = []
+image = ["iced_graphics/image"]
 svg = []
 geometry = ["iced_graphics/geometry"]
 
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d364e36a6b..d894ab957c 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -11,6 +11,9 @@ pub struct Backend {
     default_font: Font,
     default_text_size: f32,
     text_pipeline: crate::text::Pipeline,
+
+    #[cfg(feature = "image")]
+    raster_pipeline: crate::raster::Pipeline,
 }
 
 impl Backend {
@@ -19,6 +22,9 @@ impl Backend {
             default_font: settings.default_font,
             default_text_size: settings.default_text_size,
             text_pipeline: crate::text::Pipeline::new(),
+
+            #[cfg(feature = "image")]
+            raster_pipeline: crate::raster::Pipeline::new(),
         }
     }
 
@@ -159,8 +165,21 @@ impl Backend {
                     clip_bounds.map(|_| clip_mask as &_),
                 );
             }
-            Primitive::Image { .. } => {
-                // TODO
+            #[cfg(feature = "image")]
+            Primitive::Image { handle, bounds } => {
+                let transform = tiny_skia::Transform::from_translate(
+                    translation.x,
+                    translation.y,
+                )
+                .post_scale(scale_factor, scale_factor);
+
+                self.raster_pipeline.draw(
+                    handle,
+                    *bounds,
+                    pixels,
+                    transform,
+                    clip_bounds.map(|_| clip_mask as &_),
+                );
             }
             Primitive::Svg { .. } => {
                 // TODO
@@ -490,9 +509,8 @@ impl backend::Text for Backend {
 
 #[cfg(feature = "image")]
 impl backend::Image for Backend {
-    fn dimensions(&self, _handle: &crate::core::image::Handle) -> Size<u32> {
-        // TODO
-        Size::new(0, 0)
+    fn dimensions(&self, handle: &crate::core::image::Handle) -> Size<u32> {
+        self.raster_pipeline.dimensions(handle)
     }
 }
 
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index bf83e4004d..d03bdcc2a0 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -4,6 +4,9 @@ mod backend;
 mod settings;
 mod text;
 
+#[cfg(feature = "image")]
+mod raster;
+
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
diff --git a/tiny_skia/src/raster.rs b/tiny_skia/src/raster.rs
new file mode 100644
index 0000000000..e57f0e50c2
--- /dev/null
+++ b/tiny_skia/src/raster.rs
@@ -0,0 +1,107 @@
+use crate::core::image as raster;
+use crate::core::{Rectangle, Size};
+use crate::graphics;
+
+use rustc_hash::{FxHashMap, FxHashSet};
+use std::cell::RefCell;
+use std::collections::hash_map;
+
+pub struct Pipeline {
+    cache: RefCell<Cache>,
+}
+
+impl Pipeline {
+    pub fn new() -> Self {
+        Self {
+            cache: RefCell::new(Cache::default()),
+        }
+    }
+
+    pub fn dimensions(&self, handle: &raster::Handle) -> Size<u32> {
+        if let Some(image) = self.cache.borrow_mut().allocate(handle) {
+            Size::new(image.width(), image.height())
+        } else {
+            Size::new(0, 0)
+        }
+    }
+
+    pub fn draw(
+        &mut self,
+        handle: &raster::Handle,
+        bounds: Rectangle,
+        pixels: &mut tiny_skia::PixmapMut<'_>,
+        transform: tiny_skia::Transform,
+        clip_mask: Option<&tiny_skia::ClipMask>,
+    ) {
+        if let Some(image) = self.cache.borrow_mut().allocate(handle) {
+            let width_scale = bounds.width / image.width() as f32;
+            let height_scale = bounds.height / image.height() as f32;
+
+            let transform = transform.pre_scale(width_scale, height_scale);
+
+            pixels.draw_pixmap(
+                (bounds.x / width_scale) as i32,
+                (bounds.y / height_scale) as i32,
+                image,
+                &tiny_skia::PixmapPaint {
+                    quality: tiny_skia::FilterQuality::Bilinear,
+                    ..Default::default()
+                },
+                transform,
+                clip_mask,
+            );
+        }
+    }
+}
+
+#[derive(Default)]
+struct Cache {
+    entries: FxHashMap<u64, Option<Entry>>,
+    hits: FxHashSet<u64>,
+}
+
+impl Cache {
+    pub fn allocate(
+        &mut self,
+        handle: &raster::Handle,
+    ) -> Option<tiny_skia::PixmapRef<'_>> {
+        let id = handle.id();
+
+        if let hash_map::Entry::Vacant(entry) = self.entries.entry(id) {
+            let image = graphics::image::load(handle).ok()?.into_rgba8();
+
+            let mut buffer =
+                vec![0u32; image.width() as usize * image.height() as usize];
+
+            for (i, pixel) in image.pixels().enumerate() {
+                let [r, g, b, a] = pixel.0;
+
+                buffer[i] = tiny_skia::ColorU8::from_rgba(b, g, r, a)
+                    .premultiply()
+                    .get();
+            }
+
+            entry.insert(Some(Entry {
+                width: image.width(),
+                height: image.height(),
+                pixels: buffer,
+            }));
+        }
+
+        self.hits.insert(id);
+        self.entries.get(&id).unwrap().as_ref().map(|entry| {
+            tiny_skia::PixmapRef::from_bytes(
+                bytemuck::cast_slice(&entry.pixels),
+                entry.width,
+                entry.height,
+            )
+            .expect("Build pixmap from image bytes")
+        })
+    }
+}
+
+struct Entry {
+    width: u32,
+    height: u32,
+    pixels: Vec<u32>,
+}

From 5b3977daf6df624ca5d5e1a21ce282161234b22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:09:51 +0100
Subject: [PATCH 094/163] Implement `vector` pipeline in `iced_tiny_skia`

---
 core/src/size.rs         |   2 +-
 examples/svg/Cargo.toml  |   2 +-
 tiny_skia/Cargo.toml     |   6 +-
 tiny_skia/src/backend.rs |  30 ++++++--
 tiny_skia/src/lib.rs     |   3 +
 tiny_skia/src/text.rs    |   2 +-
 tiny_skia/src/vector.rs  | 149 +++++++++++++++++++++++++++++++++++++++
 7 files changed, 184 insertions(+), 10 deletions(-)
 create mode 100644 tiny_skia/src/vector.rs

diff --git a/core/src/size.rs b/core/src/size.rs
index fbe940efe4..7ef2f602ee 100644
--- a/core/src/size.rs
+++ b/core/src/size.rs
@@ -1,7 +1,7 @@
 use crate::{Padding, Vector};
 
 /// An amount of space in 2 dimensions.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Size<T = f32> {
     /// The width.
     pub width: T,
diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml
index f5a6eaa22c..7b45c672ec 100644
--- a/examples/svg/Cargo.toml
+++ b/examples/svg/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["svg"] }
+iced = { path = "../..", features = ["svg", "tiny-skia", "debug"], default-features = false }
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 647ec12acc..691975896d 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [features]
 image = ["iced_graphics/image"]
-svg = []
+svg = ["resvg"]
 geometry = ["iced_graphics/geometry"]
 
 [dependencies]
@@ -34,3 +34,7 @@ default-features = false
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.twox-hash]
 version = "1.6.1"
 features = ["std"]
+
+[dependencies.resvg]
+version = "0.29"
+optional = true
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d894ab957c..3c2a97b9b2 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -14,6 +14,9 @@ pub struct Backend {
 
     #[cfg(feature = "image")]
     raster_pipeline: crate::raster::Pipeline,
+
+    #[cfg(feature = "svg")]
+    vector_pipeline: crate::vector::Pipeline,
 }
 
 impl Backend {
@@ -25,6 +28,9 @@ impl Backend {
 
             #[cfg(feature = "image")]
             raster_pipeline: crate::raster::Pipeline::new(),
+
+            #[cfg(feature = "svg")]
+            vector_pipeline: crate::vector::Pipeline::new(),
         }
     }
 
@@ -78,7 +84,10 @@ impl Backend {
             );
         }
 
-        self.text_pipeline.end_frame();
+        self.text_pipeline.trim_cache();
+
+        #[cfg(feature = "svg")]
+        self.vector_pipeline.trim_cache();
     }
 
     fn draw_primitive(
@@ -181,8 +190,18 @@ impl Backend {
                     clip_bounds.map(|_| clip_mask as &_),
                 );
             }
-            Primitive::Svg { .. } => {
-                // TODO
+            #[cfg(feature = "svg")]
+            Primitive::Svg {
+                handle,
+                bounds,
+                color: _, // TODO: Implement color filter
+            } => {
+                self.vector_pipeline.draw(
+                    handle,
+                    (*bounds + translation) * scale_factor,
+                    pixels,
+                    clip_bounds.map(|_| clip_mask as &_),
+                );
             }
             Primitive::Fill {
                 path,
@@ -518,9 +537,8 @@ impl backend::Image for Backend {
 impl backend::Svg for Backend {
     fn viewport_dimensions(
         &self,
-        _handle: &crate::core::svg::Handle,
+        handle: &crate::core::svg::Handle,
     ) -> Size<u32> {
-        // TODO
-        Size::new(0, 0)
+        self.vector_pipeline.viewport_dimensions(handle)
     }
 }
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index d03bdcc2a0..83baef1c6e 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -7,6 +7,9 @@ mod text;
 #[cfg(feature = "image")]
 mod raster;
 
+#[cfg(feature = "svg")]
+mod vector;
+
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index c4edadb333..bfe5da9ddc 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -143,7 +143,7 @@ impl Pipeline {
         });
     }
 
-    pub fn end_frame(&mut self) {
+    pub fn trim_cache(&mut self) {
         self.system
             .as_mut()
             .unwrap()
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
new file mode 100644
index 0000000000..fd9cfdc501
--- /dev/null
+++ b/tiny_skia/src/vector.rs
@@ -0,0 +1,149 @@
+use crate::core::svg::{Data, Handle};
+use crate::core::{Rectangle, Size};
+
+use resvg::usvg;
+use rustc_hash::{FxHashMap, FxHashSet};
+
+use std::cell::RefCell;
+use std::collections::hash_map;
+use std::fs;
+
+pub struct Pipeline {
+    cache: RefCell<Cache>,
+}
+
+impl Pipeline {
+    pub fn new() -> Self {
+        Self {
+            cache: RefCell::new(Cache::default()),
+        }
+    }
+
+    pub fn viewport_dimensions(&self, handle: &Handle) -> Size<u32> {
+        self.cache
+            .borrow_mut()
+            .viewport_dimensions(handle)
+            .unwrap_or(Size::new(0, 0))
+    }
+
+    pub fn draw(
+        &mut self,
+        handle: &Handle,
+        bounds: Rectangle,
+        pixels: &mut tiny_skia::PixmapMut<'_>,
+        clip_mask: Option<&tiny_skia::ClipMask>,
+    ) {
+        if let Some(image) = self
+            .cache
+            .borrow_mut()
+            .draw(handle, Size::new(bounds.width as u32, bounds.height as u32))
+        {
+            pixels.draw_pixmap(
+                bounds.x as i32,
+                bounds.y as i32,
+                image,
+                &tiny_skia::PixmapPaint::default(),
+                tiny_skia::Transform::identity(),
+                clip_mask,
+            );
+        }
+    }
+
+    pub fn trim_cache(&mut self) {
+        self.cache.borrow_mut().trim();
+    }
+}
+
+#[derive(Default)]
+struct Cache {
+    trees: FxHashMap<u64, Option<resvg::usvg::Tree>>,
+    tree_hits: FxHashSet<u64>,
+    rasters: FxHashMap<(u64, Size<u32>), tiny_skia::Pixmap>,
+    raster_hits: FxHashSet<(u64, Size<u32>)>,
+}
+
+impl Cache {
+    fn load(&mut self, handle: &Handle) -> Option<&usvg::Tree> {
+        let id = handle.id();
+
+        if let hash_map::Entry::Vacant(entry) = self.trees.entry(id) {
+            let svg = match handle.data() {
+                Data::Path(path) => {
+                    fs::read_to_string(path).ok().and_then(|contents| {
+                        usvg::Tree::from_str(
+                            &contents,
+                            &usvg::Options::default(),
+                        )
+                        .ok()
+                    })
+                }
+                Data::Bytes(bytes) => {
+                    usvg::Tree::from_data(bytes, &usvg::Options::default()).ok()
+                }
+            };
+
+            entry.insert(svg);
+        }
+
+        self.tree_hits.insert(id);
+        self.trees.get(&id).unwrap().as_ref()
+    }
+
+    fn viewport_dimensions(&mut self, handle: &Handle) -> Option<Size<u32>> {
+        let tree = self.load(handle)?;
+
+        Some(Size::new(
+            tree.size.width() as u32,
+            tree.size.height() as u32,
+        ))
+    }
+
+    fn draw(
+        &mut self,
+        handle: &Handle,
+        size: Size<u32>,
+    ) -> Option<tiny_skia::PixmapRef<'_>> {
+        if size.width == 0 || size.height == 0 {
+            return None;
+        }
+
+        let id = handle.id();
+
+        if !self.rasters.contains_key(&(id, size)) {
+            let tree = self.load(handle)?;
+
+            let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
+
+            resvg::render(
+                tree,
+                if size.width > size.height {
+                    usvg::FitTo::Width(size.width)
+                } else {
+                    usvg::FitTo::Height(size.height)
+                },
+                tiny_skia::Transform::default(),
+                image.as_mut(),
+            )?;
+
+            // Swap R and B channels for `softbuffer` presentation
+            for pixel in bytemuck::cast_slice_mut::<u8, u32>(image.data_mut()) {
+                *pixel = *pixel & 0xFF00FF00
+                    | ((0x000000FF & *pixel) << 16)
+                    | ((0x00FF0000 & *pixel) >> 16);
+            }
+
+            self.rasters.insert((id, size), image);
+        }
+
+        self.raster_hits.insert((id, size));
+        self.rasters.get(&(id, size)).map(tiny_skia::Pixmap::as_ref)
+    }
+
+    fn trim(&mut self) {
+        self.trees.retain(|key, _| self.tree_hits.contains(key));
+        self.rasters.retain(|key, _| self.raster_hits.contains(key));
+
+        self.tree_hits.clear();
+        self.raster_hits.clear();
+    }
+}

From a8d55ceb829377725b4e7632702894fed6867eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:15:05 +0100
Subject: [PATCH 095/163] Trim `raster` cache in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 3 +++
 tiny_skia/src/raster.rs  | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 3c2a97b9b2..b3c7d2bc7e 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -86,6 +86,9 @@ impl Backend {
 
         self.text_pipeline.trim_cache();
 
+        #[cfg(feature = "image")]
+        self.raster_pipeline.trim_cache();
+
         #[cfg(feature = "svg")]
         self.vector_pipeline.trim_cache();
     }
diff --git a/tiny_skia/src/raster.rs b/tiny_skia/src/raster.rs
index e57f0e50c2..2fd73f8c7d 100644
--- a/tiny_skia/src/raster.rs
+++ b/tiny_skia/src/raster.rs
@@ -52,6 +52,10 @@ impl Pipeline {
             );
         }
     }
+
+    pub fn trim_cache(&mut self) {
+        self.cache.borrow_mut().trim();
+    }
 }
 
 #[derive(Default)]
@@ -98,6 +102,11 @@ impl Cache {
             .expect("Build pixmap from image bytes")
         })
     }
+
+    fn trim(&mut self) {
+        self.entries.retain(|key, _| self.hits.contains(key));
+        self.hits.clear();
+    }
 }
 
 struct Entry {

From 81d154d63a637d69f0c710780e2bbcd45ef4683c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:15:38 +0100
Subject: [PATCH 096/163] Use default features in `svg` example

---
 examples/svg/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml
index 7b45c672ec..f5a6eaa22c 100644
--- a/examples/svg/Cargo.toml
+++ b/examples/svg/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["svg", "tiny-skia", "debug"], default-features = false }
+iced = { path = "../..", features = ["svg"] }

From 0850f52d8c06bd4c5ee80609758197a093939d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:23:09 +0100
Subject: [PATCH 097/163] Use `ceil` to avoid cut text in `iced_tiny_skia`

This won't be necessary once we reuse the buffers from layouting by
leveraging layout linearity.
---
 tiny_skia/src/text.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index bfe5da9ddc..f2935efab4 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -84,7 +84,12 @@ impl Pipeline {
     ) {
         self.system.as_mut().unwrap().with_mut(|fields| {
             let key = Key {
-                bounds: bounds.size(),
+                bounds: {
+                    let size = bounds.size();
+
+                    // TODO: Reuse buffers from layouting
+                    Size::new(size.width.ceil(), size.height.ceil())
+                },
                 content,
                 font,
                 size,

From 24c3d20a76e45feddac67ed62249796c774ce330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:34:27 +0100
Subject: [PATCH 098/163] Tell `clippy` to go learn the borrow rules

---
 tiny_skia/src/vector.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index fd9cfdc501..89063c4cdc 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -109,6 +109,7 @@ impl Cache {
 
         let id = handle.id();
 
+        #[allow(clippy::map_entry)]
         if !self.rasters.contains_key(&(id, size)) {
             let tree = self.load(handle)?;
 

From d3900e067361c82fd857fc92b81284146140bc3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 7 Mar 2023 06:41:41 +0100
Subject: [PATCH 099/163] Enable renderer backends in `integration` example

---
 .github/workflows/test.yml      | 2 +-
 examples/integration/Cargo.toml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 390e7bf303..a9a9b3f9ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,5 +37,5 @@ jobs:
       run: cargo build --package tour --target wasm32-unknown-unknown
     - name: Check compilation of `todos` example
       run: cargo build --package todos --target wasm32-unknown-unknown
-    - name: Check compilation of `integration_wgpu` example
+    - name: Check compilation of `integration` example
       run: cargo build --package integration --target wasm32-unknown-unknown
diff --git a/examples/integration/Cargo.toml b/examples/integration/Cargo.toml
index f429977fc4..f6863cd326 100644
--- a/examples/integration/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -9,6 +9,7 @@ publish = false
 iced_winit = { path = "../../winit" }
 iced_wgpu = { path = "../../wgpu" }
 iced_widget = { path = "../../widget" }
+iced_renderer = { path = "../../renderer", features = ["wgpu", "tiny-skia"] }
 env_logger = "0.8"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

From 424ac8177309440bbd8efe0dd9f7622cb10807ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 9 Mar 2023 04:48:35 +0100
Subject: [PATCH 100/163] Implement color filter support for `Primitive::Svg`
 in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs |  3 +-
 tiny_skia/src/vector.rs  | 66 +++++++++++++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index b3c7d2bc7e..ba063f4ec9 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -197,10 +197,11 @@ impl Backend {
             Primitive::Svg {
                 handle,
                 bounds,
-                color: _, // TODO: Implement color filter
+                color,
             } => {
                 self.vector_pipeline.draw(
                     handle,
+                    *color,
                     (*bounds + translation) * scale_factor,
                     pixels,
                     clip_bounds.map(|_| clip_mask as &_),
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index 89063c4cdc..8509b761e6 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -1,5 +1,5 @@
 use crate::core::svg::{Data, Handle};
-use crate::core::{Rectangle, Size};
+use crate::core::{Color, Rectangle, Size};
 
 use resvg::usvg;
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -29,15 +29,16 @@ impl Pipeline {
     pub fn draw(
         &mut self,
         handle: &Handle,
+        color: Option<Color>,
         bounds: Rectangle,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::ClipMask>,
     ) {
-        if let Some(image) = self
-            .cache
-            .borrow_mut()
-            .draw(handle, Size::new(bounds.width as u32, bounds.height as u32))
-        {
+        if let Some(image) = self.cache.borrow_mut().draw(
+            handle,
+            color,
+            Size::new(bounds.width as u32, bounds.height as u32),
+        ) {
             pixels.draw_pixmap(
                 bounds.x as i32,
                 bounds.y as i32,
@@ -58,8 +59,15 @@ impl Pipeline {
 struct Cache {
     trees: FxHashMap<u64, Option<resvg::usvg::Tree>>,
     tree_hits: FxHashSet<u64>,
-    rasters: FxHashMap<(u64, Size<u32>), tiny_skia::Pixmap>,
-    raster_hits: FxHashSet<(u64, Size<u32>)>,
+    rasters: FxHashMap<RasterKey, tiny_skia::Pixmap>,
+    raster_hits: FxHashSet<RasterKey>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+struct RasterKey {
+    id: u64,
+    color: Option<[u8; 4]>,
+    size: Size<u32>,
 }
 
 impl Cache {
@@ -101,16 +109,21 @@ impl Cache {
     fn draw(
         &mut self,
         handle: &Handle,
+        color: Option<Color>,
         size: Size<u32>,
     ) -> Option<tiny_skia::PixmapRef<'_>> {
         if size.width == 0 || size.height == 0 {
             return None;
         }
 
-        let id = handle.id();
+        let key = RasterKey {
+            id: handle.id(),
+            color: color.map(Color::into_rgba8),
+            size,
+        };
 
         #[allow(clippy::map_entry)]
-        if !self.rasters.contains_key(&(id, size)) {
+        if !self.rasters.contains_key(&key) {
             let tree = self.load(handle)?;
 
             let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
@@ -126,18 +139,35 @@ impl Cache {
                 image.as_mut(),
             )?;
 
-            // Swap R and B channels for `softbuffer` presentation
-            for pixel in bytemuck::cast_slice_mut::<u8, u32>(image.data_mut()) {
-                *pixel = *pixel & 0xFF00FF00
-                    | ((0x000000FF & *pixel) << 16)
-                    | ((0x00FF0000 & *pixel) >> 16);
+            if let Some([r, g, b, a]) = key.color {
+                // TODO: Blend alpha
+                let color = tiny_skia::ColorU8::from_rgba(b, g, r, a)
+                    .premultiply()
+                    .get()
+                    & 0x00FFFFFF;
+
+                // Apply color filter
+                for pixel in
+                    bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
+                {
+                    *pixel = *pixel & 0xFF000000 | color;
+                }
+            } else {
+                // Swap R and B channels for `softbuffer` presentation
+                for pixel in
+                    bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
+                {
+                    *pixel = *pixel & 0xFF00FF00
+                        | ((0x000000FF & *pixel) << 16)
+                        | ((0x00FF0000 & *pixel) >> 16);
+                }
             }
 
-            self.rasters.insert((id, size), image);
+            self.rasters.insert(key, image);
         }
 
-        self.raster_hits.insert((id, size));
-        self.rasters.get(&(id, size)).map(tiny_skia::Pixmap::as_ref)
+        self.raster_hits.insert(key);
+        self.rasters.get(&key).map(tiny_skia::Pixmap::as_ref)
     }
 
     fn trim(&mut self) {

From c8f637fc16099c70836574425a6df20a3e2fa801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 17 Mar 2023 19:35:57 +0100
Subject: [PATCH 101/163] Fix panic rendering an out of bounds clip in
 `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index ba063f4ec9..271d026f15 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -267,6 +267,14 @@ impl Backend {
             Primitive::Clip { bounds, content } => {
                 let bounds = (*bounds + translation) * scale_factor;
 
+                if bounds.x + bounds.width <= 0.0
+                    || bounds.y + bounds.height <= 0.0
+                    || bounds.x as u32 >= pixels.width()
+                    || bounds.y as u32 >= pixels.height()
+                {
+                    return;
+                }
+
                 adjust_clip_mask(clip_mask, pixels, bounds);
 
                 self.draw_primitive(

From ea50ec8df1431c9c6aa8077cd1578c4698dc0314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Fri, 17 Mar 2023 19:58:42 +0100
Subject: [PATCH 102/163] Trim text `Buffer` cache every frame in `iced_wgpu`
 and `iced_tiny_skia`

---
 tiny_skia/src/text.rs | 20 ++++++--------------
 wgpu/src/text.rs      | 16 +++-------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index f2935efab4..714695b923 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -246,6 +246,8 @@ struct GlyphCache {
 }
 
 impl GlyphCache {
+    const TRIM_INTERVAL: usize = 300;
+
     fn new() -> Self {
         GlyphCache::default()
     }
@@ -328,7 +330,7 @@ impl GlyphCache {
     }
 
     pub fn trim(&mut self) {
-        if self.trim_count > 300 {
+        if self.trim_count > Self::TRIM_INTERVAL {
             self.entries
                 .retain(|key, _| self.recently_used.contains(key));
 
@@ -345,7 +347,6 @@ struct Cache<'a> {
     entries: FxHashMap<KeyHash, cosmic_text::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
-    trim_count: usize,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -355,14 +356,11 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
 impl<'a> Cache<'a> {
-    const TRIM_INTERVAL: usize = 300;
-
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
-            trim_count: 0,
         }
     }
 
@@ -407,16 +405,10 @@ impl<'a> Cache<'a> {
     }
 
     fn trim(&mut self) {
-        if self.trim_count >= Self::TRIM_INTERVAL {
-            self.entries
-                .retain(|key, _| self.recently_used.contains(key));
+        self.entries
+            .retain(|key, _| self.recently_used.contains(key));
 
-            self.recently_used.clear();
-
-            self.trim_count = 0;
-        } else {
-            self.trim_count += 1;
-        }
+        self.recently_used.clear();
     }
 }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index e99844e69d..35f24cd9da 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -321,7 +321,6 @@ struct Cache<'a> {
     entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
-    trim_count: usize,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -331,14 +330,11 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
 impl<'a> Cache<'a> {
-    const TRIM_INTERVAL: usize = 300;
-
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
-            trim_count: 0,
         }
     }
 
@@ -387,16 +383,10 @@ impl<'a> Cache<'a> {
     }
 
     fn trim(&mut self) {
-        if self.trim_count >= Self::TRIM_INTERVAL {
-            self.entries
-                .retain(|key, _| self.recently_used.contains(key));
-
-            self.recently_used.clear();
+        self.entries
+            .retain(|key, _| self.recently_used.contains(key));
 
-            self.trim_count = 0;
-        } else {
-            self.trim_count += 1;
-        }
+        self.recently_used.clear();
     }
 }
 

From 5f9e7f6cb99467363d691086cb697b2390793afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 19 Mar 2023 14:52:30 +0100
Subject: [PATCH 103/163] Update `cosmic-text` to latest :tada:

---
 tiny_skia/Cargo.toml  |   5 +-
 tiny_skia/src/text.rs | 280 ++++++++++++++-----------------
 wgpu/Cargo.toml       |   3 +-
 wgpu/src/text.rs      | 372 +++++++++++++++++++-----------------------
 4 files changed, 289 insertions(+), 371 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 691975896d..31f5cb6b5b 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -14,7 +14,6 @@ softbuffer = "0.2"
 tiny-skia = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
-ouroboros = "0.15"
 kurbo = "0.9"
 
 [dependencies.iced_graphics]
@@ -24,8 +23,8 @@ features = ["tiny-skia"]
 
 [dependencies.cosmic-text]
 features = ["std", "swash"]
-git = "https://github.com/hecrj/cosmic-text"
-rev = "81080c1b9498933b43c1889601a7ea6a3d16e161"
+git = "https://github.com/pop-os/cosmic-text"
+rev = "e788c175ec31094b04dcacbc0537dba4433afcfc"
 
 [dependencies.twox-hash]
 version = "1.6"
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 714695b923..8391571c86 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -11,62 +11,31 @@ use std::sync::Arc;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
-    system: Option<System>,
+    font_system: RefCell<cosmic_text::FontSystem>,
     glyph_cache: GlyphCache,
-}
-
-#[ouroboros::self_referencing]
-struct System {
-    fonts: cosmic_text::FontSystem,
-
-    #[borrows(fonts)]
-    #[not_covariant]
-    measurement_cache: RefCell<Cache<'this>>,
-
-    #[borrows(fonts)]
-    #[not_covariant]
-    render_cache: Cache<'this>,
+    measurement_cache: RefCell<Cache>,
+    render_cache: Cache,
 }
 
 impl Pipeline {
     pub fn new() -> Self {
         Pipeline {
-            system: Some(
-                SystemBuilder {
-                    fonts: cosmic_text::FontSystem::new_with_fonts(
-                        [cosmic_text::fontdb::Source::Binary(Arc::new(
-                            include_bytes!("../../wgpu/fonts/Iced-Icons.ttf")
-                                .as_slice(),
-                        ))]
-                        .into_iter(),
-                    ),
-                    measurement_cache_builder: |_| RefCell::new(Cache::new()),
-                    render_cache_builder: |_| Cache::new(),
-                }
-                .build(),
-            ),
+            font_system: RefCell::new(cosmic_text::FontSystem::new_with_fonts(
+                [cosmic_text::fontdb::Source::Binary(Arc::new(
+                    include_bytes!("../../wgpu/fonts/Iced-Icons.ttf")
+                        .as_slice(),
+                ))]
+                .into_iter(),
+            )),
             glyph_cache: GlyphCache::new(),
+            measurement_cache: RefCell::new(Cache::new()),
+            render_cache: Cache::new(),
         }
     }
 
     pub fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
-        let heads = self.system.take().unwrap().into_heads();
-
-        let (locale, mut db) = heads.fonts.into_locale_and_db();
-
-        db.load_font_source(cosmic_text::fontdb::Source::Binary(Arc::new(
-            bytes.into_owned(),
-        )));
-
-        self.system = Some(
-            SystemBuilder {
-                fonts: cosmic_text::FontSystem::new_with_locale_and_db(
-                    locale, db,
-                ),
-                measurement_cache_builder: |_| RefCell::new(Cache::new()),
-                render_cache_builder: |_| Cache::new(),
-            }
-            .build(),
+        self.font_system.get_mut().db_mut().load_font_source(
+            cosmic_text::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
         );
     }
 
@@ -82,78 +51,75 @@ impl Pipeline {
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::ClipMask>,
     ) {
-        self.system.as_mut().unwrap().with_mut(|fields| {
-            let key = Key {
-                bounds: {
-                    let size = bounds.size();
-
-                    // TODO: Reuse buffers from layouting
-                    Size::new(size.width.ceil(), size.height.ceil())
-                },
-                content,
-                font,
-                size,
-            };
-
-            let (_, buffer) = fields.render_cache.allocate(fields.fonts, key);
-
-            let (total_lines, max_width) = buffer
-                .layout_runs()
-                .enumerate()
-                .fold((0, 0.0), |(_, max), (i, buffer)| {
-                    (i + 1, buffer.line_w.max(max))
-                });
-
-            let total_height = total_lines as f32 * size * 1.2;
-
-            let x = match horizontal_alignment {
-                alignment::Horizontal::Left => bounds.x,
-                alignment::Horizontal::Center => bounds.x - max_width / 2.0,
-                alignment::Horizontal::Right => bounds.x - max_width,
-            };
-
-            let y = match vertical_alignment {
-                alignment::Vertical::Top => bounds.y,
-                alignment::Vertical::Center => bounds.y - total_height / 2.0,
-                alignment::Vertical::Bottom => bounds.y - total_height,
-            };
-
-            let mut swash = cosmic_text::SwashCache::new(fields.fonts);
-
-            for run in buffer.layout_runs() {
-                for glyph in run.glyphs {
-                    if let Some((buffer, placement)) = self
-                        .glyph_cache
-                        .allocate(glyph.cache_key, color, &mut swash)
-                    {
-                        let pixmap = tiny_skia::PixmapRef::from_bytes(
-                            buffer,
-                            placement.width,
-                            placement.height,
-                        )
-                        .expect("Create glyph pixel map");
-
-                        pixels.draw_pixmap(
-                            x as i32 + glyph.x_int + placement.left,
-                            y as i32 - glyph.y_int - placement.top
-                                + run.line_y as i32,
-                            pixmap,
-                            &tiny_skia::PixmapPaint::default(),
-                            tiny_skia::Transform::identity(),
-                            clip_mask,
-                        );
-                    }
+        let font_system = self.font_system.get_mut();
+        let key = Key {
+            bounds: {
+                let size = bounds.size();
+
+                // TODO: Reuse buffers from layouting
+                Size::new(size.width.ceil(), size.height.ceil())
+            },
+            content,
+            font,
+            size,
+        };
+
+        let (_, buffer) = self.render_cache.allocate(font_system, key);
+
+        let (total_lines, max_width) = buffer
+            .layout_runs()
+            .enumerate()
+            .fold((0, 0.0), |(_, max), (i, buffer)| {
+                (i + 1, buffer.line_w.max(max))
+            });
+
+        let total_height = total_lines as f32 * size * 1.2;
+
+        let x = match horizontal_alignment {
+            alignment::Horizontal::Left => bounds.x,
+            alignment::Horizontal::Center => bounds.x - max_width / 2.0,
+            alignment::Horizontal::Right => bounds.x - max_width,
+        };
+
+        let y = match vertical_alignment {
+            alignment::Vertical::Top => bounds.y,
+            alignment::Vertical::Center => bounds.y - total_height / 2.0,
+            alignment::Vertical::Bottom => bounds.y - total_height,
+        };
+
+        let mut swash = cosmic_text::SwashCache::new();
+
+        for run in buffer.layout_runs() {
+            for glyph in run.glyphs {
+                if let Some((buffer, placement)) = self.glyph_cache.allocate(
+                    glyph.cache_key,
+                    color,
+                    font_system,
+                    &mut swash,
+                ) {
+                    let pixmap = tiny_skia::PixmapRef::from_bytes(
+                        buffer,
+                        placement.width,
+                        placement.height,
+                    )
+                    .expect("Create glyph pixel map");
+
+                    pixels.draw_pixmap(
+                        x as i32 + glyph.x_int + placement.left,
+                        y as i32 - glyph.y_int - placement.top
+                            + run.line_y as i32,
+                        pixmap,
+                        &tiny_skia::PixmapPaint::default(),
+                        tiny_skia::Transform::identity(),
+                        clip_mask,
+                    );
                 }
             }
-        });
+        }
     }
 
     pub fn trim_cache(&mut self) {
-        self.system
-            .as_mut()
-            .unwrap()
-            .with_render_cache_mut(|cache| cache.trim());
-
+        self.render_cache.trim();
         self.glyph_cache.trim();
     }
 
@@ -164,28 +130,26 @@ impl Pipeline {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        self.system.as_ref().unwrap().with(|fields| {
-            let mut measurement_cache = fields.measurement_cache.borrow_mut();
-
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let (total_lines, max_width) = paragraph
-                .layout_runs()
-                .enumerate()
-                .fold((0, 0.0), |(_, max), (i, buffer)| {
-                    (i + 1, buffer.line_w.max(max))
-                });
+        let (_, paragraph) = measurement_cache.allocate(
+            &mut self.font_system.borrow_mut(),
+            Key {
+                content,
+                size,
+                font,
+                bounds,
+            },
+        );
 
-            (max_width, size * 1.2 * total_lines as f32)
-        })
+        let (total_lines, max_width) = paragraph
+            .layout_runs()
+            .enumerate()
+            .fold((0, 0.0), |(_, max), (i, buffer)| {
+                (i + 1, buffer.line_w.max(max))
+            });
+
+        (max_width, size * 1.2 * total_lines as f32)
     }
 
     pub fn hit_test(
@@ -197,30 +161,25 @@ impl Pipeline {
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        self.system.as_ref().unwrap().with(|fields| {
-            let mut measurement_cache = fields.measurement_cache.borrow_mut();
-
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let cursor = paragraph.hit(point.x, point.y)?;
+        let (_, paragraph) = measurement_cache.allocate(
+            &mut self.font_system.borrow_mut(),
+            Key {
+                content,
+                size,
+                font,
+                bounds,
+            },
+        );
 
-            Some(Hit::CharOffset(cursor.index))
-        })
+        let cursor = paragraph.hit(point.x, point.y)?;
+
+        Some(Hit::CharOffset(cursor.index))
     }
 
     pub fn trim_measurement_cache(&mut self) {
-        self.system
-            .as_mut()
-            .unwrap()
-            .with_measurement_cache_mut(|cache| cache.borrow_mut().trim());
+        self.measurement_cache.borrow_mut().trim();
     }
 }
 
@@ -256,14 +215,15 @@ impl GlyphCache {
         &mut self,
         cache_key: cosmic_text::CacheKey,
         color: Color,
-        swash: &mut cosmic_text::SwashCache<'_>,
+        font_system: &mut cosmic_text::FontSystem,
+        swash: &mut cosmic_text::SwashCache,
     ) -> Option<(&[u8], cosmic_text::Placement)> {
         let [r, g, b, _a] = color.into_rgba8();
         let key = (cache_key, [r, g, b]);
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(key) {
             // TODO: Outline support
-            let image = swash.get_image_uncached(cache_key)?;
+            let image = swash.get_image_uncached(font_system, cache_key)?;
 
             let glyph_size = image.placement.width as usize
                 * image.placement.height as usize;
@@ -343,8 +303,8 @@ impl GlyphCache {
     }
 }
 
-struct Cache<'a> {
-    entries: FxHashMap<KeyHash, cosmic_text::Buffer<'a>>,
+struct Cache {
+    entries: FxHashMap<KeyHash, cosmic_text::Buffer>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
 }
@@ -355,7 +315,7 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 #[cfg(target_arch = "wasm32")]
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
-impl<'a> Cache<'a> {
+impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
@@ -366,9 +326,9 @@ impl<'a> Cache<'a> {
 
     fn allocate(
         &mut self,
-        fonts: &'a cosmic_text::FontSystem,
+        font_system: &mut cosmic_text::FontSystem,
         key: Key<'_>,
-    ) -> (KeyHash, &mut cosmic_text::Buffer<'a>) {
+    ) -> (KeyHash, &mut cosmic_text::Buffer) {
         let hash = {
             let mut hasher = self.hasher.build_hasher();
 
@@ -383,13 +343,15 @@ impl<'a> Cache<'a> {
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
             let metrics = cosmic_text::Metrics::new(key.size, key.size * 1.2);
-            let mut buffer = cosmic_text::Buffer::new(fonts, metrics);
+            let mut buffer = cosmic_text::Buffer::new(font_system, metrics);
 
             buffer.set_size(
+                font_system,
                 key.bounds.width,
                 key.bounds.height.max(key.size * 1.2),
             );
             buffer.set_text(
+                font_system,
                 key.content,
                 cosmic_text::Attrs::new()
                     .family(to_family(key.font))
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 6a313d4f69..3aef4ff4de 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -21,7 +21,6 @@ futures = "0.3"
 bitflags = "1.2"
 once_cell = "1.0"
 rustc-hash = "1.1"
-ouroboros = "0.15"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wgpu = { version = "0.14", features = ["webgl"] }
@@ -45,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "edd23695ad53db5f89d455c3c130172fd107d6a2"
+rev = "47050174841a4f58fc8d85c943a2117f72f19e8e"
 
 [dependencies.encase]
 version = "0.3.0"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 35f24cd9da..ac116f694d 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -12,23 +12,12 @@ use std::sync::Arc;
 
 #[allow(missing_debug_implementations)]
 pub struct Pipeline {
-    system: Option<System>,
+    font_system: RefCell<glyphon::FontSystem>,
     renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
     prepare_layer: usize,
-}
-
-#[ouroboros::self_referencing]
-struct System {
-    fonts: glyphon::FontSystem,
-
-    #[borrows(fonts)]
-    #[not_covariant]
-    measurement_cache: RefCell<Cache<'this>>,
-
-    #[borrows(fonts)]
-    #[not_covariant]
-    render_cache: Cache<'this>,
+    measurement_cache: RefCell<Cache>,
+    render_cache: Cache,
 }
 
 impl Pipeline {
@@ -38,42 +27,23 @@ impl Pipeline {
         format: wgpu::TextureFormat,
     ) -> Self {
         Pipeline {
-            system: Some(
-                SystemBuilder {
-                    fonts: glyphon::FontSystem::new_with_fonts(
-                        [glyphon::fontdb::Source::Binary(Arc::new(
-                            include_bytes!("../fonts/Iced-Icons.ttf")
-                                .as_slice(),
-                        ))]
-                        .into_iter(),
-                    ),
-                    measurement_cache_builder: |_| RefCell::new(Cache::new()),
-                    render_cache_builder: |_| Cache::new(),
-                }
-                .build(),
-            ),
+            font_system: RefCell::new(glyphon::FontSystem::new_with_fonts(
+                [glyphon::fontdb::Source::Binary(Arc::new(
+                    include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
+                ))]
+                .into_iter(),
+            )),
             renderers: Vec::new(),
             atlas: glyphon::TextAtlas::new(device, queue, format),
             prepare_layer: 0,
+            measurement_cache: RefCell::new(Cache::new()),
+            render_cache: Cache::new(),
         }
     }
 
     pub fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
-        let heads = self.system.take().unwrap().into_heads();
-
-        let (locale, mut db) = heads.fonts.into_locale_and_db();
-
-        db.load_font_source(glyphon::fontdb::Source::Binary(Arc::new(
-            bytes.into_owned(),
-        )));
-
-        self.system = Some(
-            SystemBuilder {
-                fonts: glyphon::FontSystem::new_with_locale_and_db(locale, db),
-                measurement_cache_builder: |_| RefCell::new(Cache::new()),
-                render_cache_builder: |_| Cache::new(),
-            }
-            .build(),
+        self.font_system.get_mut().db_mut().load_font_source(
+            glyphon::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
         );
     }
 
@@ -86,126 +56,123 @@ impl Pipeline {
         scale_factor: f32,
         target_size: Size<u32>,
     ) -> bool {
-        self.system.as_mut().unwrap().with_mut(|fields| {
-            if self.renderers.len() <= self.prepare_layer {
-                self.renderers
-                    .push(glyphon::TextRenderer::new(device, queue));
-            }
+        if self.renderers.len() <= self.prepare_layer {
+            self.renderers
+                .push(glyphon::TextRenderer::new(device, queue));
+        }
 
-            let renderer = &mut self.renderers[self.prepare_layer];
-
-            let keys: Vec<_> = sections
-                .iter()
-                .map(|section| {
-                    let (key, _) = fields.render_cache.allocate(
-                        fields.fonts,
-                        Key {
-                            content: section.content,
-                            size: section.size * scale_factor,
-                            font: section.font,
-                            bounds: Size {
-                                width: (section.bounds.width * scale_factor)
-                                    .ceil(),
-                                height: (section.bounds.height * scale_factor)
-                                    .ceil(),
-                            },
+        let font_system = self.font_system.get_mut();
+        let renderer = &mut self.renderers[self.prepare_layer];
+
+        let keys: Vec<_> = sections
+            .iter()
+            .map(|section| {
+                let (key, _) = self.render_cache.allocate(
+                    font_system,
+                    Key {
+                        content: section.content,
+                        size: section.size * scale_factor,
+                        font: section.font,
+                        bounds: Size {
+                            width: (section.bounds.width * scale_factor).ceil(),
+                            height: (section.bounds.height * scale_factor)
+                                .ceil(),
                         },
-                    );
-
-                    key
-                })
-                .collect();
-
-            let bounds = glyphon::TextBounds {
-                left: (bounds.x * scale_factor) as i32,
-                top: (bounds.y * scale_factor) as i32,
-                right: ((bounds.x + bounds.width) * scale_factor) as i32,
-                bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
-            };
-
-            let text_areas =
-                sections.iter().zip(keys.iter()).map(|(section, key)| {
-                    let buffer = fields
-                        .render_cache
-                        .get(key)
-                        .expect("Get cached buffer");
-
-                    let x = section.bounds.x * scale_factor;
-                    let y = section.bounds.y * scale_factor;
-
-                    let (total_lines, max_width) = buffer
-                        .layout_runs()
-                        .enumerate()
-                        .fold((0, 0.0), |(_, max), (i, buffer)| {
-                            (i + 1, buffer.line_w.max(max))
-                        });
-
-                    let total_height =
-                        total_lines as f32 * section.size * 1.2 * scale_factor;
-
-                    let left = match section.horizontal_alignment {
-                        alignment::Horizontal::Left => x,
-                        alignment::Horizontal::Center => x - max_width / 2.0,
-                        alignment::Horizontal::Right => x - max_width,
-                    };
-
-                    let top = match section.vertical_alignment {
-                        alignment::Vertical::Top => y,
-                        alignment::Vertical::Center => y - total_height / 2.0,
-                        alignment::Vertical::Bottom => y - total_height,
-                    };
-
-                    glyphon::TextArea {
-                        buffer,
-                        left: left as i32,
-                        top: top as i32,
-                        bounds,
-                        default_color: {
-                            let [r, g, b, a] = section.color.into_linear();
-
-                            glyphon::Color::rgba(
-                                (r * 255.0) as u8,
-                                (g * 255.0) as u8,
-                                (b * 255.0) as u8,
-                                (a * 255.0) as u8,
-                            )
-                        },
-                    }
-                });
-
-            let result = renderer.prepare(
-                device,
-                queue,
-                &mut self.atlas,
-                glyphon::Resolution {
-                    width: target_size.width,
-                    height: target_size.height,
-                },
-                text_areas,
-                &mut glyphon::SwashCache::new(fields.fonts),
-            );
+                    },
+                );
+
+                key
+            })
+            .collect();
+
+        let bounds = glyphon::TextBounds {
+            left: (bounds.x * scale_factor) as i32,
+            top: (bounds.y * scale_factor) as i32,
+            right: ((bounds.x + bounds.width) * scale_factor) as i32,
+            bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
+        };
 
-            match result {
-                Ok(()) => {
-                    self.prepare_layer += 1;
+        let text_areas =
+            sections.iter().zip(keys.iter()).map(|(section, key)| {
+                let buffer =
+                    self.render_cache.get(key).expect("Get cached buffer");
+
+                let x = section.bounds.x * scale_factor;
+                let y = section.bounds.y * scale_factor;
+
+                let (total_lines, max_width) = buffer
+                    .layout_runs()
+                    .enumerate()
+                    .fold((0, 0.0), |(_, max), (i, buffer)| {
+                        (i + 1, buffer.line_w.max(max))
+                    });
+
+                let total_height =
+                    total_lines as f32 * section.size * 1.2 * scale_factor;
+
+                let left = match section.horizontal_alignment {
+                    alignment::Horizontal::Left => x,
+                    alignment::Horizontal::Center => x - max_width / 2.0,
+                    alignment::Horizontal::Right => x - max_width,
+                };
+
+                let top = match section.vertical_alignment {
+                    alignment::Vertical::Top => y,
+                    alignment::Vertical::Center => y - total_height / 2.0,
+                    alignment::Vertical::Bottom => y - total_height,
+                };
+
+                glyphon::TextArea {
+                    buffer,
+                    left: left as i32,
+                    top: top as i32,
+                    bounds,
+                    default_color: {
+                        let [r, g, b, a] = section.color.into_linear();
+
+                        glyphon::Color::rgba(
+                            (r * 255.0) as u8,
+                            (g * 255.0) as u8,
+                            (b * 255.0) as u8,
+                            (a * 255.0) as u8,
+                        )
+                    },
+                }
+            });
+
+        let result = renderer.prepare(
+            device,
+            queue,
+            font_system,
+            &mut self.atlas,
+            glyphon::Resolution {
+                width: target_size.width,
+                height: target_size.height,
+            },
+            text_areas,
+            &mut glyphon::SwashCache::new(),
+        );
+
+        match result {
+            Ok(()) => {
+                self.prepare_layer += 1;
 
+                true
+            }
+            Err(glyphon::PrepareError::AtlasFull(content_type)) => {
+                self.prepare_layer = 0;
+
+                #[allow(clippy::needless_bool)]
+                if self.atlas.grow(device, content_type) {
+                    false
+                } else {
+                    // If the atlas cannot grow, then all bets are off.
+                    // Instead of panicking, we will just pray that the result
+                    // will be somewhat readable...
                     true
                 }
-                Err(glyphon::PrepareError::AtlasFull(content_type)) => {
-                    self.prepare_layer = 0;
-
-                    #[allow(clippy::needless_bool)]
-                    if self.atlas.grow(device, content_type) {
-                        false
-                    } else {
-                        // If the atlas cannot grow, then all bets are off.
-                        // Instead of panicking, we will just pray that the result
-                        // will be somewhat readable...
-                        true
-                    }
-                }
             }
-        })
+        }
     }
 
     pub fn render<'a>(
@@ -230,11 +197,7 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.atlas.trim();
-
-        self.system
-            .as_mut()
-            .unwrap()
-            .with_render_cache_mut(|cache| cache.trim());
+        self.render_cache.trim();
 
         self.prepare_layer = 0;
     }
@@ -246,28 +209,26 @@ impl Pipeline {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        self.system.as_ref().unwrap().with(|fields| {
-            let mut measurement_cache = fields.measurement_cache.borrow_mut();
-
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
+
+        let (_, paragraph) = measurement_cache.allocate(
+            &mut self.font_system.borrow_mut(),
+            Key {
+                content,
+                size,
+                font,
+                bounds,
+            },
+        );
 
-            let (total_lines, max_width) = paragraph
-                .layout_runs()
-                .enumerate()
-                .fold((0, 0.0), |(_, max), (i, buffer)| {
-                    (i + 1, buffer.line_w.max(max))
-                });
+        let (total_lines, max_width) = paragraph
+            .layout_runs()
+            .enumerate()
+            .fold((0, 0.0), |(_, max), (i, buffer)| {
+                (i + 1, buffer.line_w.max(max))
+            });
 
-            (max_width, size * 1.2 * total_lines as f32)
-        })
+        (max_width, size * 1.2 * total_lines as f32)
     }
 
     pub fn hit_test(
@@ -279,30 +240,25 @@ impl Pipeline {
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        self.system.as_ref().unwrap().with(|fields| {
-            let mut measurement_cache = fields.measurement_cache.borrow_mut();
-
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        let mut measurement_cache = self.measurement_cache.borrow_mut();
+
+        let (_, paragraph) = measurement_cache.allocate(
+            &mut self.font_system.borrow_mut(),
+            Key {
+                content,
+                size,
+                font,
+                bounds,
+            },
+        );
 
-            let cursor = paragraph.hit(point.x, point.y)?;
+        let cursor = paragraph.hit(point.x, point.y)?;
 
-            Some(Hit::CharOffset(cursor.index))
-        })
+        Some(Hit::CharOffset(cursor.index))
     }
 
     pub fn trim_measurement_cache(&mut self) {
-        self.system
-            .as_mut()
-            .unwrap()
-            .with_measurement_cache_mut(|cache| cache.borrow_mut().trim());
+        self.measurement_cache.borrow_mut().trim();
     }
 }
 
@@ -317,8 +273,8 @@ fn to_family(font: Font) -> glyphon::Family<'static> {
     }
 }
 
-struct Cache<'a> {
-    entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
+struct Cache {
+    entries: FxHashMap<KeyHash, glyphon::Buffer>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
 }
@@ -329,7 +285,7 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 #[cfg(target_arch = "wasm32")]
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
-impl<'a> Cache<'a> {
+impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
@@ -338,15 +294,15 @@ impl<'a> Cache<'a> {
         }
     }
 
-    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer<'a>> {
+    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer> {
         self.entries.get(key)
     }
 
     fn allocate(
         &mut self,
-        fonts: &'a glyphon::FontSystem,
+        font_system: &mut glyphon::FontSystem,
         key: Key<'_>,
-    ) -> (KeyHash, &mut glyphon::Buffer<'a>) {
+    ) -> (KeyHash, &mut glyphon::Buffer) {
         let hash = {
             let mut hasher = self.hasher.build_hasher();
 
@@ -361,13 +317,15 @@ impl<'a> Cache<'a> {
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
             let metrics = glyphon::Metrics::new(key.size, key.size * 1.2);
-            let mut buffer = glyphon::Buffer::new(fonts, metrics);
+            let mut buffer = glyphon::Buffer::new(font_system, metrics);
 
             buffer.set_size(
+                font_system,
                 key.bounds.width,
                 key.bounds.height.max(key.size * 1.2),
             );
             buffer.set_text(
+                font_system,
                 key.content,
                 glyphon::Attrs::new()
                     .family(to_family(key.font))

From 2e236869f5f9297d40d66d5d9e3a82324b8617f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 29 Mar 2023 00:17:12 +0200
Subject: [PATCH 104/163] Export `iced_core::mouse` in `advanced` module

---
 src/advanced.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/advanced.rs b/src/advanced.rs
index 7afba85ccc..82c18e59a7 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -1,6 +1,7 @@
 //! Leverage advanced concepts like custom widgets.
 pub use crate::core::image;
 pub use crate::core::layout::{self, Layout};
+pub use crate::core::mouse;
 pub use crate::core::overlay::{self, Overlay};
 pub use crate::core::renderer::{self, Renderer};
 pub use crate::core::svg;

From 6d90f764b45fe1aaf7071c36371f11a81786eefa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 29 Mar 2023 00:17:40 +0200
Subject: [PATCH 105/163] Export `iced_graphics` in `advanced` module (for now)

---
 src/advanced.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/advanced.rs b/src/advanced.rs
index 82c18e59a7..77a26d6279 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -8,6 +8,7 @@ pub use crate::core::svg;
 pub use crate::core::text::{self, Text};
 pub use crate::core::widget::{self, Widget};
 pub use crate::core::{Clipboard, Shell};
+pub use crate::renderer::graphics;
 
 pub mod subscription {
     //! Write your own subscriptions.

From 703ef710291187f5c9a413bbaefcf4892f816a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 29 Mar 2023 00:18:06 +0200
Subject: [PATCH 106/163] Export `Pixels` in root crate

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c59d505804..26d1a35836 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -189,8 +189,8 @@ pub use style::theme;
 pub use crate::core::alignment;
 pub use crate::core::event;
 pub use crate::core::{
-    color, Alignment, Background, Color, ContentFit, Length, Padding, Point,
-    Rectangle, Size, Vector,
+    color, Alignment, Background, Color, ContentFit, Length, Padding, Pixels,
+    Point, Rectangle, Size, Vector,
 };
 pub use crate::runtime::Command;
 

From 472fbdf1875e82bc89ac0bbd4b2ff09cae1d9620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 29 Mar 2023 20:32:36 +0200
Subject: [PATCH 107/163] Export `Hasher` in `advanced` module

---
 src/advanced.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/advanced.rs b/src/advanced.rs
index 77a26d6279..2071aed04b 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -7,7 +7,7 @@ pub use crate::core::renderer::{self, Renderer};
 pub use crate::core::svg;
 pub use crate::core::text::{self, Text};
 pub use crate::core::widget::{self, Widget};
-pub use crate::core::{Clipboard, Shell};
+pub use crate::core::{Clipboard, Hasher, Shell};
 pub use crate::renderer::graphics;
 
 pub mod subscription {

From 707de9d788dc3c49d4ac57a19afac1bb938b78d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 30 Mar 2023 00:56:00 +0200
Subject: [PATCH 108/163] Introduce support for `Font` attributes

---
 core/src/font.rs              | 44 ++++++++++++++++++++++++++++++++---
 core/src/renderer/null.rs     |  4 ++--
 examples/checkbox/src/main.rs |  2 +-
 examples/todos/src/main.rs    | 15 +++++++-----
 graphics/src/geometry/text.rs |  2 +-
 renderer/src/backend.rs       |  2 +-
 renderer/src/settings.rs      |  2 +-
 src/settings.rs               |  2 +-
 tiny_skia/src/backend.rs      |  4 ++--
 tiny_skia/src/settings.rs     |  2 +-
 tiny_skia/src/text.rs         | 44 ++++++++++++++++++++++++++---------
 wgpu/src/backend.rs           |  2 +-
 wgpu/src/layer.rs             |  2 +-
 wgpu/src/settings.rs          |  2 +-
 wgpu/src/text.rs              | 44 ++++++++++++++++++++++++++---------
 15 files changed, 129 insertions(+), 44 deletions(-)

diff --git a/core/src/font.rs b/core/src/font.rs
index b67c08af15..920b3dd542 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -2,8 +2,44 @@
 use std::hash::Hash;
 
 /// A font.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Font {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub struct Font {
+    /// The [`Family`] of the [`Font`].
+    pub family: Family,
+    /// The [`Weight`] of the [`Font`].
+    pub weight: Weight,
+    /// Whether if the [`Font`] is monospaced or not.
+    pub monospaced: bool,
+}
+
+impl Font {
+    /// A non-monospaced sans-serif font with normal [`Weight`].
+    pub const DEFAULT: Font = Font {
+        family: Family::SansSerif,
+        weight: Weight::Normal,
+        monospaced: false,
+    };
+
+    /// A monospaced font with normal [`Weight`].
+    pub const MONOSPACE: Font = Font {
+        family: Family::Monospace,
+        monospaced: true,
+        ..Self::DEFAULT
+    };
+
+    /// Creates a non-monospaced [`Font`] with the given [`Family::Name`] and
+    /// normal [`Weight`].
+    pub const fn with_name(name: &'static str) -> Self {
+        Font {
+            family: Family::Name(name),
+            ..Self::DEFAULT
+        }
+    }
+}
+
+/// A font family.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub enum Family {
     /// The name of a font family of choice.
     Name(&'static str),
 
@@ -13,6 +49,7 @@ pub enum Font {
     /// Glyphs in sans-serif fonts, as the term is used in CSS, are generally low
     /// contrast and have stroke endings that are plain — without any flaring,
     /// cross stroke, or other ornamentation.
+    #[default]
     SansSerif,
 
     /// Glyphs in cursive fonts generally use a more informal script style, and
@@ -31,11 +68,12 @@ pub enum Font {
 
 /// The weight of some text.
 #[allow(missing_docs)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
 pub enum Weight {
     Thin,
     ExtraLight,
     Light,
+    #[default]
     Normal,
     Medium,
     Semibold,
diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index d93338aee8..88c588250a 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -42,12 +42,12 @@ impl Renderer for Null {
 impl text::Renderer for Null {
     type Font = Font;
 
-    const ICON_FONT: Font = Font::SansSerif;
+    const ICON_FONT: Font = Font::DEFAULT;
     const CHECKMARK_ICON: char = '0';
     const ARROW_DOWN_ICON: char = '0';
 
     fn default_font(&self) -> Self::Font {
-        Font::SansSerif
+        Font::default()
     }
 
     fn default_size(&self) -> f32 {
diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 7711149091..c5f3c1345d 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -3,7 +3,7 @@ use iced::font::{self, Font};
 use iced::widget::{checkbox, column, container};
 use iced::{Application, Command, Element, Length, Settings, Theme};
 
-const ICON_FONT: Font = Font::Name("icons");
+const ICON_FONT: Font = Font::with_name("icons");
 
 pub fn main() -> iced::Result {
     Example::run(Settings::default())
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 48b4f2f8dd..ed3684d395 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -392,10 +392,14 @@ impl Task {
 
                 row![
                     text_input,
-                    button(row![delete_icon(), "Delete"].spacing(10))
-                        .on_press(TaskMessage::Delete)
-                        .padding(10)
-                        .style(theme::Button::Destructive)
+                    button(
+                        row![delete_icon(), "Delete"]
+                            .spacing(10)
+                            .align_items(Alignment::Center)
+                    )
+                    .on_press(TaskMessage::Delete)
+                    .padding(10)
+                    .style(theme::Button::Destructive)
                 ]
                 .spacing(20)
                 .align_items(Alignment::Center)
@@ -487,14 +491,13 @@ fn empty_message(message: &str) -> Element<'_, Message> {
 }
 
 // Fonts
-const ICONS: Font = Font::Name("Iced-Todos-Icons");
+const ICONS: Font = Font::with_name("Iced-Todos-Icons");
 
 fn icon(unicode: char) -> Text<'static> {
     text(unicode.to_string())
         .font(ICONS)
         .width(20)
         .horizontal_alignment(alignment::Horizontal::Center)
-        .size(20)
 }
 
 fn edit_icon() -> Text<'static> {
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index 06e0b4d0e2..0befd63522 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -34,7 +34,7 @@ impl Default for Text {
             position: Point::ORIGIN,
             color: Color::BLACK,
             size: 16.0,
-            font: Font::SansSerif,
+            font: Font::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
         }
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index e77b708bc1..120dd644c5 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -30,7 +30,7 @@ impl iced_graphics::Backend for Backend {
 }
 
 impl backend::Text for Backend {
-    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
     const ARROW_DOWN_ICON: char = '\u{e800}';
 
diff --git a/renderer/src/settings.rs b/renderer/src/settings.rs
index d32c87d37a..2e51f339c7 100644
--- a/renderer/src/settings.rs
+++ b/renderer/src/settings.rs
@@ -23,7 +23,7 @@ pub struct Settings {
 impl Default for Settings {
     fn default() -> Settings {
         Settings {
-            default_font: Font::SansSerif,
+            default_font: Font::default(),
             default_text_size: 16.0,
             antialiasing: None,
         }
diff --git a/src/settings.rs b/src/settings.rs
index 13b3af7ca6..0dd465849a 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -79,7 +79,7 @@ where
             id: None,
             window: Default::default(),
             flags: Default::default(),
-            default_font: Font::SansSerif,
+            default_font: Default::default(),
             default_text_size: 16.0,
             antialiasing: false,
             exit_on_close_request: true,
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 271d026f15..58076b840f 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -72,7 +72,7 @@ impl Backend {
                         height: f32::INFINITY,
                     },
                     color: Color::BLACK,
-                    font: Font::Monospace,
+                    font: Font::MONOSPACE,
                     horizontal_alignment: alignment::Horizontal::Left,
                     vertical_alignment: alignment::Vertical::Top,
                 },
@@ -492,7 +492,7 @@ impl iced_graphics::Backend for Backend {
 }
 
 impl backend::Text for Backend {
-    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
     const ARROW_DOWN_ICON: char = '\u{e800}';
 
diff --git a/tiny_skia/src/settings.rs b/tiny_skia/src/settings.rs
index 9e4be0c495..abffbfe6ab 100644
--- a/tiny_skia/src/settings.rs
+++ b/tiny_skia/src/settings.rs
@@ -17,7 +17,7 @@ pub struct Settings {
 impl Default for Settings {
     fn default() -> Settings {
         Settings {
-            default_font: Font::SansSerif,
+            default_font: Font::default(),
             default_text_size: 16.0,
         }
     }
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 8391571c86..c9bb9873d7 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -1,6 +1,7 @@
 use crate::core::alignment;
+use crate::core::font::{self, Font};
 use crate::core::text::Hit;
-use crate::core::{Color, Font, Point, Rectangle, Size};
+use crate::core::{Color, Point, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
@@ -183,14 +184,28 @@ impl Pipeline {
     }
 }
 
-fn to_family(font: Font) -> cosmic_text::Family<'static> {
-    match font {
-        Font::Name(name) => cosmic_text::Family::Name(name),
-        Font::SansSerif => cosmic_text::Family::SansSerif,
-        Font::Serif => cosmic_text::Family::Serif,
-        Font::Cursive => cosmic_text::Family::Cursive,
-        Font::Fantasy => cosmic_text::Family::Fantasy,
-        Font::Monospace => cosmic_text::Family::Monospace,
+fn to_family(family: font::Family) -> cosmic_text::Family<'static> {
+    match family {
+        font::Family::Name(name) => cosmic_text::Family::Name(name),
+        font::Family::SansSerif => cosmic_text::Family::SansSerif,
+        font::Family::Serif => cosmic_text::Family::Serif,
+        font::Family::Cursive => cosmic_text::Family::Cursive,
+        font::Family::Fantasy => cosmic_text::Family::Fantasy,
+        font::Family::Monospace => cosmic_text::Family::Monospace,
+    }
+}
+
+fn to_weight(weight: font::Weight) -> cosmic_text::Weight {
+    match weight {
+        font::Weight::Thin => cosmic_text::Weight::THIN,
+        font::Weight::ExtraLight => cosmic_text::Weight::EXTRA_LIGHT,
+        font::Weight::Light => cosmic_text::Weight::LIGHT,
+        font::Weight::Normal => cosmic_text::Weight::NORMAL,
+        font::Weight::Medium => cosmic_text::Weight::MEDIUM,
+        font::Weight::Semibold => cosmic_text::Weight::SEMIBOLD,
+        font::Weight::Bold => cosmic_text::Weight::BOLD,
+        font::Weight::ExtraBold => cosmic_text::Weight::EXTRA_BOLD,
+        font::Weight::Black => cosmic_text::Weight::BLACK,
     }
 }
 
@@ -354,8 +369,15 @@ impl Cache {
                 font_system,
                 key.content,
                 cosmic_text::Attrs::new()
-                    .family(to_family(key.font))
-                    .monospaced(matches!(key.font, Font::Monospace)),
+                    .family(to_family(key.font.family))
+                    .weight(to_weight(key.font.weight))
+                    .monospaced(
+                        key.font.monospaced
+                            || matches!(
+                                key.font.family,
+                                font::Family::Monospace
+                            ),
+                    ),
             );
 
             let _ = entry.insert(buffer);
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 88c585545c..9772781a56 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -336,7 +336,7 @@ impl iced_graphics::Backend for Backend {
 }
 
 impl backend::Text for Backend {
-    const ICON_FONT: Font = Font::Name("Iced-Icons");
+    const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
     const ARROW_DOWN_ICON: char = '\u{e800}';
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index cb9d5e2f69..c4723397b0 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -61,7 +61,7 @@ impl<'a> Layer<'a> {
                 ),
                 color: Color::new(0.9, 0.9, 0.9, 1.0),
                 size: 20.0,
-                font: Font::Monospace,
+                font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
             };
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index 7c0750efbf..ff041bdff8 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -58,7 +58,7 @@ impl Default for Settings {
         Settings {
             present_mode: wgpu::PresentMode::AutoVsync,
             internal_backend: wgpu::Backends::all(),
-            default_font: Font::SansSerif,
+            default_font: Font::default(),
             default_text_size: 16.0,
             antialiasing: None,
         }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ac116f694d..b0b7a19817 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,7 @@
 use crate::core::alignment;
+use crate::core::font::{self, Font};
 use crate::core::text::Hit;
-use crate::core::{Font, Point, Rectangle, Size};
+use crate::core::{Point, Rectangle, Size};
 use crate::layer::Text;
 
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -262,14 +263,28 @@ impl Pipeline {
     }
 }
 
-fn to_family(font: Font) -> glyphon::Family<'static> {
-    match font {
-        Font::Name(name) => glyphon::Family::Name(name),
-        Font::SansSerif => glyphon::Family::SansSerif,
-        Font::Serif => glyphon::Family::Serif,
-        Font::Cursive => glyphon::Family::Cursive,
-        Font::Fantasy => glyphon::Family::Fantasy,
-        Font::Monospace => glyphon::Family::Monospace,
+fn to_family(family: font::Family) -> glyphon::Family<'static> {
+    match family {
+        font::Family::Name(name) => glyphon::Family::Name(name),
+        font::Family::SansSerif => glyphon::Family::SansSerif,
+        font::Family::Serif => glyphon::Family::Serif,
+        font::Family::Cursive => glyphon::Family::Cursive,
+        font::Family::Fantasy => glyphon::Family::Fantasy,
+        font::Family::Monospace => glyphon::Family::Monospace,
+    }
+}
+
+fn to_weight(weight: font::Weight) -> glyphon::Weight {
+    match weight {
+        font::Weight::Thin => glyphon::Weight::THIN,
+        font::Weight::ExtraLight => glyphon::Weight::EXTRA_LIGHT,
+        font::Weight::Light => glyphon::Weight::LIGHT,
+        font::Weight::Normal => glyphon::Weight::NORMAL,
+        font::Weight::Medium => glyphon::Weight::MEDIUM,
+        font::Weight::Semibold => glyphon::Weight::SEMIBOLD,
+        font::Weight::Bold => glyphon::Weight::BOLD,
+        font::Weight::ExtraBold => glyphon::Weight::EXTRA_BOLD,
+        font::Weight::Black => glyphon::Weight::BLACK,
     }
 }
 
@@ -328,8 +343,15 @@ impl Cache {
                 font_system,
                 key.content,
                 glyphon::Attrs::new()
-                    .family(to_family(key.font))
-                    .monospaced(matches!(key.font, Font::Monospace)),
+                    .family(to_family(key.font.family))
+                    .weight(to_weight(key.font.weight))
+                    .monospaced(
+                        key.font.monospaced
+                            || matches!(
+                                key.font.family,
+                                font::Family::Monospace
+                            ),
+                    ),
             );
 
             let _ = entry.insert(buffer);

From 0b459c8e240abf83bb62902a504c018194acdbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 30 Mar 2023 02:01:20 +0200
Subject: [PATCH 109/163] Introduce `font::Stretch`

---
 core/src/font.rs      | 19 +++++++++++++++++++
 tiny_skia/src/text.rs | 15 +++++++++++++++
 wgpu/src/text.rs      | 15 +++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/core/src/font.rs b/core/src/font.rs
index 920b3dd542..bb425fd6dc 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -8,6 +8,8 @@ pub struct Font {
     pub family: Family,
     /// The [`Weight`] of the [`Font`].
     pub weight: Weight,
+    /// The [`Stretch`] of the [`Font`].
+    pub stretch: Stretch,
     /// Whether if the [`Font`] is monospaced or not.
     pub monospaced: bool,
 }
@@ -17,6 +19,7 @@ impl Font {
     pub const DEFAULT: Font = Font {
         family: Family::SansSerif,
         weight: Weight::Normal,
+        stretch: Stretch::Normal,
         monospaced: false,
     };
 
@@ -81,3 +84,19 @@ pub enum Weight {
     ExtraBold,
     Black,
 }
+
+/// The width of some text.
+#[allow(missing_docs)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub enum Stretch {
+    UltraCondensed,
+    ExtraCondensed,
+    Condensed,
+    SemiCondensed,
+    #[default]
+    Normal,
+    SemiExpanded,
+    Expanded,
+    ExtraExpanded,
+    UltraExpanded,
+}
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index c9bb9873d7..865132b462 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -209,6 +209,20 @@ fn to_weight(weight: font::Weight) -> cosmic_text::Weight {
     }
 }
 
+fn to_stretch(stretch: font::Stretch) -> cosmic_text::Stretch {
+    match stretch {
+        font::Stretch::UltraCondensed => cosmic_text::Stretch::UltraCondensed,
+        font::Stretch::ExtraCondensed => cosmic_text::Stretch::ExtraCondensed,
+        font::Stretch::Condensed => cosmic_text::Stretch::Condensed,
+        font::Stretch::SemiCondensed => cosmic_text::Stretch::SemiCondensed,
+        font::Stretch::Normal => cosmic_text::Stretch::Normal,
+        font::Stretch::SemiExpanded => cosmic_text::Stretch::SemiExpanded,
+        font::Stretch::Expanded => cosmic_text::Stretch::Expanded,
+        font::Stretch::ExtraExpanded => cosmic_text::Stretch::ExtraExpanded,
+        font::Stretch::UltraExpanded => cosmic_text::Stretch::UltraExpanded,
+    }
+}
+
 #[derive(Debug, Clone, Default)]
 struct GlyphCache {
     entries: FxHashMap<
@@ -371,6 +385,7 @@ impl Cache {
                 cosmic_text::Attrs::new()
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
+                    .stretch(to_stretch(key.font.stretch))
                     .monospaced(
                         key.font.monospaced
                             || matches!(
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index b0b7a19817..dd67427997 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -288,6 +288,20 @@ fn to_weight(weight: font::Weight) -> glyphon::Weight {
     }
 }
 
+fn to_stretch(stretch: font::Stretch) -> glyphon::Stretch {
+    match stretch {
+        font::Stretch::UltraCondensed => glyphon::Stretch::UltraCondensed,
+        font::Stretch::ExtraCondensed => glyphon::Stretch::ExtraCondensed,
+        font::Stretch::Condensed => glyphon::Stretch::Condensed,
+        font::Stretch::SemiCondensed => glyphon::Stretch::SemiCondensed,
+        font::Stretch::Normal => glyphon::Stretch::Normal,
+        font::Stretch::SemiExpanded => glyphon::Stretch::SemiExpanded,
+        font::Stretch::Expanded => glyphon::Stretch::Expanded,
+        font::Stretch::ExtraExpanded => glyphon::Stretch::ExtraExpanded,
+        font::Stretch::UltraExpanded => glyphon::Stretch::UltraExpanded,
+    }
+}
+
 struct Cache {
     entries: FxHashMap<KeyHash, glyphon::Buffer>,
     recently_used: FxHashSet<KeyHash>,
@@ -345,6 +359,7 @@ impl Cache {
                 glyphon::Attrs::new()
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
+                    .stretch(to_stretch(key.font.stretch))
                     .monospaced(
                         key.font.monospaced
                             || matches!(

From 04c0ba04bf8574acdcbd5ad9fa20ac9c863f6087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 4 Apr 2023 01:47:18 +0200
Subject: [PATCH 110/163] Warn about invalid paths in `iced_tiny_skia` instead
 of panicking

---
 tiny_skia/Cargo.toml      |  1 +
 tiny_skia/src/geometry.rs | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 31f5cb6b5b..349f690335 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -15,6 +15,7 @@ tiny-skia = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
 kurbo = "0.9"
+log = "0.4"
 
 [dependencies.iced_graphics]
 version = "0.7"
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index c66621dd8c..4e3941f394 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -39,7 +39,7 @@ impl Frame {
     }
 
     pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
-        let path = convert_path(path);
+        let Some(path) = convert_path(path) else { return };
         let fill = fill.into();
 
         self.primitives.push(Primitive::Fill {
@@ -56,7 +56,7 @@ impl Frame {
         size: Size,
         fill: impl Into<Fill>,
     ) {
-        let path = convert_path(&Path::rectangle(top_left, size));
+        let Some(path) = convert_path(&Path::rectangle(top_left, size)) else { return };
         let fill = fill.into();
 
         self.primitives.push(Primitive::Fill {
@@ -71,7 +71,8 @@ impl Frame {
     }
 
     pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
-        let path = convert_path(path);
+        let Some(path) = convert_path(path) else { return };
+
         let stroke = stroke.into();
         let skia_stroke = into_stroke(&stroke);
 
@@ -151,7 +152,7 @@ impl Frame {
     }
 }
 
-fn convert_path(path: &Path) -> tiny_skia::Path {
+fn convert_path(path: &Path) -> Option<tiny_skia::Path> {
     use iced_graphics::geometry::path::lyon_path;
 
     let mut builder = tiny_skia::PathBuilder::new();
@@ -205,9 +206,14 @@ fn convert_path(path: &Path) -> tiny_skia::Path {
         }
     }
 
-    builder
-        .finish()
-        .expect("Convert lyon path to tiny_skia path")
+    let result = builder.finish();
+
+    #[cfg(debug_assertions)]
+    if result.is_none() {
+        log::warn!("Invalid path: {:?}", path.raw());
+    }
+
+    result
 }
 
 pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {

From 6fae8bf6cbe7155bcee42eaeba68e31564df057c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 4 Apr 2023 01:47:58 +0200
Subject: [PATCH 111/163] Implement `Frame::clip` for `iced_tiny_skia`

---
 tiny_skia/src/geometry.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 4e3941f394..508965ada7 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -125,7 +125,12 @@ impl Frame {
         self.transform = self.stack.pop().expect("Pop transform");
     }
 
-    pub fn clip(&mut self, _frame: Self, _translation: Vector) {}
+    pub fn clip(&mut self, frame: Self, translation: Vector) {
+        self.primitives.push(Primitive::Translate {
+            translation,
+            content: Box::new(frame.into_primitive()),
+        });
+    }
 
     pub fn translate(&mut self, translation: Vector) {
         self.transform =

From 0f7abffc0e94b4bb9f8117db633bfd07d900eb93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 22 Mar 2023 00:36:57 +0100
Subject: [PATCH 112/163] Draft (very) basic incremental rendering for
 `iced_tiny_skia`

---
 Cargo.toml                 |   3 +
 core/src/image.rs          |  30 +++++++-
 core/src/rectangle.rs      |  34 +++++++++
 core/src/svg.rs            |   4 +-
 graphics/src/primitive.rs  | 151 ++++++++++++++++++++++++++++++++++++-
 graphics/src/renderer.rs   |   2 +-
 runtime/src/debug/basic.rs |   2 +-
 tiny_skia/src/backend.rs   |  68 ++++++++++++++++-
 tiny_skia/src/primitive.rs |  82 --------------------
 widget/src/text_input.rs   |   2 +
 10 files changed, 286 insertions(+), 92 deletions(-)
 delete mode 100644 tiny_skia/src/primitive.rs

diff --git a/Cargo.toml b/Cargo.toml
index 38c35f43bd..854dc8a065 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,3 +86,6 @@ incremental = false
 opt-level = 3
 overflow-checks = false
 strip = "debuginfo"
+
+[patch.crates-io]
+tiny-skia = { version = "0.8", git = "https://github.com/hecrj/tiny-skia.git", rev = "213890dcbb3754d51533f5b558d9f5ffa3bf6da1" }
diff --git a/core/src/image.rs b/core/src/image.rs
index 70fbade052..618235efc0 100644
--- a/core/src/image.rs
+++ b/core/src/image.rs
@@ -6,7 +6,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 /// A handle of some image data.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Handle {
     id: u64,
     data: Data,
@@ -156,6 +156,34 @@ impl std::fmt::Debug for Data {
     }
 }
 
+impl PartialEq for Data {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Self::Path(a), Self::Path(b)) => a == b,
+            (Self::Bytes(a), Self::Bytes(b)) => a.as_ref() == b.as_ref(),
+            (
+                Self::Rgba {
+                    width: width_a,
+                    height: height_a,
+                    pixels: pixels_a,
+                },
+                Self::Rgba {
+                    width: width_b,
+                    height: height_b,
+                    pixels: pixels_b,
+                },
+            ) => {
+                width_a == width_b
+                    && height_a == height_b
+                    && pixels_a.as_ref() == pixels_b.as_ref()
+            }
+            _ => false,
+        }
+    }
+}
+
+impl Eq for Data {}
+
 /// A [`Renderer`] that can render raster graphics.
 ///
 /// [renderer]: crate::renderer
diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index 4fe9151957..5cdcbe785b 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -100,6 +100,30 @@ impl Rectangle<f32> {
         }
     }
 
+    /// Returns whether the [`Rectangle`] intersects with the given one.
+    pub fn intersects(&self, other: &Self) -> bool {
+        self.intersection(other).is_some()
+    }
+
+    /// Computes the union with the given [`Rectangle`].
+    pub fn union(&self, other: &Self) -> Self {
+        let x = self.x.min(other.x);
+        let y = self.y.min(other.y);
+
+        let lower_right_x = (self.x + self.width).max(other.x + other.width);
+        let lower_right_y = (self.y + self.height).max(other.y + other.height);
+
+        let width = lower_right_x - x;
+        let height = lower_right_y - y;
+
+        Rectangle {
+            x,
+            y,
+            width,
+            height,
+        }
+    }
+
     /// Snaps the [`Rectangle`] to __unsigned__ integer coordinates.
     pub fn snap(self) -> Rectangle<u32> {
         Rectangle {
@@ -109,6 +133,16 @@ impl Rectangle<f32> {
             height: self.height as u32,
         }
     }
+
+    /// Expands the [`Rectangle`] a given amount.
+    pub fn expand(self, amount: f32) -> Self {
+        Self {
+            x: self.x - amount,
+            y: self.y - amount,
+            width: self.width + amount * 2.0,
+            height: self.height + amount * 2.0,
+        }
+    }
 }
 
 impl std::ops::Mul<f32> for Rectangle<f32> {
diff --git a/core/src/svg.rs b/core/src/svg.rs
index 9b98877a2e..54e9434e05 100644
--- a/core/src/svg.rs
+++ b/core/src/svg.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 /// A handle of Svg data.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Handle {
     id: u64,
     data: Arc<Data>,
@@ -57,7 +57,7 @@ impl Hash for Handle {
 }
 
 /// The data of a vectorial image.
-#[derive(Clone, Hash)]
+#[derive(Clone, Hash, PartialEq, Eq)]
 pub enum Data {
     /// File data
     Path(PathBuf),
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 195b62daa5..bbf300b0be 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -7,7 +7,7 @@ use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
 
 /// A rendering primitive.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 #[non_exhaustive]
 pub enum Primitive {
     /// A text primitive
@@ -147,10 +147,153 @@ impl Primitive {
             content: Box::new(self),
         }
     }
+
+    pub fn bounds(&self) -> Rectangle {
+        match self {
+            Self::Text {
+                bounds,
+                horizontal_alignment,
+                vertical_alignment,
+                ..
+            } => {
+                let mut bounds = *bounds;
+
+                bounds.x = match horizontal_alignment {
+                    alignment::Horizontal::Left => bounds.x,
+                    alignment::Horizontal::Center => {
+                        bounds.x - bounds.width / 2.0
+                    }
+                    alignment::Horizontal::Right => bounds.x - bounds.width,
+                };
+
+                bounds.y = match vertical_alignment {
+                    alignment::Vertical::Top => bounds.y,
+                    alignment::Vertical::Center => {
+                        bounds.y - bounds.height / 2.0
+                    }
+                    alignment::Vertical::Bottom => bounds.y - bounds.height,
+                };
+
+                bounds.expand(1.0)
+            }
+            Self::Quad { bounds, .. }
+            | Self::Image { bounds, .. }
+            | Self::Svg { bounds, .. }
+            | Self::Clip { bounds, .. } => bounds.expand(1.0),
+            Self::SolidMesh { size, .. } | Self::GradientMesh { size, .. } => {
+                Rectangle::with_size(*size)
+            }
+            #[cfg(feature = "tiny-skia")]
+            Self::Fill { path, .. } | Self::Stroke { path, .. } => {
+                let bounds = path.bounds();
+
+                Rectangle {
+                    x: bounds.x(),
+                    y: bounds.y(),
+                    width: bounds.width(),
+                    height: bounds.height(),
+                }
+                .expand(1.0)
+            }
+            Self::Group { primitives } => primitives
+                .iter()
+                .map(Self::bounds)
+                .fold(Rectangle::with_size(Size::ZERO), |a, b| {
+                    Rectangle::union(&a, &b)
+                }),
+            Self::Translate {
+                translation,
+                content,
+            } => content.bounds() + *translation,
+            Self::Cache { content } => content.bounds(),
+        }
+    }
+
+    pub fn damage(&self, other: &Self) -> Vec<Rectangle> {
+        match (self, other) {
+            (
+                Primitive::Group {
+                    primitives: primitives_a,
+                },
+                Primitive::Group {
+                    primitives: primitives_b,
+                },
+            ) => return Self::damage_list(primitives_a, primitives_b),
+            (
+                Primitive::Clip {
+                    bounds: bounds_a,
+                    content: content_a,
+                },
+                Primitive::Clip {
+                    bounds: bounds_b,
+                    content: content_b,
+                },
+            ) => {
+                if bounds_a == bounds_b {
+                    return content_a.damage(content_b);
+                } else {
+                    return vec![*bounds_a, *bounds_b];
+                }
+            }
+            (
+                Primitive::Translate {
+                    translation: translation_a,
+                    content: content_a,
+                },
+                Primitive::Translate {
+                    translation: translation_b,
+                    content: content_b,
+                },
+            ) => {
+                if translation_a == translation_b {
+                    return content_a.damage(content_b);
+                }
+            }
+            (
+                Primitive::Cache { content: content_a },
+                Primitive::Cache { content: content_b },
+            ) => {
+                if Arc::ptr_eq(content_a, content_b) {
+                    return vec![];
+                }
+            }
+            _ if self == other => return vec![],
+            _ => {}
+        }
+
+        let bounds_a = self.bounds();
+        let bounds_b = other.bounds();
+
+        if bounds_a == bounds_b {
+            vec![bounds_a]
+        } else {
+            vec![bounds_a, bounds_b]
+        }
+    }
+
+    pub fn damage_list(previous: &[Self], current: &[Self]) -> Vec<Rectangle> {
+        let damage =
+            previous.iter().zip(current).flat_map(|(a, b)| a.damage(b));
+
+        if previous.len() == current.len() {
+            damage.collect()
+        } else {
+            let (smaller, bigger) = if previous.len() < current.len() {
+                (previous, current)
+            } else {
+                (current, previous)
+            };
+
+            // Extend damage by the added/removed primitives
+            damage
+                .chain(bigger[smaller.len()..].iter().map(Primitive::bounds))
+                .collect()
+        }
+    }
 }
 
 /// A set of [`Vertex2D`] and indices representing a list of triangles.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Mesh2D<T> {
     /// The vertices of the mesh
     pub vertices: Vec<T>,
@@ -162,7 +305,7 @@ pub struct Mesh2D<T> {
 }
 
 /// A two-dimensional vertex.
-#[derive(Copy, Clone, Debug, Zeroable, Pod)]
+#[derive(Copy, Clone, Debug, PartialEq, Zeroable, Pod)]
 #[repr(C)]
 pub struct Vertex2D {
     /// The vertex position in 2D space.
@@ -170,7 +313,7 @@ pub struct Vertex2D {
 }
 
 /// A two-dimensional vertex with a color.
-#[derive(Copy, Clone, Debug, Zeroable, Pod)]
+#[derive(Copy, Clone, Debug, PartialEq, Zeroable, Pod)]
 #[repr(C)]
 pub struct ColoredVertex2D {
     /// The vertex position in 2D space.
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 7bc462ef45..23e594be72 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -32,7 +32,7 @@ impl<B: Backend, T> Renderer<B, T> {
         }
     }
 
-    /// Returns the [`Backend`] of the [`Renderer`].
+    /// Returns a reference to the [`Backend`] of the [`Renderer`].
     pub fn backend(&self) -> &B {
         &self.backend
     }
diff --git a/runtime/src/debug/basic.rs b/runtime/src/debug/basic.rs
index 32f725a1d6..e9be4c84d7 100644
--- a/runtime/src/debug/basic.rs
+++ b/runtime/src/debug/basic.rs
@@ -129,7 +129,7 @@ impl Debug {
 
     pub fn render_finished(&mut self) {
         self.render_durations
-            .push(time::Instant::now() - self.render_start);
+            .push(dbg!(time::Instant::now() - self.render_start));
     }
 
     pub fn log_message<Message: std::fmt::Debug>(&mut self, message: &Message) {
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 58076b840f..fe84f83b0f 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -17,6 +17,9 @@ pub struct Backend {
 
     #[cfg(feature = "svg")]
     vector_pipeline: crate::vector::Pipeline,
+
+    last_primitives: Vec<Primitive>,
+    last_background_color: Color,
 }
 
 impl Backend {
@@ -31,6 +34,9 @@ impl Backend {
 
             #[cfg(feature = "svg")]
             vector_pipeline: crate::vector::Pipeline::new(),
+
+            last_primitives: Vec::new(),
+            last_background_color: Color::BLACK,
         }
     }
 
@@ -43,10 +49,48 @@ impl Backend {
         background_color: Color,
         overlay: &[T],
     ) {
-        pixels.fill(into_color(background_color));
+        let damage = if self.last_background_color == background_color {
+            Primitive::damage_list(&self.last_primitives, primitives)
+        } else {
+            vec![Rectangle::with_size(viewport.logical_size())]
+        };
+
+        if damage.is_empty() {
+            return;
+        }
+
+        self.last_primitives = primitives.to_vec();
+        self.last_background_color = background_color;
 
         let scale_factor = viewport.scale_factor() as f32;
 
+        dbg!(&damage);
+
+        for region in &damage {
+            let region = *region * scale_factor;
+
+            pixels.fill_path(
+                &tiny_skia::PathBuilder::from_rect(
+                    tiny_skia::Rect::from_xywh(
+                        region.x,
+                        region.y,
+                        region.width.min(viewport.physical_width() as f32),
+                        region.height.min(viewport.physical_height() as f32),
+                    )
+                    .expect("Create damage rectangle"),
+                ),
+                &tiny_skia::Paint {
+                    shader: tiny_skia::Shader::SolidColor(into_color(
+                        background_color,
+                    )),
+                    ..Default::default()
+                },
+                tiny_skia::FillRule::default(),
+                tiny_skia::Transform::identity(),
+                None,
+            );
+        }
+
         for primitive in primitives {
             self.draw_primitive(
                 primitive,
@@ -55,6 +99,7 @@ impl Backend {
                 None,
                 scale_factor,
                 Vector::ZERO,
+                &damage,
             );
         }
 
@@ -81,6 +126,7 @@ impl Backend {
                 None,
                 scale_factor,
                 Vector::ZERO,
+                &[],
             );
         }
 
@@ -101,6 +147,7 @@ impl Backend {
         clip_bounds: Option<Rectangle>,
         scale_factor: f32,
         translation: Vector,
+        damage: &[Rectangle],
     ) {
         match primitive {
             Primitive::Quad {
@@ -110,6 +157,10 @@ impl Backend {
                 border_width,
                 border_color,
             } => {
+                if !damage.iter().any(|damage| damage.intersects(bounds)) {
+                    return;
+                }
+
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
                     translation.y,
@@ -165,6 +216,13 @@ impl Backend {
                 horizontal_alignment,
                 vertical_alignment,
             } => {
+                if !damage
+                    .iter()
+                    .any(|damage| damage.intersects(&primitive.bounds()))
+                {
+                    return;
+                }
+
                 self.text_pipeline.draw(
                     content,
                     (*bounds + translation) * scale_factor,
@@ -179,6 +237,10 @@ impl Backend {
             }
             #[cfg(feature = "image")]
             Primitive::Image { handle, bounds } => {
+                if !damage.iter().any(|damage| damage.intersects(bounds)) {
+                    return;
+                }
+
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
                     translation.y,
@@ -248,6 +310,7 @@ impl Backend {
                         clip_bounds,
                         scale_factor,
                         translation,
+                        damage,
                     );
                 }
             }
@@ -262,6 +325,7 @@ impl Backend {
                     clip_bounds,
                     scale_factor,
                     translation + *offset,
+                    damage,
                 );
             }
             Primitive::Clip { bounds, content } => {
@@ -284,6 +348,7 @@ impl Backend {
                     Some(bounds),
                     scale_factor,
                     translation,
+                    damage,
                 );
 
                 if let Some(bounds) = clip_bounds {
@@ -300,6 +365,7 @@ impl Backend {
                     clip_bounds,
                     scale_factor,
                     translation,
+                    damage,
                 );
             }
             Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {
diff --git a/tiny_skia/src/primitive.rs b/tiny_skia/src/primitive.rs
deleted file mode 100644
index 22daaedc57..0000000000
--- a/tiny_skia/src/primitive.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{Rectangle, Vector};
-
-use std::sync::Arc;
-
-#[derive(Debug, Clone)]
-pub enum Primitive {
-    /// A group of primitives
-    Group {
-        /// The primitives of the group
-        primitives: Vec<Primitive>,
-    },
-    /// A clip primitive
-    Clip {
-        /// The bounds of the clip
-        bounds: Rectangle,
-        /// The content of the clip
-        content: Box<Primitive>,
-    },
-    /// A primitive that applies a translation
-    Translate {
-        /// The translation vector
-        translation: Vector,
-
-        /// The primitive to translate
-        content: Box<Primitive>,
-    },
-    /// A cached primitive.
-    ///
-    /// This can be useful if you are implementing a widget where primitive
-    /// generation is expensive.
-    Cached {
-        /// The cached primitive
-        cache: Arc<Primitive>,
-    },
-    /// A basic primitive.
-    Basic(iced_graphics::Primitive),
-}
-
-impl iced_graphics::backend::Primitive for Primitive {
-    fn translate(self, translation: Vector) -> Self {
-        Self::Translate {
-            translation,
-            content: Box::new(self),
-        }
-    }
-
-    fn clip(self, bounds: Rectangle) -> Self {
-        Self::Clip {
-            bounds,
-            content: Box::new(self),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct Recording(pub(crate) Vec<Primitive>);
-
-impl iced_graphics::backend::Recording for Recording {
-    type Primitive = Primitive;
-
-    fn push(&mut self, primitive: Primitive) {
-        self.0.push(primitive);
-    }
-
-    fn push_basic(&mut self, basic: iced_graphics::Primitive) {
-        self.0.push(Primitive::Basic(basic));
-    }
-
-    fn group(self) -> Self::Primitive {
-        Primitive::Group { primitives: self.0 }
-    }
-
-    fn clear(&mut self) {
-        self.0.clear();
-    }
-}
-
-impl Recording {
-    pub fn primitives(&self) -> &[Primitive] {
-        &self.0
-    }
-}
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index d066109aab..4f0182846e 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -953,6 +953,8 @@ pub fn draw<Renderer>(
     let render = |renderer: &mut Renderer| {
         if let Some((cursor, color)) = cursor {
             renderer.fill_quad(cursor, color);
+        } else {
+            renderer.with_translation(Vector::ZERO, |_| {});
         }
 
         renderer.fill_text(Text {

From 6270c33ed9823c67f6b6e6dac8fd32521e4ac5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 4 Apr 2023 20:47:53 +0200
Subject: [PATCH 113/163] Keep playing with incremental rendering (still very
 slow)

---
 graphics/src/primitive.rs |  12 +-
 tiny_skia/src/backend.rs  | 232 ++++++++++++++++++++++++--------------
 2 files changed, 160 insertions(+), 84 deletions(-)

diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index bbf300b0be..f079ff6fae 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -230,7 +230,11 @@ impl Primitive {
                 },
             ) => {
                 if bounds_a == bounds_b {
-                    return content_a.damage(content_b);
+                    return content_a
+                        .damage(content_b)
+                        .into_iter()
+                        .filter_map(|r| r.intersection(bounds_a))
+                        .collect();
                 } else {
                     return vec![*bounds_a, *bounds_b];
                 }
@@ -246,7 +250,11 @@ impl Primitive {
                 },
             ) => {
                 if translation_a == translation_b {
-                    return content_a.damage(content_b);
+                    return content_a
+                        .damage(content_b)
+                        .into_iter()
+                        .map(|r| r + *translation_a)
+                        .collect();
                 }
             }
             (
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index fe84f83b0f..8101082a41 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -20,6 +20,7 @@ pub struct Backend {
 
     last_primitives: Vec<Primitive>,
     last_background_color: Color,
+    last_size: Size<u32>,
 }
 
 impl Backend {
@@ -37,6 +38,7 @@ impl Backend {
 
             last_primitives: Vec::new(),
             last_background_color: Color::BLACK,
+            last_size: Size::new(0, 0),
         }
     }
 
@@ -47,9 +49,13 @@ impl Backend {
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
-        overlay: &[T],
+        _overlay: &[T],
     ) {
-        let damage = if self.last_background_color == background_color {
+        let physical_size = viewport.physical_size();
+
+        let damage = if self.last_background_color == background_color
+            && self.last_size == physical_size
+        {
             Primitive::damage_list(&self.last_primitives, primitives)
         } else {
             vec![Rectangle::with_size(viewport.logical_size())]
@@ -61,24 +67,46 @@ impl Backend {
 
         self.last_primitives = primitives.to_vec();
         self.last_background_color = background_color;
+        self.last_size = physical_size;
 
         let scale_factor = viewport.scale_factor() as f32;
+        let physical_bounds = Rectangle {
+            x: 0.0,
+            y: 0.0,
+            width: physical_size.width as f32,
+            height: physical_size.height as f32,
+        };
 
-        dbg!(&damage);
+        dbg!(damage.len());
+
+        'draw_regions: for (i, region) in damage.iter().enumerate() {
+            for previous in damage.iter().take(i) {
+                if previous.contains(region.position())
+                    && previous.contains(
+                        region.position()
+                            + Vector::new(region.width, region.height),
+                    )
+                {
+                    continue 'draw_regions;
+                }
+            }
 
-        for region in &damage {
             let region = *region * scale_factor;
 
+            let Some(region) = physical_bounds.intersection(&region) else { continue };
+
+            let path = tiny_skia::PathBuilder::from_rect(
+                tiny_skia::Rect::from_xywh(
+                    region.x,
+                    region.y,
+                    region.width.min(viewport.physical_width() as f32),
+                    region.height.min(viewport.physical_height() as f32),
+                )
+                .expect("Create damage rectangle"),
+            );
+
             pixels.fill_path(
-                &tiny_skia::PathBuilder::from_rect(
-                    tiny_skia::Rect::from_xywh(
-                        region.x,
-                        region.y,
-                        region.width.min(viewport.physical_width() as f32),
-                        region.height.min(viewport.physical_height() as f32),
-                    )
-                    .expect("Create damage rectangle"),
-                ),
+                &path,
                 &tiny_skia::Paint {
                     shader: tiny_skia::Shader::SolidColor(into_color(
                         background_color,
@@ -89,47 +117,64 @@ impl Backend {
                 tiny_skia::Transform::identity(),
                 None,
             );
-        }
 
-        for primitive in primitives {
-            self.draw_primitive(
-                primitive,
-                pixels,
-                clip_mask,
-                None,
-                scale_factor,
-                Vector::ZERO,
-                &damage,
-            );
-        }
+            adjust_clip_mask(clip_mask, pixels, region);
 
-        for (i, text) in overlay.iter().enumerate() {
-            const OVERLAY_TEXT_SIZE: f32 = 20.0;
-
-            self.draw_primitive(
-                &Primitive::Text {
-                    content: text.as_ref().to_owned(),
-                    size: OVERLAY_TEXT_SIZE,
-                    bounds: Rectangle {
-                        x: 10.0,
-                        y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
-                        width: f32::INFINITY,
-                        height: f32::INFINITY,
-                    },
-                    color: Color::BLACK,
-                    font: Font::MONOSPACE,
-                    horizontal_alignment: alignment::Horizontal::Left,
-                    vertical_alignment: alignment::Vertical::Top,
-                },
-                pixels,
-                clip_mask,
-                None,
-                scale_factor,
-                Vector::ZERO,
-                &[],
-            );
+            for primitive in primitives {
+                self.draw_primitive(
+                    primitive,
+                    pixels,
+                    clip_mask,
+                    region,
+                    scale_factor,
+                    Vector::ZERO,
+                );
+            }
+
+            //pixels.stroke_path(
+            //    &path,
+            //    &tiny_skia::Paint {
+            //        shader: tiny_skia::Shader::SolidColor(into_color(
+            //            Color::from_rgb(1.0, 0.0, 0.0),
+            //        )),
+            //        anti_alias: true,
+            //        ..tiny_skia::Paint::default()
+            //    },
+            //    &tiny_skia::Stroke {
+            //        width: 1.0,
+            //        ..tiny_skia::Stroke::default()
+            //    },
+            //    tiny_skia::Transform::identity(),
+            //    None,
+            //);
         }
 
+        //for (i, text) in overlay.iter().enumerate() {
+        //    const OVERLAY_TEXT_SIZE: f32 = 20.0;
+
+        //    self.draw_primitive(
+        //        &Primitive::Text {
+        //            content: text.as_ref().to_owned(),
+        //            size: OVERLAY_TEXT_SIZE,
+        //            bounds: Rectangle {
+        //                x: 10.0,
+        //                y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
+        //                width: f32::INFINITY,
+        //                height: f32::INFINITY,
+        //            },
+        //            color: Color::BLACK,
+        //            font: Font::MONOSPACE,
+        //            horizontal_alignment: alignment::Horizontal::Left,
+        //            vertical_alignment: alignment::Vertical::Top,
+        //        },
+        //        pixels,
+        //        clip_mask,
+        //        Rectangle::EMPTY,
+        //        scale_factor,
+        //        Vector::ZERO,
+        //    );
+        //}
+
         self.text_pipeline.trim_cache();
 
         #[cfg(feature = "image")]
@@ -144,10 +189,9 @@ impl Backend {
         primitive: &Primitive,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: &mut tiny_skia::ClipMask,
-        clip_bounds: Option<Rectangle>,
+        clip_bounds: Rectangle,
         scale_factor: f32,
         translation: Vector,
-        damage: &[Rectangle],
     ) {
         match primitive {
             Primitive::Quad {
@@ -157,7 +201,9 @@ impl Backend {
                 border_width,
                 border_color,
             } => {
-                if !damage.iter().any(|damage| damage.intersects(bounds)) {
+                if !clip_bounds
+                    .intersects(&((*bounds + translation) * scale_factor))
+                {
                     return;
                 }
 
@@ -168,7 +214,6 @@ impl Backend {
                 .post_scale(scale_factor, scale_factor);
 
                 let path = rounded_rectangle(*bounds, *border_radius);
-                let clip_mask = clip_bounds.map(|_| clip_mask as &_);
 
                 pixels.fill_path(
                     &path,
@@ -185,7 +230,7 @@ impl Backend {
                     },
                     tiny_skia::FillRule::EvenOdd,
                     transform,
-                    clip_mask,
+                    Some(clip_mask),
                 );
 
                 if *border_width > 0.0 {
@@ -203,7 +248,7 @@ impl Backend {
                             ..tiny_skia::Stroke::default()
                         },
                         transform,
-                        clip_mask,
+                        Some(clip_mask),
                     );
                 }
             }
@@ -216,10 +261,9 @@ impl Backend {
                 horizontal_alignment,
                 vertical_alignment,
             } => {
-                if !damage
-                    .iter()
-                    .any(|damage| damage.intersects(&primitive.bounds()))
-                {
+                if !clip_bounds.intersects(
+                    &((primitive.bounds() + translation) * scale_factor),
+                ) {
                     return;
                 }
 
@@ -232,12 +276,14 @@ impl Backend {
                     *horizontal_alignment,
                     *vertical_alignment,
                     pixels,
-                    clip_bounds.map(|_| clip_mask as &_),
+                    Some(clip_mask),
                 );
             }
             #[cfg(feature = "image")]
             Primitive::Image { handle, bounds } => {
-                if !damage.iter().any(|damage| damage.intersects(bounds)) {
+                if !clip_bounds
+                    .intersects(&((*bounds + translation) * scale_factor))
+                {
                     return;
                 }
 
@@ -252,7 +298,7 @@ impl Backend {
                     *bounds,
                     pixels,
                     transform,
-                    clip_bounds.map(|_| clip_mask as &_),
+                    Some(clip_mask),
                 );
             }
             #[cfg(feature = "svg")]
@@ -275,6 +321,20 @@ impl Backend {
                 rule,
                 transform,
             } => {
+                let bounds = path.bounds();
+
+                if !clip_bounds.intersects(
+                    &((Rectangle {
+                        x: bounds.x(),
+                        y: bounds.y(),
+                        width: bounds.width(),
+                        height: bounds.height(),
+                    } + translation)
+                        * scale_factor),
+                ) {
+                    return;
+                }
+
                 pixels.fill_path(
                     path,
                     paint,
@@ -282,7 +342,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    clip_bounds.map(|_| clip_mask as &_),
+                    Some(clip_mask),
                 );
             }
             Primitive::Stroke {
@@ -291,6 +351,20 @@ impl Backend {
                 stroke,
                 transform,
             } => {
+                let bounds = path.bounds();
+
+                if !clip_bounds.intersects(
+                    &((Rectangle {
+                        x: bounds.x(),
+                        y: bounds.y(),
+                        width: bounds.width(),
+                        height: bounds.height(),
+                    } + translation)
+                        * scale_factor),
+                ) {
+                    return;
+                }
+
                 pixels.stroke_path(
                     path,
                     paint,
@@ -298,7 +372,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    clip_bounds.map(|_| clip_mask as &_),
+                    Some(clip_mask),
                 );
             }
             Primitive::Group { primitives } => {
@@ -310,7 +384,6 @@ impl Backend {
                         clip_bounds,
                         scale_factor,
                         translation,
-                        damage,
                     );
                 }
             }
@@ -325,7 +398,6 @@ impl Backend {
                     clip_bounds,
                     scale_factor,
                     translation + *offset,
-                    damage,
                 );
             }
             Primitive::Clip { bounds, content } => {
@@ -339,22 +411,19 @@ impl Backend {
                     return;
                 }
 
-                adjust_clip_mask(clip_mask, pixels, bounds);
+                if let Some(bounds) = clip_bounds.intersection(&bounds) {
+                    adjust_clip_mask(clip_mask, pixels, bounds);
 
-                self.draw_primitive(
-                    content,
-                    pixels,
-                    clip_mask,
-                    Some(bounds),
-                    scale_factor,
-                    translation,
-                    damage,
-                );
+                    self.draw_primitive(
+                        content,
+                        pixels,
+                        clip_mask,
+                        bounds,
+                        scale_factor,
+                        translation,
+                    );
 
-                if let Some(bounds) = clip_bounds {
-                    adjust_clip_mask(clip_mask, pixels, bounds);
-                } else {
-                    clip_mask.clear();
+                    adjust_clip_mask(clip_mask, pixels, clip_bounds);
                 }
             }
             Primitive::Cache { content } => {
@@ -365,7 +434,6 @@ impl Backend {
                     clip_bounds,
                     scale_factor,
                     translation,
-                    damage,
                 );
             }
             Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {

From f8cd1faa286daaf34cc532bf6d34b932b32eb35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 04:10:00 +0200
Subject: [PATCH 114/163] Group damage regions by area increase

---
 core/src/rectangle.rs     |  14 ++
 graphics/src/primitive.rs |   4 +-
 tiny_skia/src/backend.rs  | 275 ++++++++++++++++++++++++--------------
 tiny_skia/src/text.rs     |  16 ++-
 4 files changed, 200 insertions(+), 109 deletions(-)

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index 5cdcbe785b..7ff324cb89 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -66,6 +66,11 @@ impl Rectangle<f32> {
         Size::new(self.width, self.height)
     }
 
+    /// Returns the area of the [`Rectangle`].
+    pub fn area(&self) -> f32 {
+        self.width * self.height
+    }
+
     /// Returns true if the given [`Point`] is contained in the [`Rectangle`].
     pub fn contains(&self, point: Point) -> bool {
         self.x <= point.x
@@ -74,6 +79,15 @@ impl Rectangle<f32> {
             && point.y <= self.y + self.height
     }
 
+    /// Returns true if the current [`Rectangle`] is completely within the given
+    /// `container`.
+    pub fn is_within(&self, container: &Rectangle) -> bool {
+        container.contains(self.position())
+            && container.contains(
+                self.position() + Vector::new(self.width, self.height),
+            )
+    }
+
     /// Computes the intersection with the given [`Rectangle`].
     pub fn intersection(
         &self,
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index f079ff6fae..01546dcb78 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -178,8 +178,8 @@ impl Primitive {
             }
             Self::Quad { bounds, .. }
             | Self::Image { bounds, .. }
-            | Self::Svg { bounds, .. }
-            | Self::Clip { bounds, .. } => bounds.expand(1.0),
+            | Self::Svg { bounds, .. } => bounds.expand(1.0),
+            Self::Clip { bounds, .. } => *bounds,
             Self::SolidMesh { size, .. } | Self::GradientMesh { size, .. } => {
                 Rectangle::with_size(*size)
             }
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 8101082a41..b141740971 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -49,7 +49,7 @@ impl Backend {
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
-        _overlay: &[T],
+        overlay: &[T],
     ) {
         let physical_size = viewport.physical_size();
 
@@ -70,37 +70,20 @@ impl Backend {
         self.last_size = physical_size;
 
         let scale_factor = viewport.scale_factor() as f32;
-        let physical_bounds = Rectangle {
-            x: 0.0,
-            y: 0.0,
-            width: physical_size.width as f32,
-            height: physical_size.height as f32,
-        };
-
-        dbg!(damage.len());
 
-        'draw_regions: for (i, region) in damage.iter().enumerate() {
-            for previous in damage.iter().take(i) {
-                if previous.contains(region.position())
-                    && previous.contains(
-                        region.position()
-                            + Vector::new(region.width, region.height),
-                    )
-                {
-                    continue 'draw_regions;
-                }
-            }
+        let damage = group_damage(damage, scale_factor, physical_size);
 
-            let region = *region * scale_factor;
-
-            let Some(region) = physical_bounds.intersection(&region) else { continue };
+        if !overlay.is_empty() {
+            pixels.fill(into_color(background_color));
+        }
 
+        for region in damage {
             let path = tiny_skia::PathBuilder::from_rect(
                 tiny_skia::Rect::from_xywh(
                     region.x,
                     region.y,
-                    region.width.min(viewport.physical_width() as f32),
-                    region.height.min(viewport.physical_height() as f32),
+                    region.width,
+                    region.height,
                 )
                 .expect("Create damage rectangle"),
             );
@@ -111,6 +94,7 @@ impl Backend {
                     shader: tiny_skia::Shader::SolidColor(into_color(
                         background_color,
                     )),
+                    anti_alias: false,
                     ..Default::default()
                 },
                 tiny_skia::FillRule::default(),
@@ -131,49 +115,62 @@ impl Backend {
                 );
             }
 
-            //pixels.stroke_path(
-            //    &path,
-            //    &tiny_skia::Paint {
-            //        shader: tiny_skia::Shader::SolidColor(into_color(
-            //            Color::from_rgb(1.0, 0.0, 0.0),
-            //        )),
-            //        anti_alias: true,
-            //        ..tiny_skia::Paint::default()
-            //    },
-            //    &tiny_skia::Stroke {
-            //        width: 1.0,
-            //        ..tiny_skia::Stroke::default()
-            //    },
-            //    tiny_skia::Transform::identity(),
-            //    None,
-            //);
+            if !overlay.is_empty() {
+                pixels.stroke_path(
+                    &path,
+                    &tiny_skia::Paint {
+                        shader: tiny_skia::Shader::SolidColor(into_color(
+                            Color::from_rgb(1.0, 0.0, 0.0),
+                        )),
+                        anti_alias: false,
+                        ..tiny_skia::Paint::default()
+                    },
+                    &tiny_skia::Stroke {
+                        width: 1.0,
+                        ..tiny_skia::Stroke::default()
+                    },
+                    tiny_skia::Transform::identity(),
+                    None,
+                );
+            }
         }
 
-        //for (i, text) in overlay.iter().enumerate() {
-        //    const OVERLAY_TEXT_SIZE: f32 = 20.0;
-
-        //    self.draw_primitive(
-        //        &Primitive::Text {
-        //            content: text.as_ref().to_owned(),
-        //            size: OVERLAY_TEXT_SIZE,
-        //            bounds: Rectangle {
-        //                x: 10.0,
-        //                y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
-        //                width: f32::INFINITY,
-        //                height: f32::INFINITY,
-        //            },
-        //            color: Color::BLACK,
-        //            font: Font::MONOSPACE,
-        //            horizontal_alignment: alignment::Horizontal::Left,
-        //            vertical_alignment: alignment::Vertical::Top,
-        //        },
-        //        pixels,
-        //        clip_mask,
-        //        Rectangle::EMPTY,
-        //        scale_factor,
-        //        Vector::ZERO,
-        //    );
-        //}
+        if !overlay.is_empty() {
+            let bounds = Rectangle {
+                x: 0.0,
+                y: 0.0,
+                width: viewport.physical_width() as f32,
+                height: viewport.physical_height() as f32,
+            };
+
+            adjust_clip_mask(clip_mask, pixels, bounds);
+
+            for (i, text) in overlay.iter().enumerate() {
+                const OVERLAY_TEXT_SIZE: f32 = 20.0;
+
+                self.draw_primitive(
+                    &Primitive::Text {
+                        content: text.as_ref().to_owned(),
+                        size: OVERLAY_TEXT_SIZE,
+                        bounds: Rectangle {
+                            x: 10.0,
+                            y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
+                            width: bounds.width - 1.0,
+                            height: bounds.height - 1.0,
+                        },
+                        color: Color::BLACK,
+                        font: Font::MONOSPACE,
+                        horizontal_alignment: alignment::Horizontal::Left,
+                        vertical_alignment: alignment::Vertical::Top,
+                    },
+                    pixels,
+                    clip_mask,
+                    bounds,
+                    scale_factor,
+                    Vector::ZERO,
+                );
+            }
+        }
 
         self.text_pipeline.trim_cache();
 
@@ -201,12 +198,15 @@ impl Backend {
                 border_width,
                 border_color,
             } => {
-                if !clip_bounds
-                    .intersects(&((*bounds + translation) * scale_factor))
-                {
+                let physical_bounds = (*bounds + translation) * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
                     return;
                 }
 
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then(|| clip_mask as &_);
+
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
                     translation.y,
@@ -230,7 +230,7 @@ impl Backend {
                     },
                     tiny_skia::FillRule::EvenOdd,
                     transform,
-                    Some(clip_mask),
+                    clip_mask,
                 );
 
                 if *border_width > 0.0 {
@@ -248,7 +248,7 @@ impl Backend {
                             ..tiny_skia::Stroke::default()
                         },
                         transform,
-                        Some(clip_mask),
+                        clip_mask,
                     );
                 }
             }
@@ -261,12 +261,16 @@ impl Backend {
                 horizontal_alignment,
                 vertical_alignment,
             } => {
-                if !clip_bounds.intersects(
-                    &((primitive.bounds() + translation) * scale_factor),
-                ) {
+                let physical_bounds =
+                    (primitive.bounds() + translation) * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
                     return;
                 }
 
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then(|| clip_mask as &_);
+
                 self.text_pipeline.draw(
                     content,
                     (*bounds + translation) * scale_factor,
@@ -276,7 +280,7 @@ impl Backend {
                     *horizontal_alignment,
                     *vertical_alignment,
                     pixels,
-                    Some(clip_mask),
+                    clip_mask,
                 );
             }
             #[cfg(feature = "image")]
@@ -323,18 +327,21 @@ impl Backend {
             } => {
                 let bounds = path.bounds();
 
-                if !clip_bounds.intersects(
-                    &((Rectangle {
-                        x: bounds.x(),
-                        y: bounds.y(),
-                        width: bounds.width(),
-                        height: bounds.height(),
-                    } + translation)
-                        * scale_factor),
-                ) {
+                let physical_bounds = (Rectangle {
+                    x: bounds.x(),
+                    y: bounds.y(),
+                    width: bounds.width(),
+                    height: bounds.height(),
+                } + translation)
+                    * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
                     return;
                 }
 
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then(|| clip_mask as &_);
+
                 pixels.fill_path(
                     path,
                     paint,
@@ -342,7 +349,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    Some(clip_mask),
+                    clip_mask,
                 );
             }
             Primitive::Stroke {
@@ -353,18 +360,21 @@ impl Backend {
             } => {
                 let bounds = path.bounds();
 
-                if !clip_bounds.intersects(
-                    &((Rectangle {
-                        x: bounds.x(),
-                        y: bounds.y(),
-                        width: bounds.width(),
-                        height: bounds.height(),
-                    } + translation)
-                        * scale_factor),
-                ) {
+                let physical_bounds = (Rectangle {
+                    x: bounds.x(),
+                    y: bounds.y(),
+                    width: bounds.width(),
+                    height: bounds.height(),
+                } + translation)
+                    * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
                     return;
                 }
 
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then(|| clip_mask as &_);
+
                 pixels.stroke_path(
                     path,
                     paint,
@@ -372,7 +382,7 @@ impl Backend {
                     transform
                         .post_translate(translation.x, translation.y)
                         .post_scale(scale_factor, scale_factor),
-                    Some(clip_mask),
+                    clip_mask,
                 );
             }
             Primitive::Group { primitives } => {
@@ -403,15 +413,26 @@ impl Backend {
             Primitive::Clip { bounds, content } => {
                 let bounds = (*bounds + translation) * scale_factor;
 
-                if bounds.x + bounds.width <= 0.0
-                    || bounds.y + bounds.height <= 0.0
-                    || bounds.x as u32 >= pixels.width()
-                    || bounds.y as u32 >= pixels.height()
-                {
-                    return;
-                }
+                if bounds == clip_bounds {
+                    self.draw_primitive(
+                        content,
+                        pixels,
+                        clip_mask,
+                        bounds,
+                        scale_factor,
+                        translation,
+                    );
+                } else if let Some(bounds) = clip_bounds.intersection(&bounds) {
+                    if bounds.x + bounds.width <= 0.0
+                        || bounds.y + bounds.height <= 0.0
+                        || bounds.x as u32 >= pixels.width()
+                        || bounds.y as u32 >= pixels.height()
+                        || bounds.width <= 1.0
+                        || bounds.height <= 1.0
+                    {
+                        return;
+                    }
 
-                if let Some(bounds) = clip_bounds.intersection(&bounds) {
                     adjust_clip_mask(clip_mask, pixels, bounds);
 
                     self.draw_primitive(
@@ -614,11 +635,57 @@ fn adjust_clip_mask(
             pixels.height(),
             &path,
             tiny_skia::FillRule::EvenOdd,
-            true,
+            false,
         )
         .expect("Set path of clipping area");
 }
 
+fn group_damage(
+    mut damage: Vec<Rectangle>,
+    scale_factor: f32,
+    bounds: Size<u32>,
+) -> Vec<Rectangle> {
+    use std::cmp::Ordering;
+
+    const AREA_THRESHOLD: f32 = 20_000.0;
+
+    let bounds = Rectangle {
+        x: 0.0,
+        y: 0.0,
+        width: bounds.width as f32,
+        height: bounds.height as f32,
+    };
+
+    damage.sort_by(|a, b| {
+        a.x.partial_cmp(&b.x)
+            .unwrap_or(Ordering::Equal)
+            .then_with(|| a.y.partial_cmp(&b.y).unwrap_or(Ordering::Equal))
+    });
+
+    let mut output = Vec::new();
+    let mut scaled = damage
+        .into_iter()
+        .filter_map(|region| (region * scale_factor).intersection(&bounds))
+        .filter(|region| region.width >= 1.0 && region.height >= 1.0);
+
+    if let Some(mut current) = scaled.next() {
+        for region in scaled {
+            let union = current.union(&region);
+
+            if union.area() - current.area() - region.area() <= AREA_THRESHOLD {
+                current = union;
+            } else {
+                output.push(current);
+                current = region;
+            }
+        }
+
+        output.push(current);
+    }
+
+    output
+}
+
 impl iced_graphics::Backend for Backend {
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache();
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 865132b462..512503e0cb 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -336,6 +336,7 @@ struct Cache {
     entries: FxHashMap<KeyHash, cosmic_text::Buffer>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
+    trim_count: usize,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -345,11 +346,14 @@ type HashBuilder = twox_hash::RandomXxHashBuilder64;
 type HashBuilder = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 
 impl Cache {
+    const TRIM_INTERVAL: usize = 300;
+
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
+            trim_count: 0,
         }
     }
 
@@ -404,10 +408,16 @@ impl Cache {
     }
 
     fn trim(&mut self) {
-        self.entries
-            .retain(|key, _| self.recently_used.contains(key));
+        if self.trim_count > Self::TRIM_INTERVAL {
+            self.entries
+                .retain(|key, _| self.recently_used.contains(key));
 
-        self.recently_used.clear();
+            self.recently_used.clear();
+
+            self.trim_count = 0;
+        } else {
+            self.trim_count += 1;
+        }
     }
 }
 

From 4cae262d22cde458cbb5d0667e4bcf6adce9242a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 05:47:29 +0200
Subject: [PATCH 115/163] Implement `PartialEq` and `Eq` for `image::Bytes`

---
 core/src/image.rs | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/core/src/image.rs b/core/src/image.rs
index 618235efc0..85d9d4758c 100644
--- a/core/src/image.rs
+++ b/core/src/image.rs
@@ -110,6 +110,14 @@ impl std::hash::Hash for Bytes {
     }
 }
 
+impl PartialEq for Bytes {
+    fn eq(&self, other: &Self) -> bool {
+        self.as_ref() == other.as_ref()
+    }
+}
+
+impl Eq for Bytes {}
+
 impl AsRef<[u8]> for Bytes {
     fn as_ref(&self) -> &[u8] {
         self.0.as_ref().as_ref()
@@ -125,7 +133,7 @@ impl std::ops::Deref for Bytes {
 }
 
 /// The data of a raster image.
-#[derive(Clone, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub enum Data {
     /// File data
     Path(PathBuf),
@@ -156,34 +164,6 @@ impl std::fmt::Debug for Data {
     }
 }
 
-impl PartialEq for Data {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Path(a), Self::Path(b)) => a == b,
-            (Self::Bytes(a), Self::Bytes(b)) => a.as_ref() == b.as_ref(),
-            (
-                Self::Rgba {
-                    width: width_a,
-                    height: height_a,
-                    pixels: pixels_a,
-                },
-                Self::Rgba {
-                    width: width_b,
-                    height: height_b,
-                    pixels: pixels_b,
-                },
-            ) => {
-                width_a == width_b
-                    && height_a == height_b
-                    && pixels_a.as_ref() == pixels_b.as_ref()
-            }
-            _ => false,
-        }
-    }
-}
-
-impl Eq for Data {}
-
 /// A [`Renderer`] that can render raster graphics.
 ///
 /// [renderer]: crate::renderer

From 1bba9a080f796276d5da87bf8decd2ed89ef218a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 05:49:30 +0200
Subject: [PATCH 116/163] Fix `Svg` and `Image` primitives in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index b141740971..8bc2321ce9 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -205,7 +205,7 @@ impl Backend {
                 }
 
                 let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then(|| clip_mask as &_);
+                    .then_some(clip_mask as &_);
 
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
@@ -269,7 +269,7 @@ impl Backend {
                 }
 
                 let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then(|| clip_mask as &_);
+                    .then_some(clip_mask as &_);
 
                 self.text_pipeline.draw(
                     content,
@@ -285,25 +285,23 @@ impl Backend {
             }
             #[cfg(feature = "image")]
             Primitive::Image { handle, bounds } => {
-                if !clip_bounds
-                    .intersects(&((*bounds + translation) * scale_factor))
-                {
+                let physical_bounds = (*bounds + translation) * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
                     return;
                 }
 
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then_some(clip_mask as &_);
+
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
                     translation.y,
                 )
                 .post_scale(scale_factor, scale_factor);
 
-                self.raster_pipeline.draw(
-                    handle,
-                    *bounds,
-                    pixels,
-                    transform,
-                    Some(clip_mask),
-                );
+                self.raster_pipeline
+                    .draw(handle, *bounds, pixels, transform, clip_mask);
             }
             #[cfg(feature = "svg")]
             Primitive::Svg {
@@ -311,12 +309,21 @@ impl Backend {
                 bounds,
                 color,
             } => {
+                let physical_bounds = (*bounds + translation) * scale_factor;
+
+                if !clip_bounds.intersects(&physical_bounds) {
+                    return;
+                }
+
+                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
+                    .then_some(clip_mask as &_);
+
                 self.vector_pipeline.draw(
                     handle,
                     *color,
                     (*bounds + translation) * scale_factor,
                     pixels,
-                    clip_bounds.map(|_| clip_mask as &_),
+                    clip_mask,
                 );
             }
             Primitive::Fill {
@@ -340,7 +347,7 @@ impl Backend {
                 }
 
                 let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then(|| clip_mask as &_);
+                    .then_some(clip_mask as &_);
 
                 pixels.fill_path(
                     path,
@@ -373,7 +380,7 @@ impl Backend {
                 }
 
                 let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then(|| clip_mask as &_);
+                    .then_some(clip_mask as &_);
 
                 pixels.stroke_path(
                     path,

From 4ede482ab5ff6364237f5f4626784075045d5dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 18:41:40 +0200
Subject: [PATCH 117/163] Present new frame only when damaged in
 `iced_tiny_skia`

---
 tiny_skia/src/backend.rs           |  6 ++++--
 tiny_skia/src/window/compositor.rs | 14 ++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 8bc2321ce9..0b534bba2e 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -50,7 +50,7 @@ impl Backend {
         viewport: &Viewport,
         background_color: Color,
         overlay: &[T],
-    ) {
+    ) -> bool {
         let physical_size = viewport.physical_size();
 
         let damage = if self.last_background_color == background_color
@@ -62,7 +62,7 @@ impl Backend {
         };
 
         if damage.is_empty() {
-            return;
+            return false;
         }
 
         self.last_primitives = primitives.to_vec();
@@ -179,6 +179,8 @@ impl Backend {
 
         #[cfg(feature = "svg")]
         self.vector_pipeline.trim_cache();
+
+        true
     }
 
     fn draw_primitive(
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index cea1cabfb4..6e4bb6efa8 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -106,7 +106,7 @@ pub fn present<Theme, T: AsRef<str>>(
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
 
-    backend.draw(
+    let drawn = backend.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
             bytemuck::cast_slice_mut(&mut surface.buffer),
             physical_size.width,
@@ -120,11 +120,13 @@ pub fn present<Theme, T: AsRef<str>>(
         overlay,
     );
 
-    surface.window.set_buffer(
-        &surface.buffer,
-        physical_size.width as u16,
-        physical_size.height as u16,
-    );
+    if drawn {
+        surface.window.set_buffer(
+            &surface.buffer,
+            physical_size.width as u16,
+            physical_size.height as u16,
+        );
+    }
 
     Ok(())
 }

From e134a82f4ca67346fc9095a0d488122737cfb0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 18:42:27 +0200
Subject: [PATCH 118/163] Switch debug mode to fade old primitives and display
 damage in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 97 +++++++++++++++++++++++++---------------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 0b534bba2e..974faa7480 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -74,7 +74,30 @@ impl Backend {
         let damage = group_damage(damage, scale_factor, physical_size);
 
         if !overlay.is_empty() {
-            pixels.fill(into_color(background_color));
+            let path = tiny_skia::PathBuilder::from_rect(
+                tiny_skia::Rect::from_xywh(
+                    0.0,
+                    0.0,
+                    physical_size.width as f32,
+                    physical_size.height as f32,
+                )
+                .expect("Create damage rectangle"),
+            );
+
+            pixels.fill_path(
+                &path,
+                &tiny_skia::Paint {
+                    shader: tiny_skia::Shader::SolidColor(into_color(Color {
+                        a: 0.1,
+                        ..background_color
+                    })),
+                    anti_alias: false,
+                    ..Default::default()
+                },
+                tiny_skia::FillRule::default(),
+                tiny_skia::Transform::identity(),
+                None,
+            );
         }
 
         for region in damage {
@@ -135,42 +158,42 @@ impl Backend {
             }
         }
 
-        if !overlay.is_empty() {
-            let bounds = Rectangle {
-                x: 0.0,
-                y: 0.0,
-                width: viewport.physical_width() as f32,
-                height: viewport.physical_height() as f32,
-            };
-
-            adjust_clip_mask(clip_mask, pixels, bounds);
-
-            for (i, text) in overlay.iter().enumerate() {
-                const OVERLAY_TEXT_SIZE: f32 = 20.0;
-
-                self.draw_primitive(
-                    &Primitive::Text {
-                        content: text.as_ref().to_owned(),
-                        size: OVERLAY_TEXT_SIZE,
-                        bounds: Rectangle {
-                            x: 10.0,
-                            y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
-                            width: bounds.width - 1.0,
-                            height: bounds.height - 1.0,
-                        },
-                        color: Color::BLACK,
-                        font: Font::MONOSPACE,
-                        horizontal_alignment: alignment::Horizontal::Left,
-                        vertical_alignment: alignment::Vertical::Top,
-                    },
-                    pixels,
-                    clip_mask,
-                    bounds,
-                    scale_factor,
-                    Vector::ZERO,
-                );
-            }
-        }
+        //if !overlay.is_empty() {
+        //    let bounds = Rectangle {
+        //        x: 0.0,
+        //        y: 0.0,
+        //        width: viewport.physical_width() as f32,
+        //        height: viewport.physical_height() as f32,
+        //    };
+
+        //    adjust_clip_mask(clip_mask, pixels, bounds);
+
+        //    for (i, text) in overlay.iter().enumerate() {
+        //        const OVERLAY_TEXT_SIZE: f32 = 20.0;
+
+        //        self.draw_primitive(
+        //            &Primitive::Text {
+        //                content: text.as_ref().to_owned(),
+        //                size: OVERLAY_TEXT_SIZE,
+        //                bounds: Rectangle {
+        //                    x: 10.0,
+        //                    y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
+        //                    width: bounds.width - 1.0,
+        //                    height: bounds.height - 1.0,
+        //                },
+        //                color: Color::BLACK,
+        //                font: Font::MONOSPACE,
+        //                horizontal_alignment: alignment::Horizontal::Left,
+        //                vertical_alignment: alignment::Vertical::Top,
+        //            },
+        //            pixels,
+        //            clip_mask,
+        //            bounds,
+        //            scale_factor,
+        //            Vector::ZERO,
+        //        );
+        //    }
+        //}
 
         self.text_pipeline.trim_cache();
 

From 92d61e5c592818745abbab245a82cb14b262ae67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 19:23:48 +0200
Subject: [PATCH 119/163] Use `softbuffer` fork with owned pixel buffer

---
 tiny_skia/Cargo.toml               |  5 +++-
 tiny_skia/src/window/compositor.rs | 42 ++++++++++++++++++------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 349f690335..db590fc248 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -10,7 +10,6 @@ geometry = ["iced_graphics/geometry"]
 
 [dependencies]
 raw-window-handle = "0.5"
-softbuffer = "0.2"
 tiny-skia = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
@@ -22,6 +21,10 @@ version = "0.7"
 path = "../graphics"
 features = ["tiny-skia"]
 
+[dependencies.softbuffer]
+git = "https://github.com/rust-windowing/softbuffer"
+rev = "872c66a4c05fd7cb6cb133154f75fdce45a175a6"
+
 [dependencies.cosmic-text]
 features = ["std", "swash"]
 git = "https://github.com/pop-os/cosmic-text"
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 6e4bb6efa8..5b1e56a4c5 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -5,6 +5,7 @@ use crate::{Backend, Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
+use std::num::NonZeroU32;
 
 pub struct Compositor<Theme> {
     clip_mask: tiny_skia::ClipMask,
@@ -12,8 +13,7 @@ pub struct Compositor<Theme> {
 }
 
 pub struct Surface {
-    window: softbuffer::GraphicsContext,
-    buffer: Vec<u32>,
+    window: softbuffer::Surface,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -36,14 +36,20 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) -> Surface {
-        let window =
-            unsafe { softbuffer::GraphicsContext::new(window, window) }
-                .expect("Create softbuffer for window");
+        let platform = unsafe { softbuffer::Context::new(window) }
+            .expect("Create softbuffer context");
 
-        Surface {
-            window,
-            buffer: vec![0; width as usize * height as usize],
-        }
+        let mut window = unsafe { softbuffer::Surface::new(&platform, window) }
+            .expect("Create softbuffer surface");
+
+        window
+            .resize(
+                NonZeroU32::new(width).unwrap(),
+                NonZeroU32::new(height).unwrap(),
+            )
+            .expect("Resize surface");
+
+        Surface { window }
     }
 
     fn configure_surface(
@@ -52,7 +58,13 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) {
-        surface.buffer.resize((width * height) as usize, 0);
+        surface
+            .window
+            .resize(
+                NonZeroU32::new(width).unwrap(),
+                NonZeroU32::new(height).unwrap(),
+            )
+            .expect("Resize surface");
     }
 
     fn fetch_information(&self) -> Information {
@@ -106,9 +118,11 @@ pub fn present<Theme, T: AsRef<str>>(
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
 
+    let mut buffer = surface.window.buffer_mut().expect("Get window buffer");
+
     let drawn = backend.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
-            bytemuck::cast_slice_mut(&mut surface.buffer),
+            bytemuck::cast_slice_mut(&mut buffer),
             physical_size.width,
             physical_size.height,
         )
@@ -121,11 +135,7 @@ pub fn present<Theme, T: AsRef<str>>(
     );
 
     if drawn {
-        surface.window.set_buffer(
-            &surface.buffer,
-            physical_size.width as u16,
-            physical_size.height as u16,
-        );
+        let _ = buffer.present();
     }
 
     Ok(())

From 940a47eafd098dce3567a95c38dc8697b0fc7115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 5 Apr 2023 19:30:07 +0200
Subject: [PATCH 120/163] Revert "Use `softbuffer` fork with owned pixel
 buffer"

This reverts commit 92d61e5c592818745abbab245a82cb14b262ae67.

The owned pixel buffer zeroes the data in some platforms. `softbuffer`
will need some first-class support for damage regions.
---
 tiny_skia/Cargo.toml               |  5 +---
 tiny_skia/src/window/compositor.rs | 42 ++++++++++++------------------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index db590fc248..349f690335 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -10,6 +10,7 @@ geometry = ["iced_graphics/geometry"]
 
 [dependencies]
 raw-window-handle = "0.5"
+softbuffer = "0.2"
 tiny-skia = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
@@ -21,10 +22,6 @@ version = "0.7"
 path = "../graphics"
 features = ["tiny-skia"]
 
-[dependencies.softbuffer]
-git = "https://github.com/rust-windowing/softbuffer"
-rev = "872c66a4c05fd7cb6cb133154f75fdce45a175a6"
-
 [dependencies.cosmic-text]
 features = ["std", "swash"]
 git = "https://github.com/pop-os/cosmic-text"
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 5b1e56a4c5..6e4bb6efa8 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -5,7 +5,6 @@ use crate::{Backend, Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
-use std::num::NonZeroU32;
 
 pub struct Compositor<Theme> {
     clip_mask: tiny_skia::ClipMask,
@@ -13,7 +12,8 @@ pub struct Compositor<Theme> {
 }
 
 pub struct Surface {
-    window: softbuffer::Surface,
+    window: softbuffer::GraphicsContext,
+    buffer: Vec<u32>,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -36,20 +36,14 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) -> Surface {
-        let platform = unsafe { softbuffer::Context::new(window) }
-            .expect("Create softbuffer context");
+        let window =
+            unsafe { softbuffer::GraphicsContext::new(window, window) }
+                .expect("Create softbuffer for window");
 
-        let mut window = unsafe { softbuffer::Surface::new(&platform, window) }
-            .expect("Create softbuffer surface");
-
-        window
-            .resize(
-                NonZeroU32::new(width).unwrap(),
-                NonZeroU32::new(height).unwrap(),
-            )
-            .expect("Resize surface");
-
-        Surface { window }
+        Surface {
+            window,
+            buffer: vec![0; width as usize * height as usize],
+        }
     }
 
     fn configure_surface(
@@ -58,13 +52,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) {
-        surface
-            .window
-            .resize(
-                NonZeroU32::new(width).unwrap(),
-                NonZeroU32::new(height).unwrap(),
-            )
-            .expect("Resize surface");
+        surface.buffer.resize((width * height) as usize, 0);
     }
 
     fn fetch_information(&self) -> Information {
@@ -118,11 +106,9 @@ pub fn present<Theme, T: AsRef<str>>(
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
 
-    let mut buffer = surface.window.buffer_mut().expect("Get window buffer");
-
     let drawn = backend.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
-            bytemuck::cast_slice_mut(&mut buffer),
+            bytemuck::cast_slice_mut(&mut surface.buffer),
             physical_size.width,
             physical_size.height,
         )
@@ -135,7 +121,11 @@ pub fn present<Theme, T: AsRef<str>>(
     );
 
     if drawn {
-        let _ = buffer.present();
+        surface.window.set_buffer(
+            &surface.buffer,
+            physical_size.width as u16,
+            physical_size.height as u16,
+        );
     }
 
     Ok(())

From c0431aedd3bbef4161456f2fa5f29866e8f17fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 04:47:05 +0200
Subject: [PATCH 121/163] Update `wgpu` and `cosmic-text`

---
 examples/integration/src/main.rs | 27 +++++++++++++++------------
 tiny_skia/Cargo.toml             |  6 +-----
 tiny_skia/src/text.rs            |  9 +--------
 wgpu/Cargo.toml                  |  4 ++--
 wgpu/src/image/atlas.rs          |  2 ++
 wgpu/src/text.rs                 | 17 +++++++----------
 wgpu/src/triangle/msaa.rs        |  2 ++
 wgpu/src/window/compositor.rs    | 13 +++++++++----
 8 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 9707eda78a..949a726afd 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -26,18 +26,16 @@ use web_sys::HtmlCanvasElement;
 #[cfg(target_arch = "wasm32")]
 use winit::platform::web::WindowBuilderExtWebSys;
 
-pub fn main() {
+pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(target_arch = "wasm32")]
     let canvas_element = {
-        console_log::init_with_level(log::Level::Debug)
-            .expect("could not initialize logger");
+        console_log::init_with_level(log::Level::Debug)?;
         std::panic::set_hook(Box::new(console_error_panic_hook::hook));
 
         web_sys::window()
             .and_then(|win| win.document())
             .and_then(|doc| doc.get_element_by_id("iced_canvas"))
-            .and_then(|element| element.dyn_into::<HtmlCanvasElement>().ok())
-            .expect("Canvas with id `iced_canvas` is missing")
+            .and_then(|element| element.dyn_into::<HtmlCanvasElement>().ok())?
     };
     #[cfg(not(target_arch = "wasm32"))]
     env_logger::init();
@@ -48,8 +46,7 @@ pub fn main() {
     #[cfg(target_arch = "wasm32")]
     let window = winit::window::WindowBuilder::new()
         .with_canvas(Some(canvas_element))
-        .build(&event_loop)
-        .expect("Failed to build winit window");
+        .build(&event_loop)?;
 
     #[cfg(not(target_arch = "wasm32"))]
     let window = winit::window::Window::new(&event_loop).unwrap();
@@ -73,8 +70,11 @@ pub fn main() {
     let backend =
         wgpu::util::backend_bits_from_env().unwrap_or(default_backend);
 
-    let instance = wgpu::Instance::new(backend);
-    let surface = unsafe { instance.create_surface(&window) };
+    let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+        backends: backend,
+        ..Default::default()
+    });
+    let surface = unsafe { instance.create_surface(&window) }?;
 
     let (format, (device, queue)) =
         futures::futures::executor::block_on(async {
@@ -84,7 +84,7 @@ pub fn main() {
                 Some(&surface),
             )
             .await
-            .expect("No suitable GPU adapters found on the system!");
+            .expect("Create adapter");
 
             let adapter_features = adapter.features();
 
@@ -97,7 +97,8 @@ pub fn main() {
 
             (
                 surface
-                    .get_supported_formats(&adapter)
+                    .get_capabilities(&adapter)
+                    .formats
                     .first()
                     .copied()
                     .expect("Get preferred format"),
@@ -125,6 +126,7 @@ pub fn main() {
             height: physical_size.height,
             present_mode: wgpu::PresentMode::AutoVsync,
             alpha_mode: wgpu::CompositeAlphaMode::Auto,
+            view_formats: vec![],
         },
     );
 
@@ -220,7 +222,8 @@ pub fn main() {
                             width: size.width,
                             height: size.height,
                             present_mode: wgpu::PresentMode::AutoVsync,
-                            alpha_mode: wgpu::CompositeAlphaMode::Auto
+                            alpha_mode: wgpu::CompositeAlphaMode::Auto,
+                            view_formats: vec![],
                         },
                     );
 
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 349f690335..7a5f5b1741 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry"]
 raw-window-handle = "0.5"
 softbuffer = "0.2"
 tiny-skia = "0.8"
+cosmic-text = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
 kurbo = "0.9"
@@ -22,11 +23,6 @@ version = "0.7"
 path = "../graphics"
 features = ["tiny-skia"]
 
-[dependencies.cosmic-text]
-features = ["std", "swash"]
-git = "https://github.com/pop-os/cosmic-text"
-rev = "e788c175ec31094b04dcacbc0537dba4433afcfc"
-
 [dependencies.twox-hash]
 version = "1.6"
 default-features = false
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 865132b462..e0e893bd7a 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -385,14 +385,7 @@ impl Cache {
                 cosmic_text::Attrs::new()
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
-                    .stretch(to_stretch(key.font.stretch))
-                    .monospaced(
-                        key.font.monospaced
-                            || matches!(
-                                key.font.family,
-                                font::Family::Monospace
-                            ),
-                    ),
+                    .stretch(to_stretch(key.font.stretch)),
             );
 
             let _ = entry.insert(buffer);
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 3aef4ff4de..36c891bb9e 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -13,7 +13,7 @@ image = ["iced_graphics/image"]
 svg = ["resvg"]
 
 [dependencies]
-wgpu = "0.14"
+wgpu = "0.15"
 raw-window-handle = "0.5"
 log = "0.4"
 guillotiere = "0.6"
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "47050174841a4f58fc8d85c943a2117f72f19e8e"
+rev = "6601deec1c7595f8fd5f83f929b2497104905400"
 
 [dependencies.encase]
 version = "0.3.0"
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index c00b8cef34..39b6e5d203 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -41,6 +41,7 @@ impl Atlas {
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
+            view_formats: &[],
         });
 
         let texture_view = texture.create_view(&wgpu::TextureViewDescriptor {
@@ -338,6 +339,7 @@ impl Atlas {
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
+            view_formats: &[],
         });
 
         let amount_to_copy = self.layers.len() - amount;
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index dd67427997..f01e0b4233 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -58,8 +58,12 @@ impl Pipeline {
         target_size: Size<u32>,
     ) -> bool {
         if self.renderers.len() <= self.prepare_layer {
-            self.renderers
-                .push(glyphon::TextRenderer::new(device, queue));
+            self.renderers.push(glyphon::TextRenderer::new(
+                &mut self.atlas,
+                device,
+                Default::default(),
+                None,
+            ));
         }
 
         let font_system = self.font_system.get_mut();
@@ -359,14 +363,7 @@ impl Cache {
                 glyphon::Attrs::new()
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
-                    .stretch(to_stretch(key.font.stretch))
-                    .monospaced(
-                        key.font.monospaced
-                            || matches!(
-                                key.font.family,
-                                font::Family::Monospace
-                            ),
-                    ),
+                    .stretch(to_stretch(key.font.stretch)),
             );
 
             let _ = entry.insert(buffer);
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 7144125c69..14522c89fe 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -223,6 +223,7 @@ impl Targets {
             dimension: wgpu::TextureDimension::D2,
             format,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
+            view_formats: &[],
         });
 
         let resolve = device.create_texture(&wgpu::TextureDescriptor {
@@ -234,6 +235,7 @@ impl Targets {
             format,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT
                 | wgpu::TextureUsages::TEXTURE_BINDING,
+            view_formats: &[],
         });
 
         let attachment =
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index a67ac3c044..025cd43a3d 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -31,7 +31,10 @@ impl<Theme> Compositor<Theme> {
         settings: Settings,
         compatible_window: Option<&W>,
     ) -> Option<Self> {
-        let instance = wgpu::Instance::new(settings.internal_backend);
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+            backends: settings.internal_backend,
+            ..Default::default()
+        });
 
         log::info!("{:#?}", settings);
 
@@ -46,7 +49,7 @@ impl<Theme> Compositor<Theme> {
 
         #[allow(unsafe_code)]
         let compatible_surface = compatible_window
-            .map(|window| unsafe { instance.create_surface(window) });
+            .and_then(|window| unsafe { instance.create_surface(window).ok() });
 
         let adapter = instance
             .request_adapter(&wgpu::RequestAdapterOptions {
@@ -63,7 +66,7 @@ impl<Theme> Compositor<Theme> {
         log::info!("Selected: {:#?}", adapter.get_info());
 
         let format = compatible_surface.as_ref().and_then(|surface| {
-            surface.get_supported_formats(&adapter).first().copied()
+            surface.get_capabilities(&adapter).formats.first().copied()
         })?;
 
         log::info!("Selected format: {:?}", format);
@@ -207,7 +210,8 @@ impl<Theme> graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) -> wgpu::Surface {
         #[allow(unsafe_code)]
-        let mut surface = unsafe { self.instance.create_surface(window) };
+        let mut surface = unsafe { self.instance.create_surface(window) }
+            .expect("Create surface");
 
         self.configure_surface(&mut surface, width, height);
 
@@ -229,6 +233,7 @@ impl<Theme> graphics::Compositor for Compositor<Theme> {
                 width,
                 height,
                 alpha_mode: wgpu::CompositeAlphaMode::Auto,
+                view_formats: vec![],
             },
         );
     }

From 16e6efe020e75d51958875fa198196534679af8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 05:58:27 +0200
Subject: [PATCH 122/163] Use `pixels` for presentation in `iced_tiny_skia`
 when possible

---
 tiny_skia/Cargo.toml               |  6 +++
 tiny_skia/src/window/compositor.rs | 76 +++++++++++++++++++++++++-----
 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 7a5f5b1741..731e06dea5 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -4,6 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
+default = ["gpu"]
+gpu = ["pixels"]
 image = ["iced_graphics/image"]
 svg = ["resvg"]
 geometry = ["iced_graphics/geometry"]
@@ -31,6 +33,10 @@ default-features = false
 version = "1.6.1"
 features = ["std"]
 
+[dependencies.pixels]
+version = "0.12"
+optional = true
+
 [dependencies.resvg]
 version = "0.29"
 optional = true
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 6e4bb6efa8..5a0097dff5 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -11,9 +11,13 @@ pub struct Compositor<Theme> {
     _theme: PhantomData<Theme>,
 }
 
-pub struct Surface {
-    window: softbuffer::GraphicsContext,
-    buffer: Vec<u32>,
+pub enum Surface {
+    Cpu {
+        window: softbuffer::GraphicsContext,
+        buffer: Vec<u32>,
+    },
+    #[cfg(feature = "gpu")]
+    Gpu { pixels: pixels::Pixels },
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -36,11 +40,29 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) -> Surface {
+        #[cfg(feature = "gpu")]
+        {
+            let surface_texture =
+                pixels::SurfaceTexture::new(width, height, window);
+
+            if let Ok(pixels) =
+                pixels::PixelsBuilder::new(width, height, surface_texture)
+                    .texture_format(pixels::wgpu::TextureFormat::Bgra8UnormSrgb)
+                    .build()
+            {
+                log::info!("GPU surface created");
+
+                return Surface::Gpu { pixels };
+            }
+        }
+
         let window =
             unsafe { softbuffer::GraphicsContext::new(window, window) }
                 .expect("Create softbuffer for window");
 
-        Surface {
+        log::info!("CPU surface created");
+
+        Surface::Cpu {
             window,
             buffer: vec![0; width as usize * height as usize],
         }
@@ -52,7 +74,19 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) {
-        surface.buffer.resize((width * height) as usize, 0);
+        match surface {
+            Surface::Cpu { buffer, .. } => {
+                buffer.resize((width * height) as usize, 0);
+            }
+            #[cfg(feature = "gpu")]
+            Surface::Gpu { pixels } => {
+                pixels
+                    .resize_surface(width, height)
+                    .expect("Resize surface");
+
+                pixels.resize_buffer(width, height).expect("Resize buffer");
+            }
+        }
     }
 
     fn fetch_information(&self) -> Information {
@@ -106,9 +140,15 @@ pub fn present<Theme, T: AsRef<str>>(
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
 
+    let buffer = match surface {
+        Surface::Cpu { buffer, .. } => bytemuck::cast_slice_mut(buffer),
+        #[cfg(feature = "gpu")]
+        Surface::Gpu { pixels } => pixels.frame_mut(),
+    };
+
     let drawn = backend.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
-            bytemuck::cast_slice_mut(&mut surface.buffer),
+            buffer,
             physical_size.width,
             physical_size.height,
         )
@@ -121,12 +161,22 @@ pub fn present<Theme, T: AsRef<str>>(
     );
 
     if drawn {
-        surface.window.set_buffer(
-            &surface.buffer,
-            physical_size.width as u16,
-            physical_size.height as u16,
-        );
+        match surface {
+            Surface::Cpu { window, buffer } => {
+                window.set_buffer(
+                    buffer,
+                    physical_size.width as u16,
+                    physical_size.height as u16,
+                );
+
+                Ok(())
+            }
+            #[cfg(feature = "gpu")]
+            Surface::Gpu { pixels } => {
+                pixels.render().map_err(|_| compositor::SurfaceError::Lost)
+            }
+        }
+    } else {
+        Ok(())
     }
-
-    Ok(())
 }

From 1872f7fa6d7b9ca9fa0db8d14bf44dcd3513ffca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 06:14:25 +0200
Subject: [PATCH 123/163] Use `*_from_env` helpers from `wgpu` in `iced_wgpu`

---
 wgpu/src/settings.rs          | 17 +----------------
 wgpu/src/window/compositor.rs | 11 ++++++-----
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index ff041bdff8..266a2c87fc 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -46,7 +46,7 @@ impl Settings {
     ///     - `primary`
     pub fn from_env() -> Self {
         Settings {
-            internal_backend: backend_from_env()
+            internal_backend: wgpu::util::backend_bits_from_env()
                 .unwrap_or(wgpu::Backends::all()),
             ..Self::default()
         }
@@ -64,18 +64,3 @@ impl Default for Settings {
         }
     }
 }
-
-fn backend_from_env() -> Option<wgpu::Backends> {
-    std::env::var("WGPU_BACKEND").ok().map(|backend| {
-        match backend.to_lowercase().as_str() {
-            "vulkan" => wgpu::Backends::VULKAN,
-            "metal" => wgpu::Backends::METAL,
-            "dx12" => wgpu::Backends::DX12,
-            "dx11" => wgpu::Backends::DX11,
-            "gl" => wgpu::Backends::GL,
-            "webgpu" => wgpu::Backends::BROWSER_WEBGPU,
-            "primary" => wgpu::Backends::PRIMARY,
-            other => panic!("Unknown backend: {other}"),
-        }
-    })
-}
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 025cd43a3d..15bef60c45 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -53,11 +53,12 @@ impl<Theme> Compositor<Theme> {
 
         let adapter = instance
             .request_adapter(&wgpu::RequestAdapterOptions {
-                power_preference: if settings.antialiasing.is_none() {
-                    wgpu::PowerPreference::LowPower
-                } else {
-                    wgpu::PowerPreference::HighPerformance
-                },
+                power_preference: wgpu::util::power_preference_from_env()
+                    .unwrap_or(if settings.antialiasing.is_none() {
+                        wgpu::PowerPreference::LowPower
+                    } else {
+                        wgpu::PowerPreference::HighPerformance
+                    }),
                 compatible_surface: compatible_surface.as_ref(),
                 force_fallback_adapter: false,
             })

From 42b2e9b007d49506c98d0242b8b061df3aa4228b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 06:44:46 +0200
Subject: [PATCH 124/163] Support `ICED_BACKEND` environment variable

---
 renderer/src/compositor.rs | 127 ++++++++++++++++++++++++-------------
 1 file changed, 84 insertions(+), 43 deletions(-)

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 218e7e332e..1ce13c7d0f 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -4,6 +4,7 @@ use crate::graphics::{Error, Viewport};
 use crate::{Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
+use std::env;
 
 pub enum Compositor<Theme> {
     #[cfg(feature = "wgpu")]
@@ -28,53 +29,13 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         settings: Self::Settings,
         compatible_window: Option<&W>,
     ) -> Result<(Self, Self::Renderer), Error> {
-        #[cfg(feature = "wgpu")]
-        let new_wgpu = |settings: Self::Settings, compatible_window| {
-            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(crate::Backend::Wgpu(backend)),
-            ))
-        };
-
-        #[cfg(feature = "tiny-skia")]
-        let new_tiny_skia = |settings: Self::Settings, _compatible_window| {
-            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,
-                },
-            );
-
-            Ok((
-                Self::TinySkia(compositor),
-                Renderer::new(crate::Backend::TinySkia(backend)),
-            ))
-        };
-
-        let fail = |_, _| Err(Error::GraphicsAdapterNotFound);
-
-        let candidates = &[
-            #[cfg(feature = "wgpu")]
-            new_wgpu,
-            #[cfg(feature = "tiny-skia")]
-            new_tiny_skia,
-            fail,
-        ];
+        let candidates =
+            Candidate::list_from_env().unwrap_or(Candidate::default_list());
 
         let mut error = Error::GraphicsAdapterNotFound;
 
         for candidate in candidates {
-            match candidate(settings, compatible_window) {
+            match candidate.build(settings, compatible_window) {
                 Ok((compositor, renderer)) => {
                     return Ok((compositor, renderer))
                 }
@@ -183,3 +144,83 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         })
     }
 }
+
+enum Candidate {
+    Wgpu,
+    TinySkia,
+}
+
+impl Candidate {
+    fn default_list() -> Vec<Self> {
+        vec![
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu,
+            #[cfg(feature = "tiny-skia")]
+            Self::TinySkia,
+        ]
+    }
+
+    fn list_from_env() -> Option<Vec<Self>> {
+        let backends = env::var("ICED_BACKEND").ok()?;
+
+        Some(
+            backends
+                .split(',')
+                .map(str::trim)
+                .map(|backend| match backend {
+                    "wgpu" => Self::Wgpu,
+                    "tiny-skia" => Self::TinySkia,
+                    _ => panic!("unknown backend value: \"{backend}\""),
+                })
+                .collect(),
+        )
+    }
+
+    fn build<Theme, W: HasRawWindowHandle + HasRawDisplayHandle>(
+        self,
+        settings: Settings,
+        compatible_window: Option<&W>,
+    ) -> Result<(Compositor<Theme>, Renderer<Theme>), Error> {
+        match self {
+            Self::Wgpu => {
+                if cfg!(feature = "wgpu") {
+                    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,
+                        )?;
+
+                    return Ok((
+                        Compositor::Wgpu(compositor),
+                        Renderer::new(crate::Backend::Wgpu(backend)),
+                    ));
+                } else {
+                    panic!("`wgpu` feature was not enabled in `iced_renderer`");
+                }
+            }
+            Self::TinySkia => {
+                if cfg!(feature = "tiny-skia") {
+                    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,
+                            },
+                        );
+
+                    Ok((
+                        Compositor::TinySkia(compositor),
+                        Renderer::new(crate::Backend::TinySkia(backend)),
+                    ))
+                } else {
+                    panic!("`wgpu` feature was not enabled in `iced_renderer`");
+                }
+            }
+        }
+    }
+}

From c2249d2506585abac0f056c619a6dca1b05e8c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 06:45:44 +0200
Subject: [PATCH 125/163] Fix copy-pasted panic description in `iced_renderer`

---
 renderer/src/compositor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 1ce13c7d0f..484d91eb12 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -218,7 +218,7 @@ impl Candidate {
                         Renderer::new(crate::Backend::TinySkia(backend)),
                     ))
                 } else {
-                    panic!("`wgpu` feature was not enabled in `iced_renderer`");
+                    panic!("`tiny-skia` feature was not enabled in `iced_renderer`");
                 }
             }
         }

From ba07abe5c8d3f6fb175e13f5cd10f74ee8ab460c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 07:08:03 +0200
Subject: [PATCH 126/163] Expand bounds of `Text` primitives a bit further

---
 graphics/src/primitive.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 01546dcb78..7f2c8ae2b1 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -174,7 +174,7 @@ impl Primitive {
                     alignment::Vertical::Bottom => bounds.y - bounds.height,
                 };
 
-                bounds.expand(1.0)
+                bounds.expand(1.5)
             }
             Self::Quad { bounds, .. }
             | Self::Image { bounds, .. }

From d206b82ebb7617337cd378bd19542a7abf8a4529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sat, 8 Apr 2023 07:35:16 +0200
Subject: [PATCH 127/163] Update `glyphon`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 36c891bb9e..c1f23246e3 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "6601deec1c7595f8fd5f83f929b2497104905400"
+rev = "1d26d92b19407c5dabe4625944d4a6babbbf0715"
 
 [dependencies.encase]
 version = "0.3.0"

From e3730106e9d4f75de199e1b83cf285b8ff031968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 17 Apr 2023 23:44:26 +0200
Subject: [PATCH 128/163] Update `glyphon` to latest `dev`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 4559040e8a..14dcd55074 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "6601deec1c7595f8fd5f83f929b2497104905400"
+rev = "1d26d92b19407c5dabe4625944d4a6babbbf0715"
 
 [dependencies.encase]
 version = "0.3.0"

From 435b54e57ecdaf08b1f36626f0000438895c909d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:09:36 +0200
Subject: [PATCH 129/163] Revert "Use `pixels` for presentation in
 `iced_tiny_skia` when possible"

This reverts commit 16e6efe020e75d51958875fa198196534679af8d.
---
 tiny_skia/Cargo.toml               |  6 ---
 tiny_skia/src/window/compositor.rs | 76 +++++-------------------------
 2 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index a8342e5fd0..f629dab934 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["gpu"]
-gpu = ["pixels"]
 image = ["iced_graphics/image"]
 svg = ["resvg"]
 geometry = ["iced_graphics/geometry"]
@@ -33,10 +31,6 @@ default-features = false
 version = "1.6.1"
 features = ["std"]
 
-[dependencies.pixels]
-version = "0.12"
-optional = true
-
 [dependencies.resvg]
 version = "0.29"
 optional = true
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 5a0097dff5..6e4bb6efa8 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -11,13 +11,9 @@ pub struct Compositor<Theme> {
     _theme: PhantomData<Theme>,
 }
 
-pub enum Surface {
-    Cpu {
-        window: softbuffer::GraphicsContext,
-        buffer: Vec<u32>,
-    },
-    #[cfg(feature = "gpu")]
-    Gpu { pixels: pixels::Pixels },
+pub struct Surface {
+    window: softbuffer::GraphicsContext,
+    buffer: Vec<u32>,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -40,29 +36,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) -> Surface {
-        #[cfg(feature = "gpu")]
-        {
-            let surface_texture =
-                pixels::SurfaceTexture::new(width, height, window);
-
-            if let Ok(pixels) =
-                pixels::PixelsBuilder::new(width, height, surface_texture)
-                    .texture_format(pixels::wgpu::TextureFormat::Bgra8UnormSrgb)
-                    .build()
-            {
-                log::info!("GPU surface created");
-
-                return Surface::Gpu { pixels };
-            }
-        }
-
         let window =
             unsafe { softbuffer::GraphicsContext::new(window, window) }
                 .expect("Create softbuffer for window");
 
-        log::info!("CPU surface created");
-
-        Surface::Cpu {
+        Surface {
             window,
             buffer: vec![0; width as usize * height as usize],
         }
@@ -74,19 +52,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         width: u32,
         height: u32,
     ) {
-        match surface {
-            Surface::Cpu { buffer, .. } => {
-                buffer.resize((width * height) as usize, 0);
-            }
-            #[cfg(feature = "gpu")]
-            Surface::Gpu { pixels } => {
-                pixels
-                    .resize_surface(width, height)
-                    .expect("Resize surface");
-
-                pixels.resize_buffer(width, height).expect("Resize buffer");
-            }
-        }
+        surface.buffer.resize((width * height) as usize, 0);
     }
 
     fn fetch_information(&self) -> Information {
@@ -140,15 +106,9 @@ pub fn present<Theme, T: AsRef<str>>(
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
 
-    let buffer = match surface {
-        Surface::Cpu { buffer, .. } => bytemuck::cast_slice_mut(buffer),
-        #[cfg(feature = "gpu")]
-        Surface::Gpu { pixels } => pixels.frame_mut(),
-    };
-
     let drawn = backend.draw(
         &mut tiny_skia::PixmapMut::from_bytes(
-            buffer,
+            bytemuck::cast_slice_mut(&mut surface.buffer),
             physical_size.width,
             physical_size.height,
         )
@@ -161,22 +121,12 @@ pub fn present<Theme, T: AsRef<str>>(
     );
 
     if drawn {
-        match surface {
-            Surface::Cpu { window, buffer } => {
-                window.set_buffer(
-                    buffer,
-                    physical_size.width as u16,
-                    physical_size.height as u16,
-                );
-
-                Ok(())
-            }
-            #[cfg(feature = "gpu")]
-            Surface::Gpu { pixels } => {
-                pixels.render().map_err(|_| compositor::SurfaceError::Lost)
-            }
-        }
-    } else {
-        Ok(())
+        surface.window.set_buffer(
+            &surface.buffer,
+            physical_size.width as u16,
+            physical_size.height as u16,
+        );
     }
+
+    Ok(())
 }

From d6345ff122e98fe716980301b2b0ea7342ad85d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:11:35 +0200
Subject: [PATCH 130/163] Remove `dbg!` statement leftover

---
 runtime/src/debug/basic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/src/debug/basic.rs b/runtime/src/debug/basic.rs
index e9be4c84d7..32f725a1d6 100644
--- a/runtime/src/debug/basic.rs
+++ b/runtime/src/debug/basic.rs
@@ -129,7 +129,7 @@ impl Debug {
 
     pub fn render_finished(&mut self) {
         self.render_durations
-            .push(dbg!(time::Instant::now() - self.render_start));
+            .push(time::Instant::now() - self.render_start);
     }
 
     pub fn log_message<Message: std::fmt::Debug>(&mut self, message: &Message) {

From f0fa5f76cb0b0e451b3fc86b1678403c103867e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:15:53 +0200
Subject: [PATCH 131/163] Remove `debug` overlay from `iced_tiny_skia` for now

---
 tiny_skia/src/backend.rs | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 974faa7480..756e46b390 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,4 +1,3 @@
-use crate::core::alignment;
 use crate::core::text;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::backend;
@@ -158,43 +157,6 @@ impl Backend {
             }
         }
 
-        //if !overlay.is_empty() {
-        //    let bounds = Rectangle {
-        //        x: 0.0,
-        //        y: 0.0,
-        //        width: viewport.physical_width() as f32,
-        //        height: viewport.physical_height() as f32,
-        //    };
-
-        //    adjust_clip_mask(clip_mask, pixels, bounds);
-
-        //    for (i, text) in overlay.iter().enumerate() {
-        //        const OVERLAY_TEXT_SIZE: f32 = 20.0;
-
-        //        self.draw_primitive(
-        //            &Primitive::Text {
-        //                content: text.as_ref().to_owned(),
-        //                size: OVERLAY_TEXT_SIZE,
-        //                bounds: Rectangle {
-        //                    x: 10.0,
-        //                    y: 10.0 + i as f32 * OVERLAY_TEXT_SIZE * 1.2,
-        //                    width: bounds.width - 1.0,
-        //                    height: bounds.height - 1.0,
-        //                },
-        //                color: Color::BLACK,
-        //                font: Font::MONOSPACE,
-        //                horizontal_alignment: alignment::Horizontal::Left,
-        //                vertical_alignment: alignment::Vertical::Top,
-        //            },
-        //            pixels,
-        //            clip_mask,
-        //            bounds,
-        //            scale_factor,
-        //            Vector::ZERO,
-        //        );
-        //    }
-        //}
-
         self.text_pipeline.trim_cache();
 
         #[cfg(feature = "image")]

From e63cc181bddbdc0a5b9b091cfeee5e4343b3d906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:28:47 +0200
Subject: [PATCH 132/163] Fix `Candidate::build` in `compositor` of
 `iced_renderer`

---
 renderer/src/compositor.rs | 75 ++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 484d91eb12..e31c2bedba 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -179,47 +179,50 @@ impl Candidate {
     fn build<Theme, W: HasRawWindowHandle + HasRawDisplayHandle>(
         self,
         settings: Settings,
-        compatible_window: Option<&W>,
+        _compatible_window: Option<&W>,
     ) -> Result<(Compositor<Theme>, Renderer<Theme>), Error> {
         match self {
+            #[cfg(feature = "wgpu")]
             Self::Wgpu => {
-                if cfg!(feature = "wgpu") {
-                    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,
-                        )?;
-
-                    return Ok((
-                        Compositor::Wgpu(compositor),
-                        Renderer::new(crate::Backend::Wgpu(backend)),
-                    ));
-                } else {
-                    panic!("`wgpu` feature was not enabled in `iced_renderer`");
-                }
+                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((
+                    Compositor::Wgpu(compositor),
+                    Renderer::new(crate::Backend::Wgpu(backend)),
+                ))
             }
+            #[cfg(feature = "tiny-skia")]
             Self::TinySkia => {
-                if cfg!(feature = "tiny-skia") {
-                    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,
-                            },
-                        );
-
-                    Ok((
-                        Compositor::TinySkia(compositor),
-                        Renderer::new(crate::Backend::TinySkia(backend)),
-                    ))
-                } else {
-                    panic!("`tiny-skia` feature was not enabled in `iced_renderer`");
-                }
+                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,
+                        },
+                    );
+
+                Ok((
+                    Compositor::TinySkia(compositor),
+                    Renderer::new(crate::Backend::TinySkia(backend)),
+                ))
+            }
+            #[cfg(not(feature = "wgpu"))]
+            Self::Wgpu => {
+                panic!("`wgpu` feature was not enabled in `iced_renderer`")
+            }
+            #[cfg(not(feature = "tiny-skia"))]
+            Self::TinySkia => {
+                panic!(
+                    "`tiny-skia` feature was not enabled in `iced_renderer`"
+                );
             }
         }
     }

From 9c63eb7df559e58b14188b4096e9bd206444bbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:46:27 +0200
Subject: [PATCH 133/163] Update `tiny-skia` and `resvg`

---
 Cargo.toml                         |  3 ---
 graphics/Cargo.toml                |  2 +-
 renderer/src/compositor.rs         |  3 +--
 tiny_skia/Cargo.toml               |  4 ++--
 tiny_skia/src/backend.rs           | 33 +++++++++++++-----------------
 tiny_skia/src/raster.rs            |  2 +-
 tiny_skia/src/text.rs              |  2 +-
 tiny_skia/src/vector.rs            |  8 +++++---
 tiny_skia/src/window/compositor.rs | 14 ++++++-------
 wgpu/Cargo.toml                    |  2 +-
 wgpu/src/image/vector.rs           |  6 ++++--
 11 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a3f09fa607..2f92f9db0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,6 +86,3 @@ incremental = false
 opt-level = 3
 overflow-checks = false
 strip = "debuginfo"
-
-[patch.crates-io]
-tiny-skia = { version = "0.8", git = "https://github.com/hecrj/tiny-skia.git", rev = "213890dcbb3754d51533f5b558d9f5ffa3bf6da1" }
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index f1ce6b3aa3..125ea17d22 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -31,7 +31,7 @@ version = "0.9"
 path = "../core"
 
 [dependencies.tiny-skia]
-version = "0.8"
+version = "0.9"
 optional = true
 
 [dependencies.image]
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index e31c2bedba..48ed4b1f1c 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -123,11 +123,10 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                 ),
                 #[cfg(feature = "tiny-skia")]
                 (
-                    Self::TinySkia(compositor),
+                    Self::TinySkia(_compositor),
                     crate::Backend::TinySkia(backend),
                     Surface::TinySkia(surface),
                 ) => iced_tiny_skia::window::compositor::present(
-                    compositor,
                     backend,
                     surface,
                     primitives,
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index f629dab934..a3bddc931c 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -11,7 +11,7 @@ geometry = ["iced_graphics/geometry"]
 [dependencies]
 raw-window-handle = "0.5"
 softbuffer = "0.2"
-tiny-skia = "0.8"
+tiny-skia = "0.9"
 cosmic-text = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
@@ -32,5 +32,5 @@ version = "1.6.1"
 features = ["std"]
 
 [dependencies.resvg]
-version = "0.29"
+version = "0.32"
 optional = true
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 756e46b390..16a7f9b801 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -44,7 +44,7 @@ impl Backend {
     pub fn draw<T: AsRef<str>>(
         &mut self,
         pixels: &mut tiny_skia::PixmapMut<'_>,
-        clip_mask: &mut tiny_skia::ClipMask,
+        clip_mask: &mut tiny_skia::Mask,
         primitives: &[Primitive],
         viewport: &Viewport,
         background_color: Color,
@@ -124,7 +124,7 @@ impl Backend {
                 None,
             );
 
-            adjust_clip_mask(clip_mask, pixels, region);
+            adjust_clip_mask(clip_mask, region);
 
             for primitive in primitives {
                 self.draw_primitive(
@@ -172,7 +172,7 @@ impl Backend {
         &mut self,
         primitive: &Primitive,
         pixels: &mut tiny_skia::PixmapMut<'_>,
-        clip_mask: &mut tiny_skia::ClipMask,
+        clip_mask: &mut tiny_skia::Mask,
         clip_bounds: Rectangle,
         scale_factor: f32,
         translation: Vector,
@@ -427,7 +427,7 @@ impl Backend {
                         return;
                     }
 
-                    adjust_clip_mask(clip_mask, pixels, bounds);
+                    adjust_clip_mask(clip_mask, bounds);
 
                     self.draw_primitive(
                         content,
@@ -438,7 +438,7 @@ impl Backend {
                         translation,
                     );
 
-                    adjust_clip_mask(clip_mask, pixels, clip_bounds);
+                    adjust_clip_mask(clip_mask, clip_bounds);
                 }
             }
             Primitive::Cache { content } => {
@@ -611,11 +611,9 @@ fn arc_to(
     }
 }
 
-fn adjust_clip_mask(
-    clip_mask: &mut tiny_skia::ClipMask,
-    pixels: &tiny_skia::PixmapMut<'_>,
-    bounds: Rectangle,
-) {
+fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
+    clip_mask.clear();
+
     let path = {
         let mut builder = tiny_skia::PathBuilder::new();
         builder.push_rect(bounds.x, bounds.y, bounds.width, bounds.height);
@@ -623,15 +621,12 @@ fn adjust_clip_mask(
         builder.finish().unwrap()
     };
 
-    clip_mask
-        .set_path(
-            pixels.width(),
-            pixels.height(),
-            &path,
-            tiny_skia::FillRule::EvenOdd,
-            false,
-        )
-        .expect("Set path of clipping area");
+    clip_mask.fill_path(
+        &path,
+        tiny_skia::FillRule::EvenOdd,
+        false,
+        tiny_skia::Transform::default(),
+    );
 }
 
 fn group_damage(
diff --git a/tiny_skia/src/raster.rs b/tiny_skia/src/raster.rs
index 2fd73f8c7d..3887ec8dc0 100644
--- a/tiny_skia/src/raster.rs
+++ b/tiny_skia/src/raster.rs
@@ -31,7 +31,7 @@ impl Pipeline {
         bounds: Rectangle,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         transform: tiny_skia::Transform,
-        clip_mask: Option<&tiny_skia::ClipMask>,
+        clip_mask: Option<&tiny_skia::Mask>,
     ) {
         if let Some(image) = self.cache.borrow_mut().allocate(handle) {
             let width_scale = bounds.width / image.width() as f32;
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index f5994d0928..1246bbd566 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -50,7 +50,7 @@ impl Pipeline {
         horizontal_alignment: alignment::Horizontal,
         vertical_alignment: alignment::Vertical,
         pixels: &mut tiny_skia::PixmapMut<'_>,
-        clip_mask: Option<&tiny_skia::ClipMask>,
+        clip_mask: Option<&tiny_skia::Mask>,
     ) {
         let font_system = self.font_system.get_mut();
         let key = Key {
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index 8509b761e6..fc411fdd8b 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -32,7 +32,7 @@ impl Pipeline {
         color: Option<Color>,
         bounds: Rectangle,
         pixels: &mut tiny_skia::PixmapMut<'_>,
-        clip_mask: Option<&tiny_skia::ClipMask>,
+        clip_mask: Option<&tiny_skia::Mask>,
     ) {
         if let Some(image) = self.cache.borrow_mut().draw(
             handle,
@@ -72,6 +72,8 @@ struct RasterKey {
 
 impl Cache {
     fn load(&mut self, handle: &Handle) -> Option<&usvg::Tree> {
+        use usvg::TreeParsing;
+
         let id = handle.id();
 
         if let hash_map::Entry::Vacant(entry) = self.trees.entry(id) {
@@ -131,9 +133,9 @@ impl Cache {
             resvg::render(
                 tree,
                 if size.width > size.height {
-                    usvg::FitTo::Width(size.width)
+                    resvg::FitTo::Width(size.width)
                 } else {
-                    usvg::FitTo::Height(size.height)
+                    resvg::FitTo::Height(size.height)
                 },
                 tiny_skia::Transform::default(),
                 image.as_mut(),
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 6e4bb6efa8..7523e06f93 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -7,13 +7,13 @@ use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
 
 pub struct Compositor<Theme> {
-    clip_mask: tiny_skia::ClipMask,
     _theme: PhantomData<Theme>,
 }
 
 pub struct Surface {
     window: softbuffer::GraphicsContext,
     buffer: Vec<u32>,
+    clip_mask: tiny_skia::Mask,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -43,6 +43,8 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         Surface {
             window,
             buffer: vec![0; width as usize * height as usize],
+            clip_mask: tiny_skia::Mask::new(width, height)
+                .expect("Create clip mask"),
         }
     }
 
@@ -53,6 +55,8 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) {
         surface.buffer.resize((width * height) as usize, 0);
+        surface.clip_mask =
+            tiny_skia::Mask::new(width, height).expect("Create clip mask");
     }
 
     fn fetch_information(&self) -> Information {
@@ -72,7 +76,6 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     ) -> Result<(), SurfaceError> {
         renderer.with_primitives(|backend, primitives| {
             present(
-                self,
                 backend,
                 surface,
                 primitives,
@@ -85,18 +88,15 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
 }
 
 pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
-    // TOD
     (
         Compositor {
-            clip_mask: tiny_skia::ClipMask::new(),
             _theme: PhantomData,
         },
         Backend::new(settings),
     )
 }
 
-pub fn present<Theme, T: AsRef<str>>(
-    compositor: &mut Compositor<Theme>,
+pub fn present<T: AsRef<str>>(
     backend: &mut Backend,
     surface: &mut Surface,
     primitives: &[Primitive],
@@ -113,7 +113,7 @@ pub fn present<Theme, T: AsRef<str>>(
             physical_size.height,
         )
         .expect("Create pixel map"),
-        &mut compositor.clip_mask,
+        &mut surface.clip_mask,
         primitives,
         viewport,
         background_color,
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 14dcd55074..ffae6e4ac0 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -58,7 +58,7 @@ version = "1.0"
 optional = true
 
 [dependencies.resvg]
-version = "0.29"
+version = "0.32"
 optional = true
 
 [dependencies.tracing]
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 3624e46be6..58bdf64a68 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -43,6 +43,8 @@ type ColorFilter = Option<[u8; 4]>;
 impl Cache {
     /// Load svg
     pub fn load(&mut self, handle: &svg::Handle) -> &Svg {
+        use usvg::TreeParsing;
+
         if self.svgs.contains_key(&handle.id()) {
             return self.svgs.get(&handle.id()).unwrap();
         }
@@ -116,9 +118,9 @@ impl Cache {
                 resvg::render(
                     tree,
                     if width > height {
-                        usvg::FitTo::Width(width)
+                        resvg::FitTo::Width(width)
                     } else {
-                        usvg::FitTo::Height(height)
+                        resvg::FitTo::Height(height)
                     },
                     tiny_skia::Transform::default(),
                     img.as_mut(),

From d953d12c38ad368110f4f9f40fb0f185c11dec54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 26 Apr 2023 16:48:41 +0200
Subject: [PATCH 134/163] Fix incorrect `wgpu` version for Wasm builds in
 `iced_wgpu`

---
 wgpu/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index ffae6e4ac0..9f9bd06651 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -23,7 +23,7 @@ once_cell = "1.0"
 rustc-hash = "1.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wgpu = { version = "0.14", features = ["webgl"] }
+wgpu = { version = "0.15", features = ["webgl"] }
 
 [dependencies.twox-hash]
 version = "1.6"

From af0303f95e27737d9de8915f939b60a2bc3282ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:10:41 +0200
Subject: [PATCH 135/163] Move damage tracking logic to `compositor` in
 `iced_tiny_skia`

---
 graphics/src/damage.rs             | 140 +++++++++++++++++++++++++++++
 graphics/src/lib.rs                |   1 +
 graphics/src/primitive.rs          |  90 -------------------
 tiny_skia/src/backend.rs           |  80 +----------------
 tiny_skia/src/window/compositor.rs |  54 +++++++----
 5 files changed, 183 insertions(+), 182 deletions(-)
 create mode 100644 graphics/src/damage.rs

diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
new file mode 100644
index 0000000000..63604150be
--- /dev/null
+++ b/graphics/src/damage.rs
@@ -0,0 +1,140 @@
+use crate::core::{Rectangle, Size};
+use crate::Primitive;
+
+use std::sync::Arc;
+
+pub fn regions(a: &Primitive, b: &Primitive) -> Vec<Rectangle> {
+    match (a, b) {
+        (
+            Primitive::Group {
+                primitives: primitives_a,
+            },
+            Primitive::Group {
+                primitives: primitives_b,
+            },
+        ) => return list(primitives_a, primitives_b),
+        (
+            Primitive::Clip {
+                bounds: bounds_a,
+                content: content_a,
+            },
+            Primitive::Clip {
+                bounds: bounds_b,
+                content: content_b,
+            },
+        ) => {
+            if bounds_a == bounds_b {
+                return regions(content_a, content_b)
+                    .into_iter()
+                    .filter_map(|r| r.intersection(bounds_a))
+                    .collect();
+            } else {
+                return vec![*bounds_a, *bounds_b];
+            }
+        }
+        (
+            Primitive::Translate {
+                translation: translation_a,
+                content: content_a,
+            },
+            Primitive::Translate {
+                translation: translation_b,
+                content: content_b,
+            },
+        ) => {
+            if translation_a == translation_b {
+                return regions(content_a, content_b)
+                    .into_iter()
+                    .map(|r| r + *translation_a)
+                    .collect();
+            }
+        }
+        (
+            Primitive::Cache { content: content_a },
+            Primitive::Cache { content: content_b },
+        ) => {
+            if Arc::ptr_eq(content_a, content_b) {
+                return vec![];
+            }
+        }
+        _ if a == b => return vec![],
+        _ => {}
+    }
+
+    let bounds_a = a.bounds();
+    let bounds_b = b.bounds();
+
+    if bounds_a == bounds_b {
+        vec![bounds_a]
+    } else {
+        vec![bounds_a, bounds_b]
+    }
+}
+
+pub fn list(previous: &[Primitive], current: &[Primitive]) -> Vec<Rectangle> {
+    let damage = previous
+        .iter()
+        .zip(current)
+        .flat_map(|(a, b)| regions(a, b));
+
+    if previous.len() == current.len() {
+        damage.collect()
+    } else {
+        let (smaller, bigger) = if previous.len() < current.len() {
+            (previous, current)
+        } else {
+            (current, previous)
+        };
+
+        // Extend damage by the added/removed primitives
+        damage
+            .chain(bigger[smaller.len()..].iter().map(Primitive::bounds))
+            .collect()
+    }
+}
+
+pub fn group(
+    mut damage: Vec<Rectangle>,
+    scale_factor: f32,
+    bounds: Size<u32>,
+) -> Vec<Rectangle> {
+    use std::cmp::Ordering;
+
+    const AREA_THRESHOLD: f32 = 20_000.0;
+
+    let bounds = Rectangle {
+        x: 0.0,
+        y: 0.0,
+        width: bounds.width as f32,
+        height: bounds.height as f32,
+    };
+
+    damage.sort_by(|a, b| {
+        a.x.partial_cmp(&b.x)
+            .unwrap_or(Ordering::Equal)
+            .then_with(|| a.y.partial_cmp(&b.y).unwrap_or(Ordering::Equal))
+    });
+
+    let mut output = Vec::new();
+    let mut scaled = damage
+        .into_iter()
+        .filter_map(|region| (region * scale_factor).intersection(&bounds))
+        .filter(|region| region.width >= 1.0 && region.height >= 1.0);
+
+    if let Some(mut current) = scaled.next() {
+        for region in scaled {
+            let union = current.union(&region);
+
+            if union.area() - current.area() - region.area() <= AREA_THRESHOLD {
+                current = union;
+            } else {
+                output.push(current);
+                current = region;
+            }
+        }
+
+        output.push(current);
+    }
+
+    output
+}
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 0c50db52d5..e3de40254c 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -28,6 +28,7 @@ mod viewport;
 
 pub mod backend;
 pub mod compositor;
+pub mod damage;
 pub mod primitive;
 pub mod renderer;
 
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 7f2c8ae2b1..1751d03ae0 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -208,96 +208,6 @@ impl Primitive {
             Self::Cache { content } => content.bounds(),
         }
     }
-
-    pub fn damage(&self, other: &Self) -> Vec<Rectangle> {
-        match (self, other) {
-            (
-                Primitive::Group {
-                    primitives: primitives_a,
-                },
-                Primitive::Group {
-                    primitives: primitives_b,
-                },
-            ) => return Self::damage_list(primitives_a, primitives_b),
-            (
-                Primitive::Clip {
-                    bounds: bounds_a,
-                    content: content_a,
-                },
-                Primitive::Clip {
-                    bounds: bounds_b,
-                    content: content_b,
-                },
-            ) => {
-                if bounds_a == bounds_b {
-                    return content_a
-                        .damage(content_b)
-                        .into_iter()
-                        .filter_map(|r| r.intersection(bounds_a))
-                        .collect();
-                } else {
-                    return vec![*bounds_a, *bounds_b];
-                }
-            }
-            (
-                Primitive::Translate {
-                    translation: translation_a,
-                    content: content_a,
-                },
-                Primitive::Translate {
-                    translation: translation_b,
-                    content: content_b,
-                },
-            ) => {
-                if translation_a == translation_b {
-                    return content_a
-                        .damage(content_b)
-                        .into_iter()
-                        .map(|r| r + *translation_a)
-                        .collect();
-                }
-            }
-            (
-                Primitive::Cache { content: content_a },
-                Primitive::Cache { content: content_b },
-            ) => {
-                if Arc::ptr_eq(content_a, content_b) {
-                    return vec![];
-                }
-            }
-            _ if self == other => return vec![],
-            _ => {}
-        }
-
-        let bounds_a = self.bounds();
-        let bounds_b = other.bounds();
-
-        if bounds_a == bounds_b {
-            vec![bounds_a]
-        } else {
-            vec![bounds_a, bounds_b]
-        }
-    }
-
-    pub fn damage_list(previous: &[Self], current: &[Self]) -> Vec<Rectangle> {
-        let damage =
-            previous.iter().zip(current).flat_map(|(a, b)| a.damage(b));
-
-        if previous.len() == current.len() {
-            damage.collect()
-        } else {
-            let (smaller, bigger) = if previous.len() < current.len() {
-                (previous, current)
-            } else {
-                (current, previous)
-            };
-
-            // Extend damage by the added/removed primitives
-            damage
-                .chain(bigger[smaller.len()..].iter().map(Primitive::bounds))
-                .collect()
-        }
-    }
 }
 
 /// A set of [`Vertex2D`] and indices representing a list of triangles.
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 16a7f9b801..9c69e1d21b 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -16,10 +16,6 @@ pub struct Backend {
 
     #[cfg(feature = "svg")]
     vector_pipeline: crate::vector::Pipeline,
-
-    last_primitives: Vec<Primitive>,
-    last_background_color: Color,
-    last_size: Size<u32>,
 }
 
 impl Backend {
@@ -34,10 +30,6 @@ impl Backend {
 
             #[cfg(feature = "svg")]
             vector_pipeline: crate::vector::Pipeline::new(),
-
-            last_primitives: Vec::new(),
-            last_background_color: Color::BLACK,
-            last_size: Size::new(0, 0),
         }
     }
 
@@ -47,31 +39,13 @@ impl Backend {
         clip_mask: &mut tiny_skia::Mask,
         primitives: &[Primitive],
         viewport: &Viewport,
+        damage: &[Rectangle],
         background_color: Color,
         overlay: &[T],
-    ) -> bool {
+    ) {
         let physical_size = viewport.physical_size();
-
-        let damage = if self.last_background_color == background_color
-            && self.last_size == physical_size
-        {
-            Primitive::damage_list(&self.last_primitives, primitives)
-        } else {
-            vec![Rectangle::with_size(viewport.logical_size())]
-        };
-
-        if damage.is_empty() {
-            return false;
-        }
-
-        self.last_primitives = primitives.to_vec();
-        self.last_background_color = background_color;
-        self.last_size = physical_size;
-
         let scale_factor = viewport.scale_factor() as f32;
 
-        let damage = group_damage(damage, scale_factor, physical_size);
-
         if !overlay.is_empty() {
             let path = tiny_skia::PathBuilder::from_rect(
                 tiny_skia::Rect::from_xywh(
@@ -99,7 +73,7 @@ impl Backend {
             );
         }
 
-        for region in damage {
+        for &region in damage {
             let path = tiny_skia::PathBuilder::from_rect(
                 tiny_skia::Rect::from_xywh(
                     region.x,
@@ -164,8 +138,6 @@ impl Backend {
 
         #[cfg(feature = "svg")]
         self.vector_pipeline.trim_cache();
-
-        true
     }
 
     fn draw_primitive(
@@ -629,52 +601,6 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
     );
 }
 
-fn group_damage(
-    mut damage: Vec<Rectangle>,
-    scale_factor: f32,
-    bounds: Size<u32>,
-) -> Vec<Rectangle> {
-    use std::cmp::Ordering;
-
-    const AREA_THRESHOLD: f32 = 20_000.0;
-
-    let bounds = Rectangle {
-        x: 0.0,
-        y: 0.0,
-        width: bounds.width as f32,
-        height: bounds.height as f32,
-    };
-
-    damage.sort_by(|a, b| {
-        a.x.partial_cmp(&b.x)
-            .unwrap_or(Ordering::Equal)
-            .then_with(|| a.y.partial_cmp(&b.y).unwrap_or(Ordering::Equal))
-    });
-
-    let mut output = Vec::new();
-    let mut scaled = damage
-        .into_iter()
-        .filter_map(|region| (region * scale_factor).intersection(&bounds))
-        .filter(|region| region.width >= 1.0 && region.height >= 1.0);
-
-    if let Some(mut current) = scaled.next() {
-        for region in scaled {
-            let union = current.union(&region);
-
-            if union.area() - current.area() - region.area() <= AREA_THRESHOLD {
-                current = union;
-            } else {
-                output.push(current);
-                current = region;
-            }
-        }
-
-        output.push(current);
-    }
-
-    output
-}
-
 impl iced_graphics::Backend for Backend {
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache();
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 7523e06f93..d3dffb18aa 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -1,5 +1,6 @@
-use crate::core::Color;
+use crate::core::{Color, Rectangle};
 use crate::graphics::compositor::{self, Information, SurfaceError};
+use crate::graphics::damage;
 use crate::graphics::{Error, Primitive, Viewport};
 use crate::{Backend, Renderer, Settings};
 
@@ -14,6 +15,8 @@ pub struct Surface {
     window: softbuffer::GraphicsContext,
     buffer: Vec<u32>,
     clip_mask: tiny_skia::Mask,
+    last_primitives: Vec<Primitive>,
+    last_background_color: Color,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -45,6 +48,8 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             buffer: vec![0; width as usize * height as usize],
             clip_mask: tiny_skia::Mask::new(width, height)
                 .expect("Create clip mask"),
+            last_primitives: Vec::new(),
+            last_background_color: Color::BLACK,
         }
     }
 
@@ -57,6 +62,8 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         surface.buffer.resize((width * height) as usize, 0);
         surface.clip_mask =
             tiny_skia::Mask::new(width, height).expect("Create clip mask");
+
+        surface.last_primitives.clear();
     }
 
     fn fetch_information(&self) -> Information {
@@ -105,28 +112,45 @@ pub fn present<T: AsRef<str>>(
     overlay: &[T],
 ) -> Result<(), compositor::SurfaceError> {
     let physical_size = viewport.physical_size();
+    let scale_factor = viewport.scale_factor() as f32;
+
+    let mut pixels = &mut tiny_skia::PixmapMut::from_bytes(
+        bytemuck::cast_slice_mut(&mut surface.buffer),
+        physical_size.width,
+        physical_size.height,
+    )
+    .expect("Create pixel map");
+
+    let damage = if surface.last_background_color == background_color {
+        damage::list(&surface.last_primitives, primitives)
+    } else {
+        vec![Rectangle::with_size(viewport.logical_size())]
+    };
+
+    if damage.is_empty() {
+        return Ok(());
+    }
+
+    surface.last_primitives = primitives.to_vec();
+    surface.last_background_color = background_color;
+
+    let damage = damage::group(damage, scale_factor, physical_size);
 
-    let drawn = backend.draw(
-        &mut tiny_skia::PixmapMut::from_bytes(
-            bytemuck::cast_slice_mut(&mut surface.buffer),
-            physical_size.width,
-            physical_size.height,
-        )
-        .expect("Create pixel map"),
+    backend.draw(
+        &mut pixels,
         &mut surface.clip_mask,
         primitives,
         viewport,
+        &damage,
         background_color,
         overlay,
     );
 
-    if drawn {
-        surface.window.set_buffer(
-            &surface.buffer,
-            physical_size.width as u16,
-            physical_size.height as u16,
-        );
-    }
+    surface.window.set_buffer(
+        &surface.buffer,
+        physical_size.width as u16,
+        physical_size.height as u16,
+    );
 
     Ok(())
 }

From 92d808ee73b261b639a4a8d1d4f930cd61a380c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:16:05 +0200
Subject: [PATCH 136/163] Fix double reference in `compositor` in
 `iced_tiny_skia`

---
 tiny_skia/src/window/compositor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index d3dffb18aa..1bcce6fe3d 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -114,7 +114,7 @@ pub fn present<T: AsRef<str>>(
     let physical_size = viewport.physical_size();
     let scale_factor = viewport.scale_factor() as f32;
 
-    let mut pixels = &mut tiny_skia::PixmapMut::from_bytes(
+    let mut pixels = tiny_skia::PixmapMut::from_bytes(
         bytemuck::cast_slice_mut(&mut surface.buffer),
         physical_size.width,
         physical_size.height,

From 88d3247717b6deb38d500c8c1b1b1f32d6df9991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:17:06 +0200
Subject: [PATCH 137/163] Fix build of `integration` example for Wasm target

---
 examples/integration/src/main.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 98d2bc5940..d9aae7b9ab 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -36,7 +36,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
         web_sys::window()
             .and_then(|win| win.document())
             .and_then(|doc| doc.get_element_by_id("iced_canvas"))
-            .and_then(|element| element.dyn_into::<HtmlCanvasElement>().ok())?
+            .and_then(|element| element.dyn_into::<HtmlCanvasElement>().ok())
+            .expect("Get canvas element")
     };
     #[cfg(not(target_arch = "wasm32"))]
     env_logger::init();

From 200a29c069ae0c6461b6d44e075aacc9ddad9974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:17:45 +0200
Subject: [PATCH 138/163] Fix unused import in `triangle` pipeline for Wasm
 target in `iced_wgpu`

---
 wgpu/src/triangle.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 0df8dd023b..eb15a45801 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -2,10 +2,13 @@
 mod msaa;
 
 use crate::buffer::r#static::Buffer;
-use crate::core::{Gradient, Size};
+use crate::core::Size;
 use crate::graphics::{Antialiasing, Transformation};
 use crate::layer::mesh::{self, Mesh};
 
+#[cfg(not(target_arch = "wasm32"))]
+use crate::core::Gradient;
+
 #[cfg(feature = "tracing")]
 use tracing::info_span;
 

From 38f82ab35fd24a1aaf96728148b2826211956a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:25:59 +0200
Subject: [PATCH 139/163] Expand damage regions of `Clip` primitives a bit

---
 graphics/src/damage.rs    | 6 ++++--
 graphics/src/primitive.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
index 63604150be..5aab06b17b 100644
--- a/graphics/src/damage.rs
+++ b/graphics/src/damage.rs
@@ -17,19 +17,21 @@ pub fn regions(a: &Primitive, b: &Primitive) -> Vec<Rectangle> {
             Primitive::Clip {
                 bounds: bounds_a,
                 content: content_a,
+                ..
             },
             Primitive::Clip {
                 bounds: bounds_b,
                 content: content_b,
+                ..
             },
         ) => {
             if bounds_a == bounds_b {
                 return regions(content_a, content_b)
                     .into_iter()
-                    .filter_map(|r| r.intersection(bounds_a))
+                    .filter_map(|r| r.intersection(&bounds_a.expand(1.0)))
                     .collect();
             } else {
-                return vec![*bounds_a, *bounds_b];
+                return vec![bounds_a.expand(1.0), bounds_b.expand(1.0)];
             }
         }
         (
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 1751d03ae0..d6a2c4c4cc 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -179,7 +179,7 @@ impl Primitive {
             Self::Quad { bounds, .. }
             | Self::Image { bounds, .. }
             | Self::Svg { bounds, .. } => bounds.expand(1.0),
-            Self::Clip { bounds, .. } => *bounds,
+            Self::Clip { bounds, .. } => bounds.expand(1.0),
             Self::SolidMesh { size, .. } | Self::GradientMesh { size, .. } => {
                 Rectangle::with_size(*size)
             }

From eb1b2bf24174759bba8c63db0ec89c7c6d15d191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:45:02 +0200
Subject: [PATCH 140/163] Invalidate `last_primitives` on resize in
 `iced_tiny_skia`

---
 tiny_skia/src/window/compositor.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 1bcce6fe3d..3bc0697001 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -15,7 +15,7 @@ pub struct Surface {
     window: softbuffer::GraphicsContext,
     buffer: Vec<u32>,
     clip_mask: tiny_skia::Mask,
-    last_primitives: Vec<Primitive>,
+    last_primitives: Option<Vec<Primitive>>,
     last_background_color: Color,
 }
 
@@ -48,7 +48,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             buffer: vec![0; width as usize * height as usize],
             clip_mask: tiny_skia::Mask::new(width, height)
                 .expect("Create clip mask"),
-            last_primitives: Vec::new(),
+            last_primitives: None,
             last_background_color: Color::BLACK,
         }
     }
@@ -62,8 +62,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         surface.buffer.resize((width * height) as usize, 0);
         surface.clip_mask =
             tiny_skia::Mask::new(width, height).expect("Create clip mask");
-
-        surface.last_primitives.clear();
+        surface.last_primitives = None;
     }
 
     fn fetch_information(&self) -> Information {
@@ -121,17 +120,20 @@ pub fn present<T: AsRef<str>>(
     )
     .expect("Create pixel map");
 
-    let damage = if surface.last_background_color == background_color {
-        damage::list(&surface.last_primitives, primitives)
-    } else {
-        vec![Rectangle::with_size(viewport.logical_size())]
-    };
+    let damage = surface
+        .last_primitives
+        .as_deref()
+        .and_then(|last_primitives| {
+            (surface.last_background_color == background_color)
+                .then(|| damage::list(last_primitives, primitives))
+        })
+        .unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]);
 
     if damage.is_empty() {
         return Ok(());
     }
 
-    surface.last_primitives = primitives.to_vec();
+    surface.last_primitives = Some(primitives.to_vec());
     surface.last_background_color = background_color;
 
     let damage = damage::group(damage, scale_factor, physical_size);

From a755472ee35dfb7839f989becafc6028921a3b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 27 Apr 2023 15:51:51 +0200
Subject: [PATCH 141/163] Remove unnecessary `last_` prefix in `Surface` of
 `iced_tiny_skia`

---
 tiny_skia/src/window/compositor.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 3bc0697001..9999a18888 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -15,8 +15,8 @@ pub struct Surface {
     window: softbuffer::GraphicsContext,
     buffer: Vec<u32>,
     clip_mask: tiny_skia::Mask,
-    last_primitives: Option<Vec<Primitive>>,
-    last_background_color: Color,
+    primitives: Option<Vec<Primitive>>,
+    background_color: Color,
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -48,8 +48,8 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             buffer: vec![0; width as usize * height as usize],
             clip_mask: tiny_skia::Mask::new(width, height)
                 .expect("Create clip mask"),
-            last_primitives: None,
-            last_background_color: Color::BLACK,
+            primitives: None,
+            background_color: Color::BLACK,
         }
     }
 
@@ -62,7 +62,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         surface.buffer.resize((width * height) as usize, 0);
         surface.clip_mask =
             tiny_skia::Mask::new(width, height).expect("Create clip mask");
-        surface.last_primitives = None;
+        surface.primitives = None;
     }
 
     fn fetch_information(&self) -> Information {
@@ -121,10 +121,10 @@ pub fn present<T: AsRef<str>>(
     .expect("Create pixel map");
 
     let damage = surface
-        .last_primitives
+        .primitives
         .as_deref()
         .and_then(|last_primitives| {
-            (surface.last_background_color == background_color)
+            (surface.background_color == background_color)
                 .then(|| damage::list(last_primitives, primitives))
         })
         .unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]);
@@ -133,8 +133,8 @@ pub fn present<T: AsRef<str>>(
         return Ok(());
     }
 
-    surface.last_primitives = Some(primitives.to_vec());
-    surface.last_background_color = background_color;
+    surface.primitives = Some(primitives.to_vec());
+    surface.background_color = background_color;
 
     let damage = damage::group(damage, scale_factor, physical_size);
 

From 47016a37dfe51ebc3cdf290d8afb34ceadb8edae Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Thu, 27 Apr 2023 15:36:45 -0700
Subject: [PATCH 142/163] Do not require `Copy` for text `StyleSheet::Style`

For most widgets, `Style` only requires `Default`. A few require
`Clone`. Only this one requires `Copy`.

Some of the types in the default theme has a custom variant requiring
`Box<dyn Trait>`, or `Rc<dyn Trait>` to provide `Clone`, but this isn't
possible if `Copy` is required.

It would be good to also address the inconsistency of requiring `Clone`
in some places and not others.

This removes `style/src/text.rs` which is unused in this branch and thus
confusing. If there's a reason to keep it, that can be removed from the
change.
---
 core/src/widget/text.rs |  6 +++---
 style/src/text.rs       | 20 --------------------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 style/src/text.rs

diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 485bb54209..3193ba84f0 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -153,7 +153,7 @@ where
             &self.content,
             self.size,
             self.font,
-            theme.appearance(self.style),
+            theme.appearance(self.style.clone()),
             self.horizontal_alignment,
             self.vertical_alignment,
         );
@@ -233,7 +233,7 @@ where
             horizontal_alignment: self.horizontal_alignment,
             vertical_alignment: self.vertical_alignment,
             font: self.font,
-            style: self.style,
+            style: self.style.clone(),
         }
     }
 }
@@ -261,7 +261,7 @@ where
 /// The style sheet of some text.
 pub trait StyleSheet {
     /// The supported style of the [`StyleSheet`].
-    type Style: Default + Copy;
+    type Style: Default + Clone;
 
     /// Produces the [`Appearance`] of some text.
     fn appearance(&self, style: Self::Style) -> Appearance;
diff --git a/style/src/text.rs b/style/src/text.rs
deleted file mode 100644
index d5a16bef62..0000000000
--- a/style/src/text.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! Change the appearance of text.
-use crate::core::Color;
-
-/// The style sheet of some text.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default + Copy;
-
-    /// Produces the [`Appearance`] of some text.
-    fn appearance(&self, style: Self::Style) -> Appearance;
-}
-
-/// The apperance of some text.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Appearance {
-    /// The [`Color`] of the text.
-    ///
-    /// The default, `None`, means using the inherited color.
-    pub color: Option<Color>,
-}

From 33b5a900197e2798a393d6d9a0834039666eddbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 19 Apr 2023 01:19:56 +0200
Subject: [PATCH 143/163] Make basic text shaping the default shaping strategy

---
 core/src/renderer/null.rs     |  2 ++
 core/src/text.rs              | 22 ++++++++++++++++++++--
 core/src/widget/text.rs       | 21 +++++++++++++++++++++
 graphics/src/backend.rs       |  2 ++
 graphics/src/geometry/text.rs | 10 ++++++++++
 graphics/src/primitive.rs     |  9 +++++++++
 graphics/src/renderer.rs      |  7 ++++++-
 renderer/src/backend.rs       | 11 +++++++++--
 tiny_skia/Cargo.toml          |  5 ++++-
 tiny_skia/src/backend.rs      |  8 +++++++-
 tiny_skia/src/geometry.rs     |  1 +
 tiny_skia/src/text.rs         |  8 ++++++++
 wgpu/Cargo.toml               |  2 +-
 wgpu/src/backend.rs           |  6 +++++-
 wgpu/src/geometry.rs          |  1 +
 wgpu/src/layer.rs             |  3 +++
 wgpu/src/layer/text.rs        | 10 ++++++++++
 wgpu/src/text.rs              |  7 +++++++
 widget/src/checkbox.rs        |  2 ++
 widget/src/overlay/menu.rs    |  1 +
 widget/src/pick_list.rs       |  3 +++
 widget/src/radio.rs           |  1 +
 widget/src/text_input.rs      |  7 ++++++-
 widget/src/toggler.rs         |  1 +
 24 files changed, 140 insertions(+), 10 deletions(-)

diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index 88c588250a..f62a433871 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -62,6 +62,7 @@ impl text::Renderer for Null {
         _size: f32,
         _font: Font,
         _bounds: Size,
+        _needs_shaping: bool,
     ) -> (f32, f32) {
         (0.0, 20.0)
     }
@@ -74,6 +75,7 @@ impl text::Renderer for Null {
         _bounds: Size,
         _point: Point,
         _nearest_only: bool,
+        _advanced_shape: bool,
     ) -> Option<text::Hit> {
         None
     }
diff --git a/core/src/text.rs b/core/src/text.rs
index 4c72abc302..0111cf312c 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -27,6 +27,15 @@ pub struct Text<'a, Font> {
 
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
+
+    /// Whether the [`Text`] needs advanced shaping and font fallback.
+    ///
+    /// You will need to enable this flag if the text contains a complex
+    /// script, the font used needs it, and/or multiple fonts in your system
+    /// may be needed to display all of the glyphs.
+    ///
+    /// Advanced shaping is expensive! You should only enable it when necessary.
+    pub advanced_shape: bool,
 }
 
 /// The result of hit testing on text.
@@ -77,11 +86,19 @@ pub trait Renderer: crate::Renderer {
         size: f32,
         font: Self::Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32);
 
     /// Measures the width of the text as if it were laid out in a single line.
-    fn measure_width(&self, content: &str, size: f32, font: Self::Font) -> f32 {
-        let (width, _) = self.measure(content, size, font, Size::INFINITY);
+    fn measure_width(
+        &self,
+        content: &str,
+        size: f32,
+        font: Self::Font,
+        advanced_shape: bool,
+    ) -> f32 {
+        let (width, _) =
+            self.measure(content, size, font, Size::INFINITY, advanced_shape);
 
         width
     }
@@ -101,6 +118,7 @@ pub trait Renderer: crate::Renderer {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<Hit>;
 
     /// Loads a [`Self::Font`] from its bytes.
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 3193ba84f0..2df4556d69 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -25,6 +25,7 @@ where
     vertical_alignment: alignment::Vertical,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
+    advanced_shape: bool,
 }
 
 impl<'a, Renderer> Text<'a, Renderer>
@@ -43,6 +44,7 @@ where
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
             style: Default::default(),
+            advanced_shape: false,
         }
     }
 
@@ -98,6 +100,20 @@ where
         self.vertical_alignment = alignment;
         self
     }
+
+    /// Enables advanced text shaping and font fallback for the [`Text`].
+    ///
+    /// You will need to enable this if the text contains a complex script, the
+    /// font used needs it, and/or multiple fonts in your system may be needed
+    /// to display all of the glyphs.
+    ///
+    /// If your text isn't displaying properly, try enabling this!
+    ///
+    /// Advanced shaping is expensive! You should only enable it when necessary.
+    pub fn advanced_shape(mut self) -> Self {
+        self.advanced_shape = true;
+        self
+    }
 }
 
 impl<'a, Message, Renderer> Widget<Message, Renderer> for Text<'a, Renderer>
@@ -129,6 +145,7 @@ where
             size,
             self.font.unwrap_or_else(|| renderer.default_font()),
             bounds,
+            self.advanced_shape,
         );
 
         let size = limits.resolve(Size::new(width, height));
@@ -156,6 +173,7 @@ where
             theme.appearance(self.style.clone()),
             self.horizontal_alignment,
             self.vertical_alignment,
+            self.advanced_shape,
         );
     }
 }
@@ -180,6 +198,7 @@ pub fn draw<Renderer>(
     appearance: Appearance,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
+    advanced_shape: bool,
 ) where
     Renderer: text::Renderer,
 {
@@ -205,6 +224,7 @@ pub fn draw<Renderer>(
         font: font.unwrap_or_else(|| renderer.default_font()),
         horizontal_alignment,
         vertical_alignment,
+        advanced_shape,
     });
 }
 
@@ -234,6 +254,7 @@ where
             vertical_alignment: self.vertical_alignment,
             font: self.font,
             style: self.style.clone(),
+            advanced_shape: self.advanced_shape,
         }
     }
 }
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index dd2888ab8f..0e107dd54a 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -48,6 +48,7 @@ pub trait Text {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32);
 
     /// Tests whether the provided point is within the boundaries of [`Text`]
@@ -65,6 +66,7 @@ pub trait Text {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit>;
 
     /// Loads a [`Font`] from its bytes.
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index 0befd63522..f4af9ee4c0 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -25,6 +25,15 @@ pub struct Text {
     pub horizontal_alignment: alignment::Horizontal,
     /// The vertical alignment of the text
     pub vertical_alignment: alignment::Vertical,
+    /// Whether the text needs advanced shaping and font fallback.
+    ///
+    /// You will need to enable this flag if the text contains a complex
+    /// script, the font used needs it, and/or multiple fonts in your system
+    /// may be needed to display all of the glyphs.
+    ///
+    /// Advanced shaping is expensive! You should only enable it when
+    /// necessary.
+    pub advanced_shape: bool,
 }
 
 impl Default for Text {
@@ -37,6 +46,7 @@ impl Default for Text {
             font: Font::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
+            advanced_shape: false,
         }
     }
 }
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index d6a2c4c4cc..2d9c221b85 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -26,6 +26,15 @@ pub enum Primitive {
         horizontal_alignment: alignment::Horizontal,
         /// The vertical alignment of the text
         vertical_alignment: alignment::Vertical,
+        /// Whether the text needs advanced shaping and font fallback.
+        ///
+        /// You will need to enable this flag if the text contains a complex
+        /// script, the font used needs it, and/or multiple fonts in your system
+        /// may be needed to display all of the glyphs.
+        ///
+        /// Advanced shaping is expensive! You should only enable it when
+        /// necessary.
+        advanced_shape: bool,
     },
     /// A quad primitive
     Quad {
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 23e594be72..558e21dd90 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -138,8 +138,10 @@ where
         size: f32,
         font: Font,
         bounds: Size,
+        needs_shaping: bool,
     ) -> (f32, f32) {
-        self.backend().measure(content, size, font, bounds)
+        self.backend()
+            .measure(content, size, font, bounds, needs_shaping)
     }
 
     fn hit_test(
@@ -150,6 +152,7 @@ where
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.backend().hit_test(
             content,
@@ -158,6 +161,7 @@ where
             bounds,
             point,
             nearest_only,
+            advanced_shape,
         )
     }
 
@@ -174,6 +178,7 @@ where
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
+            advanced_shape: text.advanced_shape,
         });
     }
 }
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 120dd644c5..a98e2479ed 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -48,8 +48,13 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
-        delegate!(self, backend, backend.measure(contents, size, font, bounds))
+        delegate!(
+            self,
+            backend,
+            backend.measure(contents, size, font, bounds, advanced_shape)
+        )
     }
 
     fn hit_test(
@@ -60,6 +65,7 @@ impl backend::Text for Backend {
         bounds: Size,
         position: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit> {
         delegate!(
             self,
@@ -70,7 +76,8 @@ impl backend::Text for Backend {
                 font,
                 bounds,
                 position,
-                nearest_only
+                nearest_only,
+                advanced_shape
             )
         )
     }
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index a3bddc931c..32645ac1e5 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -12,7 +12,6 @@ geometry = ["iced_graphics/geometry"]
 raw-window-handle = "0.5"
 softbuffer = "0.2"
 tiny-skia = "0.9"
-cosmic-text = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
 kurbo = "0.9"
@@ -23,6 +22,10 @@ version = "0.8"
 path = "../graphics"
 features = ["tiny-skia"]
 
+[dependencies.cosmic-text]
+git = "https://github.com/hecrj/cosmic-text.git"
+rev = "ad111a1df10d5da503620f4b841de5d41ebd4e73"
+
 [dependencies.twox-hash]
 version = "1.6"
 default-features = false
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 9c69e1d21b..0a06f8c91e 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -219,6 +219,7 @@ impl Backend {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
+                advanced_shape,
             } => {
                 let physical_bounds =
                     (primitive.bounds() + translation) * scale_factor;
@@ -238,6 +239,7 @@ impl Backend {
                     *font,
                     *horizontal_alignment,
                     *vertical_alignment,
+                    *advanced_shape,
                     pixels,
                     clip_mask,
                 );
@@ -626,8 +628,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
-        self.text_pipeline.measure(contents, size, font, bounds)
+        self.text_pipeline
+            .measure(contents, size, font, bounds, advanced_shape)
     }
 
     fn hit_test(
@@ -638,6 +642,7 @@ impl backend::Text for Backend {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.text_pipeline.hit_test(
             contents,
@@ -646,6 +651,7 @@ impl backend::Text for Backend {
             bounds,
             point,
             nearest_only,
+            advanced_shape,
         )
     }
 
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 508965ada7..7cdac1c816 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -114,6 +114,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
+            advanced_shape: text.advanced_shape,
         });
     }
 
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 1246bbd566..603a3e165a 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -49,6 +49,7 @@ impl Pipeline {
         font: Font,
         horizontal_alignment: alignment::Horizontal,
         vertical_alignment: alignment::Vertical,
+        advanced_shape: bool,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::Mask>,
     ) {
@@ -63,6 +64,7 @@ impl Pipeline {
             content,
             font,
             size,
+            advanced_shape,
         };
 
         let (_, buffer) = self.render_cache.allocate(font_system, key);
@@ -130,6 +132,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -140,6 +143,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                advanced_shape,
             },
         );
 
@@ -161,6 +165,7 @@ impl Pipeline {
         bounds: Size,
         point: Point,
         _nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -171,6 +176,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                advanced_shape,
             },
         );
 
@@ -390,6 +396,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
+                !key.advanced_shape,
             );
 
             let _ = entry.insert(buffer);
@@ -420,6 +427,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
+    advanced_shape: bool,
 }
 
 type KeyHash = u64;
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 9f9bd06651..254d32d6ce 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "1d26d92b19407c5dabe4625944d4a6babbbf0715"
+rev = "446cf0803065b52ba5fb9a30fe0addb6d7b5f9d9"
 
 [dependencies.encase]
 version = "0.3.0"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9772781a56..d09b2dbaca 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -354,8 +354,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
-        self.text_pipeline.measure(contents, size, font, bounds)
+        self.text_pipeline
+            .measure(contents, size, font, bounds, advanced_shape)
     }
 
     fn hit_test(
@@ -366,6 +368,7 @@ impl backend::Text for Backend {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
@@ -374,6 +377,7 @@ impl backend::Text for Backend {
             bounds,
             point,
             nearest_only,
+            advanced_shape,
         )
     }
 
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 59ec31fef6..a85875a44a 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -334,6 +334,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
+            advanced_shape: text.advanced_shape,
         });
     }
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index c4723397b0..7c5b43a3ce 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -64,6 +64,7 @@ impl<'a> Layer<'a> {
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
+                advanced_shape: false,
             };
 
             overlay.text.push(text);
@@ -116,6 +117,7 @@ impl<'a> Layer<'a> {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
+                advanced_shape,
             } => {
                 let layer = &mut layers[current_layer];
 
@@ -127,6 +129,7 @@ impl<'a> Layer<'a> {
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
                     vertical_alignment: *vertical_alignment,
+                    advanced_shape: *advanced_shape,
                 });
             }
             Primitive::Quad {
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index fdbdaafb59..d36ff273ba 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -24,4 +24,14 @@ pub struct Text<'a> {
 
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
+
+    /// Whether the text needs advanced shaping and font fallback.
+    ///
+    /// You will need to enable this flag if the text contains a complex
+    /// script, the font used needs it, and/or multiple fonts in your system
+    /// may be needed to display all of the glyphs.
+    ///
+    /// Advanced shaping is expensive! You should only enable it when
+    /// necessary.
+    pub advanced_shape: bool,
 }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f01e0b4233..f433a5b619 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -83,6 +83,7 @@ impl Pipeline {
                             height: (section.bounds.height * scale_factor)
                                 .ceil(),
                         },
+                        advanced_shape: section.advanced_shape,
                     },
                 );
 
@@ -213,6 +214,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -223,6 +225,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                advanced_shape,
             },
         );
 
@@ -244,6 +247,7 @@ impl Pipeline {
         bounds: Size,
         point: Point,
         _nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -254,6 +258,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                advanced_shape,
             },
         );
 
@@ -364,6 +369,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
+                !key.advanced_shape,
             );
 
             let _ = entry.insert(buffer);
@@ -388,6 +394,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
+    advanced_shape: bool,
 }
 
 type KeyHash = u64;
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 6505cfdd95..e28f76afad 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -273,6 +273,7 @@ where
                     color: custom_style.icon_color,
                     horizontal_alignment: alignment::Horizontal::Center,
                     vertical_alignment: alignment::Vertical::Center,
+                    advanced_shape: true,
                 });
             }
         }
@@ -292,6 +293,7 @@ where
                 },
                 alignment::Horizontal::Left,
                 alignment::Vertical::Center,
+                false,
             );
         }
     }
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index c322c8bae4..c904730d7f 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -500,6 +500,7 @@ where
                 },
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Center,
+                advanced_shape: false,
             });
         }
     }
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index cd23cdd235..d44f4cae11 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -366,6 +366,7 @@ where
                     text_size,
                     font.unwrap_or_else(|| renderer.default_font()),
                     Size::new(f32::INFINITY, f32::INFINITY),
+                    false,
                 );
 
                 width.round()
@@ -628,6 +629,7 @@ pub fn draw<'a, T, Renderer>(
             },
             horizontal_alignment: alignment::Horizontal::Right,
             vertical_alignment: alignment::Vertical::Center,
+            advanced_shape: false,
         });
     }
 
@@ -653,6 +655,7 @@ pub fn draw<'a, T, Renderer>(
             },
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
+            advanced_shape: false,
         });
     }
 }
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index c3229aed55..b685c1a1bc 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -309,6 +309,7 @@ where
                 },
                 alignment::Horizontal::Left,
                 alignment::Vertical::Center,
+                false,
             );
         }
     }
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 9db382f73f..abf858cac1 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -463,6 +463,7 @@ where
             &icon.code_point.to_string(),
             icon.size.unwrap_or_else(|| renderer.default_size()),
             icon.font,
+            true,
         );
 
         let mut text_node = layout::Node::new(
@@ -975,6 +976,7 @@ pub fn draw<Renderer>(
             bounds: icon_layout.bounds(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
+            advanced_shape: true,
         });
     }
 
@@ -1079,6 +1081,7 @@ pub fn draw<Renderer>(
         if text.is_empty() { placeholder } else { &text },
         size,
         font,
+        true,
     );
 
     let render = |renderer: &mut Renderer| {
@@ -1106,6 +1109,7 @@ pub fn draw<Renderer>(
             size,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
+            advanced_shape: true,
         });
     };
 
@@ -1311,7 +1315,7 @@ where
     let text_before_cursor = value.until(cursor_index).to_string();
 
     let text_value_width =
-        renderer.measure_width(&text_before_cursor, size, font);
+        renderer.measure_width(&text_before_cursor, size, font, true);
 
     let offset = ((text_value_width + 5.0) - text_bounds.width).max(0.0);
 
@@ -1346,6 +1350,7 @@ where
             Size::INFINITY,
             Point::new(x + offset, text_bounds.height / 2.0),
             true,
+            true,
         )
         .map(text::Hit::cursor)?;
 
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 713a9c302f..d3033ddbb9 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -249,6 +249,7 @@ where
                 Default::default(),
                 self.text_alignment,
                 alignment::Vertical::Center,
+                false,
             );
         }
 

From 4bd290afe7d81d9aaf7467b3ce91491f6600261a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 19 Apr 2023 02:00:45 +0200
Subject: [PATCH 144/163] Introduce `text::Shaping` enum and replace magic
 boolean

---
 core/src/renderer/null.rs     |   4 +--
 core/src/text.rs              |  30 +++++++++++++++++-----
 core/src/widget/text.rs       |  28 ++++++++-------------
 examples/todos/src/main.rs    |   3 ++-
 graphics/src/backend.rs       |   4 +--
 graphics/src/geometry/text.rs |  18 +++++--------
 graphics/src/primitive.rs     |  20 ++++++---------
 graphics/src/renderer.rs      |  11 ++++----
 renderer/src/backend.rs       |   8 +++---
 tiny_skia/src/backend.rs      |  12 ++++-----
 tiny_skia/src/geometry.rs     |   2 +-
 tiny_skia/src/text.rs         |  18 ++++++-------
 wgpu/fonts/Iced-Icons.ttf     | Bin 5108 -> 5108 bytes
 wgpu/src/backend.rs           |   8 +++---
 wgpu/src/geometry.rs          |   2 +-
 wgpu/src/layer.rs             |   7 +++---
 wgpu/src/layer/text.rs        |  12 +++------
 wgpu/src/text.rs              |  16 ++++++------
 widget/src/checkbox.rs        |  19 +++++++++++---
 widget/src/overlay/menu.rs    |  13 +++++++++-
 widget/src/pick_list.rs       |  46 ++++++++++++++++++++++++++--------
 widget/src/radio.rs           |  22 +++++++++++++---
 widget/src/text.rs            |   1 +
 widget/src/text_input.rs      |  18 +++++++------
 widget/src/toggler.rs         |  13 ++++++++--
 25 files changed, 203 insertions(+), 132 deletions(-)

diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index f62a433871..22afb058b4 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -62,7 +62,7 @@ impl text::Renderer for Null {
         _size: f32,
         _font: Font,
         _bounds: Size,
-        _needs_shaping: bool,
+        _shaping: text::Shaping,
     ) -> (f32, f32) {
         (0.0, 20.0)
     }
@@ -73,9 +73,9 @@ impl text::Renderer for Null {
         _size: f32,
         _font: Self::Font,
         _bounds: Size,
+        _shaping: text::Shaping,
         _point: Point,
         _nearest_only: bool,
-        _advanced_shape: bool,
     ) -> Option<text::Hit> {
         None
     }
diff --git a/core/src/text.rs b/core/src/text.rs
index 0111cf312c..c59d8fce9e 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -28,14 +28,32 @@ pub struct Text<'a, Font> {
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
 
-    /// Whether the [`Text`] needs advanced shaping and font fallback.
+    /// The [`Shaping`] strategy of the [`Text`].
+    pub shaping: Shaping,
+}
+
+/// The shaping strategy of some text.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+pub enum Shaping {
+    /// No shaping and no font fallback.
+    ///
+    /// This shaping strategy is very cheap, but it will not display complex
+    /// scripts properly nor try to find missing glyphs in your system fonts.
+    ///
+    /// You should use this strategy when you have complete control of the text
+    /// and the font you are displaying in your application.
+    ///
+    /// This is the default.
+    #[default]
+    Basic,
+    /// Advanced text shaping and font fallback.
     ///
     /// You will need to enable this flag if the text contains a complex
     /// script, the font used needs it, and/or multiple fonts in your system
     /// may be needed to display all of the glyphs.
     ///
     /// Advanced shaping is expensive! You should only enable it when necessary.
-    pub advanced_shape: bool,
+    Advanced,
 }
 
 /// The result of hit testing on text.
@@ -86,7 +104,7 @@ pub trait Renderer: crate::Renderer {
         size: f32,
         font: Self::Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: Shaping,
     ) -> (f32, f32);
 
     /// Measures the width of the text as if it were laid out in a single line.
@@ -95,10 +113,10 @@ pub trait Renderer: crate::Renderer {
         content: &str,
         size: f32,
         font: Self::Font,
-        advanced_shape: bool,
+        shaping: Shaping,
     ) -> f32 {
         let (width, _) =
-            self.measure(content, size, font, Size::INFINITY, advanced_shape);
+            self.measure(content, size, font, Size::INFINITY, shaping);
 
         width
     }
@@ -116,9 +134,9 @@ pub trait Renderer: crate::Renderer {
         size: f32,
         font: Self::Font,
         bounds: Size,
+        shaping: Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<Hit>;
 
     /// Loads a [`Self::Font`] from its bytes.
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 2df4556d69..f039216805 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -24,8 +24,8 @@ where
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
     font: Option<Renderer::Font>,
+    shaping: text::Shaping,
     style: <Renderer::Theme as StyleSheet>::Style,
-    advanced_shape: bool,
 }
 
 impl<'a, Renderer> Text<'a, Renderer>
@@ -43,8 +43,8 @@ where
             height: Length::Shrink,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
+            shaping: text::Shaping::Basic,
             style: Default::default(),
-            advanced_shape: false,
         }
     }
 
@@ -101,17 +101,9 @@ where
         self
     }
 
-    /// Enables advanced text shaping and font fallback for the [`Text`].
-    ///
-    /// You will need to enable this if the text contains a complex script, the
-    /// font used needs it, and/or multiple fonts in your system may be needed
-    /// to display all of the glyphs.
-    ///
-    /// If your text isn't displaying properly, try enabling this!
-    ///
-    /// Advanced shaping is expensive! You should only enable it when necessary.
-    pub fn advanced_shape(mut self) -> Self {
-        self.advanced_shape = true;
+    /// Sets the [`text::Shaping`] strategy of the [`Text`].
+    pub fn shaping(mut self, shaping: text::Shaping) -> Self {
+        self.shaping = shaping;
         self
     }
 }
@@ -145,7 +137,7 @@ where
             size,
             self.font.unwrap_or_else(|| renderer.default_font()),
             bounds,
-            self.advanced_shape,
+            self.shaping,
         );
 
         let size = limits.resolve(Size::new(width, height));
@@ -173,7 +165,7 @@ where
             theme.appearance(self.style.clone()),
             self.horizontal_alignment,
             self.vertical_alignment,
-            self.advanced_shape,
+            self.shaping,
         );
     }
 }
@@ -198,7 +190,7 @@ pub fn draw<Renderer>(
     appearance: Appearance,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
-    advanced_shape: bool,
+    shaping: text::Shaping,
 ) where
     Renderer: text::Renderer,
 {
@@ -224,7 +216,7 @@ pub fn draw<Renderer>(
         font: font.unwrap_or_else(|| renderer.default_font()),
         horizontal_alignment,
         vertical_alignment,
-        advanced_shape,
+        shaping,
     });
 }
 
@@ -254,7 +246,7 @@ where
             vertical_alignment: self.vertical_alignment,
             font: self.font,
             style: self.style.clone(),
-            advanced_shape: self.advanced_shape,
+            shaping: self.shaping,
         }
     }
 }
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 8bc7be0901..6ad7b4fbd3 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -364,7 +364,8 @@ impl Task {
                     self.completed,
                     TaskMessage::Completed,
                 )
-                .width(Length::Fill);
+                .width(Length::Fill)
+                .text_shaping(text::Shaping::Advanced);
 
                 row![
                     checkbox,
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 0e107dd54a..0c2a6d30b3 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -48,7 +48,7 @@ pub trait Text {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32);
 
     /// Tests whether the provided point is within the boundaries of [`Text`]
@@ -64,9 +64,9 @@ pub trait Text {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit>;
 
     /// Loads a [`Font`] from its bytes.
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index f4af9ee4c0..0f731e74b8 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -1,5 +1,6 @@
-use iced_core::alignment;
-use iced_core::{Color, Font, Point};
+use crate::core::alignment;
+use crate::core::text::Shaping;
+use crate::core::{Color, Font, Point};
 
 /// A bunch of text that can be drawn to a canvas
 #[derive(Debug, Clone)]
@@ -25,15 +26,8 @@ pub struct Text {
     pub horizontal_alignment: alignment::Horizontal,
     /// The vertical alignment of the text
     pub vertical_alignment: alignment::Vertical,
-    /// Whether the text needs advanced shaping and font fallback.
-    ///
-    /// You will need to enable this flag if the text contains a complex
-    /// script, the font used needs it, and/or multiple fonts in your system
-    /// may be needed to display all of the glyphs.
-    ///
-    /// Advanced shaping is expensive! You should only enable it when
-    /// necessary.
-    pub advanced_shape: bool,
+    /// The shaping strategy of the text.
+    pub shaping: Shaping,
 }
 
 impl Default for Text {
@@ -46,7 +40,7 @@ impl Default for Text {
             font: Font::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
-            advanced_shape: false,
+            shaping: Shaping::Basic,
         }
     }
 }
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 2d9c221b85..db2370351b 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,7 +1,8 @@
-use iced_core::alignment;
-use iced_core::image;
-use iced_core::svg;
-use iced_core::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
+use crate::core::alignment;
+use crate::core::image;
+use crate::core::svg;
+use crate::core::text;
+use crate::core::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
 
 use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
@@ -26,15 +27,8 @@ pub enum Primitive {
         horizontal_alignment: alignment::Horizontal,
         /// The vertical alignment of the text
         vertical_alignment: alignment::Vertical,
-        /// Whether the text needs advanced shaping and font fallback.
-        ///
-        /// You will need to enable this flag if the text contains a complex
-        /// script, the font used needs it, and/or multiple fonts in your system
-        /// may be needed to display all of the glyphs.
-        ///
-        /// Advanced shaping is expensive! You should only enable it when
-        /// necessary.
-        advanced_shape: bool,
+        /// The shaping strategy of the text.
+        shaping: text::Shaping,
     },
     /// A quad primitive
     Quad {
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 558e21dd90..605286d650 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -138,10 +138,9 @@ where
         size: f32,
         font: Font,
         bounds: Size,
-        needs_shaping: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
-        self.backend()
-            .measure(content, size, font, bounds, needs_shaping)
+        self.backend().measure(content, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -150,18 +149,18 @@ where
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.backend().hit_test(
             content,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
@@ -178,7 +177,7 @@ where
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
-            advanced_shape: text.advanced_shape,
+            shaping: text.shaping,
         });
     }
 }
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index a98e2479ed..70b146f435 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -48,12 +48,12 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
         delegate!(
             self,
             backend,
-            backend.measure(contents, size, font, bounds, advanced_shape)
+            backend.measure(contents, size, font, bounds, shaping)
         )
     }
 
@@ -63,9 +63,9 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         position: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         delegate!(
             self,
@@ -75,9 +75,9 @@ impl backend::Text for Backend {
                 size,
                 font,
                 bounds,
+                shaping,
                 position,
                 nearest_only,
-                advanced_shape
             )
         )
     }
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 0a06f8c91e..3ef7e717e6 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -219,7 +219,7 @@ impl Backend {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
-                advanced_shape,
+                shaping,
             } => {
                 let physical_bounds =
                     (primitive.bounds() + translation) * scale_factor;
@@ -239,7 +239,7 @@ impl Backend {
                     *font,
                     *horizontal_alignment,
                     *vertical_alignment,
-                    *advanced_shape,
+                    *shaping,
                     pixels,
                     clip_mask,
                 );
@@ -628,10 +628,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
         self.text_pipeline
-            .measure(contents, size, font, bounds, advanced_shape)
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -640,18 +640,18 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 7cdac1c816..7963fd8923 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -114,7 +114,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
-            advanced_shape: text.advanced_shape,
+            shaping: text.shaping,
         });
     }
 
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 603a3e165a..a63da19365 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -1,6 +1,6 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::Hit;
+use crate::core::text::{Hit, Shaping};
 use crate::core::{Color, Point, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -49,7 +49,7 @@ impl Pipeline {
         font: Font,
         horizontal_alignment: alignment::Horizontal,
         vertical_alignment: alignment::Vertical,
-        advanced_shape: bool,
+        shaping: Shaping,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::Mask>,
     ) {
@@ -64,7 +64,7 @@ impl Pipeline {
             content,
             font,
             size,
-            advanced_shape,
+            shaping,
         };
 
         let (_, buffer) = self.render_cache.allocate(font_system, key);
@@ -132,7 +132,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -143,7 +143,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -163,9 +163,9 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: Shaping,
         point: Point,
         _nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -176,7 +176,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -396,7 +396,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
-                !key.advanced_shape,
+                matches!(key.shaping, Shaping::Basic),
             );
 
             let _ = entry.insert(buffer);
@@ -427,7 +427,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
-    advanced_shape: bool,
+    shaping: Shaping,
 }
 
 type KeyHash = u64;
diff --git a/wgpu/fonts/Iced-Icons.ttf b/wgpu/fonts/Iced-Icons.ttf
index 7112f08621071c423bf130f2906de1f878b6acbe..e3273141c45fff98c2f411b421e2e3fd225668aa 100644
GIT binary patch
delta 88
zcmeyO{zYAcfsuiMK>$dwFfh2eh4{|;-@JRGNG<bUUY&_ke3_c=Onhu8V?J;9mUw=f
ouMG0cFM!G!ZXI|P2BIIN+>h97z*s9Vd9IM;=3|1|Ow2$L0NlGBwg3PC

delta 88
zcmeyO{zYAcfsuiMK>$dwFfh2eh4{{z=l5o!NG<d18?h6o_%fBApZM5N#?p4hhj@OQ
ouMG0cFM!G!ZXI|P2BIG@uj<@vz*s9VIYLNs^D#kfCT5@r0LZHxi~s-t

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index d09b2dbaca..6b847aff5a 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -354,10 +354,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: core::text::Shaping,
     ) -> (f32, f32) {
         self.text_pipeline
-            .measure(contents, size, font, bounds, advanced_shape)
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -366,18 +366,18 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: core::text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index a85875a44a..f6397ab7d1 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -334,7 +334,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
-            advanced_shape: text.advanced_shape,
+            shaping: text.shaping,
         });
     }
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 7c5b43a3ce..b9fd044e22 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -10,6 +10,7 @@ pub use mesh::Mesh;
 pub use quad::Quad;
 pub use text::Text;
 
+use crate::core;
 use crate::core::alignment;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::{Primitive, Viewport};
@@ -64,7 +65,7 @@ impl<'a> Layer<'a> {
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
-                advanced_shape: false,
+                shaping: core::text::Shaping::Basic,
             };
 
             overlay.text.push(text);
@@ -117,7 +118,7 @@ impl<'a> Layer<'a> {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
-                advanced_shape,
+                shaping,
             } => {
                 let layer = &mut layers[current_layer];
 
@@ -129,7 +130,7 @@ impl<'a> Layer<'a> {
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
                     vertical_alignment: *vertical_alignment,
-                    advanced_shape: *advanced_shape,
+                    shaping: *shaping,
                 });
             }
             Primitive::Quad {
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index d36ff273ba..665f7188bf 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
 use crate::core::alignment;
+use crate::core::text;
 use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
@@ -25,13 +26,6 @@ pub struct Text<'a> {
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
 
-    /// Whether the text needs advanced shaping and font fallback.
-    ///
-    /// You will need to enable this flag if the text contains a complex
-    /// script, the font used needs it, and/or multiple fonts in your system
-    /// may be needed to display all of the glyphs.
-    ///
-    /// Advanced shaping is expensive! You should only enable it when
-    /// necessary.
-    pub advanced_shape: bool,
+    /// The shaping strategy of the text.
+    pub shaping: text::Shaping,
 }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f433a5b619..fc126125dc 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,6 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::Hit;
+use crate::core::text::{Hit, Shaping};
 use crate::core::{Point, Rectangle, Size};
 use crate::layer::Text;
 
@@ -83,7 +83,7 @@ impl Pipeline {
                             height: (section.bounds.height * scale_factor)
                                 .ceil(),
                         },
-                        advanced_shape: section.advanced_shape,
+                        shaping: section.shaping,
                     },
                 );
 
@@ -214,7 +214,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -225,7 +225,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -245,9 +245,9 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: Shaping,
         point: Point,
         _nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -258,7 +258,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -369,7 +369,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
-                !key.advanced_shape,
+                matches!(key.shaping, Shaping::Basic),
             );
 
             let _ = entry.insert(buffer);
@@ -394,7 +394,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
-    advanced_shape: bool,
+    shaping: Shaping,
 }
 
 type KeyHash = u64;
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index e28f76afad..2a09b8fdc2 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -46,6 +46,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     icon: Icon<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -82,11 +83,13 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING,
             text_size: None,
+            text_shaping: text::Shaping::Basic,
             font: None,
             icon: Icon {
                 font: Renderer::ICON_FONT,
                 code_point: Renderer::CHECKMARK_ICON,
                 size: None,
+                shaping: text::Shaping::Basic,
             },
             style: Default::default(),
         }
@@ -116,6 +119,12 @@ where
         self
     }
 
+    /// Sets the [`text::Shaping`] strategy of the [`Checkbox`].
+    pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
+        self.text_shaping = shaping;
+        self
+    }
+
     /// Sets the [`Font`] of the text of the [`Checkbox`].
     ///
     /// [`Font`]: crate::text::Renderer::Font
@@ -171,7 +180,8 @@ where
                     .size(
                         self.text_size
                             .unwrap_or_else(|| renderer.default_size()),
-                    ),
+                    )
+                    .shaping(self.text_shaping),
             )
             .layout(renderer, limits)
     }
@@ -257,6 +267,7 @@ where
                 font,
                 code_point,
                 size,
+                shaping,
             } = &self.icon;
             let size = size.unwrap_or(bounds.height * 0.7);
 
@@ -273,7 +284,7 @@ where
                     color: custom_style.icon_color,
                     horizontal_alignment: alignment::Horizontal::Center,
                     vertical_alignment: alignment::Vertical::Center,
-                    advanced_shape: true,
+                    shaping: *shaping,
                 });
             }
         }
@@ -293,7 +304,7 @@ where
                 },
                 alignment::Horizontal::Left,
                 alignment::Vertical::Center,
-                false,
+                self.text_shaping,
             );
         }
     }
@@ -322,4 +333,6 @@ pub struct Icon<Font> {
     pub code_point: char,
     /// Font size of the content.
     pub size: Option<f32>,
+    /// The shaping strategy of the icon.
+    pub shaping: text::Shaping,
 }
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index c904730d7f..7de3cbae0f 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -31,6 +31,7 @@ where
     width: f32,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -58,6 +59,7 @@ where
             width: 0.0,
             padding: Padding::ZERO,
             text_size: None,
+            text_shaping: text::Shaping::Basic,
             font: None,
             style: Default::default(),
         }
@@ -81,6 +83,12 @@ where
         self
     }
 
+    /// Sets the [`text::Shaping`] strategy of the [`Menu`].
+    pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
+        self.text_shaping = shaping;
+        self
+    }
+
     /// Sets the font of the [`Menu`].
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
         self.font = Some(font.into());
@@ -168,6 +176,7 @@ where
             padding,
             font,
             text_size,
+            text_shaping,
             style,
         } = menu;
 
@@ -177,6 +186,7 @@ where
             last_selection,
             font,
             text_size,
+            text_shaping,
             padding,
             style: style.clone(),
         }));
@@ -311,6 +321,7 @@ where
     last_selection: &'a mut Option<T>,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -500,7 +511,7 @@ where
                 },
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Center,
-                advanced_shape: false,
+                shaping: self.text_shaping,
             });
         }
     }
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index d44f4cae11..c0cb2946e6 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -36,6 +36,7 @@ where
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     handle: Handle<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -71,6 +72,7 @@ where
             width: Length::Shrink,
             padding: Self::DEFAULT_PADDING,
             text_size: None,
+            text_shaping: text::Shaping::Basic,
             font: None,
             handle: Default::default(),
             style: Default::default(),
@@ -101,6 +103,12 @@ where
         self
     }
 
+    /// Sets the [`text::Shaping`] strategy of the [`PickList`].
+    pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
+        self.text_shaping = shaping;
+        self
+    }
+
     /// Sets the font of the [`PickList`].
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
         self.font = Some(font.into());
@@ -164,6 +172,7 @@ where
             self.width,
             self.padding,
             self.text_size,
+            self.text_shaping,
             self.font,
             self.placeholder.as_deref(),
             &self.options,
@@ -221,6 +230,7 @@ where
             cursor_position,
             self.padding,
             self.text_size,
+            self.text_shaping,
             font,
             self.placeholder.as_deref(),
             self.selected.as_ref(),
@@ -243,6 +253,7 @@ where
             state,
             self.padding,
             self.text_size,
+            self.text_shaping,
             self.font.unwrap_or_else(|| renderer.default_font()),
             &self.options,
             self.style.clone(),
@@ -336,6 +347,8 @@ pub struct Icon<Font> {
     pub code_point: char,
     /// Font size of the content.
     pub size: Option<f32>,
+    /// The shaping strategy of the icon.
+    pub shaping: text::Shaping,
 }
 
 /// Computes the layout of a [`PickList`].
@@ -345,6 +358,7 @@ pub fn layout<Renderer, T>(
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     placeholder: Option<&str>,
     options: &[T],
@@ -366,7 +380,7 @@ where
                     text_size,
                     font.unwrap_or_else(|| renderer.default_font()),
                     Size::new(f32::INFINITY, f32::INFINITY),
-                    false,
+                    text_shaping,
                 );
 
                 width.round()
@@ -516,6 +530,7 @@ pub fn overlay<'a, T, Message, Renderer>(
     state: &'a mut State<T>,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Renderer::Font,
     options: &'a [T],
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -543,6 +558,7 @@ where
         .width(bounds.width)
         .padding(padding)
         .font(font)
+        .text_shaping(text_shaping)
         .style(style);
 
         if let Some(text_size) = text_size {
@@ -563,6 +579,7 @@ pub fn draw<'a, T, Renderer>(
     cursor_position: Point,
     padding: Padding,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Renderer::Font,
     placeholder: Option<&str>,
     selected: Option<&T>,
@@ -595,25 +612,34 @@ pub fn draw<'a, T, Renderer>(
     );
 
     let handle = match handle {
-        Handle::Arrow { size } => {
-            Some((Renderer::ICON_FONT, Renderer::ARROW_DOWN_ICON, *size))
-        }
+        Handle::Arrow { size } => Some((
+            Renderer::ICON_FONT,
+            Renderer::ARROW_DOWN_ICON,
+            *size,
+            text::Shaping::Basic,
+        )),
         Handle::Static(Icon {
             font,
             code_point,
             size,
-        }) => Some((*font, *code_point, *size)),
+            shaping,
+        }) => Some((*font, *code_point, *size, *shaping)),
         Handle::Dynamic { open, closed } => {
             if state().is_open {
-                Some((open.font, open.code_point, open.size))
+                Some((open.font, open.code_point, open.size, open.shaping))
             } else {
-                Some((closed.font, closed.code_point, closed.size))
+                Some((
+                    closed.font,
+                    closed.code_point,
+                    closed.size,
+                    closed.shaping,
+                ))
             }
         }
         Handle::None => None,
     };
 
-    if let Some((font, code_point, size)) = handle {
+    if let Some((font, code_point, size, shaping)) = handle {
         let size = size.unwrap_or_else(|| renderer.default_size());
 
         renderer.fill_text(Text {
@@ -629,7 +655,7 @@ pub fn draw<'a, T, Renderer>(
             },
             horizontal_alignment: alignment::Horizontal::Right,
             vertical_alignment: alignment::Vertical::Center,
-            advanced_shape: false,
+            shaping,
         });
     }
 
@@ -655,7 +681,7 @@ pub fn draw<'a, T, Renderer>(
             },
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
-            advanced_shape: false,
+            shaping: text_shaping,
         });
     }
 }
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index b685c1a1bc..f62f4703ea 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -81,6 +81,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
+    text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -123,6 +124,7 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING, //15
             text_size: None,
+            text_shaping: text::Shaping::Basic,
             font: None,
             style: Default::default(),
         }
@@ -152,6 +154,12 @@ where
         self
     }
 
+    /// Sets the [`text::Shaping`] strategy of the [`Radio`] button.
+    pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
+        self.text_shaping = shaping;
+        self
+    }
+
     /// Sets the text font of the [`Radio`] button.
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
         self.font = Some(font.into());
@@ -192,9 +200,15 @@ where
             .spacing(self.spacing)
             .align_items(Alignment::Center)
             .push(Row::new().width(self.size).height(self.size))
-            .push(Text::new(&self.label).width(self.width).size(
-                self.text_size.unwrap_or_else(|| renderer.default_size()),
-            ))
+            .push(
+                Text::new(&self.label)
+                    .width(self.width)
+                    .size(
+                        self.text_size
+                            .unwrap_or_else(|| renderer.default_size()),
+                    )
+                    .shaping(self.text_shaping),
+            )
             .layout(renderer, limits)
     }
 
@@ -309,7 +323,7 @@ where
                 },
                 alignment::Horizontal::Left,
                 alignment::Vertical::Center,
-                false,
+                self.text_shaping,
             );
         }
     }
diff --git a/widget/src/text.rs b/widget/src/text.rs
index 04c31edcd3..50aa137079 100644
--- a/widget/src/text.rs
+++ b/widget/src/text.rs
@@ -1,3 +1,4 @@
+pub use crate::core::text::Shaping;
 pub use crate::core::widget::text::*;
 
 pub type Text<'a, Renderer = crate::Renderer> =
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index abf858cac1..32d0b1f87e 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -463,7 +463,7 @@ where
             &icon.code_point.to_string(),
             icon.size.unwrap_or_else(|| renderer.default_size()),
             icon.font,
-            true,
+            text::Shaping::Advanced,
         );
 
         let mut text_node = layout::Node::new(
@@ -976,7 +976,7 @@ pub fn draw<Renderer>(
             bounds: icon_layout.bounds(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
-            advanced_shape: true,
+            shaping: text::Shaping::Advanced,
         });
     }
 
@@ -1081,7 +1081,7 @@ pub fn draw<Renderer>(
         if text.is_empty() { placeholder } else { &text },
         size,
         font,
-        true,
+        text::Shaping::Advanced,
     );
 
     let render = |renderer: &mut Renderer| {
@@ -1109,7 +1109,7 @@ pub fn draw<Renderer>(
             size,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
-            advanced_shape: true,
+            shaping: text::Shaping::Advanced,
         });
     };
 
@@ -1314,8 +1314,12 @@ where
 {
     let text_before_cursor = value.until(cursor_index).to_string();
 
-    let text_value_width =
-        renderer.measure_width(&text_before_cursor, size, font, true);
+    let text_value_width = renderer.measure_width(
+        &text_before_cursor,
+        size,
+        font,
+        text::Shaping::Advanced,
+    );
 
     let offset = ((text_value_width + 5.0) - text_bounds.width).max(0.0);
 
@@ -1348,9 +1352,9 @@ where
             size,
             font,
             Size::INFINITY,
+            text::Shaping::Advanced,
             Point::new(x + offset, text_bounds.height / 2.0),
             true,
-            true,
         )
         .map(text::Hit::cursor)?;
 
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index d3033ddbb9..639bbb3b6e 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -43,6 +43,7 @@ where
     size: f32,
     text_size: Option<f32>,
     text_alignment: alignment::Horizontal,
+    text_shaping: text::Shaping,
     spacing: f32,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -80,6 +81,7 @@ where
             size: Self::DEFAULT_SIZE,
             text_size: None,
             text_alignment: alignment::Horizontal::Left,
+            text_shaping: text::Shaping::Basic,
             spacing: 0.0,
             font: None,
             style: Default::default(),
@@ -110,6 +112,12 @@ where
         self
     }
 
+    /// Sets the [`text::Shaping`] strategy of the [`Toggler`].
+    pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
+        self.text_shaping = shaping;
+        self
+    }
+
     /// Sets the spacing between the [`Toggler`] and the text.
     pub fn spacing(mut self, spacing: impl Into<Pixels>) -> Self {
         self.spacing = spacing.into().0;
@@ -167,7 +175,8 @@ where
                     .size(
                         self.text_size
                             .unwrap_or_else(|| renderer.default_size()),
-                    ),
+                    )
+                    .shaping(self.text_shaping),
             );
         }
 
@@ -249,7 +258,7 @@ where
                 Default::default(),
                 self.text_alignment,
                 alignment::Vertical::Center,
-                false,
+                self.text_shaping,
             );
         }
 

From edf3432bf5176be13437b9fd5d25b890ec9dbe69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 2 May 2023 00:58:33 +0200
Subject: [PATCH 145/163] Update `glyphon` and `cosmic-text`

---
 examples/checkbox/src/main.rs | 3 ++-
 tiny_skia/Cargo.toml          | 2 +-
 tiny_skia/src/text.rs         | 9 ++++++++-
 wgpu/Cargo.toml               | 2 +-
 wgpu/src/text.rs              | 9 ++++++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index c5f3c1345d..5852e97855 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -1,6 +1,6 @@
 use iced::executor;
 use iced::font::{self, Font};
-use iced::widget::{checkbox, column, container};
+use iced::widget::{checkbox, column, container, text};
 use iced::{Application, Command, Element, Length, Settings, Theme};
 
 const ICON_FONT: Font = Font::with_name("icons");
@@ -59,6 +59,7 @@ impl Application for Example {
                     font: ICON_FONT,
                     code_point: '\u{e901}',
                     size: None,
+                    shaping: text::Shaping::Basic,
                 });
 
         let content = column![default_checkbox, custom_checkbox].spacing(22);
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 32645ac1e5..400eee6a34 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -24,7 +24,7 @@ features = ["tiny-skia"]
 
 [dependencies.cosmic-text]
 git = "https://github.com/hecrj/cosmic-text.git"
-rev = "ad111a1df10d5da503620f4b841de5d41ebd4e73"
+rev = "b85d6a4f2376f8a8a7dadc0f8bcb89d4db10a1c9"
 
 [dependencies.twox-hash]
 version = "1.6"
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index a63da19365..58079cc0f4 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -229,6 +229,13 @@ fn to_stretch(stretch: font::Stretch) -> cosmic_text::Stretch {
     }
 }
 
+fn to_shaping(shaping: Shaping) -> cosmic_text::Shaping {
+    match shaping {
+        Shaping::Basic => cosmic_text::Shaping::Basic,
+        Shaping::Advanced => cosmic_text::Shaping::Advanced,
+    }
+}
+
 #[derive(Debug, Clone, Default)]
 struct GlyphCache {
     entries: FxHashMap<
@@ -396,7 +403,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
-                matches!(key.shaping, Shaping::Basic),
+                to_shaping(key.shaping),
             );
 
             let _ = entry.insert(buffer);
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 254d32d6ce..6934ae49b1 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "446cf0803065b52ba5fb9a30fe0addb6d7b5f9d9"
+rev = "504aa8a9a1fb42726f02fa244b70119e7ca25933"
 
 [dependencies.encase]
 version = "0.3.0"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index fc126125dc..ad7bdc8d5b 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -311,6 +311,13 @@ fn to_stretch(stretch: font::Stretch) -> glyphon::Stretch {
     }
 }
 
+fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
+    match shaping {
+        Shaping::Basic => glyphon::Shaping::Basic,
+        Shaping::Advanced => glyphon::Shaping::Advanced,
+    }
+}
+
 struct Cache {
     entries: FxHashMap<KeyHash, glyphon::Buffer>,
     recently_used: FxHashSet<KeyHash>,
@@ -369,7 +376,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
-                matches!(key.shaping, Shaping::Basic),
+                to_shaping(key.shaping),
             );
 
             let _ = entry.insert(buffer);

From 9499a8f9e6f9971dedfae563cb133232aa3cebc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 4 May 2023 13:00:16 +0200
Subject: [PATCH 146/163] Support configurable `LineHeight` in text widgets

---
 core/src/length.rs            |  8 ++++
 core/src/pixels.rs            |  6 +++
 core/src/renderer/null.rs     |  2 +
 core/src/text.rs              | 73 +++++++++++++++++++++++++++++++++--
 core/src/widget/text.rs       | 20 +++++++++-
 graphics/src/backend.rs       |  2 +
 graphics/src/geometry/text.rs |  5 ++-
 graphics/src/primitive.rs     |  4 +-
 graphics/src/renderer.rs      | 13 ++++++-
 renderer/src/backend.rs       |  5 ++-
 tiny_skia/src/backend.rs      | 20 ++++++++--
 tiny_skia/src/geometry.rs     |  1 +
 tiny_skia/src/text.rs         | 28 ++++++++++++--
 wgpu/src/backend.rs           | 13 ++++++-
 wgpu/src/geometry.rs          |  1 +
 wgpu/src/layer.rs             |  3 ++
 wgpu/src/layer/text.rs        |  5 ++-
 wgpu/src/text.rs              | 28 +++++++++++---
 widget/src/checkbox.rs        | 14 +++++++
 widget/src/overlay/menu.rs    | 46 ++++++++++++++++------
 widget/src/pick_list.rs       | 26 +++++++++++--
 widget/src/radio.rs           | 13 +++++++
 widget/src/text_input.rs      | 30 +++++++++++++-
 widget/src/toggler.rs         | 13 +++++++
 24 files changed, 337 insertions(+), 42 deletions(-)

diff --git a/core/src/length.rs b/core/src/length.rs
index bb925c4b42..3adb996e6e 100644
--- a/core/src/length.rs
+++ b/core/src/length.rs
@@ -1,3 +1,5 @@
+use crate::Pixels;
+
 /// The strategy used to fill space in a specific dimension.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Length {
@@ -36,6 +38,12 @@ impl Length {
     }
 }
 
+impl From<Pixels> for Length {
+    fn from(amount: Pixels) -> Self {
+        Length::Fixed(f32::from(amount))
+    }
+}
+
 impl From<f32> for Length {
     fn from(amount: f32) -> Self {
         Length::Fixed(amount)
diff --git a/core/src/pixels.rs b/core/src/pixels.rs
index e42cd9f9f4..6a9e5c8888 100644
--- a/core/src/pixels.rs
+++ b/core/src/pixels.rs
@@ -20,3 +20,9 @@ impl From<u16> for Pixels {
         Self(f32::from(amount))
     }
 }
+
+impl From<Pixels> for f32 {
+    fn from(pixels: Pixels) -> Self {
+        pixels.0
+    }
+}
diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index 22afb058b4..f0cc952e19 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -60,6 +60,7 @@ impl text::Renderer for Null {
         &self,
         _content: &str,
         _size: f32,
+        _line_height: text::LineHeight,
         _font: Font,
         _bounds: Size,
         _shaping: text::Shaping,
@@ -71,6 +72,7 @@ impl text::Renderer for Null {
         &self,
         _contents: &str,
         _size: f32,
+        _line_height: text::LineHeight,
         _font: Self::Font,
         _bounds: Size,
         _shaping: text::Shaping,
diff --git a/core/src/text.rs b/core/src/text.rs
index c59d8fce9e..1a867be320 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -1,8 +1,9 @@
 //! Draw and interact with text.
 use crate::alignment;
-use crate::{Color, Point, Rectangle, Size};
+use crate::{Color, Pixels, Point, Rectangle, Size};
 
 use std::borrow::Cow;
+use std::hash::{Hash, Hasher};
 
 /// A paragraph.
 #[derive(Debug, Clone, Copy)]
@@ -13,9 +14,12 @@ pub struct Text<'a, Font> {
     /// The bounds of the paragraph.
     pub bounds: Rectangle,
 
-    /// The size of the [`Text`].
+    /// The size of the [`Text`] in logical pixels.
     pub size: f32,
 
+    /// The line height of the [`Text`].
+    pub line_height: LineHeight,
+
     /// The color of the [`Text`].
     pub color: Color,
 
@@ -56,6 +60,59 @@ pub enum Shaping {
     Advanced,
 }
 
+/// The height of a line of text in a paragraph.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum LineHeight {
+    /// A factor of the size of the text.
+    Relative(f32),
+
+    /// An absolute height in logical pixels.
+    Absolute(Pixels),
+}
+
+impl LineHeight {
+    /// Returns the [`LineHeight`] in absolute logical pixels.
+    pub fn to_absolute(self, text_size: Pixels) -> Pixels {
+        match self {
+            Self::Relative(factor) => Pixels(factor * text_size.0),
+            Self::Absolute(pixels) => pixels,
+        }
+    }
+}
+
+impl Default for LineHeight {
+    fn default() -> Self {
+        Self::Relative(1.2)
+    }
+}
+
+impl From<f32> for LineHeight {
+    fn from(factor: f32) -> Self {
+        Self::Relative(factor)
+    }
+}
+
+impl From<Pixels> for LineHeight {
+    fn from(pixels: Pixels) -> Self {
+        Self::Absolute(pixels)
+    }
+}
+
+impl Hash for LineHeight {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        match self {
+            Self::Relative(factor) => {
+                state.write_u8(0);
+                factor.to_bits().hash(state);
+            }
+            Self::Absolute(pixels) => {
+                state.write_u8(1);
+                f32::from(*pixels).to_bits().hash(state);
+            }
+        }
+    }
+}
+
 /// The result of hit testing on text.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Hit {
@@ -102,6 +159,7 @@ pub trait Renderer: crate::Renderer {
         &self,
         content: &str,
         size: f32,
+        line_height: LineHeight,
         font: Self::Font,
         bounds: Size,
         shaping: Shaping,
@@ -115,8 +173,14 @@ pub trait Renderer: crate::Renderer {
         font: Self::Font,
         shaping: Shaping,
     ) -> f32 {
-        let (width, _) =
-            self.measure(content, size, font, Size::INFINITY, shaping);
+        let (width, _) = self.measure(
+            content,
+            size,
+            LineHeight::Absolute(Pixels(size)),
+            font,
+            Size::INFINITY,
+            shaping,
+        );
 
         width
     }
@@ -132,6 +196,7 @@ pub trait Renderer: crate::Renderer {
         &self,
         contents: &str,
         size: f32,
+        line_height: LineHeight,
         font: Self::Font,
         bounds: Size,
         shaping: Shaping,
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index f039216805..2d86e735a2 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -19,6 +19,7 @@ where
 {
     content: Cow<'a, str>,
     size: Option<f32>,
+    line_height: text::LineHeight,
     width: Length,
     height: Length,
     horizontal_alignment: alignment::Horizontal,
@@ -38,6 +39,7 @@ where
         Text {
             content: content.into(),
             size: None,
+            line_height: text::LineHeight::default(),
             font: None,
             width: Length::Shrink,
             height: Length::Shrink,
@@ -54,6 +56,15 @@ where
         self
     }
 
+    /// Sets the [`LineHeight`] of the [`Text`].
+    pub fn line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.line_height = line_height.into();
+        self
+    }
+
     /// Sets the [`Font`] of the [`Text`].
     ///
     /// [`Font`]: crate::text::Renderer::Font
@@ -135,6 +146,7 @@ where
         let (width, height) = renderer.measure(
             &self.content,
             size,
+            self.line_height,
             self.font.unwrap_or_else(|| renderer.default_font()),
             bounds,
             self.shaping,
@@ -161,6 +173,7 @@ where
             layout,
             &self.content,
             self.size,
+            self.line_height,
             self.font,
             theme.appearance(self.style.clone()),
             self.horizontal_alignment,
@@ -186,6 +199,7 @@ pub fn draw<Renderer>(
     layout: Layout<'_>,
     content: &str,
     size: Option<f32>,
+    line_height: text::LineHeight,
     font: Option<Renderer::Font>,
     appearance: Appearance,
     horizontal_alignment: alignment::Horizontal,
@@ -208,9 +222,12 @@ pub fn draw<Renderer>(
         alignment::Vertical::Bottom => bounds.y + bounds.height,
     };
 
+    let size = size.unwrap_or_else(|| renderer.default_size());
+
     renderer.fill_text(crate::Text {
         content,
-        size: size.unwrap_or_else(|| renderer.default_size()),
+        size,
+        line_height,
         bounds: Rectangle { x, y, ..bounds },
         color: appearance.color.unwrap_or(style.text_color),
         font: font.unwrap_or_else(|| renderer.default_font()),
@@ -240,6 +257,7 @@ where
         Self {
             content: self.content.clone(),
             size: self.size,
+            line_height: self.line_height,
             width: self.width,
             height: self.height,
             horizontal_alignment: self.horizontal_alignment,
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 0c2a6d30b3..ae89da061c 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -46,6 +46,7 @@ pub trait Text {
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
@@ -62,6 +63,7 @@ pub trait Text {
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index 0f731e74b8..c584f3cd52 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -1,5 +1,5 @@
 use crate::core::alignment;
-use crate::core::text::Shaping;
+use crate::core::text::{LineHeight, Shaping};
 use crate::core::{Color, Font, Point};
 
 /// A bunch of text that can be drawn to a canvas
@@ -20,6 +20,8 @@ pub struct Text {
     pub color: Color,
     /// The size of the text
     pub size: f32,
+    /// The line height of the text.
+    pub line_height: LineHeight,
     /// The font of the text
     pub font: Font,
     /// The horizontal alignment of the text
@@ -37,6 +39,7 @@ impl Default for Text {
             position: Point::ORIGIN,
             color: Color::BLACK,
             size: 16.0,
+            line_height: LineHeight::Relative(1.2),
             font: Font::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index db2370351b..d814c7572d 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -19,8 +19,10 @@ pub enum Primitive {
         bounds: Rectangle,
         /// The color of the text
         color: Color,
-        /// The size of the text
+        /// The size of the text in logical pixels
         size: f32,
+        /// The line height of the text
+        line_height: text::LineHeight,
         /// The font of the text
         font: Font,
         /// The horizontal alignment of the text
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 605286d650..aaf1737af9 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -136,17 +136,26 @@ where
         &self,
         content: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
     ) -> (f32, f32) {
-        self.backend().measure(content, size, font, bounds, shaping)
+        self.backend().measure(
+            content,
+            size,
+            line_height,
+            font,
+            bounds,
+            shaping,
+        )
     }
 
     fn hit_test(
         &self,
         content: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
@@ -156,6 +165,7 @@ where
         self.backend().hit_test(
             content,
             size,
+            line_height,
             font,
             bounds,
             shaping,
@@ -173,6 +183,7 @@ where
             content: text.content.to_string(),
             bounds: text.bounds,
             size: text.size,
+            line_height: text.line_height,
             color: text.color,
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 70b146f435..c1bec6afd6 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -46,6 +46,7 @@ impl backend::Text for Backend {
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
@@ -53,7 +54,7 @@ impl backend::Text for Backend {
         delegate!(
             self,
             backend,
-            backend.measure(contents, size, font, bounds, shaping)
+            backend.measure(contents, size, line_height, font, bounds, shaping)
         )
     }
 
@@ -61,6 +62,7 @@ impl backend::Text for Backend {
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
@@ -73,6 +75,7 @@ impl backend::Text for Backend {
             backend.hit_test(
                 contents,
                 size,
+                line_height,
                 font,
                 bounds,
                 shaping,
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 3ef7e717e6..99230a2f66 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -216,6 +216,7 @@ impl Backend {
                 bounds,
                 color,
                 size,
+                line_height,
                 font,
                 horizontal_alignment,
                 vertical_alignment,
@@ -233,13 +234,15 @@ impl Backend {
 
                 self.text_pipeline.draw(
                     content,
-                    (*bounds + translation) * scale_factor,
+                    *bounds + translation,
                     *color,
-                    *size * scale_factor,
+                    *size,
+                    *line_height,
                     *font,
                     *horizontal_alignment,
                     *vertical_alignment,
                     *shaping,
+                    scale_factor,
                     pixels,
                     clip_mask,
                 );
@@ -626,18 +629,26 @@ impl backend::Text for Backend {
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
     ) -> (f32, f32) {
-        self.text_pipeline
-            .measure(contents, size, font, bounds, shaping)
+        self.text_pipeline.measure(
+            contents,
+            size,
+            line_height,
+            font,
+            bounds,
+            shaping,
+        )
     }
 
     fn hit_test(
         &self,
         contents: &str,
         size: f32,
+        line_height: text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
@@ -647,6 +658,7 @@ impl backend::Text for Backend {
         self.text_pipeline.hit_test(
             contents,
             size,
+            line_height,
             font,
             bounds,
             shaping,
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 7963fd8923..a445b56182 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -111,6 +111,7 @@ impl Frame {
             },
             color: text.color,
             size: text.size,
+            line_height: text.line_height,
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 58079cc0f4..ba8a4e4b70 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -1,7 +1,7 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::{Hit, Shaping};
-use crate::core::{Color, Point, Rectangle, Size};
+use crate::core::text::{Hit, LineHeight, Shaping};
+use crate::core::{Color, Pixels, Point, Rectangle, Size};
 
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
@@ -46,13 +46,21 @@ impl Pipeline {
         bounds: Rectangle,
         color: Color,
         size: f32,
+        line_height: LineHeight,
         font: Font,
         horizontal_alignment: alignment::Horizontal,
         vertical_alignment: alignment::Vertical,
         shaping: Shaping,
+        scale_factor: f32,
         pixels: &mut tiny_skia::PixmapMut<'_>,
         clip_mask: Option<&tiny_skia::Mask>,
     ) {
+        let line_height =
+            f32::from(line_height.to_absolute(Pixels(size))) * scale_factor;
+
+        let bounds = bounds * scale_factor;
+        let size = size * scale_factor;
+
         let font_system = self.font_system.get_mut();
         let key = Key {
             bounds: {
@@ -64,6 +72,7 @@ impl Pipeline {
             content,
             font,
             size,
+            line_height,
             shaping,
         };
 
@@ -76,7 +85,7 @@ impl Pipeline {
                 (i + 1, buffer.line_w.max(max))
             });
 
-        let total_height = total_lines as f32 * size * 1.2;
+        let total_height = total_lines as f32 * line_height;
 
         let x = match horizontal_alignment {
             alignment::Horizontal::Left => bounds.x,
@@ -130,17 +139,21 @@ impl Pipeline {
         &self,
         content: &str,
         size: f32,
+        line_height: LineHeight,
         font: Font,
         bounds: Size,
         shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
+        let line_height = f32::from(line_height.to_absolute(Pixels(size)));
+
         let (_, paragraph) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
                 size,
+                line_height,
                 font,
                 bounds,
                 shaping,
@@ -154,13 +167,14 @@ impl Pipeline {
                 (i + 1, buffer.line_w.max(max))
             });
 
-        (max_width, size * 1.2 * total_lines as f32)
+        (max_width, line_height * total_lines as f32)
     }
 
     pub fn hit_test(
         &self,
         content: &str,
         size: f32,
+        line_height: LineHeight,
         font: Font,
         bounds: Size,
         shaping: Shaping,
@@ -169,11 +183,14 @@ impl Pipeline {
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
+        let line_height = f32::from(line_height.to_absolute(Pixels(size)));
+
         let (_, paragraph) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
                 size,
+                line_height,
                 font,
                 bounds,
                 shaping,
@@ -380,9 +397,11 @@ impl Cache {
 
             key.content.hash(&mut hasher);
             key.size.to_bits().hash(&mut hasher);
+            key.line_height.to_bits().hash(&mut hasher);
             key.font.hash(&mut hasher);
             key.bounds.width.to_bits().hash(&mut hasher);
             key.bounds.height.to_bits().hash(&mut hasher);
+            key.shaping.hash(&mut hasher);
 
             hasher.finish()
         };
@@ -432,6 +451,7 @@ impl Cache {
 struct Key<'a> {
     content: &'a str,
     size: f32,
+    line_height: f32,
     font: Font,
     bounds: Size,
     shaping: Shaping,
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 6b847aff5a..def80a8100 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -352,18 +352,26 @@ impl backend::Text for Backend {
         &self,
         contents: &str,
         size: f32,
+        line_height: core::text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: core::text::Shaping,
     ) -> (f32, f32) {
-        self.text_pipeline
-            .measure(contents, size, font, bounds, shaping)
+        self.text_pipeline.measure(
+            contents,
+            size,
+            line_height,
+            font,
+            bounds,
+            shaping,
+        )
     }
 
     fn hit_test(
         &self,
         contents: &str,
         size: f32,
+        line_height: core::text::LineHeight,
         font: Font,
         bounds: Size,
         shaping: core::text::Shaping,
@@ -373,6 +381,7 @@ impl backend::Text for Backend {
         self.text_pipeline.hit_test(
             contents,
             size,
+            line_height,
             font,
             bounds,
             shaping,
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index f6397ab7d1..8cfed1e5d5 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -331,6 +331,7 @@ impl Frame {
             },
             color: text.color,
             size: text.size,
+            line_height: text.line_height,
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index b9fd044e22..dcae06481c 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -62,6 +62,7 @@ impl<'a> Layer<'a> {
                 ),
                 color: Color::new(0.9, 0.9, 0.9, 1.0),
                 size: 20.0,
+                line_height: core::text::LineHeight::Relative(1.2),
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
@@ -114,6 +115,7 @@ impl<'a> Layer<'a> {
                 content,
                 bounds,
                 size,
+                line_height,
                 color,
                 font,
                 horizontal_alignment,
@@ -126,6 +128,7 @@ impl<'a> Layer<'a> {
                     content,
                     bounds: *bounds + translation,
                     size: *size,
+                    line_height: *line_height,
                     color: *color,
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index 665f7188bf..ba1bdca828 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -14,9 +14,12 @@ pub struct Text<'a> {
     /// The color of the [`Text`], in __linear RGB_.
     pub color: Color,
 
-    /// The size of the [`Text`].
+    /// The size of the [`Text`] in logical pixels.
     pub size: f32,
 
+    /// The line height of the [`Text`].
+    pub line_height: text::LineHeight,
+
     /// The font of the [`Text`].
     pub font: Font,
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ad7bdc8d5b..ff68772da3 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,7 +1,7 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::{Hit, Shaping};
-use crate::core::{Point, Rectangle, Size};
+use crate::core::text::{Hit, LineHeight, Shaping};
+use crate::core::{Pixels, Point, Rectangle, Size};
 use crate::layer::Text;
 
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -77,6 +77,11 @@ impl Pipeline {
                     Key {
                         content: section.content,
                         size: section.size * scale_factor,
+                        line_height: f32::from(
+                            section
+                                .line_height
+                                .to_absolute(Pixels(section.size)),
+                        ) * scale_factor,
                         font: section.font,
                         bounds: Size {
                             width: (section.bounds.width * scale_factor).ceil(),
@@ -114,7 +119,7 @@ impl Pipeline {
                     });
 
                 let total_height =
-                    total_lines as f32 * section.size * 1.2 * scale_factor;
+                    total_lines as f32 * buffer.metrics().line_height;
 
                 let left = match section.horizontal_alignment {
                     alignment::Horizontal::Left => x,
@@ -212,17 +217,21 @@ impl Pipeline {
         &self,
         content: &str,
         size: f32,
+        line_height: LineHeight,
         font: Font,
         bounds: Size,
         shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
+        let line_height = f32::from(line_height.to_absolute(Pixels(size)));
+
         let (_, paragraph) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
                 size,
+                line_height,
                 font,
                 bounds,
                 shaping,
@@ -236,13 +245,14 @@ impl Pipeline {
                 (i + 1, buffer.line_w.max(max))
             });
 
-        (max_width, size * 1.2 * total_lines as f32)
+        (max_width, line_height * total_lines as f32)
     }
 
     pub fn hit_test(
         &self,
         content: &str,
         size: f32,
+        line_height: LineHeight,
         font: Font,
         bounds: Size,
         shaping: Shaping,
@@ -251,11 +261,14 @@ impl Pipeline {
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
+        let line_height = f32::from(line_height.to_absolute(Pixels(size)));
+
         let (_, paragraph) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
                 size,
+                line_height,
                 font,
                 bounds,
                 shaping,
@@ -353,21 +366,23 @@ impl Cache {
 
             key.content.hash(&mut hasher);
             key.size.to_bits().hash(&mut hasher);
+            key.line_height.to_bits().hash(&mut hasher);
             key.font.hash(&mut hasher);
             key.bounds.width.to_bits().hash(&mut hasher);
             key.bounds.height.to_bits().hash(&mut hasher);
+            key.shaping.hash(&mut hasher);
 
             hasher.finish()
         };
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
-            let metrics = glyphon::Metrics::new(key.size, key.size * 1.2);
+            let metrics = glyphon::Metrics::new(key.size, key.line_height);
             let mut buffer = glyphon::Buffer::new(font_system, metrics);
 
             buffer.set_size(
                 font_system,
                 key.bounds.width,
-                key.bounds.height.max(key.size * 1.2),
+                key.bounds.height.max(key.line_height),
             );
             buffer.set_text(
                 font_system,
@@ -399,6 +414,7 @@ impl Cache {
 struct Key<'a> {
     content: &'a str,
     size: f32,
+    line_height: f32,
     font: Font,
     bounds: Size,
     shaping: Shaping,
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 2a09b8fdc2..c34fd0bb7f 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -46,6 +46,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     icon: Icon<Renderer::Font>,
@@ -83,6 +84,7 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING,
             text_size: None,
+            text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Basic,
             font: None,
             icon: Icon {
@@ -119,6 +121,15 @@ where
         self
     }
 
+    /// Sets the text [`LineHeight`] of the [`Checkbox`].
+    pub fn text_line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.text_line_height = line_height.into();
+        self
+    }
+
     /// Sets the [`text::Shaping`] strategy of the [`Checkbox`].
     pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
         self.text_shaping = shaping;
@@ -181,6 +192,7 @@ where
                         self.text_size
                             .unwrap_or_else(|| renderer.default_size()),
                     )
+                    .line_height(self.text_line_height)
                     .shaping(self.text_shaping),
             )
             .layout(renderer, limits)
@@ -276,6 +288,7 @@ where
                     content: &code_point.to_string(),
                     font: *font,
                     size,
+                    line_height: text::LineHeight::default(),
                     bounds: Rectangle {
                         x: bounds.center_x(),
                         y: bounds.center_y(),
@@ -298,6 +311,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
+                self.text_line_height,
                 self.font,
                 crate::text::Appearance {
                     color: custom_style.text_color,
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index 7de3cbae0f..dfb6a22a99 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -31,6 +31,7 @@ where
     width: f32,
     padding: Padding,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -59,6 +60,7 @@ where
             width: 0.0,
             padding: Padding::ZERO,
             text_size: None,
+            text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Basic,
             font: None,
             style: Default::default(),
@@ -83,6 +85,15 @@ where
         self
     }
 
+    /// Sets the text [`LineHeight`] of the [`Menu`].
+    pub fn text_line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.text_line_height = line_height.into();
+        self
+    }
+
     /// Sets the [`text::Shaping`] strategy of the [`Menu`].
     pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
         self.text_shaping = shaping;
@@ -176,6 +187,7 @@ where
             padding,
             font,
             text_size,
+            text_line_height,
             text_shaping,
             style,
         } = menu;
@@ -186,6 +198,7 @@ where
             last_selection,
             font,
             text_size,
+            text_line_height,
             text_shaping,
             padding,
             style: style.clone(),
@@ -321,6 +334,7 @@ where
     last_selection: &'a mut Option<T>,
     padding: Padding,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -352,10 +366,13 @@ where
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
 
+        let text_line_height =
+            self.text_line_height.to_absolute(Pixels(text_size));
+
         let size = {
             let intrinsic = Size::new(
                 0.0,
-                (text_size * 1.2 + self.padding.vertical())
+                (f32::from(text_line_height) + self.padding.vertical())
                     * self.options.len() as f32,
             );
 
@@ -395,9 +412,12 @@ where
                         .text_size
                         .unwrap_or_else(|| renderer.default_size());
 
+                    let option_height = f32::from(
+                        self.text_line_height.to_absolute(Pixels(text_size)),
+                    ) + self.padding.vertical();
+
                     *self.hovered_option = Some(
-                        ((cursor_position.y - bounds.y)
-                            / (text_size * 1.2 + self.padding.vertical()))
+                        ((cursor_position.y - bounds.y) / option_height)
                             as usize,
                     );
                 }
@@ -410,9 +430,12 @@ where
                         .text_size
                         .unwrap_or_else(|| renderer.default_size());
 
+                    let option_height = f32::from(
+                        self.text_line_height.to_absolute(Pixels(text_size)),
+                    ) + self.padding.vertical();
+
                     *self.hovered_option = Some(
-                        ((cursor_position.y - bounds.y)
-                            / (text_size * 1.2 + self.padding.vertical()))
+                        ((cursor_position.y - bounds.y) / option_height)
                             as usize,
                     );
 
@@ -462,12 +485,12 @@ where
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
         let option_height =
-            (text_size * 1.2 + self.padding.vertical()) as usize;
+            f32::from(self.text_line_height.to_absolute(Pixels(text_size)))
+                + self.padding.vertical();
 
         let offset = viewport.y - bounds.y;
-        let start = (offset / option_height as f32) as usize;
-        let end =
-            ((offset + viewport.height) / option_height as f32).ceil() as usize;
+        let start = (offset / option_height) as usize;
+        let end = ((offset + viewport.height) / option_height).ceil() as usize;
 
         let visible_options = &self.options[start..end.min(self.options.len())];
 
@@ -477,9 +500,9 @@ where
 
             let bounds = Rectangle {
                 x: bounds.x,
-                y: bounds.y + (option_height * i) as f32,
+                y: bounds.y + (option_height * i as f32),
                 width: bounds.width,
-                height: text_size * 1.2 + self.padding.vertical(),
+                height: option_height,
             };
 
             if is_selected {
@@ -503,6 +526,7 @@ where
                     ..bounds
                 },
                 size: text_size,
+                line_height: self.text_line_height,
                 font: self.font.unwrap_or_else(|| renderer.default_font()),
                 color: if is_selected {
                     appearance.selected_text_color
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index c0cb2946e6..bc2c90669f 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -36,6 +36,7 @@ where
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     handle: Handle<Renderer::Font>,
@@ -72,6 +73,7 @@ where
             width: Length::Shrink,
             padding: Self::DEFAULT_PADDING,
             text_size: None,
+            text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Basic,
             font: None,
             handle: Default::default(),
@@ -103,6 +105,15 @@ where
         self
     }
 
+    /// Sets the text [`LineHeight`] of the [`PickList`].
+    pub fn text_line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.text_line_height = line_height.into();
+        self
+    }
+
     /// Sets the [`text::Shaping`] strategy of the [`PickList`].
     pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
         self.text_shaping = shaping;
@@ -172,6 +183,7 @@ where
             self.width,
             self.padding,
             self.text_size,
+            self.text_line_height,
             self.text_shaping,
             self.font,
             self.placeholder.as_deref(),
@@ -230,6 +242,7 @@ where
             cursor_position,
             self.padding,
             self.text_size,
+            self.text_line_height,
             self.text_shaping,
             font,
             self.placeholder.as_deref(),
@@ -358,6 +371,7 @@ pub fn layout<Renderer, T>(
     width: Length,
     padding: Padding,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     placeholder: Option<&str>,
@@ -375,11 +389,10 @@ where
     let max_width = match width {
         Length::Shrink => {
             let measure = |label: &str| -> f32 {
-                let (width, _) = renderer.measure(
+                let width = renderer.measure_width(
                     label,
                     text_size,
                     font.unwrap_or_else(|| renderer.default_font()),
-                    Size::new(f32::INFINITY, f32::INFINITY),
                     text_shaping,
                 );
 
@@ -400,8 +413,10 @@ where
     };
 
     let size = {
-        let intrinsic =
-            Size::new(max_width + text_size + padding.left, text_size * 1.2);
+        let intrinsic = Size::new(
+            max_width + text_size + padding.left,
+            f32::from(text_line_height.to_absolute(Pixels(text_size))),
+        );
 
         limits.resolve(intrinsic).pad(padding)
     };
@@ -579,6 +594,7 @@ pub fn draw<'a, T, Renderer>(
     cursor_position: Point,
     padding: Padding,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Renderer::Font,
     placeholder: Option<&str>,
@@ -645,6 +661,7 @@ pub fn draw<'a, T, Renderer>(
         renderer.fill_text(Text {
             content: &code_point.to_string(),
             size,
+            line_height: text::LineHeight::default(),
             font,
             color: style.handle_color,
             bounds: Rectangle {
@@ -667,6 +684,7 @@ pub fn draw<'a, T, Renderer>(
         renderer.fill_text(Text {
             content: label,
             size: text_size,
+            line_height: text_line_height,
             font,
             color: if is_selected {
                 style.text_color
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index f62f4703ea..9dad1e22a2 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -81,6 +81,7 @@ where
     size: f32,
     spacing: f32,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_shaping: text::Shaping,
     font: Option<Renderer::Font>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -124,6 +125,7 @@ where
             size: Self::DEFAULT_SIZE,
             spacing: Self::DEFAULT_SPACING, //15
             text_size: None,
+            text_line_height: text::LineHeight::default(),
             text_shaping: text::Shaping::Basic,
             font: None,
             style: Default::default(),
@@ -154,6 +156,15 @@ where
         self
     }
 
+    /// Sets the text [`LineHeight`] of the [`Radio`] button.
+    pub fn text_line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.text_line_height = line_height.into();
+        self
+    }
+
     /// Sets the [`text::Shaping`] strategy of the [`Radio`] button.
     pub fn text_shaping(mut self, shaping: text::Shaping) -> Self {
         self.text_shaping = shaping;
@@ -207,6 +218,7 @@ where
                         self.text_size
                             .unwrap_or_else(|| renderer.default_size()),
                     )
+                    .line_height(self.text_line_height)
                     .shaping(self.text_shaping),
             )
             .layout(renderer, limits)
@@ -317,6 +329,7 @@ where
                 label_layout,
                 &self.label,
                 self.text_size,
+                self.text_line_height,
                 self.font,
                 crate::text::Appearance {
                     color: custom_style.text_color,
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 364ec3cd94..bbc07dac07 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -68,6 +68,7 @@ where
     width: Length,
     padding: Padding,
     size: Option<f32>,
+    line_height: text::LineHeight,
     on_input: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_submit: Option<Message>,
@@ -96,6 +97,7 @@ where
             width: Length::Fill,
             padding: Padding::new(5.0),
             size: None,
+            line_height: text::LineHeight::default(),
             on_input: None,
             on_paste: None,
             on_submit: None,
@@ -177,6 +179,15 @@ where
         self
     }
 
+    /// Sets the [`LineHeight`] of the [`TextInput`].
+    pub fn line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.line_height = line_height.into();
+        self
+    }
+
     /// Sets the style of the [`TextInput`].
     pub fn style(
         mut self,
@@ -208,6 +219,7 @@ where
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
+            self.line_height,
             self.font,
             self.on_input.is_none(),
             self.is_secure,
@@ -263,6 +275,7 @@ where
             self.width,
             self.padding,
             self.size,
+            self.line_height,
             self.icon.as_ref(),
         )
     }
@@ -299,6 +312,7 @@ where
             shell,
             &mut self.value,
             self.size,
+            self.line_height,
             self.font,
             self.is_secure,
             self.on_input.as_deref(),
@@ -327,6 +341,7 @@ where
             &self.value,
             &self.placeholder,
             self.size,
+            self.line_height,
             self.font,
             self.on_input.is_none(),
             self.is_secure,
@@ -447,6 +462,7 @@ pub fn layout<Renderer>(
     width: Length,
     padding: Padding,
     size: Option<f32>,
+    line_height: text::LineHeight,
     icon: Option<&Icon<Renderer::Font>>,
 ) -> layout::Node
 where
@@ -454,7 +470,10 @@ where
 {
     let text_size = size.unwrap_or_else(|| renderer.default_size());
     let padding = padding.fit(Size::ZERO, limits.max());
-    let limits = limits.width(width).pad(padding).height(text_size * 1.2);
+    let limits = limits
+        .width(width)
+        .pad(padding)
+        .height(line_height.to_absolute(Pixels(text_size)));
 
     let text_bounds = limits.resolve(Size::ZERO);
 
@@ -515,6 +534,7 @@ pub fn update<'a, Message, Renderer>(
     shell: &mut Shell<'_, Message>,
     value: &mut Value,
     size: Option<f32>,
+    line_height: text::LineHeight,
     font: Option<Renderer::Font>,
     is_secure: bool,
     on_input: Option<&dyn Fn(String) -> Message>,
@@ -567,6 +587,7 @@ where
                                 text_layout.bounds(),
                                 font,
                                 size,
+                                line_height,
                                 &value,
                                 state,
                                 target,
@@ -595,6 +616,7 @@ where
                                 text_layout.bounds(),
                                 font,
                                 size,
+                                line_height,
                                 value,
                                 state,
                                 target,
@@ -644,6 +666,7 @@ where
                     text_layout.bounds(),
                     font,
                     size,
+                    line_height,
                     &value,
                     state,
                     target,
@@ -926,6 +949,7 @@ pub fn draw<Renderer>(
     value: &Value,
     placeholder: &str,
     size: Option<f32>,
+    line_height: text::LineHeight,
     font: Option<Renderer::Font>,
     is_disabled: bool,
     is_secure: bool,
@@ -971,6 +995,7 @@ pub fn draw<Renderer>(
         renderer.fill_text(Text {
             content: &icon.code_point.to_string(),
             size: icon.size.unwrap_or_else(|| renderer.default_size()),
+            line_height: text::LineHeight::default(),
             font: icon.font,
             color: appearance.icon_color,
             bounds: Rectangle {
@@ -1110,6 +1135,7 @@ pub fn draw<Renderer>(
                 ..text_bounds
             },
             size,
+            line_height,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,
             shaping: text::Shaping::Advanced,
@@ -1336,6 +1362,7 @@ fn find_cursor_position<Renderer>(
     text_bounds: Rectangle,
     font: Option<Renderer::Font>,
     size: Option<f32>,
+    line_height: text::LineHeight,
     value: &Value,
     state: &State,
     x: f32,
@@ -1353,6 +1380,7 @@ where
         .hit_test(
             &value,
             size,
+            line_height,
             font,
             Size::INFINITY,
             text::Shaping::Advanced,
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 639bbb3b6e..b1ba65c95b 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -42,6 +42,7 @@ where
     width: Length,
     size: f32,
     text_size: Option<f32>,
+    text_line_height: text::LineHeight,
     text_alignment: alignment::Horizontal,
     text_shaping: text::Shaping,
     spacing: f32,
@@ -80,6 +81,7 @@ where
             width: Length::Fill,
             size: Self::DEFAULT_SIZE,
             text_size: None,
+            text_line_height: text::LineHeight::default(),
             text_alignment: alignment::Horizontal::Left,
             text_shaping: text::Shaping::Basic,
             spacing: 0.0,
@@ -106,6 +108,15 @@ where
         self
     }
 
+    /// Sets the text [`LineHeight`] of the [`Toggler`].
+    pub fn text_line_height(
+        mut self,
+        line_height: impl Into<text::LineHeight>,
+    ) -> Self {
+        self.text_line_height = line_height.into();
+        self
+    }
+
     /// Sets the horizontal alignment of the text of the [`Toggler`]
     pub fn text_alignment(mut self, alignment: alignment::Horizontal) -> Self {
         self.text_alignment = alignment;
@@ -176,6 +187,7 @@ where
                         self.text_size
                             .unwrap_or_else(|| renderer.default_size()),
                     )
+                    .line_height(self.text_line_height)
                     .shaping(self.text_shaping),
             );
         }
@@ -254,6 +266,7 @@ where
                 label_layout,
                 label,
                 self.text_size,
+                self.text_line_height,
                 self.font,
                 Default::default(),
                 self.text_alignment,

From c189ef62a6a5dd183b8098496ac31d30f7814ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 14:46:56 +0200
Subject: [PATCH 147/163] Use `LineHeight::default` in `iced_wgpu::layer`

---
 wgpu/src/layer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index dcae06481c..ab66264c31 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -62,7 +62,7 @@ impl<'a> Layer<'a> {
                 ),
                 color: Color::new(0.9, 0.9, 0.9, 1.0),
                 size: 20.0,
-                line_height: core::text::LineHeight::Relative(1.2),
+                line_height: core::text::LineHeight::default(),
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,

From 2bc4880d0031dca86851cd10b30c197261847e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 14:51:06 +0200
Subject: [PATCH 148/163] Warn about unsupported primitives in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 99230a2f66..b6adb8cef1 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -430,10 +430,18 @@ impl Backend {
             }
             Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {
                 // Not supported!
-                // TODO: Draw a placeholder (?) / Log it (?)
+                // TODO: Draw a placeholder (?)
+                log::warn!(
+                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
+                    primitive
+                );
             }
             _ => {
                 // Not supported!
+                log::warn!(
+                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
+                    primitive
+                );
             }
         }
     }

From 91ef07e6ebe56e46ea235f6657b17a3a078ddf5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 14:51:53 +0200
Subject: [PATCH 149/163] Warn about unsupported primitives in `iced_wgpu`

---
 wgpu/src/layer.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index ab66264c31..8af72b9d10 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -270,7 +270,11 @@ impl<'a> Layer<'a> {
                 );
             }
             _ => {
-                // Unsupported!
+                // Not supported!
+                log::warn!(
+                    "Unsupported primitive in `iced_wgpu`: {:?}",
+                    primitive
+                );
             }
         }
     }

From 16bf8fc7622fbe67a7d81cbe6daad329385cc44c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 15:37:29 +0200
Subject: [PATCH 150/163] Export `Shaping` and `LineHeight` in `widget::text`

---
 core/src/widget/text.rs | 23 +++++++++++------------
 widget/src/text.rs      |  1 -
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 2d86e735a2..90af88b732 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -10,6 +10,8 @@ use crate::{
 
 use std::borrow::Cow;
 
+pub use text::{LineHeight, Shaping};
+
 /// A paragraph of text.
 #[allow(missing_debug_implementations)]
 pub struct Text<'a, Renderer>
@@ -19,13 +21,13 @@ where
 {
     content: Cow<'a, str>,
     size: Option<f32>,
-    line_height: text::LineHeight,
+    line_height: LineHeight,
     width: Length,
     height: Length,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
     font: Option<Renderer::Font>,
-    shaping: text::Shaping,
+    shaping: Shaping,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -39,13 +41,13 @@ where
         Text {
             content: content.into(),
             size: None,
-            line_height: text::LineHeight::default(),
+            line_height: LineHeight::default(),
             font: None,
             width: Length::Shrink,
             height: Length::Shrink,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
-            shaping: text::Shaping::Basic,
+            shaping: Shaping::Basic,
             style: Default::default(),
         }
     }
@@ -57,10 +59,7 @@ where
     }
 
     /// Sets the [`LineHeight`] of the [`Text`].
-    pub fn line_height(
-        mut self,
-        line_height: impl Into<text::LineHeight>,
-    ) -> Self {
+    pub fn line_height(mut self, line_height: impl Into<LineHeight>) -> Self {
         self.line_height = line_height.into();
         self
     }
@@ -112,8 +111,8 @@ where
         self
     }
 
-    /// Sets the [`text::Shaping`] strategy of the [`Text`].
-    pub fn shaping(mut self, shaping: text::Shaping) -> Self {
+    /// Sets the [`Shaping`] strategy of the [`Text`].
+    pub fn shaping(mut self, shaping: Shaping) -> Self {
         self.shaping = shaping;
         self
     }
@@ -199,12 +198,12 @@ pub fn draw<Renderer>(
     layout: Layout<'_>,
     content: &str,
     size: Option<f32>,
-    line_height: text::LineHeight,
+    line_height: LineHeight,
     font: Option<Renderer::Font>,
     appearance: Appearance,
     horizontal_alignment: alignment::Horizontal,
     vertical_alignment: alignment::Vertical,
-    shaping: text::Shaping,
+    shaping: Shaping,
 ) where
     Renderer: text::Renderer,
 {
diff --git a/widget/src/text.rs b/widget/src/text.rs
index 50aa137079..04c31edcd3 100644
--- a/widget/src/text.rs
+++ b/widget/src/text.rs
@@ -1,4 +1,3 @@
-pub use crate::core::text::Shaping;
 pub use crate::core::widget::text::*;
 
 pub type Text<'a, Renderer = crate::Renderer> =

From 180cb073bdb1429e566839b09d6fe86114c83673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 16:19:28 +0200
Subject: [PATCH 151/163] Add `line_height` to `checkbox::Icon`

---
 examples/checkbox/src/main.rs | 1 +
 widget/src/checkbox.rs        | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 5852e97855..ef61a97439 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -59,6 +59,7 @@ impl Application for Example {
                     font: ICON_FONT,
                     code_point: '\u{e901}',
                     size: None,
+                    line_height: text::LineHeight::Relative(1.0),
                     shaping: text::Shaping::Basic,
                 });
 
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index c34fd0bb7f..7d43bb4a1e 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -91,6 +91,7 @@ where
                 font: Renderer::ICON_FONT,
                 code_point: Renderer::CHECKMARK_ICON,
                 size: None,
+                line_height: text::LineHeight::default(),
                 shaping: text::Shaping::Basic,
             },
             style: Default::default(),
@@ -279,6 +280,7 @@ where
                 font,
                 code_point,
                 size,
+                line_height,
                 shaping,
             } = &self.icon;
             let size = size.unwrap_or(bounds.height * 0.7);
@@ -288,7 +290,7 @@ where
                     content: &code_point.to_string(),
                     font: *font,
                     size,
-                    line_height: text::LineHeight::default(),
+                    line_height: *line_height,
                     bounds: Rectangle {
                         x: bounds.center_x(),
                         y: bounds.center_y(),
@@ -347,6 +349,8 @@ pub struct Icon<Font> {
     pub code_point: char,
     /// Font size of the content.
     pub size: Option<f32>,
+    /// The line height of the icon.
+    pub line_height: text::LineHeight,
     /// The shaping strategy of the icon.
     pub shaping: text::Shaping,
 }

From c6d9221ee42b2838ca07b79df710d3d224e1c52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 16:20:05 +0200
Subject: [PATCH 152/163] Round paragraph position until we implement subpixel
 glyph positioning

---
 tiny_skia/src/text.rs | 9 ++++++---
 wgpu/src/text.rs      | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index ba8a4e4b70..a34c731797 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -99,6 +99,10 @@ impl Pipeline {
             alignment::Vertical::Bottom => bounds.y - total_height,
         };
 
+        // TODO: Subpixel glyph positioning
+        let x = x.round() as i32;
+        let y = y.round() as i32;
+
         let mut swash = cosmic_text::SwashCache::new();
 
         for run in buffer.layout_runs() {
@@ -117,9 +121,8 @@ impl Pipeline {
                     .expect("Create glyph pixel map");
 
                     pixels.draw_pixmap(
-                        x as i32 + glyph.x_int + placement.left,
-                        y as i32 - glyph.y_int - placement.top
-                            + run.line_y as i32,
+                        x + glyph.x_int + placement.left,
+                        y - glyph.y_int - placement.top + run.line_y as i32,
                         pixmap,
                         &tiny_skia::PixmapPaint::default(),
                         tiny_skia::Transform::identity(),
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ff68772da3..cf9fbad3f8 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -133,10 +133,14 @@ impl Pipeline {
                     alignment::Vertical::Bottom => y - total_height,
                 };
 
+                // TODO: Subpixel glyph positioning
+                let left = left.round() as i32;
+                let top = top.round() as i32;
+
                 glyphon::TextArea {
                     buffer,
-                    left: left as i32,
-                    top: top as i32,
+                    left,
+                    top,
                     bounds,
                     default_color: {
                         let [r, g, b, a] = section.color.into_linear();

From 9a8b30d7e9cf76c097d68c84736e7687b452d5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 8 May 2023 16:41:42 +0200
Subject: [PATCH 153/163] Clip text that exceeds section bounds in `iced_wgpu`

---
 wgpu/src/text.rs | 124 ++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 56 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index cf9fbad3f8..714e04001e 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -96,64 +96,76 @@ impl Pipeline {
             })
             .collect();
 
-        let bounds = glyphon::TextBounds {
-            left: (bounds.x * scale_factor) as i32,
-            top: (bounds.y * scale_factor) as i32,
-            right: ((bounds.x + bounds.width) * scale_factor) as i32,
-            bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
-        };
+        let bounds = bounds * scale_factor;
 
         let text_areas =
-            sections.iter().zip(keys.iter()).map(|(section, key)| {
-                let buffer =
-                    self.render_cache.get(key).expect("Get cached buffer");
-
-                let x = section.bounds.x * scale_factor;
-                let y = section.bounds.y * scale_factor;
-
-                let (total_lines, max_width) = buffer
-                    .layout_runs()
-                    .enumerate()
-                    .fold((0, 0.0), |(_, max), (i, buffer)| {
-                        (i + 1, buffer.line_w.max(max))
-                    });
-
-                let total_height =
-                    total_lines as f32 * buffer.metrics().line_height;
-
-                let left = match section.horizontal_alignment {
-                    alignment::Horizontal::Left => x,
-                    alignment::Horizontal::Center => x - max_width / 2.0,
-                    alignment::Horizontal::Right => x - max_width,
-                };
-
-                let top = match section.vertical_alignment {
-                    alignment::Vertical::Top => y,
-                    alignment::Vertical::Center => y - total_height / 2.0,
-                    alignment::Vertical::Bottom => y - total_height,
-                };
-
-                // TODO: Subpixel glyph positioning
-                let left = left.round() as i32;
-                let top = top.round() as i32;
-
-                glyphon::TextArea {
-                    buffer,
-                    left,
-                    top,
-                    bounds,
-                    default_color: {
-                        let [r, g, b, a] = section.color.into_linear();
-
-                        glyphon::Color::rgba(
-                            (r * 255.0) as u8,
-                            (g * 255.0) as u8,
-                            (b * 255.0) as u8,
-                            (a * 255.0) as u8,
-                        )
-                    },
-                }
-            });
+            sections
+                .iter()
+                .zip(keys.iter())
+                .filter_map(|(section, key)| {
+                    let buffer =
+                        self.render_cache.get(key).expect("Get cached buffer");
+
+                    let (total_lines, max_width) = buffer
+                        .layout_runs()
+                        .enumerate()
+                        .fold((0, 0.0), |(_, max), (i, buffer)| {
+                            (i + 1, buffer.line_w.max(max))
+                        });
+
+                    let total_height =
+                        total_lines as f32 * buffer.metrics().line_height;
+
+                    let x = section.bounds.x * scale_factor;
+                    let y = section.bounds.y * scale_factor;
+
+                    let left = match section.horizontal_alignment {
+                        alignment::Horizontal::Left => x,
+                        alignment::Horizontal::Center => x - max_width / 2.0,
+                        alignment::Horizontal::Right => x - max_width,
+                    };
+
+                    let top = match section.vertical_alignment {
+                        alignment::Vertical::Top => y,
+                        alignment::Vertical::Center => y - total_height / 2.0,
+                        alignment::Vertical::Bottom => y - total_height,
+                    };
+
+                    let section_bounds = Rectangle {
+                        x: left,
+                        y: top,
+                        width: section.bounds.width * scale_factor,
+                        height: section.bounds.height * scale_factor,
+                    };
+
+                    let clip_bounds = bounds.intersection(&section_bounds)?;
+
+                    // TODO: Subpixel glyph positioning
+                    let left = left.round() as i32;
+                    let top = top.round() as i32;
+
+                    Some(glyphon::TextArea {
+                        buffer,
+                        left,
+                        top,
+                        bounds: glyphon::TextBounds {
+                            left: clip_bounds.x as i32,
+                            top: clip_bounds.y as i32,
+                            right: (clip_bounds.x + clip_bounds.width) as i32,
+                            bottom: (clip_bounds.y + clip_bounds.height) as i32,
+                        },
+                        default_color: {
+                            let [r, g, b, a] = section.color.into_linear();
+
+                            glyphon::Color::rgba(
+                                (r * 255.0) as u8,
+                                (g * 255.0) as u8,
+                                (b * 255.0) as u8,
+                                (a * 255.0) as u8,
+                            )
+                        },
+                    })
+                });
 
         let result = renderer.prepare(
             device,

From 3f1c8a8d288d823529e81124bd514f626e84c610 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 9 May 2023 14:57:50 -0400
Subject: [PATCH 154/163] fix: tiny-skia svg premultiply final filtered color

---
 tiny_skia/src/vector.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index fc411fdd8b..a3f3c2e3d3 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -141,18 +141,19 @@ impl Cache {
                 image.as_mut(),
             )?;
 
-            if let Some([r, g, b, a]) = key.color {
-                // TODO: Blend alpha
-                let color = tiny_skia::ColorU8::from_rgba(b, g, r, a)
-                    .premultiply()
-                    .get()
-                    & 0x00FFFFFF;
-
+            if let Some([r, g, b, _]) = key.color {
                 // Apply color filter
                 for pixel in
                     bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
                 {
-                    *pixel = *pixel & 0xFF000000 | color;
+                    *pixel = tiny_skia::ColorU8::from_rgba(
+                        b,
+                        g,
+                        r,
+                        (*pixel >> 24) as u8,
+                    )
+                    .premultiply()
+                    .get();
                 }
             } else {
                 // Swap R and B channels for `softbuffer` presentation

From 75439ff96e11fd38b7800f8af65428aacd279a2e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Tue, 9 May 2023 16:23:17 -0400
Subject: [PATCH 155/163] fix: border radius typo

---
 tiny_skia/src/backend.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index b6adb8cef1..d481bacd1c 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -527,7 +527,7 @@ fn rounded_rectangle(
         bounds.y + bounds.height,
     );
 
-    if bottom_right > 0.0 {
+    if bottom_left > 0.0 {
         arc_to(
             &mut builder,
             bounds.x + bottom_left,

From f0c87375d53d620b5939d87e1bc54288f9c184ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 10 May 2023 00:02:34 +0200
Subject: [PATCH 156/163] Add `line_height` to `pick_list::Icon`

---
 widget/src/pick_list.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index bc2c90669f..50b474176c 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -360,6 +360,8 @@ pub struct Icon<Font> {
     pub code_point: char,
     /// Font size of the content.
     pub size: Option<f32>,
+    /// Line height of the content.
+    pub line_height: text::LineHeight,
     /// The shaping strategy of the icon.
     pub shaping: text::Shaping,
 }
@@ -632,22 +634,31 @@ pub fn draw<'a, T, Renderer>(
             Renderer::ICON_FONT,
             Renderer::ARROW_DOWN_ICON,
             *size,
+            text::LineHeight::default(),
             text::Shaping::Basic,
         )),
         Handle::Static(Icon {
             font,
             code_point,
             size,
+            line_height,
             shaping,
-        }) => Some((*font, *code_point, *size, *shaping)),
+        }) => Some((*font, *code_point, *size, *line_height, *shaping)),
         Handle::Dynamic { open, closed } => {
             if state().is_open {
-                Some((open.font, open.code_point, open.size, open.shaping))
+                Some((
+                    open.font,
+                    open.code_point,
+                    open.size,
+                    open.line_height,
+                    open.shaping,
+                ))
             } else {
                 Some((
                     closed.font,
                     closed.code_point,
                     closed.size,
+                    closed.line_height,
                     closed.shaping,
                 ))
             }
@@ -655,19 +666,19 @@ pub fn draw<'a, T, Renderer>(
         Handle::None => None,
     };
 
-    if let Some((font, code_point, size, shaping)) = handle {
+    if let Some((font, code_point, size, line_height, shaping)) = handle {
         let size = size.unwrap_or_else(|| renderer.default_size());
 
         renderer.fill_text(Text {
             content: &code_point.to_string(),
             size,
-            line_height: text::LineHeight::default(),
+            line_height,
             font,
             color: style.handle_color,
             bounds: Rectangle {
                 x: bounds.x + bounds.width - padding.horizontal(),
                 y: bounds.center_y(),
-                height: size * 1.2,
+                height: f32::from(line_height.to_absolute(Pixels(size))),
                 ..bounds
             },
             horizontal_alignment: alignment::Horizontal::Right,

From f75b8bd9ec4677b4469910b91ca2aa9ec5636e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 10 May 2023 00:13:51 +0200
Subject: [PATCH 157/163] Increase default `LineHeight` to `Relative(1.3)`

---
 core/src/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/text.rs b/core/src/text.rs
index 1a867be320..c154cc2758 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -82,7 +82,7 @@ impl LineHeight {
 
 impl Default for LineHeight {
     fn default() -> Self {
-        Self::Relative(1.2)
+        Self::Relative(1.3)
     }
 }
 

From 1400b5187d6fa30f5fa4f83684939f6dc87cb55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 10 May 2023 00:37:08 +0200
Subject: [PATCH 158/163] Fix bounds of `PickList` text label

---
 widget/src/pick_list.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index 50b474176c..8c445dda9b 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -706,7 +706,9 @@ pub fn draw<'a, T, Renderer>(
                 x: bounds.x + padding.left,
                 y: bounds.center_y(),
                 width: bounds.width - padding.horizontal(),
-                height: text_size * 1.2,
+                height: f32::from(
+                    text_line_height.to_absolute(Pixels(text_size)),
+                ),
             },
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Center,

From dd04c0b070b60b15293892e2a7c284787d3d63b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Wed, 10 May 2023 22:21:31 +0200
Subject: [PATCH 159/163] Bundle `tiny-skia` backend together with
 `iced_renderer`

---
 Cargo.toml                      |  4 +-
 examples/integration/Cargo.toml |  2 +-
 renderer/Cargo.toml             | 18 ++++----
 renderer/src/backend.rs         |  6 +--
 renderer/src/compositor.rs      | 80 ++++++++++++++-------------------
 renderer/src/geometry.rs        | 27 +++++------
 renderer/src/lib.rs             |  3 --
 7 files changed, 56 insertions(+), 84 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2f92f9db0c..479830ac6e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,11 +12,9 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-default = ["wgpu", "tiny-skia"]
+default = ["wgpu"]
 # Enable the `wgpu` GPU-accelerated renderer backend
 wgpu = ["iced_renderer/wgpu"]
-# Enable the `tiny-skia` software renderer backend
-tiny-skia = ["iced_renderer/tiny-skia"]
 # Enables the `Image` widget
 image = ["iced_widget/image", "image_rs"]
 # Enables the `Svg` widget
diff --git a/examples/integration/Cargo.toml b/examples/integration/Cargo.toml
index 2ab5d75f22..22914742da 100644
--- a/examples/integration/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 iced_winit = { path = "../../winit" }
 iced_wgpu = { path = "../../wgpu" }
 iced_widget = { path = "../../widget" }
-iced_renderer = { path = "../../renderer", features = ["wgpu", "tiny-skia"] }
+iced_renderer = { path = "../../renderer", features = ["wgpu"] }
 env_logger = "0.10"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 176578882d..640ac99604 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -5,11 +5,10 @@ edition = "2021"
 
 [features]
 wgpu = ["iced_wgpu"]
-tiny-skia = ["iced_tiny_skia"]
-image = ["iced_wgpu/image", "iced_tiny_skia/image"]
-svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
-geometry = ["iced_graphics/geometry", "iced_wgpu?/geometry", "iced_tiny_skia?/geometry"]
-tracing = ["iced_wgpu/tracing"]
+image = ["iced_tiny_skia/image", "iced_wgpu?/image"]
+svg = ["iced_tiny_skia/svg", "iced_wgpu?/svg"]
+geometry = ["iced_graphics/geometry", "iced_tiny_skia/geometry", "iced_wgpu?/geometry"]
+tracing = ["iced_wgpu?/tracing"]
 
 [dependencies]
 raw-window-handle = "0.5"
@@ -19,12 +18,11 @@ thiserror = "1"
 version = "0.8"
 path = "../graphics"
 
-[dependencies.iced_wgpu]
-version = "0.10"
-path = "../wgpu"
-optional = true
-
 [dependencies.iced_tiny_skia]
 version = "0.1"
 path = "../tiny_skia"
+
+[dependencies.iced_wgpu]
+version = "0.10"
+path = "../wgpu"
 optional = true
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index c1bec6afd6..c9d798517e 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -6,19 +6,17 @@ use std::borrow::Cow;
 
 #[allow(clippy::large_enum_variant)]
 pub enum Backend {
+    TinySkia(iced_tiny_skia::Backend),
     #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::Backend),
-    #[cfg(feature = "tiny-skia")]
-    TinySkia(iced_tiny_skia::Backend),
 }
 
 macro_rules! delegate {
     ($backend:expr, $name:ident, $body:expr) => {
         match $backend {
+            Self::TinySkia($name) => $body,
             #[cfg(feature = "wgpu")]
             Self::Wgpu($name) => $body,
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia($name) => $body,
         }
     };
 }
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 48ed4b1f1c..a353b8e4f2 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -7,17 +7,15 @@ use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::env;
 
 pub enum Compositor<Theme> {
+    TinySkia(iced_tiny_skia::window::Compositor<Theme>),
     #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::window::Compositor<Theme>),
-    #[cfg(feature = "tiny-skia")]
-    TinySkia(iced_tiny_skia::window::Compositor<Theme>),
 }
 
 pub enum Surface {
+    TinySkia(iced_tiny_skia::window::Surface),
     #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::window::Surface),
-    #[cfg(feature = "tiny-skia")]
-    TinySkia(iced_tiny_skia::window::Surface),
 }
 
 impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@@ -55,14 +53,13 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) -> Surface {
         match self {
+            Self::TinySkia(compositor) => Surface::TinySkia(
+                compositor.create_surface(window, width, height),
+            ),
             #[cfg(feature = "wgpu")]
             Self::Wgpu(compositor) => {
                 Surface::Wgpu(compositor.create_surface(window, width, height))
             }
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia(compositor) => Surface::TinySkia(
-                compositor.create_surface(window, width, height),
-            ),
         }
     }
 
@@ -73,12 +70,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         height: u32,
     ) {
         match (self, surface) {
-            #[cfg(feature = "wgpu")]
-            (Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
+            (Self::TinySkia(compositor), Surface::TinySkia(surface)) => {
                 compositor.configure_surface(surface, width, height);
             }
-            #[cfg(feature = "tiny-skia")]
-            (Self::TinySkia(compositor), Surface::TinySkia(surface)) => {
+            #[cfg(feature = "wgpu")]
+            (Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
                 compositor.configure_surface(surface, width, height);
             }
             #[allow(unreachable_patterns)]
@@ -90,10 +86,9 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
 
     fn fetch_information(&self) -> Information {
         match self {
+            Self::TinySkia(compositor) => compositor.fetch_information(),
             #[cfg(feature = "wgpu")]
             Self::Wgpu(compositor) => compositor.fetch_information(),
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia(compositor) => compositor.fetch_information(),
         }
     }
 
@@ -107,13 +102,11 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     ) -> Result<(), SurfaceError> {
         renderer.with_primitives(|backend, primitives| {
             match (self, backend, surface) {
-                #[cfg(feature = "wgpu")]
                 (
-                    Self::Wgpu(compositor),
-                    crate::Backend::Wgpu(backend),
-                    Surface::Wgpu(surface),
-                ) => iced_wgpu::window::compositor::present(
-                    compositor,
+                    Self::TinySkia(_compositor),
+                    crate::Backend::TinySkia(backend),
+                    Surface::TinySkia(surface),
+                ) => iced_tiny_skia::window::compositor::present(
                     backend,
                     surface,
                     primitives,
@@ -121,12 +114,13 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     background_color,
                     overlay,
                 ),
-                #[cfg(feature = "tiny-skia")]
+                #[cfg(feature = "wgpu")]
                 (
-                    Self::TinySkia(_compositor),
-                    crate::Backend::TinySkia(backend),
-                    Surface::TinySkia(surface),
-                ) => iced_tiny_skia::window::compositor::present(
+                    Self::Wgpu(compositor),
+                    crate::Backend::Wgpu(backend),
+                    Surface::Wgpu(surface),
+                ) => iced_wgpu::window::compositor::present(
+                    compositor,
                     backend,
                     surface,
                     primitives,
@@ -154,7 +148,6 @@ impl Candidate {
         vec![
             #[cfg(feature = "wgpu")]
             Self::Wgpu,
-            #[cfg(feature = "tiny-skia")]
             Self::TinySkia,
         ]
     }
@@ -181,6 +174,20 @@ impl Candidate {
         _compatible_window: Option<&W>,
     ) -> Result<(Compositor<Theme>, Renderer<Theme>), Error> {
         match self {
+            Self::TinySkia => {
+                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,
+                        },
+                    );
+
+                Ok((
+                    Compositor::TinySkia(compositor),
+                    Renderer::new(crate::Backend::TinySkia(backend)),
+                ))
+            }
             #[cfg(feature = "wgpu")]
             Self::Wgpu => {
                 let (compositor, backend) = iced_wgpu::window::compositor::new(
@@ -198,31 +205,10 @@ impl Candidate {
                     Renderer::new(crate::Backend::Wgpu(backend)),
                 ))
             }
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia => {
-                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,
-                        },
-                    );
-
-                Ok((
-                    Compositor::TinySkia(compositor),
-                    Renderer::new(crate::Backend::TinySkia(backend)),
-                ))
-            }
             #[cfg(not(feature = "wgpu"))]
             Self::Wgpu => {
                 panic!("`wgpu` feature was not enabled in `iced_renderer`")
             }
-            #[cfg(not(feature = "tiny-skia"))]
-            Self::TinySkia => {
-                panic!(
-                    "`tiny-skia` feature was not enabled in `iced_renderer`"
-                );
-            }
         }
     }
 }
diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index 21ef2c0671..a20e9d3582 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -7,19 +7,17 @@ use crate::graphics::geometry::{Fill, Geometry, Path, Stroke, Text};
 use crate::Backend;
 
 pub enum Frame {
+    TinySkia(iced_tiny_skia::geometry::Frame),
     #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::geometry::Frame),
-    #[cfg(feature = "tiny-skia")]
-    TinySkia(iced_tiny_skia::geometry::Frame),
 }
 
 macro_rules! delegate {
     ($frame:expr, $name:ident, $body:expr) => {
         match $frame {
+            Self::TinySkia($name) => $body,
             #[cfg(feature = "wgpu")]
             Self::Wgpu($name) => $body,
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia($name) => $body,
         }
     };
 }
@@ -27,14 +25,13 @@ macro_rules! delegate {
 impl Frame {
     pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
         match renderer.backend() {
+            Backend::TinySkia(_) => {
+                Frame::TinySkia(iced_tiny_skia::geometry::Frame::new(size))
+            }
             #[cfg(feature = "wgpu")]
             Backend::Wgpu(_) => {
                 Frame::Wgpu(iced_wgpu::geometry::Frame::new(size))
             }
-            #[cfg(feature = "tiny-skia")]
-            Backend::TinySkia(_) => {
-                Frame::TinySkia(iced_tiny_skia::geometry::Frame::new(size))
-            }
         }
     }
 
@@ -127,14 +124,13 @@ impl Frame {
     #[inline]
     pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
         let mut frame = match self {
+            Self::TinySkia(_) => Self::TinySkia(
+                iced_tiny_skia::geometry::Frame::new(region.size()),
+            ),
             #[cfg(feature = "wgpu")]
             Self::Wgpu(_) => {
                 Self::Wgpu(iced_wgpu::geometry::Frame::new(region.size()))
             }
-            #[cfg(feature = "tiny-skia")]
-            Self::TinySkia(_) => Self::TinySkia(
-                iced_tiny_skia::geometry::Frame::new(region.size()),
-            ),
         };
 
         f(&mut frame);
@@ -142,12 +138,11 @@ impl Frame {
         let translation = Vector::new(region.x, region.y);
 
         match (self, frame) {
-            #[cfg(feature = "wgpu")]
-            (Self::Wgpu(target), Self::Wgpu(frame)) => {
+            (Self::TinySkia(target), Self::TinySkia(frame)) => {
                 target.clip(frame, translation);
             }
-            #[cfg(feature = "tiny-skia")]
-            (Self::TinySkia(target), Self::TinySkia(frame)) => {
+            #[cfg(feature = "wgpu")]
+            (Self::Wgpu(target), Self::Wgpu(frame)) => {
                 target.clip(frame, translation);
             }
             #[allow(unreachable_patterns)]
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index ba737b112d..22ec7bd1d8 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,6 +1,3 @@
-#[cfg(not(any(feature = "wgpu", feature = "tiny-skia")))]
-compile_error!("No backend selected. Enable at least one backend feature: `wgpu` or `tiny-skia`.");
-
 pub mod compositor;
 
 #[cfg(feature = "geometry")]

From 8622e998f2701e7f4ca8d2f71c85150f436a9945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 11 May 2023 15:25:58 +0200
Subject: [PATCH 160/163] Write missing documentation in `iced_graphics`

---
 graphics/src/damage.rs        |  5 +++++
 graphics/src/geometry.rs      | 11 ++++++-----
 graphics/src/geometry/path.rs |  2 ++
 graphics/src/image.rs         |  1 +
 graphics/src/lib.rs           |  2 +-
 graphics/src/primitive.rs     | 15 +++++++++++++++
 graphics/src/renderer.rs      |  4 +---
 widget/src/canvas/program.rs  |  6 +++---
 8 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
index 5aab06b17b..c6b0f759d9 100644
--- a/graphics/src/damage.rs
+++ b/graphics/src/damage.rs
@@ -1,8 +1,10 @@
+//! Track and compute the damage of graphical primitives.
 use crate::core::{Rectangle, Size};
 use crate::Primitive;
 
 use std::sync::Arc;
 
+/// Computes the damage regions between the two given primitives.
 pub fn regions(a: &Primitive, b: &Primitive) -> Vec<Rectangle> {
     match (a, b) {
         (
@@ -73,6 +75,7 @@ pub fn regions(a: &Primitive, b: &Primitive) -> Vec<Rectangle> {
     }
 }
 
+/// Computes the damage regions between the two given lists of primitives.
 pub fn list(previous: &[Primitive], current: &[Primitive]) -> Vec<Rectangle> {
     let damage = previous
         .iter()
@@ -95,6 +98,8 @@ pub fn list(previous: &[Primitive], current: &[Primitive]) -> Vec<Rectangle> {
     }
 }
 
+/// Groups the given damage regions that are close together inside the given
+/// bounds.
 pub fn group(
     mut damage: Vec<Rectangle>,
     scale_factor: f32,
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 8db1594a72..1f3d2c01d4 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -16,10 +16,11 @@ pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
 pub use style::Style;
 pub use text::Text;
 
-pub use iced_core::gradient::{self, Gradient};
+pub use crate::core::gradient::{self, Gradient};
 
 use crate::Primitive;
 
+/// A bunch of shapes that can be drawn.
 #[derive(Debug, Clone)]
 pub struct Geometry(pub Primitive);
 
@@ -29,8 +30,8 @@ impl From<Geometry> for Primitive {
     }
 }
 
-pub trait Renderer: iced_core::Renderer {
-    type Geometry;
-
-    fn draw(&mut self, geometry: Vec<Self::Geometry>);
+/// A renderer capable of drawing some [`Geometry`].
+pub trait Renderer: crate::core::Renderer {
+    /// Draws the given layers of [`Geometry`].
+    fn draw(&mut self, layers: Vec<Geometry>);
 }
diff --git a/graphics/src/geometry/path.rs b/graphics/src/geometry/path.rs
index c3127bdfd0..3d8fc6fa92 100644
--- a/graphics/src/geometry/path.rs
+++ b/graphics/src/geometry/path.rs
@@ -53,11 +53,13 @@ impl Path {
         Self::new(|p| p.circle(center, radius))
     }
 
+    /// Returns the internal [`lyon_path::Path`].
     #[inline]
     pub fn raw(&self) -> &lyon_path::Path {
         &self.raw
     }
 
+    /// Returns the current [`Path`] with the given transform applied to it.
     #[inline]
     pub fn transform(&self, transform: &lyon_path::math::Transform) -> Path {
         Path {
diff --git a/graphics/src/image.rs b/graphics/src/image.rs
index 2f634252cb..6b43f4a88f 100644
--- a/graphics/src/image.rs
+++ b/graphics/src/image.rs
@@ -5,6 +5,7 @@ use bitflags::bitflags;
 
 pub use ::image as image_rs;
 
+/// Tries to load an image by its [`Handle`].
 pub fn load(handle: &Handle) -> image_rs::ImageResult<image_rs::DynamicImage> {
     match handle.data() {
         Data::Path(path) => {
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index e3de40254c..91f502824a 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -9,7 +9,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    //missing_docs,
+    missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index d814c7572d..d4446c8792 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,3 +1,4 @@
+//! Draw using different graphical primitives.
 use crate::core::alignment;
 use crate::core::image;
 use crate::core::svg;
@@ -90,18 +91,28 @@ pub enum Primitive {
         /// The [`Gradient`] to apply to the mesh.
         gradient: Gradient,
     },
+    /// A [`tiny_skia`] path filled with some paint.
     #[cfg(feature = "tiny-skia")]
     Fill {
+        /// The path to fill.
         path: tiny_skia::Path,
+        /// The paint to use.
         paint: tiny_skia::Paint<'static>,
+        /// The fill rule to follow.
         rule: tiny_skia::FillRule,
+        /// The transform to apply to the path.
         transform: tiny_skia::Transform,
     },
+    /// A [`tiny_skia`] path stroked with some paint.
     #[cfg(feature = "tiny-skia")]
     Stroke {
+        /// The path to stroke.
         path: tiny_skia::Path,
+        /// The paint to use.
         paint: tiny_skia::Paint<'static>,
+        /// The stroke settings.
         stroke: tiny_skia::Stroke,
+        /// The transform to apply to the path.
         transform: tiny_skia::Transform,
     },
     /// A group of primitives
@@ -135,10 +146,12 @@ pub enum Primitive {
 }
 
 impl Primitive {
+    /// Creates a [`Primitive::Group`].
     pub fn group(primitives: Vec<Self>) -> Self {
         Self::Group { primitives }
     }
 
+    /// Creates a [`Primitive::Clip`].
     pub fn clip(self, bounds: Rectangle) -> Self {
         Self::Clip {
             bounds,
@@ -146,6 +159,7 @@ impl Primitive {
         }
     }
 
+    /// Creates a [`Primitive::Translate`].
     pub fn translate(self, translation: Vector) -> Self {
         Self::Translate {
             translation,
@@ -153,6 +167,7 @@ impl Primitive {
         }
     }
 
+    /// Returns the bounds of the [`Primitive`].
     pub fn bounds(&self) -> Rectangle {
         match self {
             Self::Text {
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index aaf1737af9..de90550399 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -235,9 +235,7 @@ impl<B, T> crate::geometry::Renderer for Renderer<B, T>
 where
     B: Backend,
 {
-    type Geometry = crate::Geometry;
-
-    fn draw(&mut self, layers: Vec<Self::Geometry>) {
+    fn draw(&mut self, layers: Vec<crate::Geometry>) {
         self.primitives
             .extend(layers.into_iter().map(crate::Geometry::into));
     }
diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
index efb33c5678..ad0fbb83f6 100644
--- a/widget/src/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -2,7 +2,7 @@ use crate::canvas::event::{self, Event};
 use crate::canvas::mouse;
 use crate::canvas::Cursor;
 use crate::core::Rectangle;
-use crate::graphics::geometry;
+use crate::graphics::geometry::{self, Geometry};
 
 /// The state and logic of a [`Canvas`].
 ///
@@ -52,7 +52,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: Cursor,
-    ) -> Vec<Renderer::Geometry>;
+    ) -> Vec<Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
     ///
@@ -94,7 +94,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: Cursor,
-    ) -> Vec<Renderer::Geometry> {
+    ) -> Vec<Geometry> {
         T::draw(self, state, renderer, theme, bounds, cursor)
     }
 

From de638f44a5c62459008a5c024b39c2443b72bf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 11 May 2023 15:37:56 +0200
Subject: [PATCH 161/163] Write missing documentation in `iced_wgpu`

---
 graphics/src/geometry.rs  |  6 +-----
 renderer/src/geometry.rs  |  6 +++---
 runtime/src/lib.rs        |  2 +-
 tiny_skia/src/geometry.rs |  4 ++--
 wgpu/src/geometry.rs      | 15 +++++++++------
 wgpu/src/lib.rs           |  2 +-
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 1f3d2c01d4..88997288f3 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -1,8 +1,4 @@
-//! Draw 2D graphics for your users.
-//!
-//! A [`Canvas`] widget can be used to draw different kinds of 2D shapes in a
-//! [`Frame`]. It can be used for animation, data visualization, game graphics,
-//! and more!
+//! Build and draw geometry.
 pub mod fill;
 pub mod path;
 pub mod stroke;
diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index a20e9d3582..26e2fed059 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -135,15 +135,15 @@ impl Frame {
 
         f(&mut frame);
 
-        let translation = Vector::new(region.x, region.y);
+        let origin = Point::new(region.x, region.y);
 
         match (self, frame) {
             (Self::TinySkia(target), Self::TinySkia(frame)) => {
-                target.clip(frame, translation);
+                target.clip(frame, origin);
             }
             #[cfg(feature = "wgpu")]
             (Self::Wgpu(target), Self::Wgpu(frame)) => {
-                target.clip(frame, translation);
+                target.clip(frame, origin);
             }
             #[allow(unreachable_patterns)]
             _ => unreachable!(),
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 8a277e479c..d3b84c7d69 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -33,7 +33,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    //missing_docs,
+    missing_docs,
     unused_results,
     clippy::extra_unused_lifetimes,
     clippy::from_over_into,
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index a445b56182..a1fd7b60f3 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -127,9 +127,9 @@ impl Frame {
         self.transform = self.stack.pop().expect("Pop transform");
     }
 
-    pub fn clip(&mut self, frame: Self, translation: Vector) {
+    pub fn clip(&mut self, frame: Self, at: Point) {
         self.primitives.push(Primitive::Translate {
-            translation,
+            translation: Vector::new(at.x, at.y),
             content: Box::new(frame.into_primitive()),
         });
     }
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 8cfed1e5d5..7e17a7ad69 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -1,3 +1,4 @@
+//! Build and draw geometry.
 use crate::core::{Gradient, Point, Rectangle, Size, Vector};
 use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::{
@@ -9,9 +10,7 @@ use lyon::geom::euclid;
 use lyon::tessellation;
 use std::borrow::Cow;
 
-/// The frame of a [`Canvas`].
-///
-/// [`Canvas`]: crate::widget::Canvas
+/// A frame for drawing some geometry.
 #[allow(missing_debug_implementations)]
 pub struct Frame {
     size: Size,
@@ -353,10 +352,12 @@ impl Frame {
         self.pop_transform();
     }
 
+    /// Pushes the current transform in the transform stack.
     pub fn push_transform(&mut self) {
         self.transforms.previous.push(self.transforms.current);
     }
 
+    /// Pops a transform from the transform stack and sets it as the current transform.
     pub fn pop_transform(&mut self) {
         self.transforms.current = self.transforms.previous.pop().unwrap();
     }
@@ -373,14 +374,16 @@ impl Frame {
 
         f(&mut frame);
 
-        let translation = Vector::new(region.x, region.y);
+        let origin = Point::new(region.x, region.y);
 
-        self.clip(frame, translation);
+        self.clip(frame, origin);
     }
 
-    pub fn clip(&mut self, frame: Frame, translation: Vector) {
+    /// Draws the clipped contents of the given [`Frame`] with origin at the given [`Point`].
+    pub fn clip(&mut self, frame: Frame, at: Point) {
         let size = frame.size();
         let primitives = frame.into_primitives();
+        let translation = Vector::new(at.x, at.y);
 
         let (text, meshes) = primitives
             .into_iter()
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 0b169140bd..4a92c345b2 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -25,7 +25,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    //missing_docs,
+    missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,

From b60194844a0f81a864f00e0637b6a4d131194fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 11 May 2023 15:40:57 +0200
Subject: [PATCH 162/163] Write missing documentation in `iced_widget`

---
 widget/src/lazy.rs         | 3 +++
 widget/src/lazy/helpers.rs | 8 ++++++++
 widget/src/lib.rs          | 2 +-
 widget/src/overlay.rs      | 1 +
 widget/src/text.rs         | 2 ++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index b08ed8cb9d..0ad4686528 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -26,6 +26,7 @@ use std::cell::RefCell;
 use std::hash::{Hash, Hasher as H};
 use std::rc::Rc;
 
+/// A widget that only rebuilds its contents when necessary.
 #[allow(missing_debug_implementations)]
 pub struct Lazy<'a, Message, Renderer, Dependency, View> {
     dependency: Dependency,
@@ -41,6 +42,8 @@ where
     Dependency: Hash + 'a,
     View: Into<Element<'static, Message, Renderer>>,
 {
+    /// Creates a new [`Lazy`] widget with the given data `Dependency` and a
+    /// closure that can turn this data into a widget tree.
     pub fn new(
         dependency: Dependency,
         view: impl Fn(&Dependency) -> View + 'a,
diff --git a/widget/src/lazy/helpers.rs b/widget/src/lazy/helpers.rs
index be60bb78b2..8ca9cb869a 100644
--- a/widget/src/lazy/helpers.rs
+++ b/widget/src/lazy/helpers.rs
@@ -4,6 +4,8 @@ use crate::lazy::{Lazy, Responsive};
 
 use std::hash::Hash;
 
+/// Creates a new [`Lazy`] widget with the given data `Dependency` and a
+/// closure that can turn this data into a widget tree.
 pub fn lazy<'a, Message, Renderer, Dependency, View>(
     dependency: Dependency,
     view: impl Fn(&Dependency) -> View + 'a,
@@ -29,6 +31,12 @@ where
     component::view(component)
 }
 
+/// Creates a new [`Responsive`] widget with a closure that produces its
+/// contents.
+///
+/// The `view` closure will be provided with the current [`Size`] of
+/// the [`Responsive`] widget and, therefore, can be used to build the
+/// contents of the widget in a responsive way.
 pub fn responsive<'a, Message, Renderer>(
     f: impl Fn(Size) -> Element<'a, Message, Renderer> + 'a,
 ) -> Responsive<'a, Message, Renderer>
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index 904f62ada0..ab1ab95b72 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -4,7 +4,7 @@
 )]
 #![deny(
     missing_debug_implementations,
-    //missing_docs,
+    missing_docs,
     unused_results,
     clippy::extra_unused_lifetimes,
     clippy::from_over_into,
diff --git a/widget/src/overlay.rs b/widget/src/overlay.rs
index b9a0e3e05d..bc0ed744f3 100644
--- a/widget/src/overlay.rs
+++ b/widget/src/overlay.rs
@@ -1 +1,2 @@
+//! Display interactive elements on top of other widgets.
 pub mod menu;
diff --git a/widget/src/text.rs b/widget/src/text.rs
index 04c31edcd3..ce4f44bde7 100644
--- a/widget/src/text.rs
+++ b/widget/src/text.rs
@@ -1,4 +1,6 @@
+//! Draw and interact with text.
 pub use crate::core::widget::text::*;
 
+/// A paragraph.
 pub type Text<'a, Renderer = crate::Renderer> =
     crate::core::widget::Text<'a, Renderer>;

From 63d3fc6996b848e10e77e6924bfebdf6ba82852e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Thu, 11 May 2023 15:50:35 +0200
Subject: [PATCH 163/163] Remove OpenGL mentions in `README`s

---
 README.md                     | 36 ++++-------------------------------
 examples/README.md            |  3 +--
 runtime/src/user_interface.rs |  7 +++----
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index fe2a4a640e..c72fd770d0 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,9 @@ Inspired by [Elm].
 * First-class support for async actions (use futures!)
 * [Modular ecosystem] split into reusable parts:
   * A [renderer-agnostic native runtime] enabling integration with existing systems
-  * Two [built-in renderers] leveraging [`wgpu`] and [`glow`]
+  * Two [built-in renderers] leveraging [`wgpu`] and [`tiny-skia`]
     * [`iced_wgpu`] supporting Vulkan, Metal and DX12
-    * [`iced_glow`] supporting OpenGL 2.1+ and OpenGL ES 2.0+
+    * [`iced_tiny_skia`] offering a software alternative as a fallback
   * A [windowing shell]
   * A [web runtime] leveraging the DOM
 
@@ -52,9 +52,9 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
 [Modular ecosystem]: ECOSYSTEM.md
 [renderer-agnostic native runtime]: native/
 [`wgpu`]: https://github.com/gfx-rs/wgpu
-[`glow`]: https://github.com/grovesNL/glow
+[`tiny-skia`]: https://github.com/RazrFalcon/tiny-skia
 [`iced_wgpu`]: wgpu/
-[`iced_glow`]: glow/
+[`iced_tiny_skia`]: tiny_skia/
 [built-in renderers]: ECOSYSTEM.md#Renderers
 [windowing shell]: winit/
 [`dodrio`]: https://github.com/fitzgen/dodrio
@@ -196,34 +196,6 @@ end-user-oriented GUI library, while keeping [the ecosystem] modular:
 [`ggez`]: https://github.com/ggez/ggez
 [the ecosystem]: ECOSYSTEM.md
 
-## Troubleshooting
-
-### `GraphicsAdapterNotFound`
-
-This occurs when the selected [built-in renderer] is not able to create a context.
-
-Often this will occur while using [`iced_wgpu`] as the renderer without
-supported hardware (needs Vulkan, Metal or DX12). In this case, you could try using the
-[`iced_glow`] renderer:
-
-First, check if it works with
-
-```console
-cargo run --features iced/glow --package game_of_life
-```
-
-and then use it in your project with
-
-```toml
-iced = { version = "0.9", default-features = false, features = ["glow"] }
-```
-
-__NOTE:__ Chances are you have hardware that supports at least OpenGL 2.1 or OpenGL ES 2.0,
-but if you don't, right now there's no software fallback, so it means your hardware
-doesn't support Iced.
-
-[built-in renderer]: https://github.com/iced-rs/iced/blob/master/ECOSYSTEM.md#Renderers
-
 ## Contributing / Feedback
 
 Contributions are greatly appreciated! If you want to contribute, please
diff --git a/examples/README.md b/examples/README.md
index 74cf145b57..111e89100d 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -93,8 +93,7 @@ A bunch of simpler examples exist:
 - [`download_progress`](download_progress), a basic application that asynchronously downloads a dummy file of 100 MB and tracks the download progress.
 - [`events`](events), a log of native events displayed using a conditional `Subscription`.
 - [`geometry`](geometry), a custom widget showcasing how to draw geometry with the `Mesh2D` primitive in [`iced_wgpu`](../wgpu).
-- [`integration_opengl`](integration_opengl), a demonstration of how to integrate Iced in an existing OpenGL application.
-- [`integration_wgpu`](integration_wgpu), a demonstration of how to integrate Iced in an existing [`wgpu`] application.
+- [`integration`](integration), a demonstration of how to integrate Iced in an existing [`wgpu`] application.
 - [`pane_grid`](pane_grid), a grid of panes that can be split, resized, and reorganized.
 - [`pick_list`](pick_list), a dropdown list of selectable options.
 - [`pokedex`](pokedex), an application that displays a random Pokédex entry (sprite included!) by using the [PokéAPI].
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index c29de7db1a..d9206134f1 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -16,11 +16,10 @@ use crate::core::{Element, Layout, Shell};
 /// charge of using this type in your system in any way you want.
 ///
 /// # Example
-/// The [`integration_opengl`] & [`integration_wgpu`] examples use a
-/// [`UserInterface`] to integrate Iced in an existing graphical application.
+/// The [`integration`] example uses a [`UserInterface`] to integrate Iced in an
+/// existing graphical application.
 ///
-/// [`integration_opengl`]: https://github.com/iced-rs/iced/tree/0.9/examples/integration_opengl
-/// [`integration_wgpu`]: https://github.com/iced-rs/iced/tree/0.9/examples/integration_wgpu
+/// [`integration`]: https://github.com/iced-rs/iced/tree/0.9/examples/integration
 #[allow(missing_debug_implementations)]
 pub struct UserInterface<'a, Message, Renderer> {
     root: Element<'a, Message, Renderer>,