From 7d2d813343baae10c2667590463385d50abb784c Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Mon, 23 Jan 2023 16:57:24 +0100
Subject: [PATCH 001/440] added new style for scrollable, to be applied when
 mouse is over the scrollable area

---
 native/src/widget/scrollable.rs |  4 ++++
 style/src/scrollable.rs         | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 82286036..de6eacb5 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -856,6 +856,8 @@ pub fn draw<Renderer>(
                         theme.dragging(style)
                     } else if mouse_over_y_scrollbar {
                         theme.hovered(style)
+                    } else if mouse_over_scrollable {
+                        theme.focused(style)
                     } else {
                         theme.active(style)
                     };
@@ -869,6 +871,8 @@ pub fn draw<Renderer>(
                         theme.dragging_horizontal(style)
                     } else if mouse_over_x_scrollbar {
                         theme.hovered_horizontal(style)
+                    } else if mouse_over_scrollable {
+                        theme.focused_horizontal(style)
                     } else {
                         theme.active_horizontal(style)
                     };
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index 64ed8462..a3f3db20 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -45,6 +45,11 @@ pub trait StyleSheet {
         self.hovered(style)
     }
 
+    /// Produces the style of a scrollbar when mouse is over the scrollable area.
+    fn focused(&self, style: &Self::Style) -> Scrollbar {
+        self.active(style)
+    }
+
     /// Produces the style of an active horizontal scrollbar.
     fn active_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.active(style)
@@ -59,4 +64,9 @@ pub trait StyleSheet {
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.hovered_horizontal(style)
     }
+
+    /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
+    fn focused_horizontal(&self, style: &Self::Style) -> Scrollbar {
+        self.active_horizontal(style)
+    }
 }

From eaa2238600a0d3055b379592c7a3f8e6453b9dc7 Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Mon, 23 Jan 2023 17:32:08 +0100
Subject: [PATCH 002/440] debugging focused style not working

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

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index de6eacb5..71814034 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -859,7 +859,7 @@ pub fn draw<Renderer>(
                     } else if mouse_over_scrollable {
                         theme.focused(style)
                     } else {
-                        theme.active(style)
+                        theme.focused(style)
                     };
 
                     draw_scrollbar(renderer, style, &scrollbar);
@@ -874,7 +874,7 @@ pub fn draw<Renderer>(
                     } else if mouse_over_scrollable {
                         theme.focused_horizontal(style)
                     } else {
-                        theme.active_horizontal(style)
+                        theme.focused_horizontal(style)
                     };
 
                     draw_scrollbar(renderer, style, &scrollbar);

From 49e9a9a5379c1e9a9469045ca9a51ffb860ee620 Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Mon, 23 Jan 2023 17:56:39 +0100
Subject: [PATCH 003/440] added function focused and focused_horizontal to
 theme.rs

---
 native/src/widget/scrollable.rs |  4 ++--
 style/src/theme.rs              | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 71814034..de6eacb5 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -859,7 +859,7 @@ pub fn draw<Renderer>(
                     } else if mouse_over_scrollable {
                         theme.focused(style)
                     } else {
-                        theme.focused(style)
+                        theme.active(style)
                     };
 
                     draw_scrollbar(renderer, style, &scrollbar);
@@ -874,7 +874,7 @@ pub fn draw<Renderer>(
                     } else if mouse_over_scrollable {
                         theme.focused_horizontal(style)
                     } else {
-                        theme.focused_horizontal(style)
+                        theme.active_horizontal(style)
                     };
 
                     draw_scrollbar(renderer, style, &scrollbar);
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 55bfa4ca..8d40bda1 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -935,6 +935,13 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
+    fn focused(&self, style: &Self::Style) -> scrollable::Scrollbar {
+        match style {
+            Scrollable::Default => self.active(style),
+            Scrollable::Custom(custom) => custom.focused(self),
+        }
+    }
+
     fn active_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
@@ -958,6 +965,16 @@ impl scrollable::StyleSheet for Theme {
             Scrollable::Custom(custom) => custom.dragging_horizontal(self),
         }
     }
+
+    fn focused_horizontal(
+        &self,
+        style: &Self::Style,
+    ) -> scrollable::Scrollbar {
+        match style {
+            Scrollable::Default => self.active_horizontal(style),
+            Scrollable::Custom(custom) => custom.focused_horizontal(self),
+        }
+    }
 }
 
 /// The style of text.

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 004/440] 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 d26ec2b6..42c9488c 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 eaa1df7e..200306aa 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 461e67a4..920bc4a0 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 6dac999c..00000000
--- 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 b7c2c074..00000000
--- 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 c3648f44..00000000
--- 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 f161c8a0..00000000
--- 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 c1d05b65..00000000
--- 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 1a848ab7..00000000
--- 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 95c9d62a..00000000
--- 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 36a34eda..00000000
--- 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 d3a25b5b..00000000
--- 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 9bc20641..00000000
--- 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 9e7de0d9..00000000
--- 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 95437fcd..00000000
--- 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 67d9a098..00000000
--- 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 e909162c..00000000
--- 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 89036530..00000000
--- 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 6aaa0d55..00000000
--- 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 9af0cb6e..00000000
--- 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 fe505997..00000000
--- 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 5e05abdf..00000000
--- 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 93e541f2..00000000
--- 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 174ffdd3..00000000
--- 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 59ed88e5..00000000
--- 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 bb9d8122..00000000
--- 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 89931f06..00000000
--- 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 71147aa5..00000000
--- 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 17c3e641..00000000
--- 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 37ccdece..00000000
--- 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 42c88455..00000000
--- 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 aac5fb9e..00000000
--- 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 20756032..00000000
--- 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 13ab61d8..19d6af0c 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 d55d0faf..00000000
--- 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 c0b50e1d..00000000
--- 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 d39dd90c..41bef2c3 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 f1e22cf6..5badeae6 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 6a299425..e9e23e80 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 e17b84c1..125e6be0 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 005/440] 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 2a56b6fa..69f6961e 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 1d453caa..cc8f299c 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 74f7a676..38d62616 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 0eb3e62d..266ad404 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 5badeae6..d29c1129 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 e9e23e80..77785760 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 125e6be0..ccb627cd 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 6d0c36f6..50231f7c 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 006/440] 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 77785760..9bf464b3 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 ccb627cd..2b18299f 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 007/440] 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 2b18299f..19d0782a 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 008/440] 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 ee0473ea..5e198b8f 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 009/440] 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 19d0782a..3f828da1 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 010/440] 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 17528db4..a128d1ae 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 011/440] Implement basic text caching in `iced_wgpu`

---
 core/src/font.rs |  16 ++++
 wgpu/Cargo.toml  |   2 +
 wgpu/src/text.rs | 197 +++++++++++++++++++++++++++++++++--------------
 3 files changed, 157 insertions(+), 58 deletions(-)

diff --git a/core/src/font.rs b/core/src/font.rs
index 3f9ad2b5..130e378e 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 d29c1129..1a94c6a3 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 3f828da1..a1d621d4 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 (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,
+                });
 
-                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
+                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 mut paragraph =
-            glyphon::BufferLine::new(content, glyphon::AttrsList::new(attrs));
+        let (total_lines, max_width) = paragraph
+            .layout_runs()
+            .enumerate()
+            .fold((0, 0.0), |(_, max), (i, buffer)| {
+                (i + 1, buffer.line_w.max(max))
+            });
 
-        // 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 012/440] 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 a1d621d4..cca00435 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 013/440] 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 cca00435..1e2bf5c2 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 014/440] 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 1e2bf5c2..026a6d27 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 015/440] 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 026a6d27..41787136 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 016/440] 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 41787136..fa7fd5df 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 017/440] Overhaul `Font` type to allow font family selection

---
 core/src/font.rs                              |  57 +++++------
 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, 147 insertions(+), 256 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 130e378e..1f774a70 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],
-    },
-}
-
-impl Default for Font {
-    fn default() -> 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);
-            }
-        }
-    }
+    /// 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,
+
+    /// 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,
+
+    /// 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
zcmcbk{Y0mpfsuiML4c8gfrWv=%`L=t=DEeI7#PGn7#J92++AGV7}Oag7#PGf7#J87
z{Dbw4+;l>i7#J8k7#JABl5-OaJ_$X0%)r3-gMooDD7maef$i#l76t}>7m)h2g7n<3
zi4!6j7?^z+7`O}46N?K#wlOe>DKIcFaHQu{)~8Lgjge+x;4fidV7icznwTPUR@aV!
zfsu!Sfx#>zBQ=rj7jpyy10%>lm5khy3jTHm7X}8#2Mi1h5;^(FiHr*vo-i=*r!X)u
z@Z}~}6fm+d3NSD*W`G=!mzbNXJhd#6fkDWHfq{8uL4I+`iex{31_n`(e!GGqi`0Ur
zj@o+|82I)uFfg=%LxYilVT=8)3-SCmUm4_?UobE*Fx>oT#|EMwFt47@!0>+~^U}$7
zZ1Uzy!RkR0Fw6!PVPlA4U<C^?F~~6JFcdQ|Fk~{cfkhaZ3nqs!hFCxhW?*3SWnf@_
z!QjFy$iToH30A_)z`y{)GGN0P7<?F*!7LdD76yaKHyCA1_`mb<@G^k~!8#Zi7}*%$
zTt+4a1_ls@%7H1y$%0HzHb3F~!97`+NpSL2PJS`4IEb)dcmfVEMg|uK#?4;Lr<v**
z7=#$^!A&$}$bqsM83Y)PK-o+T><mw#Y-R>+Mpr1Cg+YLEGL+5Az|FV^%4TB_V0;B-
zb1`T$1w+}~48lyyL4IW6WME*(0{K3UfsuuifssLhVG&e<iGh#dDwNI45XSHp%4T6u
zU@U~PSsBC_mq6KU3<``VplmLNFvj0dHaCMBQ~hLpj%-GT$zANG^$ZN249N_s3@Hq{
z3?U5p3@Hrx48;t(V9|VrJW$+uCa0$8hUBN@7wdW^=jRnOFa$BAGNdz<GUPBMG88c|
z1f`~z<|Gy|Ft{;*w3LA9B8GH^R0ahGBL+PN0|o^KD+UFyp&+Xi;8xWaLxn*aL2QsR
z69!!dBQQ2#Fk&!fU~tRND{;#&N>5cV(lb!7QUJL~0qi0Lu!|I|6ijrDbd3y*j1m4p
zSOPK^<V%Ph49L1;ARY>1NM$HuC}zk6dq9D~5bS7%u+*aB%=|nBLp=k8xx|Ol<i8x@
zj0}@MvTHLkOb+JM5XmShDX`MlPs`6MNzKX0*GtaNWtd#asgexJU5pG&j7*Hoj4Vv~
z*{mf+iNzUg1*v(-nK=xgq|NyMKLbBF!GMYe0R{<h3TJ_)bWkY<!XT9l3=H>g?gFVo
G$+rOO&e^B{

delta 1080
zcmaE&b4R<LfsuiMfuEs)ftjJeJvh`!p<A_zfq~%<0|P^df3Uuhn@)%#0|R3K0|P@?
za&BV5HIHUn1_s6z3=E8OlFLdI*slI(VPN1q!oa|wkXDeM+cj}QBm)EI69xwEg7n1V
z0tN;K0R{%nJq!#C9O*fgY13??uQM<(yD%^?oy$l~tWObpxqmGK1Dgl~1A|#cMrtCv
zEpr$H1Dg*61A|INZb=276$1kU0~^?&oc!cO#`z3S7#P?Z7#JA1auX{G7@4?#F)*<8
zfE<vQn45ZLuDl`x1KSz~2BxzG`Nbu^`+R~J7&vPf7#M5|ic$-nI%@A>U=R&qU|?ut
zU<?Bp!(hN*$H3&`<`cremy=kM#~{VP0<x5W0USEWY{s0-^h5>@s0<?m3s@y10|x^m
z0~<_~xqosGV~7C*0|P4q0|PSy1A`6&14tob2G~Fbh9m}NFiVGlnSqOefiZ)Dg~4pH
z1e1&u++Gd_5Cpk^31kE#+vGx~+mjoZG%R_*YD~Z+*!T}T3=AL)GV<dO1_lsjU}9kS
z%nZR$%NRCS@t<bW1VuO_1H&|iHi3A4o39Mq%r8Jj-TY_=@&E&b{=bp=#bh%^d7l>`
zLqYOz%mPvm#)1qC%#l!W3x+3*>CgaRVTb|yoPmLfL54wxp_qYzA(Oj+VX~u;NIl3$
zAU&WkGld$?#K6vA3uQAia4@()*(?kk3_egcD+4z}2$apnz`+m?WpgoTGo(Y=+zi4D
zlR&;@;bdT7$YNLuWiv7eF!Dp#ehf?ue2nrC4g)iT0HZFH&B7qSXbWYtGKewyLfLE#
z0*uK}HWxz}V=<J?&7j73a&n)rsZm;fUP)?BPJU2odTCB#5sV9?!%~ZiGxPHl4D}3P
zLX%5HwS_ZEN(!v>^<iRq$@#gHm4vgC(-`s@@)$}OQW<g>av1U%f*4X6(iut_au^aB
ziWtyk(fMHvsSHI7#SEEXQxq5s8T1$o&~;6g6%C)fNK}3DeNiQK7DgsUW=0l9RtBd0
mY}S&Z#NrILg4Dd^%p6cWf#Qqt|9=Ml$u9f~n|+vna03AC=C$hp

diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 6408f09c..5509cf0e 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
zcmZQzWME(rU}RumVPJ3%@DC1%iuYn*6yRWB5UFtw4s{CU3z@;dsM5l~!0^XESl{U8
z+Nw+jhVMTZ7#I?ga}x_Tmh~=SVE7Tiz`$6NTvnpM_FZBz10%>#2EDX`^xUGTA_oSB
zpJx~t*q){*78fuGF-R~l^8aCAVBks5sZ5*i&>hXdz{tbE@PRKQH8JJSoKMOO44+dN
z7#PelGEx)yx3Mo}VEBH8fq_9KBe$f&Aujej1H<Pz3=Aw5Ir+(nYg68eGBA9!VPIg=
z$W5#$VB%r_$-wYYhJk@WAulmERa?%soq>_jfPsNKt02F)WR+mLFasmc90msFxPqe8
zf@SPe#TghGwlFX-cr&mt=rS-c|7M-Zpvqv%V98+1@XtZa*2db((!$)##7Ij+MM+*(
zScr{<i(T7$LwrDlgEIpo69c0h12YpN6EmX`10xF)BZ~n80|OH?0}~^I8UqUhD+dcJ
zh{egt#=xM$z{bWc&%nXK4q~&j^RO#$N_%g}35alT#BLND11AF;Cj)~TRzu+i@v|#%
zNIQ6uWd=Jt2LppL+)*I6DRM?eZm`f6wqrInl4BAT;bY-vR908BV=*;RQ&!?*QdUwI
zHZg<BF)1slF)9iwnkxz_{*ttG@z=9Y_tccrH8W6V5v<~2k<v9cQ1G<Ww9t^@mgGsc
zGZ52|6%>@!5Hqm*w~+bVA0s2?<Uey+O2yP<1(hA5EzAR~wbfL`GfS0>wKeptG>mP8
z#Dv8D{ML66l+zR!*N_vmXIb(q-HcU-fr;VP|BsB9S!XivGAJ_CIq)$s$jOKZG4L|*
zva_+mVo92T0hG>FSQr@@x#by{n3x$ER2Z0<g_spsprJ3x0!p+@poFW2P$0^zz%1>c
zgd)ex%*4o`3|9j(OOXW}T8x4sd`#@hdd#MR%qDhBh|tkvVqC|}#>rO6#>vL4Ev%>~
zC8eh%EUW~g6@^)6{ym}_79MS45*;3<%VhKGs+69Rh=`J&l(a5Ll`aDl!wlw`Obx6v
z8Mqik8D={OadR^;aEo$_3i2~>F>tZ5u)%#Q!o$hP!obKV2l5Id1A_`HGYc~#BR7Kr
zv$Xey7Xc9t>To4sDR9UrgPDvBj0`GFAd-<mkww};7p#(rnNf~~k&zh`g37Fn%nVGR
z)Xty=3QUj&kO7PgimcEeVCQ30R#MYv6jT(1GZ~Eqm}TUpWZ485U%*(bGymP2t)Q%|
zFq=^c!D3)wVlZQ1U<qWM$zaFe#AxZD#=zj@=wQ!a$6#k+W@>Dpuce``rmCzUCoLr@
zAtb=h%f-peC<ybvE*}pQivTY(Ga~~FBLjmPCnGyMw>&>L6Duny_i=GBv9a;VgTjV~
zL4g$-_u8C{>}>2NAW4u)7B*G}CN(sJKw9`2z{v#^h!zkn;J`A))X2!l!oZ*mG6LiZ
z6|jRqEJZeHhXe+8PIeOpPBu;xP!Yk%#9+k0z+lY4!NAYW!Oy^?#=ynE&C12i$fU-=
z#=r`44TBm3A1@;xD3kICF!D0<@Pf(%76xWU7G_Y<!p8@SX$D3RrN|Qri3w(9B{fqM
zGjm~OW<Ex3Mqvoop3zuX+1!rNno$@;FdGXS8;OaEurnL8gH$ntd2IZQs>Z^~%wi#d
z;tGt6?%&-xbY=ZRCy7fjGIE@8e8J1AqCU@qO<OJ?<a>y}q#~o|6<$_VwJyia5>kwe
zoPXzhcl^${{9mM!Gz&W`W7NO7s`8A>#bsD|*en^{ykun<)8v%?MKLauli*<eH`iNM
z`rj^bSypZ~%VtJ51_ow^tp7qRDs1Tt77We|evF|Gd=_TLMk-1&QsQD9Y~Zxc84%&%
zA;HMV<fWk?%fig)X{X7{!oY0L!_3UWV8Xz}%EBtgz|6?N$P5Zy7DfgZ0|q807Ercl
zVG)vNU}a?lu^AZ!Sryo&A!Rw)=80mO2P)8ANpv4011lpdBZDf!p`t7bY|;+?q?*GF
z@|-dQ69Wq?$jfRBj39GWAjT`QL(&JU9;3Rs9V4ia5*OBEHZ`$hvS$P(33fR~adtLk
zB|Ro}W;te25k4k<Mo`jVGy#d&F*AzDF^LQFF*AOuJnmu2F2yHo;Fjp3>eim^Xqmep
zgNsQ@%!w~^hK;s}6rZM*kD;PRPl2mV@$zgQCTUS8#u=&(VTMYMsjkX@uPWID=*v0A
z+sg59Cwd2Q^Qjr?aWDysnuazedUofyvP=+`JH{Ji<s>JmsL1|LM$9CrIwopfg*V#<
zVOgeDBM%cbfq#5#x^A&d7Yy9ZGz1tAvuW6PGcd3+c>I6QdYg4QgD`_SgCT<}LnLF2
zgIHLIkC&5!g_)tgj+Tm&l!O2uv?iAch;T4qU}j)o2bFSa4D1XXoa`K+oW;ZhN++PA
zPEekKlarN^L4}Qxm6eB8flb<bgHk|*g9%}MtgJjB&1|3)$Hpea22XJoSoN~7fa@rb
z#SDy$f}q5Ork?{^a9J|2FfuW+Fc~p0GB7bSf*Tyze8I}fkK_PRkOLfC;d)s)**IC*
z2${jj%Ek$*_c%Er{s2*m9FdU3#3%x466i63QV}Rcv76{Iftm@TB63W|Ms`f#gat`O
z1XMB|HVH4WcPS1tFbFGlaV`xt?3OWfR8@5}kd`(8(S|Zi4ZN}v4ZmM<$q2Wwnwo?c
zBb1kf8FZm5XR!}yjW#fdZVd@*i!m^WX$y0Tv6hmuj&X8~wv?2#jAkqs6#mu1E5H~O
z(gIT05)#%9QrI5m6l*0VWfkk>7zI)o#lXZ6^#22E1?x%%dj@Yt2L};G1~(UdT@5uQ
z1wnpJb_RP!dk#=dBnN64vNAF<Suip)dU|N9O0%*tGs`hBGBGnTG8-{4F@Y*hc18vU
zL3svdW>B%j%E-dPBhSFb2IsISfT9`H$aEylC<drWpv20+$|}SPHV9NA+2b|{<QOJK
zP=%xhbrAy#3qQy~P-8?v1*L-<aVD^_u(E*?3o`=?E696l3~X!=b3hcV2x2snV*(d7
zYU+B-u;e1nXvYYypZFNrAuS0|g94JY%=H*SDGXEs85^0IGx9MqP4RDvH)qLbW#JWP
zWtTT})iVmPlowPoQ)8T?rpv)3B9zDE=ESJ8Mpi{^LfqHM0kbN-^n;6BY^_XF`v09V
z@Jlf%*yQprGAo;PrEy5UjTj@Jkd%d<oPwpVuCjxptJ=R<=gD5eV#W6o|6Sk{n;4yC
zmOdrctu`w}&UccZXG6UC@5heGF3LeJjH@l@gPKA!m}fE?gIj8W4qOZjkoFlfC{=)>
zQj8PSUtpAjHb|L34N_3k%s~Mv0V;36EiI4~D3yTB1U1J%&2dI-O)BJu6ayne+rQgP
zjBNZ2G7RhvEFxTt+}eyHLgI3aq9SbkjF58P9L!~BV`5ay%V1;S<M#K?bd-~G%=Gr>
z=HtrDWh%Y)FLyh)00*BCyFu}zC(o-YUp#(PV#qGU$1l9?Uk(E!gV(>?j7MR%a0-KL
zF=0{%wKwb;A(aNZIw-Qt%*})twQ@7LP%U9$%gAFYy~a3Yn=n705W8W?qsK2QtDZl3
zRBXU5#K$4Py`6C~10zEMb3D@?)<+Bm3>o0CG+;205C?~)WI%+2lCGwPih{hfumC?d
z2RjQNBLk?_3u?wQs4y@v@G^qh?%G%sF+e(~%7{n+g}5RMIEX<_CN_RXb#pUwJw|;-
zb8#_oJw{tbV^I-yJ4Sm(adtjNb~#3QMv(v1#bg;7lUUhB6xZmiQBf697Fw&bR#}Xb
zJ%W#0T5yfd8bL)NAw|KpI%|bwxCNNwj|wXZNQxwTr-(8$ar2~lr-&#BsfrvsswvMe
z#+~e)!p+0P#Lb=Rox&|9ps0R~fsrAFVI7MSOCJL_L#cxh0|Ns$12-2Z2Rj=p3o{cV
zJ1A9wTBE9LjI0bytPBjwEQ}1yjG!dOz@P@IsF*<AOeR()21tV*u8slHcmy>g8Nhu;
zO!chb;1E<4RTNYfR5Vo-Wa?&|{x5UVzih^-EPek%+y4bIu4`vp&A`YI_wOTP0K*#w
zIfi%#Hfc#V7ABC(K<QnGpOF#V`vTQ{jEp>>IDvF`(Pa2RG7i!Z<&2;{2snDc+Cb3-
z?P8fD^{d!H>CN1Z*&NhXi4&C9k&@Gw7mzY=*OlYt<C0g9X5*F8k{7HN*OV6$Q#Y2=
zO^lCHljRZM<>OX0uu>FK)CJ|O6eb>~Ag09(%nYgyY@n_k6T7y9I9d{606B<3kr~t_
zRuolCVSM*bh-vY3kp77O9~lD~-Y^I=1Us;SS`=`<^MTSA*aM70j0#N9IvYt;6eJ3@
z3shQyEmZ;8#mJz@3~t3E`xoTR2=vZl9(rGq@&A|q%b32g9%SHT&~;$rWM^RlyQnuH
z!hr|mU{eN0MqaSZTp+7V7#J9|nLu$Z4sPXvnt%)W%w@fqB6$rIy+xIkSZ^vQf%;`O
z|39+$u&xBRsmdL=U@a&XSX@gnKw3+XMhi2jDFw=hLXch)sQ!^aZl}QHMZx8tBC-?%
zsOhfE05bxl5*q)EB23`wfRV}6L<rn^WfVehY_RwQ_UzBi+uIWm(6cu$cYjadPV?9*
zC#R|ybMqJw9c#{XX3xL3TOuO1FbeP4!zi*fB4X>mH+z=c@36M+xW8n{JrI2l6j-Mi
z7+B<4=P(E{oOa+55)|O)<K<*$WPpz>DD$u|F)}fNs&-J_398z;<(a|5X-q1hikJo7
z%T$0VWnyG90f#)2I(~>cP-fP`rjCV$fq_98p@D&gfeF-^)W=ZFzzoXUS_}-#U@Z)w
zkv))8z&fC9e^o_66LVHjK&t68G8%*OIHNqH3G;sjE)h<C2{sGHRTCMd{xWnhU)0gP
z&B4yg>C0I7>rDqJL^2o{SX5Y7G8i*#a}Z!;0JWq=gavpRj2Vr=Ju^_Q*VSiaVdiFJ
zVq}tIU}0utW??jfMkXty%>yc;7*rUTn0T1L4QWu~(8kmRQq2r1sTe?g7)V*h#LuL_
zD(zrGKs7iiDl@<=Vg!|dY~U;fYIT5mHSCObjK+#aVzP{ipfaD)j@cC2YK4tk*fBFj
zM$apDG6>4H`PZ%yq{jF_R_TumzaZmj%Q$Bh4YxQmvlw?nE)E4LR&MrKzJTiatSimZ
zr^E$x)Rx-*tK;TXlFqRe)(~VoYn7doZ*L!OC$C`Xr!OnT$S9CBJ<Svpo;m+Nu;{U_
zWbguwH8L_dJ6c;B8tCh(sYpu-3o>{ydU3+?m$MrqI~x}x3#&LIGZV8M13Mcl8#}8J
z0}~4~3lp;u11kdy6Dtd-*TTjIYB_K~!kU>G+LI7sgf|2o@f!uw$;QsW1~Lm_D%>DZ
zMg?|h2QRYBU}R(l6?HJPKyCx|A~slP!{Y_iR)KUU)XmL|jl{&|7{%q7LEQ*&1es!u
zsGR6o`F6^VF_t~O-c4(hixw4lNcxD1ipX;?u`uyzxTJb}7kaD72lf|4HwLMyyTpQ`
z&VYwQK@t&lCJ7zEF4=(=f~xD9ljr4ITc&gdC~yi2v2e1=dOGMB`X%UFCAeucGO9Vn
zSlGqb$SGL*>meeOi9v&bfhB=;CW8Qj7{f^iJ~2@Ner`~0&BDk4&l_?gprI)_R#-(1
z3S(%GkB137z68n)3RqPkasUf-Fi#Vr4wSh;BTi_hLe#T>(mt!SgCVL~237`UMpkB!
z{g5UAh{Xa@tir$qq7>PnojYSu5jJf`P%8j5u*Yc3Y+`24sL0%YQ&?ov+`p|NvMfSO
zJD1I6X8rq}iIIslO+f5lJ7cA|U^MgGf4ik@6#iN>Ff!!)|G@l@btZ!z!vhBaJzY(8
zd08n5Aps6hV*!@Jtw94II@(OktYVBzEX;BY%&egP1E_1t$_yIA01bkJ#_=Gd=qxNu
zpz4*0Nr(yDr3M9@B`zb_7#J8q*+PwhkpX5H+yGHfG34Mxl3ws|k}?C#43Jwu9UD+e
z7GYCXWJVet*JA>wWJq5aoQRd!*wuv<nJ*bw{<Cu`h%Z=OVja-EC)d6tB}~ywNKV+;
zBhlHrB2-V^zs%pP#IB%(X*sL6n&H0=38#{Iu|+$Y-6XZl<b0&$)#ME#YkZw^e6)l_
z6q)9M>S<7kV#GR=L5e|-VLqsg*49*%7Z>H`WRPN%f~P|j3D7t(C>=7eFoOn5LBrnM
zpzbK5xPT3iLe(-bF)*2c%4C=ZST1H1WdxPUx)38Vm0`>DsD&}8Z38KV8Lb%^?HD0l
zJUb>xVDT|Ab%o6;aq(!}mYcJ_#yKRKF`LgwVctJ}<C=fhG<@^jJxYRgbpi^UJxT(#
zne!}j=cgsFs`GHI-&zoNrHb*TkmTQPW%YkPu0=t*dO-zFZiW6@hQYa@@;8rxfyIV(
zCW8<|7N~v1AjBZV&&$aUZ`FuE>kwu}CMIrq(6kk(y#j5+GJ~7ipgtQYW%4s9FiAVe
zflM_8jmCf~9c7R{NQi=z!J09mB5drC@en&kb44XJTSgWeevZHEdG*xmnWA{51^<c&
zO0&)kP}1T59W15FGEY)VSX!`>ftexU{|6Q|)|CwM48{!Z3`ZQKOidIO7#ZwsP25f0
zwKWxt6^#Y?8RQw|;q``|1P2o{3!@wdBMSpF6J*2~G5#sf&IlQfU}I!p5MqE=$2w45
zpzOi|&U;Auk@bjz2GSkO2q<R&HII~$^nr#zKqbru3vE^<Q1>3x-vagSjlmO6Z0wL~
zK-~zD2tcDr!f1RZ=j=@lZWG!Hi|vZ$CnYW@vMVWQo8Vr*DcddISJN;!$J#n4*ih3q
z-_0%APDar&(ZM0nQBlS&S->)DdR*6LHLc|({#|KSR%u=SCCjzcHh0BM&$8@OcTcwQ
z%5;*Kcgpm#Np@Ff+Mw+oV`voNq^9N+VPqKNt_{j*Qy3Un%%E{G7nIWs^wd-&#kn~_
z;g85^vfvV*0W=NB#KHh7X5kq}5HuUb18UJgQj`)@Eh7Un3#g`4L)OIvYWslZWuS_f
z7??~MkW?~&vN5Pc0@ePkj0_;Vph3(C4r0Wd6e98QF)~7%J)qzP)v`>gffMr_-Rjn5
zq_3!O6xXp;|F@XeKz<417BMwJ^Dah7ZJ$hgr(9nxb<a#kk9;2uCLgoRnaOcWs@z<v
zR;AnJXJuOa;}8~SvX(WG($QmF?40YPsqK?x?~?7Mrtg;q3b}^=9~mo|Z-M&~Gtl}H
zDghA=QVif}Hc%6h50vR3ISAB`0@Zw=Hl_q<9tt$-37#26$b+W2KotR2c~NjLQxRD!
zj=m<SLu8KB*#s3(f@u5(^v)PMAH8$N%!%GxV`6Cd2MGx|1|x<Q4qW=Ws>+}qG`Rc$
zg@hcqON=!%ctE8tWbQ%+tcr<&89hXJ7!^Pv1_}|JYWP8F98}Sbz!oyBkR}0g$e?t?
z(dRweaCXbt&;tukKb`3hdblw%OksG%Jc}iqK?pR?#VE+gtt|{1<6>t8kI#s+$}!3^
zGEQM;6A<}lFQO|csVl;GP(<L*FQ#LR6YB*fxt?(Iv#|<rJ?4@UXkeTKN|VzVw=;ia
z?qy(RU}rFP;DQdaFtD&|JHS#5c)SEW!UP_j01d7{Mg~}*BLkqW)HLSkKTAQF$*!I8
zS~~+H!#jpo%%5Ry6<}cG);0%KcB*!a=6a0ks-W>DM$vZyAQx&&N@{~#EWphAszE@C
z>oJ!AD;q!e6D~=?`hWReAa^SL|H$-%btQuagAKzm2R=)4eO+}`B?ZvB1bCTa3>wrC
zVPs@x!dROCDeW1+W6vz0GD!t8NDP_=10@qf+**;AHNZ5Af@VS-tccRX3hJGJ$|uNB
zFvtjKiwSL=fvE{-p#fwH0ld-xQE-9sp_06JWV(%idy<8&YmmD!i%=DhuB*SRu9B6%
zu5GxDDvu=JRP@xvDk*ECA+8rv;q8+bY-?twICB}dmZPPmYlMxqo1v7Pik$fG1?Z`a
zi6QL2Ae#)UKSLlxBBP~)LU0fxLv&<NVsN6ntF@)6F{r$kkrL!*XJrUv4CDp1W1Ryc
z90G(HxtJoDnV7lE8Cltw<v{be3~a1M3>*wBOdQ}Y8WRH-GZPmhgBlMf6Eh<>69XG)
zltYbym7Sdx)InlpWe2rw*+G;dXd>WvK!ig$)Lc%y=5j*JW#nXL0MFPEG@eu1A%ZlM
z85kKj8Nn49HzQt`Lza=KDygZ1MjJrYJSZx~#F^P(wGFI=Cn_Q&#|RqLH#0VpXJlhh
zR#H&|%_p%K8_BVN`s=Djc1-5N;MFIhB4RB4eo4Gm9ey?u*0PQb`)i$3bz_Bv<Tb?&
zBb?PEXJ4*rd$leld*{#o881Wmc|^G+v;VzcyY}C;+qLE?J!_8T#B7+`5^rjoJ@Frt
zyuG!dppUwqcWsoh(=KnnKsQa#6syp+-4UW9|E7Bzs_08|S)}!ccU|aqP22Kq;;MiD
z*F`uPb4oaQ1m&G))Y+GNYW>7?OAWu`soS%2wzv6Ih!}-AGOBahr?t3xgflQPa4|5j
zdV<%eh%)SV;Nj=v<>BUJV`V~&BgqPZrt;;$RW=JFXb}K2GdFCV0;~XsDPm?}HbJOF
zTbZB%H3_5$vOIx-g%P|Qfq?~NvI+wuhyo2B=^-fvHP7Hn5wL22jvXl~E2*h7D}vV)
zFd8!|GJ~R)oz-)ilmbWF-`X~ICCO<_wnzU>ViJESCdw_!B_+Zb^>3Mw4C~B4)lBYY
zfts#TpgI0^3=Av_SZ6YbFvv4#G3;~@6BT7((9%#+5S15|lMrJNVGw3!1ka{{YI_|X
z&?u4|0}DGNq6rIX=77e;L2W2d1AvVYJi-i`nFSSOT2MU<46G~+;3Zf{y20Z^Dj*&F
zpjy<y7_VYR(A+9$%@5QXa8n-AgE1CV1UFdun4m3IWkx|oa3fVsSrx`mT*r8_Wq-A`
zqI0Ut+y%~!yDR=3XEX~g_f?rY|KDjwhM)?6wHXWk{bZeKlF%J)niS$BD!-&HdRmS(
zQ|~`sHP?8{{KhU7hiJ39GEna#>i-8;PS%wSdJJbBgcun>eQ60Xa4Dq6s0W@E0EL-}
zFe7N~4=V$x4qyTG@{HIR!C_&*0PD3ffv1;2zG7emwXR^5fRQk6y-W-&%#d{j@Lq%{
zBWR(5HF282s}YppOE6d&85y9}0HcvSBe<LZ5AT|(fChiSgK>H+u<1ci1J&G&Wq|;%
zPsHzyv;S;L%G}4uxnSPYNPBi6L0(x6Gp{6v;{9E|zOCCb9n!+R)dU$ec!Sf5vJW!y
zEn39LcPKk4B$A6)SVloc*niTcrnXBHefSj&mG~K$7}hZ`uy(M{WZ+?tWGHvw5)%;?
z<YZ@K0k_3KA&NA@4elvJ6Ce+P5pI4^kI{kn5pFgXWko?nBNj2p&^Cx|$Hdx^w(H-Y
zd4FFpNz7wp*_C$Oqh(L=ztxPP#d}&jn9eNx_hU~w>&*1M|9&iNxiG=!_d=ik3!t<D
z%4dqKGa0xU7T}mc0{Ki8I{Xf9;4rW<K$baxJ;?%U<*=~uKt`xR8A};7jl{sn$^cRg
zS$P0rftKDdfCjz!Srk~L9dvN0VqswhEo6eJ1`Sig7LSQ4g4$1D%%b==fJyi7Wu^^(
zdRb@A`=>JFpZGl1naDokWaxGfU|?Y2WB`q^foH_v?H@T5|A4#znqUX}hX=9fPlgp#
zFoG~>fEm<uW`cNxAH42Qoq?H&*%U<$6R5OB8&-y{e1ke(SrF`WpTAoUgWSzM@9zxO
znGB2!pgilqx{|?!;VEd{fR2``vaGbQAP+YO8-od>3B07UR%B!aO_DS6GBPtT%Q3LB
zF|n~S88I+{d<3p@A!`H}SXcz*L9_OVwT!ULYl*`M76vv}7Vw}h+%O~qM43T(*qJ1~
z;29cagdw1L8)#kzSJ#5dprH*#K|W?^buI+T)X-Ufq)C5fU8}?}AGLeJ;*2}YN?T_{
z&iVIePiFdlM*bC{lWMc{%mt+dgeC1FD}yVKbb0yq9O&g1lNVvM5fjM!drRF)T^O9Z
zmoV}j%#zf1){2nk=F?D>@}GRMspIMtKL$o{&b9#Of=v#5NK>eYaajpijmn_L%7|3?
z!upd^sPdro$e^?U&fAcMl`5=^pvekQ;s*7+LF@g%MnRP_Ge9O`wZTO&R28TkWl#fk
z+ZdR^X^$0@t5iTsm>9roDnb2FMP)%nL1jT>K}A7hR*S=b{v1Bc%yO8i=Whw?%)gCH
z^$d&*mlzlrr?AdsU}gw}&tgJ)hCB@5HLnZ|JfP7j$S4CJXhs#3tr-{~V^*Lg(4aYR
zP|5~57nIEyU~`a)%7Vs>Qw|-1<UX7KADB+E&SVg0SnI$gE+)v&#{(@Pr9l05c1F<R
zQwB%?f_soibAX_dMv)z~%0!L<G>5^+1ezBDuXchKr9z;=B#0yBpbD88nN1iNnHWtN
z;5`?}kdr#50>~&6Tp=i#g9boAfe2Zmqz+zOVr(P^sz*!(jhRkb7q7@o%w%F?W)c+@
zvN3W>cUL{g_`YIavzv^prHr7ckVZ&z6!SU;MutNS46IhHGZ~Z^PC4)?DJsaz$$;ty
zCPW&N1Laxp;tpmeP*zZ51+DLpXJG_SbitZ&3fNSEMzTTb_#txu;E6zpI#B%xYHxsg
zoJht(HGmo>imcKOh7iRJjI40A(1|n11P-WN1Gi#S7(f%24Det9HMwESvp`G#7(qQO
zbw)jA@QA-LW3#84t_b5@F-?V~fA5K^ippq-Gg++=mJ$}=_$SCMEU73Faqu9ss<1ed
zjHKw_>Ea4poGQ|PBiXnFIGHSY1bJBh7J$pYbqoy5cUWgKurj1LaDWSI2JlJ_P?`{C
zfR3#)GBBwyfE#hJY$psJO$N=RL!=<<1Z1G1NL_J|Mo<w69br`kty?f=EMUs{bLr6H
z#gMeSj)8%#k##16GQ$A}9tAmB88Kl{OB_C%D+3<Sm4lYGMxY!Fn#~0}2o`&Cm})?a
zZ<!ex8NuTykg`AnLlw9!4qBf9%4aH|c`rs#4wrV&XJ%w#VU&YU<ADb8Ks`WE^nt2M
z(8w~#2GEo-10vq!7{%=v&A~Azs4NJYkzvzjR8nV@V-y9I6-Hv>jLi9bqFh{Je2h<d
zWu*F7F){rUmDH8dmHfxW%)F{!N`{y5JrkRRskDr-6my|C*ROOISy2PYKMlIN%*|3p
zqQ4)r&g2sR(+4UHKrJIs`6<RQ$$>{qR79AEi<1Ls9-N;AG}sLaEO1hXEp`wD3xkp>
zXc(NI3A_pdl(uC+5==~>No^1d)ca5Y1sM})<%6_?Is*eE3xfuDI|Zbq1hx7>-6E7U
z%nBKeVgz|skI_`n7*yZDgMd*;N>YH?j+tpylDItopTkT{t5R5J@{0UEA!R7e{QXzD
zfG~@>q=CpEW>D&2Vu<<wk@exguWx{NeZh4ltP!Zh#{}y!vp!7Q_3!t*dH??GN=w_t
z$TDvpBP*mmSW>*F)x)E8PjLyfP5AjxcJ?7g-h~Spc@O909RBxtVauh7etr`#wX|HE
z=<7T2B4|A65Ca2CJ?l&cJ_bohi%L>lke`8%ftQt;i4mzq#mveGUHT8|NrFZv5H$-d
zcgQd>f@b`|LmWuz!SxI?I9{0;Kx5V{%%EPV8Ur(UF9v9-2Pl!Sf)_}F>pjpknxHbg
zZ>6jbF0f71v>6$j4>B(AIN9Rp)_$V#*|XsKFrAgFpD{`NeZe}@zGO*i%CZXQSvvlC
zPMxzrzKi*HgAKG^L59JA;kN^iuC}tGq&Pn>2V{2$XdSs4H!Bk(C<ihyGMFO9odx9)
z-V_4$Z@f2%21Gc(Rl|p5Q51p(s|6slD4>!Ju9~3PpoX;yic6RnK=b;bQ5F^!Xb%lK
z&xT7GBPdWo18flGAYI^c9#;Q>7gVY<gSuGY!4=#oOw+Hxjj>>XiiP+e%W7xBNiB8T
z+y?!B#Uhf7LP8=0k{lDLCS`fbI+H<yL7Cw`s8^z_C@sk#!5}Uy2ugGC9;_-KwAatZ
z$P7wW3~KORBO`ot1U5;j3{?#3;)3U^7+B!ipe;2}Dg~83dJv^dj10`+)W`~%;9_6_
zuf+ugAgEEz2JQkgfJRD8AR0isx|o?jI|>+#5%Xd=v_Z#9!1Ly?5dtxBMr9>+Mm<Kf
z^gOlWSfiambaSwZ4CA6Trjq}91T{1!pAKyd*IBvz3RBqMRjf13GbTs-v}Ae-i)#Em
zuF1q8A=<0yonhb51S+4c{(oS;&AO7o7BnJkZK<KAtSBP|TKfghzs9zVjI45uET9o#
z2GG<Jvk`cXiNyfEJ%AOQl0g}f0cB3z5VuxVP%wadCGZgi$XvP=QF`#qp@R}BWCU1L
zM2-zK00<g*g6>#=6b5>1koiI}apoRQ5dlG6*F;yx6lW#t#OlWCL~DoY%|+c$11&hj
z`9#eEi-TQryfv&7svD~ltgQ={W>*~ZV%f>hucWD@Y!j$&<8Ps<V;)i!8Mm~`Ej28L
zn_t&VSIsrS+A-KdUDGVAG2W*y&&kJwfssLmfq|utbtVHl!(7mQGX{3hN*vI7On5s&
z6qMeW85mSpz&#1H77Ys{Xqh1+s6PN&*2E85iw9{n$b;&5Qx=dEsE-WN4Qh>p(<!9$
zpbAQY3`|-uh2R+<Wtc+HxEiQY0j(CHD>qr{{uv(nr_VZb@oz4cZ;Kfi85aD1&nn6~
zlR*;X14afBVLl#qHU>#XNrVqT?HO))Pzwl=9$;-UQE=<U1W8hq3BJ8d9xe%Pu7g`V
z5F<d9JZM{)GAQ|hwoNdDjKHc2TCs!rkf2%}wr4=lSWrZciRpG^PonWb|H)TcTCPm-
zKWLoTJIf|#S`>5opP4mRW=BNKzEZ=S{%2Oyv>aPd-r!(hV08!2@RvJq2nh=CF(I`)
zIY2Y`a-eo3xEsO)@d&6e7KTePfp!#u=3YSo04hHO(WJDQr5!{$7?~JBZGT1vcy~pc
z1rigWJyzn3NG&!-WsccW3LK16`NX+7Mfn&fvnxr?`MYC1>r5$;KfFo-+S&n1%%25i
zf2A`pGVn1lus>&=$)Le7*?~tx9n|j-<U<-e7FQPI0CmLWm>_L1P-@@-4PZd}Q7F>P
z3??9H@c0HK&50uGhDw9{qX-gb0WEE0K=_D-$%KK0nZ<;GnOPgUItasWMq=WOV(_*p
zqcS6SfS6I4Z=sYD8>0pXFB>}_Cu1O+vZRHSB0HnM5FZ;C2cssdvgGuCj_dwS<>qAN
zWc@dJ9XKpxr0tZH?4_8W2+B%{{E;znR<w~~ej+6EE1ktvUQ<Ms|MzZ42(f%)oyj20
zu*iW+T2hdomz$XpK58e*2ksC;BN@~XMT%u{BuP**1xfQm5&<Zt6%o>qgbGS2P<62M
zticBwIRdQ#Wrp{?Al*OE(h*QQ3DV<&CTdPb(6A<>8Kmvb3EJbJ&Inr#^826qK~WJ7
z#xiz3#zan0{+<6+8DAd|ljQi<z|Q@zi&I>53)2IpoqW814~a@L@$d=$4frcA&c_rf
zD*X36AE+D8!N9=s1U#-@@4z7<#KywJ2=8Z!@-Q<ngZk&7%?0R-S&$_e7(vT|k;XQJ
zk#s^NL1{!BEDA~^kp4LX6G$5@)q`q2h+mOXKGU^>e?PC1lH+Fd5RvBQmJ(rf=aiRR
z!({dM7?Txqyp-_Y%gT0g@^(s0x&pGG+#ANgzyccC;Dzk&1?}wR;Remk!pkaY&|X|b
zVGGj40PRJBDtu60mIRflpvEhx8w^(f=}Ri1$bsUQ0o2uI1dWd{f;wx8(A~YFBJ7Nc
zqKc*_=8TG_EK@}PTxB-;eL<L6=g)K2nI1}VzkBET$Vs!5&0}C>==*n{@gM7723`gW
za2>(Rz{|zK&dS8d%C7C81nSN*fyQ9e7?{A#NYK;*w7y_s29@-n>107g$htdY&>Gb~
z#sX=vl`F-h|J`Soa}$&Nc~(-~je&vj|C|5InBK!yd$Y4LF(9q>W@KPA1?_|Yjr@Q%
zP=GTsBV@HVXs0KrHKL|2;-hH5%M|G?Yr)HUP)XsJx{@+zyz<|D##3M)7&~zB@^Evp
zv$8P3=E6ZkIG~0p1E|~q2N%fo44~A-pa_}^7dJ7pW(4)dY(X2tqaaRaEciF!wulUy
zv9yTWk4FrQ4D*<UneVdBWDsPCcHj`?2Q8t4r&VDt(CCpIC`W-kfwY5J5F!PNM-xy=
z1|>yNE^t8(YVm`%)iRkdFfxJ?BB&o>49;WBdW`C9?BIDTCYEBxv_?S*jw8In?0n*f
zIK)LdSZDsN65(S^5Z4yf(f+r9PXrY8{~j}o{Euc}X3z!&AIN{;+~gn$au!H|GRS^V
z9Sw2}Xv7S(oJmyClv(7@o23;Mpv68c-He-AS2A#d))X)@u(2?3GIGLw$qTN?LCpn0
za3pbqhY7%r2d~K&HWHJExc<DN0^ig$Q7OJxtSd#uKk@Q2GBJSqtRI-GSlAgf87vu%
z9K^J>3=Om_wJlYZ<zytqMTEIInHa$9z(70FEEO49nDtqi*x13#vYD7c8wZ&f*x8ua
zL2=2<44IZ^6_Mv)gsdP2Wd<Gw@Y+gHXU3Lj13=5<z@|VtBA}Ti&>S`>D_UbSgq4Ar
z1+o+s;T{GCeq<vci;g|8>1JR9t?UFXfW|O|10)05iU#r$#4&83`6doX#SEIv)Mo^Z
zPD7@q&EdxzsOf{2hlASfjG%dEQ$A);_nW!OUrK>hM8hW}-pV@NN7rfcyEUoFj**V~
z;zH6K3L%HeLR+Hr{u$}}x!TKBugNi#(y<Ycic_&v7g2Odb+yS4GiUKHt5nof6y~!G
z46sP)3;p|4SlLM7GK;*Ci<X9!svsx@&-nj|MU3?zgBXJ<W4wcygg66(ysWsYgerp=
zgD7a8j|nm}3hKRTOG^nev#^5uuME8M?2Pcvq6lc`D5$PtV`c)k=Rp&rpe?J!Y5}+8
zA*0Cpcx+)~WM<}p*~P%bB#Ky#tBcUa$j->Z3hJMN#<O_kL7MncHG!N5+NGj{RTF4~
z6B8qYDo7(F!!htOgI1lIVOP$~1YSqMz{Ut2G-Y6A1qB8J6NrLzi$VQjV?kp<@J15Q
zDHouVEY#WAlo^%S*agAM5kSimW^A@!oEg!VVrEmgI4!Bun3F?|F)+N@+@RE>Z-%l{
z0_(xQi##Kpnh(|$9PADBafwl5E)VehC+1{!YIky9v=(T;-2YF^^(?FmT8vB%d>U$U
zG7@5-v11k{aQ_SxkH%VzjI2_i0T9pvQf5X5Q2&gHk(mjpe<lK&=>}~OWnf_uVu9yN
zQniXgw1RS@A#Pg{T|00u4K%R_*^h2Tlpb(@5LB;0+zXoM0L=`6f*dl(i?Tu37&h|@
zTJpgJY9KMYatQGAE1UURcoq4oYx(55IEGlL2#IqWIUUQ3UtHm8U%9C`Yl%IxBR7wv
zoTO<=UqnoQqOrW1yr5&Cw_EF>n!*F!ey;YQ{N(Zf6Z27MezFGTCq`&~5)}dECI&G^
zG4T8wD0AouGqN&COEELEu!82znR$^CsR%fGfu<@L*_gmHDxfqADjJRO>H;mT<pJx3
z6hWZ%(y+-o0~DQ146H1mgbUh)3(6#*LJ%oSgXh`3H-K`9K6ZWVj4Yr99^j0^0NP#-
zI_HEJG^^rZg;xiIG6ORkBj~^cMg}#6l_+CKic0#>xPx`P1&sw&jm*pi^%#|vz)O0V
zqt&<s9GB;WgR{$`^w<`YP5*4eo6QYN-TP)JIVGr8`^P&s9jYrh*cWJT$z=4)zA3<y
z@s*S5solxF(OL{l3|{{~F&}4PWl&+zWfX9bP*Y`O(9}@XRnwJ`5&^HxW>8^N0oQ7v
zd}AU8I(Y|l*aIlD7%{LhFfxORcr^}2R!|aF0nJY0$T%eHManrwsP?imGH@`mvO(6F
zz}>)rmUXO&(}XYYfT|?W{sPF37;wH}22I(3Vnketja|`1kBLb+dRBqGkmTPuCWDX?
z59dTTeL*oEBgL4^0`ts`jUJ9w8;TmI2r;QEImNTE+7_?O(UM8%i`SP|kr#B-uvQax
z?>yC<wWHm)d1{MYy0<2%aU;dRz%+$*9fKUBDrm%xL5@LARz_M%R0uS703NY33W#vf
z<_GnH8ChAF<WP14vVb<Dsetyc@yUbsr9ux-0A(FbgcguI3oGa-D$r&GXkHP7X@Cv%
zsUtLiCVW71gA8g&T0!RXvx1ksg1T_V2<2>ytSqdc;b$heCa}Yx8|y%e7eJPSM*J)h
zx<IQQnHZRj&~-B~V_V7q8ukMfa>jz{pmm+bpm;Gh0&N@CW>n&1k_B}k1a}pPN-r>s
zZU}I(VqsK}mDlq&lVw!>_mDZ3msM26Gby}1)<7gughRqC!ZEh-&jJQ!2BUwIneVZ%
zF<3JAGQ=__ILP?>F*1aQ`o;RkdU-h5fkw3j_*j@3EEz4iLF*7fJEUDX7}+_D1euuF
z9krNPnVIFd7}*(^nAxERMX<7gntY%!C_d1URG@N=laYZz1hnfPQfjk^K~5p?1Rb}6
zZWse20|x^mhY@x|IXLi`2a0zL$Kf}Rje!MpHi9YxlEECHeQ5r;+y(Lr2Rj4k91rYH
zWMcuXhERqcx&SdBv>6Q)eV{odMNtucMls0HqdFfWVjL3GScGj?fSpNTqQ?SJ13B;l
zx&jPRC^9~GD%NKd)+$!AOzjSKw^vZKN~o%@O0aUQ+K`{WJkLBnSld`Y(LljF)H1D?
zae|gdTt<$erMt36u9ruVzt+DaX2BLRg*n-UvKB!sY_c*=ikt$D0bZ41dV(T)Vk)Wv
zESzFS5pIrE@s>JXiKgC}@*>U_V)}Yo0$Sa%UX`JGzYnYFN%F9=aY*}_DOqbvN*OpY
z`N^4i>&E8g#p-&Sf!51RVqjpt%X*MOl;JCQU5zM%sE`0J52)7)Zl!=CO;H3qV*@(B
zfEQ`6kcd1h3ln(e50**gVG0>Rr$s?`nejrDLFc$ZwHVwyxH7Ooum&E|WH`(`&`M*_
zlptIK=v*|=Iae%9pbilOXfj++1T<X;o>OH4ZL$OvKA=7=Y)=JfPb`B9XkiZvbVd~v
z<wz|-(2S~@GN=(aX_Mo;^x*nXolTiJ{+(8=2mh{d4K`2h3;SEm)LLBc<M>w$)WQG_
z!Z)yPW?*IzXE+4v@rwv?aX|Wu;Bg92O(h8$rvMEHF*6IwgN~E|?`(iB9s>m~k^)`~
z1)$cNG{OXk0%$lv52gYIs066O2K7wA=LmtOF&LPcc|ikO4$7cqCg8DW(Aiy}G97eY
z0H}`#Ixm3{ygUVVo{ONepfGII6}szzF=Ep#QDr?TDP3g|5oKK|DLrLT=C6OanZGjH
z!Nv4Ja{3GmO#e^(o5BbR5fKIrMn+J20_|&H5MdAz<Y8w8rzcRDsByy9i$Dt;L3vh2
zCMG_4(C7##tQZ)?AhT(pA_zk@FD})f;8cd1%?R=;=v*c6><*|M3)KeMb^{7EsKKE5
zM^FHPHXMRF<_xNcvrr(N4Fiao2!)6(RUm6X^Y)-&3rK)6LT2khX$yQb9DD*p%-G1x
z6iWarxaRsOnn`mo@$qvA@%lMo3Gd$rY%~3IxwsN|*%>_pSsbv0JtM;m1_tIItOpt7
z7zL5)YDrL<WQLp?0S+HN(4lUitPJfTfhta3P{{MamaM>XGiV|Xbj%?GXq6HuGsBgF
zx>V40D<H+7z|?@63mGH=jio`&2dRTCE#zedZ;S_3(1sB8Y>cdo;4>^hl{zCRB;mF}
z$5BCt9f1}Iut_@@LG&Oi1+A9=A9?}a1`QhMLs=^T8m@-K1eO&qYM?ne@PZdcZ#@wy
z0Y(RYImt!;y7{C9g=Bdddlrbv^Znb*FDGZTnf2hGx!i(`;Q}K6iUp;(c;rR?@dyer
z&KKqVC&PLWl+>0nFfc~29%Nu<$aesp0K*I}0YP;#DAajDBSyTSX=0=WSqMS!dMro_
zpC2?#$N)N#kCBlVJUWDX*a<S60UmLU*u;A9mp$u221bTS3=FLA!M#pt2QdZ)1}z3H
zbyX!r&^c<L^NN@m!L4Y}*pQ+oH!CQ6$gwf9fEKT*faenU<T=<`nVFe+AWJ4e&R2yg
zWME(bHRT|q4In>>AQXdA0;s%#D`sM3WCJa5X8{c~LAoUnlldVggOY(B!ekcEUI@_8
z8dgo9UJa;}cK~T%2Mv6%vNN-@GK1EV88a}ju`_@Y4``^35xUrsg&oxW1PwfZj@{&7
zWM^P!U;x+jpcG*&2x>)x#sI{`q32yf%YQy5&{`VMiI;5bf|Ih;xOgqPW76woL|wxY
zjRI=J^)_WB>-gI!Z%T@DD%5BGs+!>%QIu#NU?O3h)E@(?A<C=eZK7>Jtf~rk+rPY^
z^Z~ACSy&mw89sx`MFw#OaS<VYK2COK$Z88ve8`Hif>uVzK?Yb=K!r3Pr1FGr5(mYF
zB1{n|Dj48<3Nb5VxI%1|CTL;{G)@kR11-3T%%HV%;5w5DG+7J^JJ4=&Q0>eB-A}G3
z#tPa^3R<}Ys%4o$=?1I=x^od{Eo&qX8(V{hGc<JhoEB#zs#@l+s(GGKXjLr}gUA0*
zEPO1i48jb`467Z4L`4`Gq$Nd^MU}ZZ8H5>y;Wdj4H0VIHlp^420@|Mt0_}E#jB4Rj
zBMMOiO2bkh1E2*MsA__m0@+EZf+`6vaFh|MK%>N<*#l52gB@=G>#GSHnL!5|K?93S
zI{BMxot<kp=jU&(b8)HLoIh>KlxaQ%-m0qJ1uU#y9S6%R4s>{Wb{wcEKiJ{*r{d(6
zt*1<q`lF)y5=|JG7$*H&$->XV4jwTq1&weZjTnMQnxK0rKy|L3v=l2dD~l*26DyM(
zsHYEVs6$d1e2k1q2s}b309q65y#chclPF!H$htr^wh^*j;35NLAv6r(1C*daLzqs`
zxCkh5n;`4Ns|n<MkkQQG0WnaV=_Bi9KpuGntq5UeU{FPPR20+-aIi$t!2l_Mkae;$
zFfoG$4nY|KG}i$&2r-T*3@=5%=jDP&5(QDm5kVygzvJ@UaM0LD!Q!;IR%1p%@X&}y
zFK8U`-%3^=)e8Rv=Vs9GNN=E><v$0Ob0{N;Obj0XRx%%j#&j84OrwttqmE@k#y`P>
z!6L|mQ9_`~2)bqo9MdS{M7VT`BIyFhv@jzpGi=-pG)T*bF>nTrc9>3hOe5<=L=1`>
z!FoWgS+L2FDG6{)qv(Z?o`GTqR826bBBdP2;wjK57_vJ-r(l4N^Mwt(fd|kSK&@ys
zkX?`#HfXH|BC0{vEM$2Kq;oGOZf<7Gh&l{*bd$s4OmIXOE=o`8G~?k?`?nl4W?Tjt
z24nvEYYXFBuPE41n45#Y>YrZFNSK2;bR-O1e>438$Mr*SO(Di0CM+nx$Hf7yDL}EM
z$iv9QAj-zX!o&nxnhGkmVbulbNI}q63`k)I+Cl|W$iT!5+QS1nc$N>f8wb$?8rB2_
zFIGLsl?ZHS1^E0T2U8wKW=ty(6$88~fog*cwm{l0pjucAQZa~$gU%m?_P^3(#aMVu
zW~OVo$cnQ|@L8F})@m_-6_cKqRW2;pDk+?k{<j)btJ?klz|7CW3fU8DWdYg|D=o>v
z1`R1tiDGQS$jB<o$OIaj0xdxSkFc{aG9#~m5&<px1GQ<<RzTs_3L0Z%#kvBDC_PM|
zmI-LZ8N^c16ewtz95ihSK7&;mvhb780w|_yJd*rs<~}C69>&tTUUA8BUb;p}eX&_<
zY_vGUgoHFK18q(GOeA%^;*;aObPZzK!cyj2G5d*$NsEhXn98f0sL3j7*o51<m4_R-
znz``u$tcN4>)9x2nXAhxXxc?PT4e_s*qehwTIc@<rd_Od42q2Ypq(tT(h_3Aprf&P
z*;p7985O}J>7cPdV@^g!W_d;i&^S61Gm{AesD;nQY6R-~f{IWEW@d01!NAA_9;6k5
zWNT1V8RF0iTCv8+23ldH#sC`Kg=>T*Skg3#Lb{fqmX8%NHZp*QcR@SXpiX9GU}REc
zmv(UAWMo0{DI;jCip_`twBLpmbh0ccnSr__tXPcz%|?RS2&_tKrjSW<bMWcR;GIw+
z;JpgQ;0Y4OqZN%+0%FTFnZyL6K<8%L8OmtNiE{99o9HzOwAC@?2#dIjGFtKr|6APn
zcY%W)zYxD*sJ0;kBSY2y56nlIzcPq3`~a6F;tb+K0-#mgtjypx6S&pM#|~PSAjitW
z#K;I9odBgu(2^MBRwtSwCMF(GRRAiSAxEmiTK~$(3PA=jFfs8XDHR1x-$523X+f2O
zhFU?bcaQ@>i)z3FmEhChR6v6%pkv0R9SlK=Ss3NOvx$r>pyilM;0^<*HwZd+1$-g|
z#66&07?6S+l%oVeVQFR#UMCKp$q;1J$;$TYvf7lT#>MBfBrCW+Oq==Z->Tv|FDItg
zf4Eh1JtNIi`ofsn7#JCZ7#Nt}GJj<dV!*qWj1M$XhqTIwwrk0RCW*?hF*5QAuyY9U
zF|x2pi*)}>Uda4ajQ?+miifhYhYC}Vfao7?$Vw^J_sriJ^cc1}@aX9%DagyBt|e0!
z=U`?AAEe0y>Q#Uiiy^NiLzadv7K5%OJ01|>Ac{p=8@6ap5+(^6Sup{xX#}rD(`J!&
zPz1?=7n?CMfR-MCSKOg5HUs4l@M<$*$a*4h7BLbNN9KZ-*Mb&$@G-J8vuQK(^@z!^
z9^&9*<q+Y%#wsc7D<Z{ukz0_1Re<vttBi2lza70&Tn{+7SXsF^9&^jJLBq^hNy%A-
zX#&592>;&#Wfw(74|zxkDlx4W*B2Kz5dRyb!~k9i%6y6WD}yw{DlF^H#6|en7+65p
zLqHnW(0l|64^Z7Ii6RZkA0P!tYtNLC72sTbrUh2T3|e{!8oB~?ebL8FpgVq0)}INR
zL5dj2`ZH!W$if)L`hTlei-~aj;1s;YCBnbt-)hF>)nbwy|JnK8aEXh|XJTi3$H)7x
zMMj3vflu(C%-{Foe2l%a;{TR|*PikHTgm)^`747ML$w2km<Z@>FYrniQ2S7Xj}=_D
zfQAadMT-DvS1hDy0+R#PE~a1wjPUiOLI{1}q`?4M?IQ*f#JTPabdIGk#>z9s-JH@g
zEj$0k%@UVlW8~-LWd*H6WM`8V?E80BM1pY=^Dc3|zfEE~;^I2uOtk`{AlJAtFffNQ
ze`VkY?FR<!+Xt;YgRd+E?FUBGWFYnE3(q7#W3He<GjN#%SyKkuC&Vo6polC5N+IBN
zR1hVg0bEeW5mac2utArdfeu|WRb&q3<NkYxN%Jo&FAtOY-}_7-m{$rb^Zixp_Tp6*
zV7lMKz{sHU?>-X)>t6;326yn;`34fALIR*YS8VLs4u&d_Ay?26MbPCHpaan$dyYVd
z4PiN=gAKG8%|uPv6x3q{O?}ugS%Z#R(Po6qZh$68*dd4hii(I?GlG_@!Fst{-JG4>
z1cU`NgR6r~Wq3q<Bl(2*#5Bzn70orp_=NZ(eMNX=OoOU}H3ftP7+2Z{W(PPJB_*Yp
zxR!+I`HKjphFN4JCmE?Z8mn@0s+u^c8YLxXScInti3I3}l(?ECCnqs5GCcdYlCgmG
zF9S1!jRWiqSMLp=R0lq76}*y<Q2?~g8hY9)XaWHiUEr{0h7>M>%FnvGSpWW51CosR
zcb`cI7K-+Ewl;?PI+}uf+??Q0lx1WE4Lvb~_HBWyDbN`Mpd(Gd;RznUL>&nR$0ek1
zsLf~!S|5i9PjfwHP*=hfw7&(kV-|7-7HG?ln6ao58{=XDVF9fm{6QF`B_J#S3U0=g
zMoG!Zpb*p#5D`iV2Zx}lg9#`EjUCm%AsCh_B;v0J3c-}5BqN7_>_Cu@OBm;|2r)A-
zNHe&D&J~al6B6X-<>FvrW{_r-W@p!S&}Cp`Wi(-6VPY|519byHbv5W5K_>9xEzmLt
zP&o$LoCg~F2Km^?%-k3{kpP-cQHD+?FnxFQWSpStn&x1V79XYp;iNi(I83RbZq5Y(
zItuEFA@0rv0lJFnpyPLL{aeX+g@u&?bk9pIXodyto)=JTOCxsgh=3Xzpv(knZ3;k!
zb3iRi3D6-~;ANelv3-bZnM6RVr5%*ej)g)b5>Rgtv|A6l5EOI{l)14Svnb{@FKqB@
zUakr&=}JrKf-Z8=1z+UyZzYqgZfJOniAhX&sP5m#Ecc}$*SknVkDUR{BX#{3Wnp4@
z#-PVw&N$OSKu<?gLs?NyRzi%Qmy44fG=>Zs!ExngWMDLw5f)%!VlYx;VrJ1|U}9rs
z0Zrn8w#kA|gERsSVz4k9Fo4$eF@etb5e3cbLI+Dk*uZCjatA~>kY|_>reUDqCC@M{
zE(6t&PNaB~fq@NlU@0h8Ss5Yz1)o^&Ly{p(pd%td6J_AJaVF4c59GQ7klFANV^&CZ
zMY=BoG8~}J3>rTc107-kxif=VL=1FQ29sgT>_U5|x*g@<J1_)-TFmq~`1yDgb?voG
z>_e^91h|D*4QzHouE==aUTNY}?5EDn<=?WcD1UcXAoFGs*_S-_hIZWCf)Wz!f7w{%
zm1H>C?LEBM*9*%sJzaD_oaqOfWpW32sXhZsH0ufmJ4Ss65j$Hm6Y%L!ilDVK+?*^-
z;1PdNOo0|SFq>;Lv9p1eYA}Q9DA0yi#3B~>c(NcUsv)Nlf$pmU4cmZX$DE&$3EcqD
zX>^cIJ`2iv7&fSOes=Krf}jqU0}0yM*+EM<8Q7r4fGAM6%LA_w3=9k$tPC8WUKa}k
zD;uO}X2WI_sQU%3<3MYcp#>CZ!3Jo)P7iW10eCI8GH5|IJLuG4P?e{wXllo7DyVFt
zAlqh^w<OQ6GR{@PgG-c)Pm)_i)7VMZKEXkOai^TvziLY(SxY&lCEOx1LVs+O><nZN
zGcAx(VPuV4TJ5gx5@n*t#>&knsjn=m<(KF3@27{5+-L7xT~>A<K522jVlE|PS3O2h
z8Q8+`fQ5x6fkBzUoMEa17wASZ87VFfczeVGyceIDK~a<+v~^HULX4S_iCK=9m5D({
zL0+7hQ5v+h88j*l$|kU)05rzy;6zv}qFKoV8R&+u@Bx{q$PTVTP0Y;I&BY;;Ddytf
zBXQW+#o58fKdGs+tDEaFnnN!IF@>HxcwbR=X7qHO3@ght?U|9&<&_j=XGG7?$*{Cc
z)tMPNT~4V**)C9DKiF19#Wq-9KhRE@X#q$oYKFX$qTI~r89M18t<z&>$SHx00`c_%
zL8=4w^n>h_mF<E+Z6XE+mSE8CeMTV%3GnWH(DEfo32`w|5n&+#(7+3L-3%yiXmf#^
zNX(23pyQT7#i<%6BP$0Z8$0M0DK#cW@Wxm0?QO8mE>sIBBp6L_X=Gq$=Vyn{dzwRR
zfoNf1XJa=-)5pff%D|w^$q2c-ii432WIHI~dvSs0RzZi3gNu766R>X3WfLq6T%cXj
zkb5^kELKjiAq<=h9BiE6%m6Ws0b&>zWbjQ`5wp3hC<=z4O}M6trizmojs9g!m6GRT
z6yXzLXBXmQ6y{Kroc1rB(fHpQ#*lw&HbW?;LS_v~k-w*utz>1bm6*%~W&Yeq%S``w
zl+ijplYt4Tt;Ws}f^y0pq{Suyn)L*YVlsf%fI(Z=0^kZ-5m|~EbY2E%eJMl<WZMKd
z2^xd;zk^$HptjtfXa64lc?zmqi~ct=x3ey1@L-5ynC`&m=Ax^up{6L0GDc|b!N|xO
z;b$ws!pxuyIfEE&sE`G8I5KE80r(grP`xV12s${$k)TebkwWaFexUXe+Mplo7*tSE
zgt7M#wgd^ZTo!a-uDBheDP$QEvmtai(7@MJ#?U`4GtJ-7FT~K!D6u~#YmJR2hq$1S
zhE=G&k-wRYQBX!+MvzfhtdTu*Sn%(5x7-#xGXpsjH~$a~Co`6hpkYEuEem-yOMPuU
zbN3kAz<M>+Bv-^>p|XsmuAQ2$ld+bLv0JQzU#+rQrngmgfPtO)-zCQGmZtJj-ufyQ
zdTPqbB66Of*x+NC#T3R`4L$)hAMFHCg@6bL0nnxh(2N0iCn5v<<Nztq=pSfxh%!h5
zREB}KOhC>JPz0}E1@(d9*VKWOf)|p28hy|{75dT^R%i<q)CLDNz26HdXo`zz$O{R{
zYlw+!DhM&AgN~LH*OU_ylG79iT`0lIDXszHX^4w!fz)Y%?j;lwl7sU>v)nHKKe7H~
zUBRHo;Kh){808=q9~&I#>TGTbI+0mMN>mtBBZKdf1hwki#Ti+c*g-dW$bk;;X8~Vb
z20FUT0CbfX?8q$!Mh;f+a5L;8CN@FP;yq{uD+IYu5>$v$!#GihaiHqn6}Riy7&w{O
zI6+hUNJoRg-O0fLb(<*oib_AS&0z;!$pyZq5)_~8AY(z-RD$w6Be=o=wYy*)Pf(tK
z936(T&YaQ24tAg*i?Wg)i@As#i!peu9^{BI7B&uUHf|0!Tgzo7NeheZU8|NS<;<|u
zV-?`xlQ;6Qb}RJP*7nJ=GjK9c{S#yo-?nI1YU=JqZSf``_U_cwT_ARfPEb+LqKKB~
ztCMwuihCAEv^-mt#CV>SosG@G$<w83MM~<*N@o{yM>ZZYX>r|<3UA-aAZ;EI2}aJ;
z-HTfjOiU757w=9@*}VwDUbHJUa!G$lux`rQmu->D`pbg#QrEu*<)Rp7d!`W9RScR8
zrVL*|`+xNHv`n>4G4}tM1w=SlDl#&&>VhgU(3y>(n;Foy0C6ya7EXg&z@X*<bT^P7
zGq}kHN>L6t41n#wf$!ac?z#b$lAzuP1Gtm~P0u=b6EFhHMj)tR49b{Wct8cFGU!Zt
zLOXcO%)uLY#F#>CgoHSFB=n3dl++vzq}3uOW?NaR8L7$&@QJXBnN)h3g;>e`duZ&X
z;+AM5Wy0*iEo3OFAkHnKX``v+Y^uzpYHuSXD#*{JWvHiQ6Jq@DnwoMZlc2P+s22E+
zlrDxwW=7^k3?dAg44e*Z;+jk%Ox)VSro!TKjG$W<+1SD3m7*g2j93M`ep>PIan0xB
z<L8~v$|_@}kH%+W6K8CdVHe{S6!`aBf|pP1-){~f4jEn<##S5>pnm-nMr-B|Oph5@
z8G=yG-T{?5vJ8w&OpKZgpgppX9xrH}2dE1V+J`9ZAOl(|ZHhx0l=p-cK~01y%rVpd
zS~ETV7r_WR=#H{mbyyf+C8solF@q;V7-OG<l!*!G{yq~=6Au?BOLH?*13eWb&=@1Q
z)dup3ogE`P2P0?&6FU<-Xm1-U11AS7xLo4kVq|9l6&Rp>6`(o;a{Mji5J<?$hoJpw
zphQlADWZrAHf+${!oa``o@rKN!0IZvOTgRQAd@1lq?&=PRn8&p;0-Z{fsLJoosGqa
zfdv#gpgW4OyNC@EPFUOcoY3{5!UT#@R#1`v-75-ezlaMfE2%Rh&b-iL(q?o46_>;p
zozLblDy&(Soh2yA{bY)wz)4O?selr5Uwu(wZ8wt^rZXgznh*ZXW3H*KiffVNk`wv2
zNs>{Im#;`v!%9unLPdyykwJvzJW~*>3rY7ui7?syJ;dr#3M!G^nAMpsv91EQYl6|*
zHK6n*j-?AG2yfm(7aB2O4SnzhWx~)7D!2=(q{oEbn{qRXD0g)&k1&GK^>SvOT3Q}v
za&l%KT3ViFax59nW#L9f;bqQFrQycL;iZmRo@Vm$AXQ%G^77_h3``6u3;`@kESng(
z8Tc8xL2Cy=W8bK^kAX)LUIauq=pkP^#sO--fR46hP-6gfwn0S-8yjfZ9jK22I-Ek<
z!3=am5hMI;D@bFXphh-OVZ#WX5{2AH2HHu1bSK%rZ03D`oLDyf>*)A5fw7>2vEq+v
zJE-&vVs2pyWJ_hxWoQ7M(GR+<5qx8jE~74Z<`Wbv+S(X57J)9h0G;OtZr6Z1X`nsj
zeBjkWCiqo@3RF-Vlo50u1Ngi(@G5gqZ3W)F1G-Tabj=oMpd57fkUjYBA@F(!&^Qu!
z>nUTDNvMq?=#q~`;`*Y8MaBOya`D`i)KL(&(bco$;}8~P;be8^?_x`pGxOEgaJ93N
zTgt{ECgQ8jE5mbJ(!|tM+SuGci%)=&ktZvQfsrAExrQl-EtSERVUvRxBZHZVfu5G8
zhPu40gqQ#ygDs;iI6l2W7m-_nu0v*IVHE+L(T8!*5cbP~z*l^L_L}iAf;MG%kz)ok
z*bvZRP@r}{sNcm1TBQjOH}Gfz(#=4qw*oPOm(#I<8-1W4WM)h<4zgA#cXHKojW)0h
zvDM}`=jW5<W)qUrR*=_M5D-*%)DL&JGBB{@0c}3#WOZiOaSUNgl{I$JXwVh*vojB|
zl$A8}(3fBn=T(pq7LnHwmD85t3um-3F*4ED5a4HI<T3R(m1baMIKtA+6bjqr4L*~U
zgOwRP_XSE_yr5(Vp4buuPeO2mk`rj26MFL+BY0OjsDH;4`jSstG;0c<q5|v6fB*P-
zKZ%3qp{hWuzL>u<$TCKPS9HrVfN#%%%-@5@g+b%rYM_~MMiJ1?a5*;6L4e?iHqan9
zXljuMw6;Y6a*V5QK!k$^l4{T<3PuLd5p1B@e9%GB3@Q*4AnHNB(1EIF1|292o0JFb
z`~|N7K-B|VkD-UGhXu6#7j*amWNx0BUmk1)$bAgpyDdPvKqZP1vM%_r6G$-w6KD}Q
zgBpkpGEId6Y$#|sumwmHD9ti3$$^fZWdRMIFu-+#76(A}GJ+4HS789{nuadXhm<WC
z%LCNZ!N=(-shJ8g>f~hlL01Vl_lA2FsI#+0s%bKR{hOCt0b42H;bN?(6|VO0rG^UV
z98X3Dt^ek%VyrV6gc%lr<4u@B2<`qxP{_(c&lWWTb!m-39bZu68??rr8*;QTC{WZ<
z6oGsQUX21$1zM!W#0WaJ7rgz&hygT4!Jq{`rx`Q@0NNo5+D2^5#>mRV1lku3(gkVf
zf$xT7hun-Nstl^P1(gM1w}r5Z-JbjJ_1uhQrS|rv%Q9GJ&irN0dh(Y!bF6J<Utm~o
zss#fhLk;6z#^p>e7=%GLC_-;QgwC^pN<q|H4Z-8ApflhhGhv|aT8+4-nVh_ZhJ=KM
zg}j`ZrZ`g|GEZF743vFZ{w-vD&%nhX%W&9%kC8!AoS%=4g+Z247QVkmQGl0;fk~PX
zoIaTt7??B|LDyI@gJuJmnFSy#%|!zu928I$GMQje2g*(=Fm<4N>_B%Pv4F-9K!-CR
z%w&~z(8Z+;Jc157QWc_{k(rSRycT7Hg|@g6=rSlX&=9D)xiP$8Q&TrLTf-(GrXZ@N
zEv9Lsrd=Qr6{uhtV4&$GFUa<tos(TrN?1yWhqX6A#MMl}SVdTn&m7chsbFqla$$>S
z;AdC_Jzt&+bdLZyY*Ydw927a3!52i!fz|>*ZXaX-Z+(R9$%JHbP%6{LRLIN-Q3~B9
z3BOE`P1?Z#Q#GOc2SEwISkN4_!cU*k+*r_9RB`QOmTVqAaZdGnIZgjEnQt=g(2n5b
zv)K2yDiqYB@?f@M+6X?EQJx_IzT#V6R32%?Hz*fLg3c!dZ9fHX+X1!mL94SNZ7bpy
zYQt+9NF@Ur4uUPyW)l?=W2|#44A9XDD0Fi#3e?dFEOHMC4h{(q4rX1c9Z>8Jx_e4H
zu*Ac?I6(XF-^`ShjEt0&Opp(zF*GvsGB08fVo(M33ROh~7?`-V&B6DV3Y(d$sWYpY
zn%FZ6i>it;qYJ*VlHr=q%g4h%pG(H-C!@wsWPYOzuZ*A|BdY`tw-h6*pr8z|%)e@J
zaq)lEm=X*u3~3AutTn8&7z7v;7}OXH7`Hme80cwhs;Mf-gEsSm=6ex0)`4%c0EMfA
zl!!1h8@mc411FOl0~<RlI~%JJsJX_;z{<(Mq{fAGl^qWwJ3BY1o&go=+>mo`VG~BS
z$mZ~X+88FFQD_q!MlpbQL92ia;fI_k;TI6$;D*Bx1{O{x&<%J54Fe7IgD%wA!3;|7
zUSQ*RpnhZLVK-smVdH_g3$Kw(Y6$m%jpUSeh{tCb2P+FJhZY0qR!nXtBbeC?tPIdl
zWZ+_8X5?aK1kX7#a)X8~!B&74FF>y2<AHX*Kz9+dX)}r{n<|3FJ{XNv(ee|kiJ3XG
zF)L^p4ETIlR{mT*-k{un=Y&L=xERA~e)phcI2Lv$=8tdw3JB}S`Y;;_=_&X!ayxSK
zZ`dHfW65~M8Ywp(7S<8}xAU637;B8I0s}KRJ;k!lV$fx<WpHPF<{-z&;O^?=U~6M-
zWocn*tgnaM)`q7iZ*xNf(3(SNiyL%33M5T2ut4q#1;-&XIBoGTGJwWHL0itaAxR6|
z$yMQkBrQ;<9W*%Ufo>!>B6;CA6}q(yWF9{gcupLY$^t1c58RapmHMD8zy-Plm61V_
zQ`#Gn;6lMBbHh3ipldw2*-aR@*|=ee4tE$Zse#98K$R*y6u{>{b4fcSA)Cv^h-oed
zD+4I~L4%k9<S;HK(3v@$Xdw-<g$vX`1^WS<{6PH}MR@Wfx(|b%E`{MKk|m9}-p!vm
zC@J+dB8f6RB&OeEjFfo)mO;}k3xf*-18Xho0tNvFKZX#7IHp7gH6g*cn8@&uV0TwX
zdr;~%(9={`lo#|9@<Wt}f}r&mp!<E|y%>48B^WumR2ezggFrjY<QRCkxwv__j2PHC
zIXKxlj2O5WIN7-%gHH@>3>=`HXuR-(l1Yt$n;X=|;}>9JWrY`*e2`SlB@I~?mrMm~
z`1!fzp>_!{Vp_!wy_Grzi&gxr+^qcEM(92hU}R<B=3(Uq^@|C45>kYNyv5I?0P+^7
z%+00LE*3U$QP04EHDKX(f{SHtX@?r(?PK6$WMbrFGQ#dh40{=P8JHP)VP!V>RDHBE
zn-^D^4cQI`Z}>rP2qn~`MK9O|Pz&}yPUQ4>nVZ1nzX&38A(#J5$4TxF|A|4VCzu#?
z{>@=#Vqs;_WUys8>cD4ZVW0=vp8>zI4Aj^*76I)uWMp7sl4D?GWoBgr?dN1-1)YBc
z>#nhYk8uI5y=MS#3kNkUKn)ZF+*(2100u@T(0(uI26GWs&}^+0ZY_v)d?3xB!WOjl
zmPrNFkOM9E2X~cN;WG{__Ke2jq9S}Oply7hsU*<M6C>In9W#@>cSME_&MV8*c=!a_
z{}rNNT6P6=XPHh=nYT}tkC}m?;;iL7I(A0-HUZW;uHZY%c(_>vr1U^*%=Ex(%!HM6
z8UFu=+&9JcjY$o(51oOXk%KXt0h>5CiufJ4dLG6yB=wiz;({pRpWx!0$l~m}aB%^~
zV$i_C{}&7lY`4HCuu3q>If#JPTYyd!gkReNIin5~m8PPgMU$Wt_?bCCQ~GM4OwPi=
z23o}fULy;-O#)nAf=W+zMpjlH&?+y;NvFn8&5-MiL0Xs?FpYuSc?Z(U4@wG<v348c
zw6d~-+L#P*BS4FaKnpUQq1xG5SXn?<auaX?JKPvh^~wqwsQ|An1NA=?MHPji7<S7R
z=&~(#rn}64{|ehM>HmFV%ar)%kKx}do4Hk`rZC=OycowL%Llq_27E~lW5>UxB9crZ
zOdmB}<v~5?sDBH=w?%m~)i_9iT4=U57G{R}>Z%HIlHzPE4Bm|1@HuF2X+~xiD@Il}
zJ3d}!26j(I4h9xE24)sE7G}hD7Dx%pzy!HG3O2hd&&bKd06J|&g@J=ZfJ1>(+Is_U
zK!gMNMhamw64Zew-$+qxMuLi;APkQ)VtAaBk%66&oq^E^+VsZ=0R~1!4$#~**#DsF
z4wR(*NirF<Y>opoaf&^V5%clBBpHjCn1@>cyJ3(WGA|!arg^Lk><p~zpvC|r2M2W7
zGb9i|VF8|?hpaJTMIQ3dV`4Hj0Utjv23ctbnSO_rp`d%;L9_Y%pzAEai!(qYBTUUm
zLnA8PkLHIFy!%T)fY&GZ<st#>qbOxOrTZBfX5zaQj5j#3fXy6vu;u@M&}~92is159
zgMk5DzM6x}OYmJ=NaEa#$l{>#6{4Pp(FsXCs2qieb3(-bpJ8BN+ygd8hk=2CjgjLA
zsPqP1XV8Tt$_*0z|DJ(?shSOBHbgBCGsFM?|35J>FjcUDOooVpvL^W8de)2J`{@-K
z9y$og$w*5{N{EXJ@bmG28cX1vd!Qt%#>xmfH<2B*g%;GHfegnpa?3NYvx9my3`|T&
zcNVLF?tB0pItRKr2}vJZE%dw}P}@%zms%#!A*9N1^Fh{t26aJ)b%77G10DU(z{bo9
zt_c_zn4xZC$EFW-)CXjk34Do~s0b7IMm1$s(1Jtg6=OzrOh!kU#KBi*fUnc|`|>Eu
z4Ud*RCI414*8Xc|3<cex!OX+d3%*hfe7zdeEF;j>YX1a^{xO4YSA(PkRtq*z4QU8Y
z34)Bbz%dKHO9UKOpgp#r8u&3*ac)LraZoHm)blXDLsAbiA0jS@A`XgQh&U%moPm*{
zj^Q>7GfM;mHv_u^3nwchw>BpeJ13($C!;whBlFLHD;SgF|IPb1JDxG+-|~3INX7`}
zZ~s>Oo1eg#^lwfAV+vzr!oOvV5e&=>G5;sCK4iVcpva)hV8JNlz-MZ#r6DIHF3QWz
z#sZ!<1ML_zmt<sNGBQ+Cm1kvT;p1RpU}XlcLI>TW!3!G)f|Zk?Avp%{CF8J`8&>Vi
zOrQ&&Kt~s&mVv0+LEU~+Y_=n`GcmBRg0|N}_KJerLf{>r4t7NAL)xwh(hpj~2il$s
zo-P0<D<w5`c2Kug7<5@Fv_LZlP42Oa39*WZiG%KXP~u}^HBnP%1aIVo-rkb4$3I2P
zO4e_GK{faem*Nw_K_UtYDQnUTemi=*GEKIb5)Qh}h53i0&ELY3IiS?YbY|hd&xf)N
z4LW3{7+I1S6*hzKb+Izbmll7W^zYT`_RF5k&05-i6EC&Yo%HzA;s(0m<^O-kdH>+l
zXaP>89E@|psSA7$0FpR2ia01WLe%pxu0T=`N_7x%PN+Ee%yF<eHemC)87)EWKJYys
zpqpg`7^E5IfaX7>C4~hU1Q__)L7R~fClP_xHnXyTCMMJv5SMl!U0en_p9B=)$_(%=
z{-_E;GawA$TV_Bv4}#7JV+74S<5dkl@d|o*A9%?qXz3q#S{>!GnS;+d&@Y=|6!`an
zb>_bx=-16KGVJ>Qfu)Rf9fJqMN6-!$XD3^0Rb@~+i@}4@13XU$$~9WjpqWn4!6~3+
z+MwnHC~bqb&j`YH<AZJvgWfs=Dv|Z18CjXZ2by8g!OF@5(*{|~0?J;X;L<_W1+svJ
z3AEP>lq2|&^nlM5b+ABH&cMpd$jr(Jx-=BDjS+ly52#-T>JovcHdLTfw4fsoK}}c4
zz!0b-1ir8rbImFX^2N^Jqjl_<m=>l_Ptw<R@OIEP4TudewM=REPn-u`qH6AKs^exT
zWf77TVxjBo=d3Gf5ozy|@2|btwP6eEI-A%$W1BE1BLiavbrW5Ew=_S$s!(0T_H_qU
z3pZmet6(Qne|s|<cLN1S6Gg3%x{yC=%nveFRXKrb)tLVun5$S<GO2+^g&5cwoEh$d
z(>l6%8H)H!xcb{D;+=5uM=0XeaPce@@q2Lb2MqT>la&lH|39#SPI7T(2xN$1UgV$#
zx^p@rJSZkO#@E}`#opG!%-B#*7j%0h^fXjwMrQ%g$P{P|l!v1=69>DzI1>}-o)->w
zHg*m+BL>i>Xl5oOUPd-9M(F9N{5(wTpo5ZBIQf`BM?Qjv*+D&IRz~pA!k~dw8PK7R
z)G$vJa)=~o&N+l!^PnfGf}AG`8qk8dRg?uht^~>>iA0;t$ioB5a8R!^pacXSi+G@e
zWs&$S;%DSxXW(IEPzIaM&cOg`8zYB29t%KShW>yEhgb?N;0Cqklo_~LShzu%m75zH
zS|C~xWC>`qb_#Y&xR|(@nT)Xdf`O3>v_MpumywNui<u2{dpQFWUb{fUi=grJG<<gP
zF*3lcQ)A#{VCUcj1sOKWxLH8Mj-W~aR<T1yQ5jf4gQ<$#(hlip7V)xk@ES2NLp+7U
zB3=eYE?)4GYJ|54*#sKa17Ucv$EK_ZJCPT(|BD$^_`%1Bm@v+j2VIcD2s%?9+$Jyu
zoeT>;xtFCcs5jkOK=N-di=J<$qic+<ngE{=o4#Ura+XQyesk&Yta5ADqF{`Z=eHJC
zOj0yk`)?cQ)cKS^%VbY2#yz$PuA1zOf8=e#Sy&ya))#2XMz=@l$g0S4a@c~7`7JE5
zi?EPXcFXdxDT%RWF)FK5)>0M*olKt=9g+U`A*-^5hgNuiidUW&<9pDRV2=3#pccH>
zzlF@8)66{>(?M&AT%1gd^mQTi92*O$rUS1f0`=70q#0S5%o$nPtU==mtZt0#SjH1r
z8CX~uknW@wk!R#!0`;qyR2bOV1whNjy}`SAeK1VJ?4&b5Oygh#-5|(_Vk!e8BRgm@
z0N6~>@C2yT@Fc@b@HhZyR1w}l6#*4-4#8xYh14@=XNUHmA+7{D7TkXZ-6?_6c?NG5
z28}a<7dz>ptZ+95-59~gh}v^zoPgAGRt@e=vx1(Uu8;MQb#6g6BkNU(g4lb_mE8U<
z+X@T8r>i@lAHL4X;ppMTVTIIT{{J6xqBppX^#HXG8Jroufa_TBN#97~WhmmHIu@e-
zHi|f?E`^9^LB#+6WME)y1DkV#0kjX)`7)?xpAK3Af+Si768(RPfq}`46=XI<?d?mT
z{_;Zx1}05bkjW6ytjnO`UZ4M;Sy)-y7)%&E7-}8(%uF5ZOg+pz^mJ5|z$+_2Z7eM-
z1Mo?GCdQJ&Li}v(jG!wJnPHnCK|{x&jspYa%32friXqq6f{w`qRZk!nfVNSCI~#h8
zpcMjojOq}E9HY27Xy+O~BV^+}XdMk`xdJFr=rO9Z3xh7LfbLxskz-<9$iga~uA6Ep
zB*`k0uqAN0GKW~AO|qN1UG?^gq*b*Zb|p(QQZ_n@l*a9dcP|dqV-_&+PPX$d^ikIf
z$YjxE=VcS)_YhIyW0e-?=d%;AF{rZS<rWoiHmsSwGq3;2f-tA*O$Bkw>%79kJN7xW
z|LHNyU7D{QXs>D%UhWcDAEx{NKj<_{=DVz*7E&NM6+8k>EB^lvInfUsPeEXDXNKS4
z)B!%}4@tZXMI01^5cRiF#6jjm#2=xEgW?t<o&^$TU}i{R*vq2C(f~fQSDV4nflosX
zw5Obl19UwbXpg@(1NeG1(Bv~{=NagHLk1jYB(Q?U8x%zq(FguPTgBns3MD<J6wn$~
z#w1}y<h|jF!svXa$L);E&<6JZ2BQgpb{IMQ-@>BH;>n=Mpv_>)sO=!6tD|G8YYN)e
zCM6-j$H@-vbAVcgHZqJXOeV&vpuHHNW&ta+oFF4Bqb%r-bMS&7Q^csI2>8f#NE&1i
zVgOHzgUU*>%@Bo{0m?5{gxvw}w}V!xL0uur09sb+LYihs?;T+Zxckll8ID96Sp;|B
zq33vmG7z}`&L|?zs0KQH3v~aBsfjwH81n>MC+FJD`995N=3>^e&J&&7KnFGYw_CV~
zC@4hzIcd$f#WUZh#9xEa+`HIc!{nd88*_=v{xZ<XjY<k$vXVz!57mH<Z&Xu`mKOiJ
zaX})JpM_b<#D6NLDg9B?6aH>D0F_(dlbXQkJ_4E_zJl`ux_B7_vN$L|K-Awx5eKDv
zh<FxM9DGU(*!&o<`DF}Gz`b?w8Ir6A8AKSA8S5Ox#6%ewWTi!w#grL9r#AD0&H)FH
z5Q0*Zk)#AOGb@WQ_zX$V6;sFu3L>BDD1>~jBWR$VXq}?SIzg$=1ldlcbN!I5gJ^<|
z2JnKm96_drP;Esz5fXB|A^ZSJgig>}RM2V02FSKzJrNRdOd#||8cP%{pe>1@u?S>K
zi8xFW?NS;+w4)?9*)M?{FIccRExrZ)97%SGzYD!0VK>sa+W#{~JxB8Ye+Eb@0HqE{
zD#(JS0<M3nSSPX0WKd_&XIulCFVfUdQIZCa6AKCQ@p7;+s57dA=Ziq?I|Cg?4pz|d
z7)){u91P4%9L(TN$E@7)Y~Tao<=H_a&(QH>0Y>mvGEgcohw5WzlH+7#U}9%tU^l{U
z00X#H1X_D909siNSs7u1UpqS}o<Nf*pal;QhcJPy1{FX^dKp+bSWU3m4>JI)mmi`R
zG<@xZuotWsBo8?{0W>$n%)oAd<Oz0AbCUryrVa5wsCB2vA?@IYW(WftGYd0hV-7P5
z6KJz1GZO>opmBDXfozaq#cCiIs2c)mBCtXle#%N}rY2_QN^0t`=|f{iWq416QIQ#Z
z9V2TBJ13KjT&!_Ks=tk-0!Q25+BSA2$!ScsN11F@MYNQ}47J4NM0o$$Gl@SG6Xh1=
zy3E1qBrfakWR<EWCBhi>Z<&w`>&##2-16%BQfk`loE%KgncU3+HC;g$g)qeYTgCi>
z1vHux%=pwn%GJf&%O%(~7%_SwD$K{j$qwGT1xiPL){Jbdp7Kl_oH7hd%p8J@OrU-O
z8!HPdIA9n!Iat7JY2cGqBJx~}930Sv<U;bGxnU;I)Eg6%026rX5tPb8@tVrW3_2ao
zh=GNm>7e2fZaAp_3@VO-NHiSOoC958#el;P%wT7OQfL5CCbKiJvVqq4sv&s*W(QK(
zh%zg1NIOK4Ya|yV2Lm%BD4^BAdjLV>3E*a`3TTTUXk{BH{cW(&R)nW9Xb%LO5bc=E
z)kwQw4UzU(;Yn0X-BezJ3;VTeQk>YYT|*>HXu_4XFxC}jSBN9!GPeK!8KVAwVC4jl
zZG#SjVQ1uKd<m|NL4B8ca4qTvtwleB8i@?+{;gs$VV%jK#(2R&ijhHC5ma=7&zKMt
z;0KqVYK&^|bZ-eNI~nB|SV8M*!E;;SJ7qu{X&|$03=Aq9pjBb=oLo$>mGq#atUv>F
zpd{|V!pO+UC<i(a0(93OXh9$JlnMr1CNXewLJB01Ik0Z9EpBr-85lttRB;&ySvCnu
zxYp=~K+mCoOx{5b&tQNX$IcGgfdKLybbT+Vgmopx2zJo@yCB_a44feEGbqFT1ac{;
zkoAU`!@$AL#KfV62p()MVrO7tz+)PC(<5dH3!O+51<{BCmW2(TYW;2gMll!v4Pes!
zdzooNG$LUm6{YZ18;Ilzx&iCoD)0?hHVm$edmQBKY#A9G9c*3gTrJJDHPuuU<Rrwv
zDanS>h6gnA3o1cfbs1UNSQr^Wn{(J$SXtOujTkr?SlBp0<M!N$vJ$nm#EzP(K&b(g
zs(he^fo_U~8U_kNNHtB^RFpa!R$h7%WhMix>c!<`Na+qrZSMFCWaeh%;A95f{euVv
zxY-PdRv#$wIs}qz5-VsT3ViGv)=C+iWWd8VVxVOV;G)nBddM53JBT!12vWfgFFl!I
zcX+*oCnP76^tE+vj#V4-uwLtBG&x8_T~P#5Vef_A>jg_>rm?C_9$hCILDzYq-SlPS
z&c`jUrY8xmzF9)2w!rTC0^eZ4{FQ;3ArjXO7T}#_NH<vUgAT=kww}RvSm3!M6}*BD
zbci-%#3slMG7O9iIt&afpgYM08Co4U1O-5A!{Gbp<oLO{KuZ!BKu10@F@bL`W@KOj
zH41qkN4tU21F9+p@Lj}ERs0}T4(cezfE9q+4bXEJLB@eLi77&-1XV>v*jd5bP1!+1
zFM`I5D;XQ4|IKE~`EzNv<f22&sz(}S`S$!%TFj&s-zvo$#spfn!C=O~z~s$(kU@Z9
zHaP4A7z8*u;69Py=jLK(0$obV2)f#qkr#AK9S`IrOpqV2%JW0yLA?<vB>mv(27WyV
zv$TT>k|byWH|S(T&@CFEiB1*JN-)rlerWGk&|Fl6jUN;V5Z^J*+{D8_ebYwC8LS8Y
z9`a2S5M_7%%gVIVCsUT&g{dCYFI~sLz-j@m2_b78xEU{iYeMjS7T}r?GOkm`$OdXK
zF~t1;#G%f*l0k;SfXT=~ih)5_TUn7ohCxPB9CVr;2k0nGW+p~(T?m>LHI`;%WZ-6G
z2Co1GpZ?3hpa$M;%E+L?#m>aWCMeIz2)d;Ne0LKI4-2?W54yC`9-meQkVcR>><kPl
zT;N><XvTmlQys`sHQX-1WejKu9}5c)*lD0ei43f)qO9OaDT9Cr2TyD+W8eU-2Uh``
z2yQ%}xC^&|pk}8#Nd|)MFM^rJz{!c~K2U;lMly~KwAd0<WP+|sV_;-w04<?pgvA8H
zD1Lbqqd24;yofi2lLd4n1L%l77FK2!kPR?rfm{b(1_@1~;F=XwyDFN3wnghPf|iVd
z4|)+dWd<$ffgFtvzHf~~9ahi&SrYPZVc)A2F)=G%^)37tBJNPWG9zPUg`;Byh%R@4
zSGgZ5+OiKa@-74~qG+%D@YlHI@)UpnDVJMXE>HIJn|zsp88kM@Rtlb-aA5FeN^wwe
zax^kzWN>$L^mg*LvM_Woa?sIIQjme&OliPqzz3?4L1QF#dW>8ga$=CFSm+ci0~Z4$
zGZ!NxgBmX<6XYg4Hg50)EDt*q_*5v+wPdi%T|uX|P+$u5wn|W{@y72KMov!9I2+U{
z&@1+!JQRnCvcP*O&RC4(W#r^w;ACV_2J7YE0xbtsL--lpD9}0uzkmn_Kk|$M&%P)l
z8wy(OgV@{^Lb|aGOzhyfQyxZk78Z6!24&EOHt6grI}510Bkd51#aM1e2AJQ~K)VvS
z*g*LR;d3N&8CY2$-8M*cGq8Xi4Q??&Dn{@!3e@%iWIB-%d6eIdkr8r!ENF}pv^i0U
zj|nn`_yuJO(KgaSS4fn{7(9bmzTe#JU}wsbQU{0f<!R0POpSK`UEbZH<dWg)p5dz0
z$((AN;Hrf=WeC3*w79&W3U&!iWnN|-=pve^{v;F7RWw^pGPA-b3IG3Ru=@Xj`8L}(
z1~pKf$N=g&v4QIg@J$Wi`XUTm_?0m%2a7}0gH|1xfy5bk83n-N5cQz(O^EtC4Aa5l
zkX1*Z)ku(4N1Ti<VDT^p29_z{dde1T4mYD8SR8zoGuYl(kT^pb!xpeOSUtNilNtj=
zJwIavSRA5$7n2$TME!k+tzdDmdhm)%h<aWW^&odb)ZYP_&%nr#^=|?5C)RZg$_zgp
zL>NFrfy$6OxP*l`*jSjsW2&G=w+=7pmMl3|MkaPfHby2`ZxA%_0J<>{v?CBSd&vOW
zz6lzg1m$Z@EP6l}(Si3ou&_YKM+6c3dyOF)K)ZCAm_c0w6zf1*K|OrXB7D$}2S(5Z
z2W-*~R#06`ETCmtMhM-YrN3;Tdv6&~k3EKKhOG@^=3`VgH3999Fc*egj0!sLKvaYc
zlzjOa6-AjAMoPZFW}_Quufq{JTU7L_sKo1AGV*$X4!WFTj84o9f7Q<JjI)%oig97O
zz|SNp?78CD{v=s(DXUnQMUCLr4a-EP6xNvxybRF}9K1Z-oJ<VNpt2YgPQt9<6B9w*
zBL-6jCMIqs_yOaB5Gl}bh6$)S2s&R}lohnW4tcXQ1A{j7^j~EqeJ051uENGlDdnQV
z4T1uVY+^js_m{Cu<f{`DtYhV51YLg00CkTb$UTAr{JhBSVP^y#3=gu@6l5tkq=^UW
z0SiK;z)m$`U}6HhhaI%98FVo?g9+$7Ca^ffJ%Zrj7SMVE$Z@pH%GEq#Yz^FOtn91}
zY~tMI_m{EG<YKMm<YMJwsb%B*2U;}@JLQInjiC_Sj8tIhVRB)e$so#5<-o_tASl4Y
z#m34Y$|wq+=LChI5a{Ry(AhN%s-RN}xIqV5K=w|^F@pjNbPE*&6DaXO<~&&#!HN}G
zq#cw%>%>eT6HUl_Y8XJfvO%Z6z?$5kV+V|3r-Ooyjb=3R&2W^d<5RNK*0xmQtCMle
zWa-iNOfpxr)DRcfuv9cp^3(>!{T7zJj2l^ZF$gorIIzLaAOIi!4az={`}06+HNb1h
zA!nF_`eBS4MU_D}T7q`aKyI{TwSt}5ECs*Ik|B#FoAEd6JqBS0d4^yIF3|1mAUnY4
zu7XxcVLQ`@m!dO$z&AvKFP_U%F!#{V^t4b=u<+E>@Gw_MG1J#IH`moSV^!92F_M-x
za?#RsF_4xvaM9GUu+Y)90G-Lu_HPyAM+RO78HNrA9?)qC9Bd3Sj51&sgGLLaK_dl>
zasvEJ3^GihlQa<{LZG#lpyCL011S?!2{R}%L5U8bj8)n}g9Q}v5JO-pKq8>)ltBFt
z6;M(I&tRjEp4c&&i^F@ojECVpT}f?gr5MbC5_xMgePLdtArb~g1|gPpOp&ae3{ni2
zK`SlAML{_Xd{(&>qZD}7Q!gOGL5hu$fdzCP3TQR}vS^VNbb2c&a=bTyR-~!I4>AWG
zs|cOA2d$I@4JSjjDuTkKARxj)hk=n5bm|6ZO(gV&JXQu~)YH#ldRV0$jA6<_Cvh;d
zFrjK=!Fp&qwDF5_ZaTX%bUzv6LKSt!97%mg4P{$1191<gd?^Dbb!A&KeO6s99esZb
zd08dd2m^mh5Dgj(j$`R&dJaC9Mwp@5L5Pcsfq_eyONgHrbRaDB<`;181|2#Aid<G^
z7G_39LBx5Ra$phg(4#V#2|5Eq1?kL9byh}L<CcMm!IXs&dJP5W;B`<Kf=-+OUEBg`
z+`vz|0c~p1W&~9NjBAhc$clP(@hU1ZZurb6EfTgxKu!^K{EYz5Cvj2mDL7(cpj>Y7
z{|n1{=C2Hjj7s2|RFOeJT1s4mj|VhbzzV5JH3A|WR0J3qK^Md@F@bhZFsQIIva#`j
zR-=P_2r9jJ7{RCTf_$!lT`eOc__!Qs1uDu6?rMTMOllDI?2K%zOiT<cpsubO10y3p
z$asWm(6PXv!rTa=nt_o8boa0ksxHu_K%fE>R!@VfYtY@}c2G^MY)nk7TCl@h5JoUC
zF|aX#dQMmk;D8RuL#}85ALs(AW!2QpL5Gu@nF=a{7mBc~my_+-^sl(GQOQZ3oryz0
zO2o->FQ=fCAoEubag{%P%te2j$~$=ky*asA8SR{yY8<#Fgn1bl8RjtYGVfvPC+UQ=
zIm`-w9x(NTu1N;zXFW%%epaJj=b-wnn7=Tpv;Jg|0PS&LV_@Xg76vVfF*Appu?Q|#
zKx<>zi)5uE1I#&Cxdh}S_=LsTrJ27NBpO65byZ^JVdLWx(J?fWQ*cq^=8@n6rLHLE
z`;2a^Pax(purYFLgVzYKv4hv#nA<U%ny7(K=V0WQm5TI7HkkE^L4rXv%wS<%sKMM4
zpgVV>{=H#zWB7<<t}5s-NMg+Wh|^dGCI&0!FHGU!a4-a&Dk3k*#sE5N5_?#PV;9B<
zqQk_8nGVjtWMYV7zRy$!4ok4xB;^^{m~e(C(ZRtum-v9!!5MT+3{n5yFqMI01le^s
zoPk3aGZA3A4rlb?b{qpEL)pJsEJCb@7~~oA9Qfqrq$R~fK{s`=FtLGJv$g>d4%)n&
zObm>CpdGR@5=<=2pglK?pi8ZpLHA&R3TFmzaVG|8_k(J4O$;rd1EUy02i$>55=PKS
zBnyie<hsBbtahMifZY4bz{to8(E{qmn_$=h+U*5e(}<!KR5mjp4(@^;jA0Ge%mnun
z_!>rK*ri|$OstHc-477=f;#2U!@t<19c*B_Suu4purh;=#!>^V=3;?tDn@YvXuBA=
zauPN%12qc8nazxi#F_0F&A|us2@10*E2#?$Dwb(#EBOQjs7q*=nyZQXEp*k<_*WsW
zW^Sq>@voeDn!Eug7Y{Sz3vuy(66{ip2J$xl68?M_7iZ>VT!0j-`ixH;#Ps!abu`tL
z6=kJC=g&i87rdqd6uWT0Ff*viGqJL$D1a~b;9z872Tk#?g7;c7@`48(L8CUHs+$jV
zM}rs}xRwG%w-qcrP|aXsWZ;CwIfi)*Y;0m|;Cc}h|2SNM(*!oq(s0m-JTJryP=av9
z?g|Fb?m|WeWt?V#`oRn;3~ZqLn-$q$N2mC}O=Ch17no^?WCHRcIG)kG2)W4vY$&_5
zLnzERPLOfz9ME7!7{|cL%)kjsY)lNWWXHk4&I&mm6>+5mietf*FQ~PPBQ1e$kWkiR
zREMM~K1O!XZ9j@Q(iUTfhK}n(KS&buTjZ*($=HcKrTtxDBX7Vc$^K7LT%7SayCf*}
zF-0&iGF)JIz`ULL1cNZ>W+YIbg$Y!KhzCSCfKRIcb&ePq_&|L*oF}$He1m#q+Xd^C
zb|2r4RBP+h4qu=46l<nn7|*vo#o9Whoq?Gl;{Qk1ForkalTfW0<~s0Mn1NQ#g4QKM
zcMyWwUqURPRvM^b#>&jZ$S4GI3uMg}nv5t!2GpvO1?d5eQ7|ZjSfG&+6_9QaLy=k9
zK^we60o=4=U}Xkv(g$aL&@p(Bd$>UU23_&M0P1;yJZKJWV1u`RDd{n(65vOmAJxFZ
ziZ1f^FS<w`+5%44#Xqp48_@X-><k|N-*fC_T@DUILk3rdNQPX7M#kF?a&<K&MOhgM
zaiBAiog6^>`E|5ZlptXX9)Sk+OHDu<c-cX9f*Lm?I}ao1WExQE0Y0Kg1=K(nl;>rH
zjK6cSF@X<L0F5kxrc^A5(8~bYc?L27l(V=P+1P~Gz;`f%;?)L+eijyPdHBU4jDqsm
z%;11-w6O*C-9Q^mLGyB;P6mS-4pUiK`N2McIYboV5Kv<Af*Zoh$;QdbW<<y^UPew<
zHqan8lFvBVKu3{EJ47N3<K^OI<-%$h12+Q?2R9EWq}dr@Va~}5Hj{yufs2h7ymbb4
zfIrx5E>No-loA=yhA7z4W;(zpdNG2woDx#0O28zh!zSS+_AbR?1_oipF3zQ)hTSrT
zj;gATpuq$XZ79Rk$|)n!@cSi~jBpF9sY!S-LU~D;K^MAm<_v-+ve<{TMjIGJw}ynZ
z#TbAtoN$V<mXflLadM2dl$5lLW~}8E{MEuMz!((L0#eu#64nk<*dFE-Yb7OR73<^}
z1yUI0NI;%}k)eyBk?|(@G<J3e7A6r;PXXIW?C6KC<2+;?)JvGg(8%}{e3l=(1B(z7
zsF#3wXdmNKlw<msWW}+b$jA8Kg@J)tnRO-uCxep%8z(yp6S#Z^<sTlT?XOJG`~cdu
z20k_xGQ-XVzDbjTfkB%I+<s99rwY*KW2CcuOrfV<F)}Fq|Hx9rx}3qCvDZP)-Oa(?
z&eqc0$Us|DT~$dD)XEeV<l_NNO@PY}kQ;nB8JU<(896}b{xLz;IWlmvbFg!AfUb(-
z1&#ZHS|dD+Y}}0OoS<u&K<BH2%5nxqP}b()-~yGjTwFq2@M$A2+-9QO9);a>xQU`%
z;8p3M3?59GiCkP9pqc_^GRVn_oYD@-#Fz?N`3$;}4zw+R0d~g}4+A$l4>zdcz{UUz
z6%K5+a6`s=gpENRbJ#f;OrUG>z|90jK1NX)MsWyRj?vf%bae%EJ&7KZy0WRUnh9vB
zr?S#yk@(&nIc@vgY&it@1Xb-4y(b-1U{aQr_y;QE886F7{L7L#Fv%>)Mq5FWhl7X1
z+wDSs$*zuYfxb3IM#gsL=DO4UJ}D6{oV;p!Y9|hu3(1OThziK@TL{XYJ1453svyeF
z?v_^QKlyTV8o!)?h^7bw6N3Y@C#xpwOa?gyHHPO767ur$YVvBTD#}WV3NliX5+Z`2
zF?evR7L=Au#l`sfm|2-vLA#h)8CjVajo2AMcQ`YsaDr|aWZ;$uUEK&CU4jZQf}69T
zC^o^=3|7O=$jSt6+k<(a^$sc^LqH7B=@C9i+SoZ*S=qH1m{{3ZnLtO`Ftf5T8-OkY
z1l?f>8n9<&;$Q_u8Vdt6;%suz+&Rce44{ozpaEp0t7iq31<gU1%qpofi-Y!$8;Oal
zi-JzjRW@Zl%*M^a%E7UcQ$Qdqk8?Y(ypTN44vxGmK|by;Tk5v3gz`!9@k#PA>hp5^
z-N2aZ{cnSe45P2dzsXDi9K52L|0EfoXM#$bFa`$JI@Xm8<_wQO`{x<V8O)50G}L6I
zCB%5Rz@wa?uvIgZ6$PDP%P0rhLJZ1spa~<;J|a+FWCNW94IS|UjbN!DR5L>x&1xuW
z!K-B;WBYp8)q+npS4P$Z8t(-KxhWP6pqT?E(7YE5=mv0Ta}1;bX@D41^(hM4F@sLT
z1x*QwipVjE3o3$}$EJ|$_CS3zQ2UHs6r3fPT>?9j&0VWkrlhQ_b~R7x4E)C-r^2{6
zVRnvn^7>Ex{h!t+Tj$PBU|gai$GDB(F}*)FdvUIXMegG4*#2}!{(oM|GAZlC6FSzV
zHe8z(7B=fzL+ZMY1o3q#GN2u%G5<fa7_qKk&|<J-xZ@zAqitrQZKq?Wp{A?|X=Q=u
z?LeV#0b1d2Aj8B8x=D|P8Fr}(D4l_t0FXX8_`(TLf(OM210y5!o(E8Tm|@coKlTzd
z*vHBQIzA9pH=DGB1MwQcmsKevOaP5_gATF)C23IU13HbF3B1aJ2|PMz1e#C+AE*vG
z3Rg`XeLq=@x~E^5anzIyOV7!7r-V(+u=45HQ;;#sfQhlIM$6qoi<euNyTYkF!Ciz)
z%`V(3q$xsI!6uZ|Qd&!f&#UKD!>NDkKet<E&xkKRH6<)EOx0QH*l7_-5gwu6o#q9r
zigkh=)a-JnhC8OYse;C_`4|{jlUQdmFf;Hll%d>V0*V1iPRMK;0|TUOiLo>ct^j<o
zG!x3IFeR8~upA_1gBqw{LqJMFeFRWA88a%XDl+OZs`D|jGbOBN3jVc*k(t@|UjwHI
zC#NtcXf^yC=KbPUN=nw^puB7MZzZcF>r4i2hHc=y%gw-zcJ{YtK!k%hxCg_^z@P%!
zr^GD}8lDzl1kX-_ye1C1?uyYARS{ycP!S>xISrhFK^bHQXcZnvJ?I2-(Da)T=ol0x
z7SKR4GZTXr=rjOkM%Z!SEKIBnOki!G#kdSiu;ai%`H>M^nt`r&Q8s0j+`Z!;_m17H
zGiUx>$rcX6GeNfs{9DP&%sP`nh@sB`>^achIq)nK$Ztw~;B!70<v<-XP*DnvAjp+%
zpd-0K<K!T3%EMJMf#wMr7*vt8fEVv+!c{OpkM~exU}6SMU7=k9#|mx>fzD846a`%o
z0jeT78TA-VLs-`TNoBJAdzg9l??6s2rqaLN+#IYkXa2P|`D;DXkx!O~nThEyuPh$}
zBf}J?81Rib%%C&PL4IOl*M|0xK?NBodO=q`gDV<l=-$66%rSqKFg*s}IibhEz;c~!
z1A{n2vjdm7n5Zy2D-#1aTtL2+;bmlI0M&zxOrWiIplt|{l7a_vNI9rfz^R5Gq{cxV
z*$8F^X3#-NpdbSs+6o#J0=W=A^~R_SE=Lh}r9(Oq%8YWWWi%Q6#bj8g@$j&)a&t0n
zV3iRm{(EgI({x2mOELa`sR}Mi(iXC;?gFAe0~nYYtQh{WDlji#P-n1a@Ml=+AZKf%
zsR24u&c@%?-`G&YTGLuy7Id!}XqOOpWgocu_SThT1s$3v#|&EB09r%9$e_l>#tB*g
z#=^*;3}%A%SE_(^euEgGy2J^tje(hgos}7UECBpS7cS614(MJ`PDYRh(1fNMs1FMA
zJqIHL8v`Q)<W5ReB|Ro}#9n+*H6jix^Z1xlQFqEJLM{UXZ>eUNV`hG35$)?JBkSlB
zV{TU%YGf2zXlEYd<0vcR=o@WeR}f}o6jt!pU&YScNK(?s+)hQs-atmiz@BM>ioL#!
zjJ~~!ik$^W%EIoSlC_VPmXEcPL1c}OPfdg&jBgkL;zt@xk~4KxS9dj$m(cexF!0cq
zfYI_MAaPSU2FCx>{w-pTVO`0f%rM1)OI}7ygqNFz37oD#`Ar2h1}DJ?KKlbaJfZ@w
zb`ZBB3owDl_dsb-5lJmG0~08XgYz7y^}xU&2+nibNNN~Bl?`a&8Ur(EzcT~qnhqwA
zVz5?N83|dQ#|{c@Hg;wZ1)X=YV=`wf6WuaN%~gSei9<+EA|;={iPtf?(OcO|j*FR7
zL_yLj+*Xx?#d+NhK7lY!J}%bWvfsbbCdKRW3i$BwvN1|q$2u`EF>GM0W4^(BltG%o
zoKe_8N>+xE!Ndr(DqhB1)*O6KG6(3kYH+&~v<lBpgq4YbS(uH9k;y=jiG^KXiHVgB
zbhIA>6KJ9mvceQ}svjeR8Yd$Q8{`6Xb_O<9(515=Ay9)wg@F}BDS}q4f#%Phv6~87
zWePQm0oe$MZdC?w$bmL@@PYP}IZ)Yc;DQgdUDaG1Qk8=mQtaxWIFVxl*Wg&hnT2J|
z^prRyl?!Z5(o^Gg<t+4+IAxU!olG-Q;&t)JF-P%<N^lqH>nUm|@`_6G<Qf|)YAXI)
z$15tqU1*@EsHw;Y71aRU2sVvjH}gl9ItF2eiw<JKLg39XJV+HH131P&7gB@9R2UdF
z7}!`@*)$Pj#7t@&j4Y4?I5`+uKxbyEuror=&IFBFfyx;JNQan>mCck$eGc{rEud>#
zP)B@0hrDw@&gz7W{DS)jV5>nf$^g2Z22@cBE1Da#8;dHkD~c+zE1N5tDw-=!V|-cE
zSoHDVg?PsPe@5kv<^R4gddL3@WA6R<vHe8*pFiy<7?>EQFa$8qVwu1o$RNs~>%a!O
ziWXGU$O{T^fbR2<0nfW*)Hp1l8V5AL%gzeEV2f3bQI-*WHPRGjHX*5h?s~>jMxu;6
zC58X|VrKjEi&>npvPwXj=e!UPD?iso9%+Fp#_E4u?Vy&`JB9$}FW6kb37)h8on`>4
z<-qj{xC#fYCRYTxfKe25jlH=l=o(UWRXs*qMn*+bMdmMmehEu5?$or9HWdBmE+qtZ
z02{No*S}Vf8!ifSv+;4A=avzu`h5WGf`<Q{EF7$#7+4uZ7z`ZPSXr1DL1CaI$j8OT
z47zt4)U5$6l44K>uT_FqydXyiGa7R;Dl;=e`emGq;N6W4jBPcHZU3rjJ~4`L@Uyb=
zaWYE$dm+Td%Fn^Hm)Z2s=|5+fP5$l{R}&Ia6K8T|a?@58QUk3p`2X+UN(Ls@gAB}|
z@fc8<2p*3Cm90FWzP>yIBWTkUXgmhA8Xr6!V+xW0t(O2T_h$sH&tim*$1ocUDl@UL
zupa#J0#qGKF)%QnX5G)A$e0UVy`TuacR`qshn)@FpD+rDaL^SL01ePGvao_~=7#o@
zK=X5~pcWnE!VY<MHYOI>3V2X)u8pLLnUR43bZ;mqwSr6n1sEeQTnnhp1!`dstA!sj
zi+Bt)DTrhX$OWt{pgW7PSO%$QKzY&>QwwMS7PK^oL5-P_0qiMdu#-W_ixt$J2Q7kd
zgz94hg#xI4VqgX@pMdTNWidvW!obYR$_&aR%*>#6Gy^M$g03XrV4-a+2w89l>)3z~
zO#$7uCCdnE+bRm~DiD=kU{$iVSj}ISjY&k9TY`V%LZ*~W|3a8!d09n8JS}2p7ua!e
z#qzQ<PM%`?N1i$1&jMJCeq!CiAkVl6bVnM4JOkt&4H01>L4Hu2g3rNG3y5&g1fRPl
z#{ii&1?`pL1<lxjn(Cl?#`xqp*qNA_d6>Z?9^ga()c`(Z7orO^*@|5gs8#|e0*EG%
ziJ+VViGM-R$`oj?lNZGvP$JO9)Pigq6KEby1?)I}h~t(7L^x<+YGMMZ0VxJ;6NK3Y
zNjRWXU;@#>z{CQ|RLY=vVfcxm3<$S^ItDO<K#9PKk&&GZl>J#i>Dh>bk)4g1jh)#D
z(;TE7ln^&Vx)IP+04k)>l7Tg7?~5LzvJ#stsFwgq1ST1CGJ<D%q--+F)oAKr<oNdw
zngYy1rWZKz{)%MPVq%-xX4VLf|NmFmxEPPHePiHckage!T?4?t$;ipfuI<1LULOUz
zDM*_MR91twW`j<IQk|=yAac1|R6_9IO}1~mBB$ATZZa_a|G*~3RL1s+L6||EAq?%#
zKv3vWdgn37322i6=vN+}0bOh?st&r+SX~r!(J|vHAvp~(aSb^^K{*X^F%3B(wk9!k
z5KmnUBo9)L#%Ew;aA8wtQevA((%K*w#(V#i*d}Iya?~O=E~ZIr-x#<-A<DqOz|Ft~
zzDErdqKpjSv2SpQGO~ikx<M<Nm?r(ZB`77@b(u?0NKBCJ+YKI$(_B0p%nS^S|KG52
zF;%eLVGv-jci;e>atmF73kp*~c1Fl{G6p8ZvR`&aM(`FhNWTnX9r)HoP!CF<QB9o<
zvhvs5n5m+jM~1VBgN1{oiBpEB{oMvOE_Swf78W+9csBM+$hHfCY=_)14_=Q9ww((!
z{Rr9u2K5xPw1X&UizTS9%mlmD9lYomH1wdX4qoL8uH+!gd>OkoyaT&{8FU0LGuRDm
zT$k9{;+WW&nc0})*w{hgDZ~1m$&2j{12027Xk9Ni7ih&f11}>lcwH~ZB~)3x3v#29
znyE4P0yR@(5jIBS&c0&5urR;ke%9~BMb@^q)|oX7j0`*2<Qdnn3o{6V`qj|+Xa{jn
z0|T^71k`~Abtyn?G6qFZzZ!jxi*b#JlCGqLj-s%zqK<^5u967b3<(`Y5fKni2egb=
zhk=QqjP)$zM|NHCdR=3b^|}tAJLH*}Ks|0X9G7f@G7H-5uQ|kD;Ptp=^2RP|>aM18
zpx&CAi?MtpY&|YpwYrnOl$5@cx|)NYl$4%>nzp5-He@}n6dMOq7~3TVX@(6BLW~Tc
zo0j-_!K+oJ8KuGFxX}R-4ufwkDkx%6mZGvD)}pRfR%J{Q)3Vc0cCa>)P*P<~5!bd?
zS9Y*6VXN0v)%Gxzm6DgzR?+q}k&}`Kp9<l}#>MoD?KJ}@gD^t|j@78(Gzng43U2#S
zxaJh(e#r4Yc8tb~a2Df=<Dhk>eFAEVjK@C<%8Djz7S>Q;dwq<LcdLlRF<!o{A`+0c
zCZjMz69YR#5(5hZ6N3_iE(7Rf+X-w>!He4&7;Zu!qYvXDro+rnSOwS=*%H~NupMXj
zV4uzYlS7gtiKCB`gL5L6CAU2HTAn1HpS*#5;(S~9E%~qV{}a#_2omHF(iYk(94!1_
zBva&)sIKT6u^6$5;(X$3#otTxNc@wml6)z(Svp2WNTyikm8_TSZMj6blkzI^k@Btb
z+ZEUqG!-Hgot1QyUMn9`=~eYrt5cUzU#gL;sic{%Wu$dcJ4Po^*IoCn-X#580|A2q
zLvh3TMjS@TMz@XGjO&fh8lN?BFikY`H+yTo(fpmoR!eoO2x|rFZ0jY~M{F5w6>VE=
zU)kl_%h>xkXgJJrIO`bWc*;rJDc^az%V)RM?#b@??$z$??vvf;yRY`h@)Guv_tN$<
z_j2~~^NRFJ@yhp>@K*6Q@V4>x@DA}#@NV_V_9^#i_UZST?X%oh!S|;htDm5ste>Wz
zsh?xO<iOQ|+XD{=o)5eo_$=^a;GZD&pmjmJf{q1U3c45cD(G8qM2J&}Ur1C)T1Zhy
zU1(`&W7v`i&Ir*6#YpF<=BT~ViqU=1v!a*9a>Ol*+Z4Ai?o`~hxJPmC;(o=m#S6vD
z#cRdiOHfNFNvKJ<lgOQzl6W;KBk6qdq~uM>my-XbXr+XuEJ^vC>XfFNo{_#R!z1%~
zmSC1eR$lhB9FJVq+%tJ<c{B1^@>TLD6a*ApEL>Y;QB+y9tC*o!uSC35ywtjMLFs|g
z=VfYT8D$&F9+&Hsude_dv&z80D7D}VU+u+sew(ihlI#~47#J8%O^z!7)A#jS|GWH~
z%(0VQ7t{%5U;>FUFtDgIfcRhzV-o`d(>jJ*%u)<9SUMQYSUMQ8*i;xiSnC*q7|$@w
zV2WU9V~Sw#Vpd>CVCi5;VO+rw$FvPhM=-tm|AnQ4!G@)S;S@^;Lk3F+Lk>#^g9ela
zvGZ6u!1|^z{$OYTVU`YtDJ&ff(^xtf-Z9HCD6!=*gs}!NaIx|+tYeL0h+=)ju#TmR
zVI4~j!#dVI3{k8v7}hbRF<fG<V6b5gVmQRY!my6rfMFd-oXv(IhUFN;ArQ^V!ElI0
zg~5tt4ucHq7KR0^0Sp}M-x&B<*%<g(UNLa6JYWc8ieTttdiVbgQv^d4O9#U|W)TJk
zrZfgM=5Gu!EO87on3pklvBWWWut+d?F)d<{V*bZq#1g?UiHU)siSf_>6D$%8Gng0{
zma%0qOah6sL@;=;1Tahj>0wr5n8cjIV8`@|L5C%Rp^AlpL5TGa10VAT1{oFx20rFF
z3~o#j3_45^49}P%7$R6Y7)oGa&(gur#nQoG!qUOe!qNdz!~Bk+h$)SMkIja`g=q~#
z4D&p&nkk^L2aBaKh%ierxPjt?X$C_O(+q|XrZk2lAiG(u7_^v_7;2c(7+RQSFjO%8
zV(?&|$1sg`0z(=YPhxOkmSNBVhdU_j(J;Hy{}-UR0LKF;E})nx?f)63G=^DBY5(6d
zrTzcJro~_ciw95~AY+yehB^=*92cPYfMRf59Ah}da)@CUDBQ7OwgiS4a9l_*c!A;q
zhM5@t|72odn9juT{}L0!|A#C=3_kF90L29|?qEn^iC}O5g$D{|VBiDC83O|!$p0Yw
zL4F0>w}fFG$SzPEv)D1{Ff}olf&2%ugJS|i4BIgV4;BvwD^NUx(i)hCrY%tXg3=fY
z-NBH>lm<>?pmZj}l*XXIl*X`yDGe;%#+1e&#FWMm$8v?ifF*)q4qFz(9L5z4R*Wkc
zqClAG27?vT4TdNXX6axkgW?OU>lh+9nHW5nDj2$$Dj23QrTuqd>0nS|UBKYLdW|8B
zrGp`cwSa+-HG;v8HG&}ooad?-^jISpte6%4gYw=6XdVRR#dj<n3=Iqn|NpU+Fi5d1
zVUS`<`+w#C2L>00MgQOYf5RZdu!EtDL5jf-)SP19_AiWqfs^UK%YSE%ogfi#F#;tR
zIT@H)gcv7)I@_!jtRf5yj1mx<c^5+k;};HQCVp1Xeq?4Q<^~3a^$rXPUQn$JC6xg_
z3=RwoznR#){#7wfVBf~LN`Zl4GDx2JE9*=K1_lLi2?i>~m>C!tL>NFT&_FZ`V*&#M
zLkNQdc&vwkftR6<;Xflgqa>ptqYGm&V>DwTV;$oprsGT}neH+lP!Lg&Qjk+nQczPc
zP_R;PQCOp>q^PFEq{ODguOy@-r6i}Mt>mGUpp>e5N-gs@)Bpb<H!$!rC@?HwWMPzG
zG-PyS3}TF8Okk{FoWyjD=_Jz)<^u}C3K9x33JPFTEzwLBL^3r6Y%1gb{|t=(zy5#x
z|Iq(^|JVJW{=egY_5afUh5w`fd;AmqC-RT&ugZf<56(Y0_u%Y<Qx6V4*!f_?1JC<c
z?q9t3?cV2mukXFO_xRp}dspu5xVP}$yxUf{=CFazAp|>>y2J(s9fgz)3JGb-8yEs2
zQX_RYFzP6zC~P<ouz^J_Y6FXFbcCX^qI6e;!iIo=2*nK!k<tnqEI=%a$Vi0^oUVx}
z8#F*%PFIBu1|Wt3NX3DG2!%9-uC7Fd4O{^c3DOE16hLxZAeI@3WtJeF5E&UMy@5eH
zG7@Tcr0xbLoek{DP8-;ioi;Flu=55s=fH>!?9SSo7#JCx6Pz}PrOHI=ZeZ5gz~HRl
zs<45{HF*Q0Yf^%X?gkc^7=yO*Mm84J1O?YF<wTHYz;-i8gWR`4L3)D&+{O*es>+Ej
zF1j07bv7_2C@5^;boK&;gTe+*Wv9puTp(Uhgu(_cWv58p4QwC_HZZ9=LEW;ElS$QS
zBNvmZ(*{N{WrYpQssRxj7@Rk-s5*6ZDRe0(ZeZ0?RNlat2xCiwWI@WARKaqQ8#tZa
zH*h(-Cv0d)LilAP1B0-#%LYd04Geah7#SIz6P$E6u<I}=By3<z+|13*$l%nKu#t^P
zTXzG8jzYo)?gRyA<qeDp&KsCiH!!INMkp)TY+y`K-XN4JBdw?ysk?zwX9I`!1`aLV
z4O}`33hoLByOa|xloh%{BhUq<LE5-=7&b79ZQ#<{z$j{<yMaeX!E^&-g6;-h9fl3e
zkbvL7pbd)y5R*Y{3pjnc*eP3V<Y5%m(%rzPqhO=pj<9h9gL9&V?goAxJ#ib|4FXtX
zH!wOUTj*{O)Y-_yAf~FIr{E4w3{0w?U0v?V?#hWt8yJ<HHVH5?ii&9IZV=Mhz#z7P
zMRfy<Dp+;{qjqYSp0a|1O_zo424RG(f*x32VFRnO(*{Oug$)S-5egd|0wXpvE3ha?
zZ)R3wk&1M3QdZc&;jGZ53|6e{mau`<c|$`|g2Dy{ZAgk{c1}o9-oWCVm=X}Nf!R4x
zdIO7dLgWT!)eQ|viOLEJ8(7qo-4ZRNl{auWyMf|_!x?N=f&$biWsq6Q8(5taKw-uT
zN(>;q8(7p56*jP_f=p*tO-KodP?T0yj6|3isk=c0<Q)YCg$=A~Q12+)Sm<sL1q*NB
zP<B#KP;gUr-@u@)3<_m2kT}R?Owh1l2#L^Buu)c&2Du9=sIY+*5qNB>8(396H-J(o
zqieEq5+r*mL&H-Ulq|$ShJphL8lVZF0%Su&5-iLmbd(kJKt6X1icqkL)Z56(D59;q
zK@u(;fGjKp7Y3__X+=>Zt+Rna6p{`$fmXtZ2<vU&)6(4_gF{?aXCnini0}q}E!_=r
zIvWJFbT=sLY!K3h84k7y<}Njz4Z_-83JNx$gwbVzMa>3QXT1%a+PWK5Kwbx@HCXU(
zVANJtuu;%cwt)IlQD-9ui>ebmO+urIaH?~MrVdczAR?h{U{ZAhWnLR)3u#59NLP%6
zIz&MSlpZ$7YwK=M0{I>0T~&~G6+v+Y@-Niga39KpeCVpIpr_#0rJM-!l)BCa5p9?O
z8X(RF32ogCnqZcsw(bTkkhTpX+8d;_bvJ11Y!HR3)&X(As&&CEkZL_J3#3$EXM-4A
zsR4)sR%!@lfs`77Ss<mxIvd2{N=-l<uu@Yn3#8Nx%mOJj*U{G9V4<_Y98z*IFfi=o
zVBla#R@lI(?4q!NS-D_?h^vCa291O?P~nG2?HibsT{d%aF*9jz<`w{vf?~`}+L4=B
zG}v5&TsCtHurO(Z3pgmTgQ1&Y2Lp)g0kvXScQJouVEDI^b>;sLth-oP|9|>71+0>v
zVHc=H!@|kHzz90efti7k1$2B02P3$p!@|kH#K6ZW169M!5W=VhWwS6yFxElYtPBB+
z)1YiN1_{PzP&PY50^>g@n}flCDGti!WRPR(gR;3;cQCDivbh-yI8vZ&9)=W-DNr^q
zV++R*D4UPLgsX<ZnIWH{fT5D1h#`|9ogssvgh7EpgCUtglR<&Oh{1rtkimdK7s@hZ
zP+&-6sAN!JC}F5%2w=!($YDri$YV%hP+;(3C}qfINMtBxsA5oHaABxo$Ye-mNCDHy
z3<?b844Dii3>gdx3_%R348;to3`GoOU=<1sZVdShd0?CU7!nzB8B!S(7?c=%7!nyu
z81fmE81%sAXEG!+q%!1z^@40H1=|cV2jrd%u&!VRPX-?b1qOeH0<c<SvwawlP0(Rb
zU<d=dqL?8QY`+47A%h+m!)yk*G@YRo?8_nyKO_4X-M>~~7em|+@iD?2kQ^jr4dH%7
zSA*SU1`H+))(i>^;ouM~0lPkrK^qzqnGD6?@CC&uB%JaYN*Rj4p$7AjE;#fNZh?s_
zFo1L`FeHNGwum8-A%!88A(tVMp@<=yL4hHkAq^};TCD3~gc+f9f*hupsR)~Ei@_-n
zlAbc*t^~z?8bc!3?+OecRxU#(Lk>9Yf_w&w^K^zhX!^@!$OHQhmWE0ha>1#v2q_Q1
zQhqo%OhC4lGw3oTfm1vvohyJt3}G%vFMi*E@)>d}R{+}y%1_1M^dHQCaEB5DD270;
zgycF<Y-KQLf^&u^IOmjrb1*1pfpSAWg91Y`*rllqY2XwL@jJ-9kUR^@O9~9d4EbPN
z6&MN_@)<xW3X~5s84?+CprMrv&KqeAIpEw=!T<`ZbOw-mP>GQbwiP4_vKf@JLAe}c
zZUzG=_2q!e22kvPQj-EhAwwy+9Dw9-keea?Er7ZeWIM>O<qV*>0Qt8Rp5H+>gJL0{
zAq5<dAlFua{hq{73Z~1E>`Vct=mK!w1(jF`pF-T64)zJipP=vprFf9bK_QRZZcxY-
zF{Fd@9mtQF3{~Kq2r8dKz%B-bI!IM911KecVju?^R-jx7vKbUspwh0G0aOA({0$OI
z2FDU8zd>TE4D9|)h9rg@aLESoJ*Wf)g<UB_0l0(%<!(@!n+i4!<R?&>3i1&s{1m`?
zOTh73#E`}SvOkvr<VQq~0L3*Zt!98@AQv3lpzs343#gP$1)Gr$&Sju91M;gQIJ9AI
z0p$fqnGNy>hz0T)EHsP3`cuKB2uLNQ{05~RP>GVmkk610mIIYF+2GJrU`S;E`5u%{
zLFobE8<4A$;dX;cS5SEZqCx4s9Gn-?^C8F&kg$W4xdz~n0@(m6BOzvkQYxtK1LZML
z{g=X!4|Pc%I9Gs55KvtQa&0*SsFchDr$A7g6)_ZnYZ{O~P<jTLngY(3uoMAG{h-oE
zm!SxpK0);*qQod+NCcNmpjd&GvY2rPl10QWq8tR3*J%u?44_y7`4W^fA*O&rqlh6F
zT<3z~1C**kB_JsEAYu;WVo+)X=__Uc@k$v$Aq=WFKq?EsZidAM$Q2+}i3~|#H-q9B
zIjw+v3W`}!cou_8S5Q9C1Gg$l7z!Ay81xzR8Op&BQa6A~9Z-G&g^3;msI19l&?i|v
zD5Ze%8>B=pVkl<NM`@45W3)%~>DKPiAlWydme<f}ErDt=P^%FUzr_s6;98-8p@gBB
zK@VIK<}m1iOP_QGeFlF9HwGVY-9?T*(CRdBgZqC8Lj{<DMlcG4mx6;XX<-4a|6pKe
z;9%fn-~#QxWZ-4sW8h~HU=U;wVi0B!VGv~yV-RPMV31^xVvuH#VUT5zV~}T1U{GXG
zVo+vKVNhjIV^C+%V9;dHV$f#LVbEpJW6%e;ij5eI8B7>V8O#{W87vqq8LSwr8EhDA
z8SEJB85|fK8JrlL8C)1#8Qd7$89W#~8N3+08GIOg8T=Uh83Gsr8G;ys8A2FB8NwLC
z86p@W8KM}X8Dbb>8R8h?84?&08JQUtGqf<YGVEoT#_)onjiHaBn_(`)N`@tjEDT)?
zw-}lkCNq3u_{`ADFrA@;;V{EJhK~&M7*;WSW%$DIjbRbPT85Jh#~Ic!Brzm2OkhZ1
zIL(mCaDw3!!+C}?3}+e6F}!3*W4O$4f#D*<dWLj{4-69-t}$F;xXO^h@S5Q*LnlKP
zLncEuLoP!OLmtBdhJ1!X22fd046bR*7|I!5F;p;AF;p^CGt@HFFzjGh$WYHv$I!sg
z$nb{Y9m6h0Rz^04zYPBv*%>()t}{Ghc+AMj$i=XMVIw0qBM-w9hNld>8F?8&S5gTu
zJY#syu#Djb!$U?vhT9Bx816DWV7SR}pJ6t`CWg%n+ZeVp9AVhPu$AE`LleUxhIWS4
z496JuG3;m9!zjei!!Vy=2Ez)5Sqw87-ZLy^n8YxLVL3xT!xV<83_BTx84fTUWE5c(
zWfWr+XOv)+WRzl*W|U!+Wt3y_3-$3~FU`v|FmN=0(k|?d`RVz2soCs_P}&trr$T5p
zzr^Iyl2o=l2o(&WiXl`KgsK8lTu~|cC5g$&sd*(_Rd6QQ9wTQ<7T40Ed=SUT%*>K2
zy(qCPRWCWQIF&agGqotSII|ec<IYV?F3QgXv$?>gf|>lunMKK^xoJ766<|JBaw1$+
zQc)_@C_cEQU`3oonR)487FS7TP71_2!Hm+p^u(gl+?>SH60jtAew&Fwh=Kk8e+GW=
z3;`E|0fP$zlZ%^A2m@bEVo4r@6axz=(}Bjo85oe*j0{ZKsYQ7Vd=L_B7HGW*XqFsA
zgU-ME23B7tq#~rkogt(ma6zz5-~w9&Pn~cOuL@5c<1-!`P93HlJax?Xc<NYYu)N~2
zVT<5k<J95H5a8p^5DwzKz$eBh#`%f&0#^&~1qhGJhU*$v5myV>HISKtZGvq)bwVoK
zpSV8>wsC(FQW0zu4njbXJv?=AXu|`Bd>K4-AoE}tWD5jC?0~RAB*+cCDtuzReqfml
z0X`4}*$VQNzy$~i;tRG3sR##w&iP<q1(!g)@X`lVx`4_SO=y_{D^D;>6HqAvDnYy%
z{NN==D7?goW5{6uwc0?rvxK1(oFi)(Y8jdsn!)8q8$&xoC&MIgewfBEonZ#UY=$`u
za~b9_%x74@u!vzX!xDz249ggnGpt}(#ju)T4Z~W7&EVVy%6B^$b}<}aIK*(6;RwTV
zhLa3u7|t<VX1Ky|jo}8vQ*ge0!SIsd6~k+WHw^E=<<U2WpA04pod0VW`2YJb2>$nB
z5c*%kAp8FagWUfk3`z`g3@ZO?7<B(zF}VHT#o+#b7lX(DT?_&Lk1z!OKf)07e-}gW
z|04_`|93Hj{y)MH@&5=z`TrvfP5)~cn*Y}@wEVAOX#HQq(DuKEq5XdiL&yIbhL!(!
zF|7K(i(&QuT?}jf?_yZ{e;321|GOAA|3AX8<^L{*t^ap1Z2P~9Vf+7G3_JesV%YV6
z7sKxVM;P|}Kf<v0{}G0L|Bo;n`d`Cv^#3k~<NtRtocVu*;oSdS3@`utFueKi!|?Ne
z4TC2G>%V&pT>tJd@cz5Uz|UaDAn@OcL6E_WLFxZF2Ic=77}Wl6V9@%%fx+ni1_qP=
z8yL+0hcH<F_hPX6pTS`BUx&f|zZZks|2qus|L-t({J+Bx^#2Y+$p1SGk^iSKME&2u
z5c7WuL(ac@47vZU81nyHF%<o~$58U$jG^?u8AIiND~9U-W(+m|?lIK<w_@o0zky-O
z{|yXN|8HQJ_J0Gz^#2<eX8hm4Fzf#YhWY<>7*_tj!?5cA9fsBa?=Y<Se}`f1|2qtu
z{@-EP^8XIQ*8g`Hw*9}uu>JoXh8_R!Fzot&hvCTo4Gc&B-(fiZ{|>|1{~H+2{lCL-
z`M(as)Bjcs&;DC6JpXr(;l;mu3@;hX7+(Fm$ME{!J%%?7W(@EDTQPk4Z^iKWzZJu`
zfA<*l7&!lzG4TKAU=aMz!65X%j6vmp8H4VBF9w(Y=NR1nKVoqI|A@ik|09N=|Bo0#
z{y$=9`d`M-{J)H$<$oDN>;E!_w*O@e?f=UdI{ue2Ec$<rVe$WS3`_o>V_5qC9K*8z
z=NOj%KgY1*|2c-0{~s}|`u~Vw_5Vi<YyLlCSo{AG!>0d_7`FU>#IW`MBZh7NA2DqI
z|A=A7|3?hF{y$<k^uLVZ@c(lRNB=)!IR5_;!@2*D7+(J8V0iPNgW>1@GSKZ-|1UA9
z{lCPZ_5Tus(f>;fCjT!nnEyY+VDbMNL+AfX3{(DJVwn2>62r9rml&r1zr--(|0RZ5
z|1UAj{(p^O&i`u+bN^psnD_r0!;$}&7|#B`#1IY70|F@dAb~;de*%N@|9Rkip!R<r
zgVz6f47&d<7>xeUV=(zYkHO_X8-v?_JqGvxdJG=_^%%VVyD$X&PhbfApTH3GUymX9
ze*#0ue?5lK{|O9X|Kk`U{wFX*{`X;s`d`8j{l9=A=D!a^?Eemi-2Xld`Tu<w%Ks-Y
zRQ~s2sQvGQHy?HWpT{ue|2&4N|K~AG`#+Ci`u}+hGyczGnDu`i!=nFe42%D>F)aDd
z#<2818^f~yYz)i)voWmr&&IIwzaGP?|9T9o|LZZV`LD;Y_P-v(rvG{joBt;;Z27Op
zu=T$l!?yo=4BP+fG3@xS$FS?a9>ebc2@HGwCot^&pTMy1e*!rF9sbY8aOD3yhNJ)W
z7>@tfV>t6af#K}`c?{?N>oGk2@5AuyzYjc5zW?vT@aew~!)Ivz%w_=H70UU)f&o-p
z@iG`N@c(yU5cofVLGZr=gV6s92HF2B807x1U{GQ(U{L;lhC$_j1%ulEGYne)&oJoz
z&tNe6e}=*2{}~3C|2+(D|9cqR|MxI>{O@7#{Qro->wg79!2cBtf&W)91pV(}2>!o<
zA>@A#L+Jk%3}OGLF@*oW#t`v;1w-Wj3k=c!&oIRNzrYate;q>(g8@VC{|OBF|0ggM
zF&HqEFjz5^GFUN`|6jpS`F{dKHG>sH4TAwg?f(f3P5&zxn*UcYwEVANX#HQo(DuKA
zq5XdaL&yILhR*+I7^eI`!!Y&#8HQ>9&oE5?e}-Yk|1%7;{-0r3^uLE;@&6u%CI5RE
zmj3TySoXh%Vfp_ah86#N7*_u8VOaIQhhg>q9)>mldl=UK?_t>VzlUM-{}l{d{`W9!
z{oli|?SBu$_WwN$JO1}D?E2rsu>1cChCTmRFzo%mf??nP6%2>|S1=s@-@|a^{~3m(
z|9cpY|L<Wq^M3`y+5cx4&i(IUc=~?=!?XVr7@jj2FuY(eV0ii8f#DT{0mEws1BN&M
z9T?vKpTO|x{{)85|0ghfV=!R&`M&~GnlczLaQ<I}6kBZ!0{<T{2>x$l5c<D}L5V?$
zLFNA<2HpR&7+n6ZU~v2YfWiI$0|t-(4;Z}u&tnMs|9~On{{x1w|CgYl{D2|<{{v_!
z8!(hI7%)`+f51@9U;qu_2MkUB7cn&dU&PSze-T6L|3wUK{}(Z||6jz=@qZD+qW>!x
z7XM$tu;l*=hNb^kFf9AOf?@gp6$~r>uV7gD{{h3Q{|^{e|9`-+=KlkRwf`S5Z2JFz
zVaxvq3|s#{VA%Hm0mJtH4;Xg*f55Qo{{x0Y{}(YF{=b6Z=>G={$NxWIIQRbn!_)r{
z7@qxqfD}q?NTJlm@c#b;hEM+=Fns?102)e*7z`N%{vTpc{{M(U?f)YNt^bc0jQ&4j
zF!}!or5^G8e+FKcg#Ta15cz)}L)8Bh3^D)rG35R~#E}305JTnvLkzY54>5H9f5b55
z|09N}{~s|-`~Qex`u|4^GyXqfnDze=8Fj`Zq&fpsqTXS6`u`Bav;T(}-v2+u@ag{{
zhR^>GF$giRGPp2sF}N`BGPp4C|F2^Z{9nhA!{EYD#NfhE!jQsH%8<fP&5*)S!{Ea3
zoWX_R1%nI2%l~x@uNYhyUNg8by!l_p@C~e=|9=gG;Qty1m;bjI7X81)u=xKih9&=R
zF)aOmi(%RSTMWzp-(pzt{}#jH|F;-k{;y$p^S_3Hg@OP7AqK(!hZtV|Kg96n{~-nu
z2Dkr57~KCKVekOAI6$q9BMdA5A7NPa{|LkC|3?_s{6E65_Wu!vP2d*95r(b*k1%Ze
ze}rNC|04`L{vTo3_5TRN(f>ynj)PkYM;KHXIRCF>fVocS|2hVh|LYjs{y$@I|No4^
z<Nq^;p#RSpLjFHvX!^g7q51zhhL->97+U|YV`%%oj-mbkI);w_>ljx4f5x!t|1*Zw
z|DQ3e`TvYz?f+*CoBlsz*z*4w!`A=L7`FX?#<2bWGlm`ipE2zE|BT_#|8)#U|370m
z{{I=nx&P1LKK}WC9jN#E{|1BF{~HWi|8FoD{lCFr^8W@(E`sHt&i^+Uru@IbF!lcp
zhH3wAFiih{gJH)18w|7l-yk{VANhX+p6bv3zX4A9LJXY$Js5=kdoZZ{_W<{ktr)Br
zY#1~c>=~>Wn*Mt*H2?QtX!-BK(E8tlq3yp1L;HUZhK~Op4D%T@7!LjSV7Sbn!SM6H
z2ZI0u=l>H7{Qu7}2>w6EAoTwPgUbIC3{C$}Ff{)^!O-&m1Viip6AW$tPcXFqKf%!P
z{{+LK|0ft;{y)d?=Knc{pZ`xVXfm+=zr?`#{~80=|4R%!|8Fqx{=dY)|NjJo;Qtd0
zLjSKZsQkaiVE%s|gXRA-4A%c2G1&ayz+n4-7lZx(GYk&@Z!jeMzrm36{}Myd|4R%t
z|1U8#{lCW0{Qnw5%l~T(t^cnvwEe%v(Ek4#L&yJX4D<hQU^w*u8pGxP8yK$q-^Fn4
z|1O3b|93Gw|9^?$#s5nTFaMulc=i7h!|VT-7~cFp!SL<>C5E3Mw=oF(&tk~^pT&^>
zKZ~LAe-=aS|15^5|FamL{m)`}|38c2)Bh}n&;PR+6c||lmoRYsFJa*QU&0{pzk$K>
ze;k9=|277j{}~MS|Kk`U!6m^7hMfN;47vXs81nx&FckeSVJP`u!%+IahN1F*14H%y
z8itzxB@DIy8yM#Q&tSOxKZD`v{|1I<{~H*d|1V*9@xO%O)&CNP*Z)fx-v4i4`1HSl
z;q(6nhHw8%7z7zu|L<Vn`oDvL_x}!t$o~&OH={Ac{C~iZ^M40J(f=I`CI5FYl>Xnr
zQ2l=gL(Tsk4A1}XV0iI=2g9rXI~ZR7-@)+h{|*Kb2G;*e7`Xl~Vc_}yfPwe_5(dlv
zJq%X=A28Ve?_qHG|9~O#|1*Z@|3?^N{y$?#0Gqyqq3Hh-hMNCN7@q%M!tmn%5{6g*
zmoU8kzl7o2|0N8W46F=t44nUC7`PbZ7<d`v82JBZFbMolU=aMD!65WMhC%j!8-v{c
zHgHV?YQL-ekAb)0b-}GMNITx;e*=Tt{{#m2{|O8p{}ULz{)aFG{BL6j{NKh9^gn?i
z_<tKi$o~X}(En`=VgDN#BL25AME;+{5cPivL-hX|hM50z7;+fo7;^t7Fy#MFU?^gc
zV<=%TVkl)WVkrOL#!&e`fuWkgh@pl-j-mE{0z=dP7>4HmF$^vLV;EZh$1t@0k6~#4
zAH&e`KL&5Rf6@O2hQ<FI7?%8RU|9OUfnnMI28QMT8yHsnZ(vyYKY?M@{{)8B{}UM2
z{7+z5`#*tU)Bgm9&HvjNw){_E*!n+#VcY)%hVB0o7<T+mVA%CPfnoRmHikX_+Zgu#
zZ)4c^zm4J0{}_hD{~Mrvg#?D<{}UL_{BMKy7ZMnr{!d_d_CJB)IfER-3kErcm;W;u
zUNOiqyk?MNc=JDl;r;&vhEM+!7(V|`VED!$$MExi41)oK!2ey)7&ykD_Wu}z*8gJ+
zM*oj7nEXG+;P(F(gZuwm3?Bb)F$Dd;#SrrU7DL$oCk&DQZ!pCCzrm3Ee-}gk|6L4~
z|93Ie{@=yW`TrQhl>f&Vrv5+1Fzx>_hUx#0G0gaXjA7RQV+<?*-(pzx{}#jQ|F;;{
z{J+Jp_Wv!0P5*B(Z25nSVe9`}4BP(SV%Yxw7Q>GJw-|Q)zr}Fm|1pN6|8FrI|9^|&
z?Ehm7=l<Vfc=~@A!?XXp7~cQi#qjC>E{4zlcQNQPu>O}};QBAa!24f@LEwJ{gYy3q
z3~K*RFlhZh!C>_N1cS-{6Ab46eHbkN`yk~^ABM>PH4IVz4>832uVKjfFT;@gzk(tE
ze+5I)e;J0#{}l{1|793z!EL`23{(D}V3_*<1jDrdCm5#xKfy5L{|Sa!|4)E(>yiH_
z7|#Ab0nN1)4A1^oFg*V+!|>w248yDcG7PW(%P_qEU%~L{e+9$m{}l}1{>w0^GqC>m
zW8nOMhJow99|P}yKL-B)6%2y^D;R{pE#os#7f%4^LF@mA7;OG0FxdXT#9;q_0z=M!
zKZc_JehfAL{TQ15pJ8bJe}<vu{~3nX|7RH5{-0rJ|9^&|<Nq0k`QUc_8HUUM6Bw@i
zzr=9u|0RYS|1U8-|L@1};=dom%l{P&um1Zny#DXU@CNKMKZc+G&oFp1aQ^pV;0K4N
zAA{h383v*MUJT0rFEOb6_rmC-Suz+fSTPtd*f7X3*n>u@{vTj)`@e+2{r?gMkN-;;
zg8naI2>HK+A@{!@L;in1hRXkb47FgFdoeWs_hM-I@5Rvi-;1H`zZXOMe=mlP|6X|e
zd-ECO7#96Mz_9rL0fr_24=^nKe}G}x{{sxm{~usj@&5qB%Ku9kR{dYXu=@WJhBg0}
zFs%K*gkjVFB@A2sFJajFe+k33|4SIQ|6jte<Np$dUH_Lb9QyCYaQOcL22j88=>H`Q
z$Nw(@_aD#wU&3&iL5|_+e?Nw2;Lws`cms}0KZZ~L{TM#~2ZfdwgBb(se=i2E|6UBd
z|GgLl{-0q``hS8!`TsQrwg1-`wEkZMuih~Fe~rNeT({LQSo}Z1VEMm-!Rr4S2Alse
z4EFyk7$X0#V~7FuSpIu4<o-XykpKS-L(zXPhLZmt45j})7%KmtVW|G^!BF$xi=p=a
z8HUdP*BGY!zs4~2|22kb|F1Dj|9_2P#{X*!v;JRWnEn3*!<_#o80P*z!7vY;N@Ey~
z{J+L<7F-v`Fg*Q#hT+-&GYrrFdojHD@5S)yzZb*n|6UC5|DR#_^#2UQ=l^FIzWw)t
zjy+m16rhYf%7MoZK{t<qRuMBXupsdn89-<HvVjIt8Pp(TPG)){gARl&E-ff#FoKZK
zu}RRVBqNv&nlIpBaAU{=+snwn!N9~I!@$kR0UEakjakD+s~H6ug%}taxEY)ovKR^(
z%D^Mm_ZaRoJOGVygIxpC&B!3d0HT=~*cf;i*%+7@d>BDjO8PS}GB7fDBH6;jz|2t1
N02;dkxgR_y0RV`u8&v=R

diff --git a/graphics/fonts/OFL.txt b/graphics/fonts/OFL.txt
deleted file mode 100644
index dfca0da4..00000000
--- 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 256b7ab5..7bbdee95 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 cc8f299c..f6eb2fdd 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 34b6eb1d..7ad53dec 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 056f8204..8c0b2dfb 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 50f741ef..9c3a8a44 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 9376d540..50d7d6d6 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 55c3cfd3..b7915a55 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 9b69e574..138c458c 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 a128d1ae..c1ff0004 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 9daddfbc..bd803910 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 3fee48f2..235a027e 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 5e198b8f..e6b70db2 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 a434af65..495406db 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 1db5c93f..9a1c1855 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 266ad404..ce07b0dd 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
zcmZ3X{zbi>fsuiML4c8gfrWv=%`L=t);zyA3=G0I7#J92++AGV7}Oag7#M_iFfcGE
z_y_A7*(n69VPIhFU|?VfOU_L!_@VoFGXn$T7X}7KujH~41-7gISr{1jEkNqi3et1C
zCQgWCU|@D&VBjuDPb@9~*~Y*iyn%s%fg?SqvOdlI<+&OL2L2QV28II}sfj7Fvv0&Q
zFfj5kFff>9WTYmt{bY_{U|@7%U|>+m$StYhj$m+MU|@W}z`!7qlb@W(puv#9z`!5D
zz`($hn^;l6u#Ul-fq^jt<bb@y+|)0n=Vvl72&gbHFb5Xo7ni(T;S#{WAY8$~z+h2O
zWRY6%)KPm60|Ot(MQz~FU}Rvhv|aHbp5NvxgFN#K1_lO(TL)f+f#?U!t2!AN7#NwC
zPL^Vkv0`9gUJBL%l7nGZum~%I7?@^YU}9in5MwB2U|`T=kOeDZWEPwp!WdEyF`I#b
z(U*aN$(n(I`31;p49pA+U@QYQz=eSs%#vYXVbEY;U|?flVPIrndcp94=l_2O1_&*|
z%>M(d3St8r1DwOi!~k*xSR77(Vtuj*)5Fah*ne<O7G@Gulwbfu=Ai#sAPiRt3SN-v
z)sxMbeVJVt7$>(eXV)_@2r=A)TVcwO17$NZa53zFvY8mz87@QF%nYiG>QFWd0~cd5
zl+DV(%?Jr~kiWPXS3t$N7_^zVp=@pjVWxOc7_e|MFfe3+LMM)ak%g0ikwJuE5mbVS
zfsf%Zl+DcG#c&(SW?>Lv^o6on8N?X#plmh<5ynYSHWxz}<7OzEn?a4qd@?gzHY3C2
zI9Aho1_n=tWQJ6R6b1z_E1w|`6qlaKsVNGc$@zK33=BaGsSN21r3^U?i3~*y3_+>s
zr8$X33=D1zAjKtMx`-j2A(cUa!H7YR!GJ-5!3t^|y1@_`69!!dBQUNvU@&4ZW?*p3
z&nt1uFG^2UFw!$nuu?$SuVAHMqHCmUWME`Wgj>THQW=UEiWxG&Zc|_|1iObJEVZaO
zGe1wkP|pBih%SRCgGe%1VKD;($VOd=k0)Pb3uk1Qe3Vt2kzukryT;@XtRj<r*;S%h
zL3x9LiIItsnIk2?JWn?zvxq4_n}Lym@&A7YesFw(GPVGN1Oq5lvOrTND1Cu2G|}F_
LxeKHUCD#D}u$IQh

delta 1098
zcmeyOzCyj8fsuiMfuEs)ftjJeJvh`!p<A_zfq~%<0|P^df3UuhokGAD1_s6e1_p+(
z<lMx936)pQF)%Q$U|?WuOD-!>V7vOCg@J*60s{ksLRvw3Zr8*Kkqiv%8yFb43(^yd
z3m6y}1Q;0DI~W)kIMQ<})7)*(Suij#8!#|19LPvbtWS~XkkDjcVE(|sz+je<k($VE
z%N)wUz@ovxz@U<mTT;Qr&A`CGz~aNez`&D}pPa~`!H~efz!Cv6FgLNHfME^yJO&1q
z1ds#r5_40}&J~wnU|?xrU|>31kY8Nl^J|(10|PtA1Lg%qsRd6Rwf8VE2rDo!Ftjl+
zhA}WOa4{G#*fB7<xcP)I@Z}_y<S|Gwuz)OOU;u{>GMh0cGd+=k11iJFzyemu$iTtC
z$iM~@WsaQO!x$37z`(%Dz`(%Fz`&pb@&W?`V;tB(28IX*W-v>Kfti5|EY1Q}!^XhE
zz{tS#g5d+t|NjgOFdA$y8`J_O1_nm9$%#z&Cl@fO=<|Rb3JNU{g9)Suf<fkg;9+0@
zVFo6!2@DJjle74JK@OU{i$A*_6!nY@4A;NDUKG!7^Ob>{`31<3TL)f&f`tJ_GrwS(
z0SaxfDIf)m3=GUc|FakvK<fYhXMO>)3nT%@%pe&iYlsT4C@9uI_AxVvK~*!=Gq5p;
zF%&Z}Fz9iE(g{eN5W_vFGy{Vv%+U;>@HK^sGcm9;*h1ON3>*wDP&Nw#2ZIlk&C0;d
z5CUbhF>o-%L)lym+6?JXHaA1PFvBEJJg{&wFfe2>EQPWe83Y*lp=>4wK1O*co0&m?
zQ5VW)VGv-ng|b;0#29^{Y&He~#$+g)iy@4$7|P~mP-8sloL^8`l$oAUqM+fdsbFL<
zxlT~kC@nv)BsC`|KPWZ5G$*kL#)Z*gsYS(^`FRS4dIm6|$-KhalM{tSCNm3W*`_h%
zGvqOpFr+f%Fyt`gGXycDGNdz<GUPBMG88eO%cAio7YK>-ql;}73ZHBxtUkG1SV^9l
qk%^I+k%fUHCBHmRHzl)(DL)$&ON<PR|Nk@aPqyG!*zCakgBt+Ib+zLF

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9bf464b3..874edb96 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 1a293681..6d6d3fd6 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 5ef79499..bd9cf473 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 fa7fd5df..083d9d2b 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 018/440] 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             | 522 ++++++++++++++++++++---------------
 winit/src/application.rs     |  10 +
 14 files changed, 384 insertions(+), 241 deletions(-)
 create mode 100644 native/src/font.rs

diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 5509cf0e..5df4e968 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 7bbdee95..8658cffe 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 7ad53dec..b052c094 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 a51b8c21..d1589c05 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 00000000..6840a25f
--- /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 ebdc8490..27b6fc0d 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 c71c237f..25cab332 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 50d7d6d6..150ee786 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 b7915a55..1bbd36cc 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 318852f9..17c5ab97 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 1a94c6a3..dffbbab0 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 874edb96..5a275c8a 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 083d9d2b..cdfcd576 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -5,27 +5,309 @@ 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>>,
+#[ouroboros::self_referencing]
+struct System {
+    fonts: glyphon::FontSystem,
+
+    #[borrows(fonts)]
+    #[not_covariant]
+    cache: glyphon::SwashCache<'this>,
+
+    #[borrows(fonts)]
+    #[not_covariant]
+    measurement_cache: RefCell<Cache<'this>>,
+
+    #[borrows(fonts)]
+    #[not_covariant]
+    render_cache: Cache<'this>,
+}
+
+impl Pipeline {
+    pub fn new(
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        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),
+            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,
+        queue: &wgpu::Queue,
+        sections: &[Text<'_>],
+        bounds: Rectangle,
+        scale_factor: f32,
+        target_size: Size<u32>,
+    ) {
+        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,
+                    },
+                    &text_areas,
+                    glyphon::Color::rgb(0, 0, 0),
+                    fields.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,
+            });
+
+        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.system
+            .as_mut()
+            .unwrap()
+            .with_render_cache_mut(|cache| cache.trim());
+
+        self.layer = 0;
+    }
+
+    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: 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))
+                });
+
+            (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: 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) {
+        self.system
+            .as_mut()
+            .unwrap()
+            .with_measurement_cache_mut(|cache| cache.borrow_mut().trim());
+    }
+}
+
+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,
+    }
+}
+
+struct Cache<'a> {
+    entries: FxHashMap<KeyHash, glyphon::Buffer<'a>>,
     recently_used: FxHashSet<KeyHash>,
     hasher: RandomXxHashBuilder64,
 }
 
-impl Cache {
+impl<'a> Cache<'a> {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
@@ -34,14 +316,15 @@ impl Cache {
         }
     }
 
-    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer<'static>> {
+    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<'static>) {
+    ) -> (KeyHash, &mut glyphon::Buffer<'a>) {
         let hash = {
             let mut hasher = self.hasher.build_hasher();
 
@@ -58,8 +341,7 @@ impl Cache {
         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);
+            let mut buffer = glyphon::Buffer::new(&fonts, metrics);
 
             buffer.set_size(key.bounds.width as i32, key.bounds.height as i32);
             buffer.set_text(
@@ -102,223 +384,3 @@ struct Key<'a> {
 }
 
 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,
-        queue: &wgpu::Queue,
-        format: wgpu::TextureFormat,
-    ) -> Self {
-        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,
-        }
-    }
-
-    pub fn prepare(
-        &mut self,
-        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 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,
-                    },
-                    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");
-    }
-
-    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,
-            });
-
-        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.render_cache.trim();
-
-        self.layer = 0;
-    }
-
-    pub fn measure(
-        &self,
-        content: &str,
-        size: f32,
-        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,
-        });
-
-        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> {
-        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) {
-        self.measurement_cache.borrow_mut().trim();
-    }
-}
-
-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,
-    }
-}
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 9781a453..889becad 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 019/440] 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 dffbbab0..280ce29b 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 cdfcd576..2ca3f0d8 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 020/440] 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 280ce29b..1ab3d93f 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 5a275c8a..f19959bd 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 2ca3f0d8..4af57af3 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 021/440] 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 e6b70db2..0656be62 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 4af57af3..967596f2 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 022/440] 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 1ab3d93f..0d9fb75b 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 967596f2..6c88acc3 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 023/440] 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 0d9fb75b..da8cdf9f 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 024/440] 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 38b81842..390e7bf3 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 025/440] 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 9c3a8a44..4ccccbf7 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 138c458c..0e21e995 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 c1ff0004..b4cda748 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 bd803910..5f60eaef 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 235a027e..aede754a 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 0656be62..f71b4503 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 495406db..d9c80ebe 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 026/440] 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 4ccccbf7..0509f7bc 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 027/440] 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 1f774a70..b67c08af 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 d3596b4d..d7314851 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 6840a25f..15359694 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 028/440] 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 6c88acc3..59a840ca 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 029/440] 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 da8cdf9f..b3fbfc00 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 59a840ca..e8c3e385 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 030/440] 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 e8c3e385..16eea234 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 031/440] 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 16eea234..f1171b5f 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 032/440] Set `Attrs::monospaced` if `Font::Monospace` is
 selected

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

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f1171b5f..6e7e60d8 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::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::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 033/440] 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 f71b4503..f51416e1 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 034/440] Refactor `quad::Pipeline` to `prepare` and `render`
 architecture

---
 wgpu/src/backend.rs |  31 ++++--
 wgpu/src/buffer.rs  |  86 +++++++++++++++++
 wgpu/src/quad.rs    | 229 +++++++++++++++++++++++---------------------
 3 files changed, 232 insertions(+), 114 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index f19959bd..2c35936c 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 7c092d0b..c210dd4e 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 2f5fcc6b..ebbe7a9d 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,117 +133,145 @@ 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,
+    ) {
+        if self.layers.len() <= self.current_layer {
+            self.layers.push(Layer::new(device, &self.constant_layout));
+        }
+
+        let layer = &mut self.layers[self.current_layer];
+        layer.prepare(device, queue, instances, transformation, scale);
+
+        self.current_layer += 1;
+    }
+
+    pub fn render<'a>(
+        &'a self,
+        layer: usize,
         bounds: Rectangle<u32>,
-        target: &wgpu::TextureView,
+        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(..));
+
+            layer.draw(render_pass);
+        }
+    }
+
+    pub fn end_frame(&mut self) {
+        self.current_layer = 0;
+    }
+}
+
+#[derive(Debug)]
+struct Layer {
+    constants: wgpu::BindGroup,
+    constants_buffer: wgpu::Buffer,
+    instances: Buffer<layer::Quad>,
+    instance_count: usize,
+}
+
+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 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 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", "DRAW").entered();
+        let _ = info_span!("Wgpu::Quad", "PREPARE").entered();
 
         let uniforms = Uniforms::new(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,
-            );
+        queue.write_buffer(
+            &self.constants_buffer,
+            0,
+            bytemuck::bytes_of(&uniforms),
+        );
 
-            constants_buffer.copy_from_slice(bytemuck::bytes_of(&uniforms));
-        }
+        let _ = self.instances.resize(device, instances.len());
+        self.instances.write(queue, 0, instances);
+        self.instance_count = instances.len();
+    }
 
-        let mut i = 0;
-        let total = instances.len();
+    pub fn draw<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>) {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("Wgpu::Quad", "DRAW").entered();
 
-        while i < total {
-            let end = (i + MAX_INSTANCES).min(total);
-            let amount = end - i;
+        render_pass.set_bind_group(0, &self.constants, &[]);
+        render_pass.set_vertex_buffer(1, self.instances.slice(..));
 
-            let instance_bytes = bytemuck::cast_slice(&instances[i..end]);
-
-            let mut instance_buffer = staging_belt.write_buffer(
-                encoder,
-                &self.instances,
-                0,
-                wgpu::BufferSize::new(instance_bytes.len() as u64).unwrap(),
-                device,
-            );
-
-            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;
-        }
+        render_pass.draw_indexed(
+            0..QUAD_INDICES.len() as u32,
+            0,
+            0..self.instance_count as u32,
+        );
     }
 }
 

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 035/440] 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 6e7e60d8..95994a4e 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 036/440] 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 2c35936c..395d28d5 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 ebbe7a9d..e4173b12 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 037/440] 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 e4173b12..94bcec92 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 038/440] 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 395d28d5..90a511ef 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 a5e63b17..f6c39f1a 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();
+        let layer = &mut self.layers[self.prepare_layer];
+        layer.prepare(device, queue, instances, transformation);
 
-        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 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 eafe2f96..7df67abd 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 6d6d3fd6..9da40572 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 039/440] 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 f6c39f1a..5d1ae8d7 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 040/440] 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 69f6961e..5af30ab1 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 90a511ef..8c4c0daa 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 88289b98..43fc47ac 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 ef87422f..7ae7edd2 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 94bcec92..c1aa49c4 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 efdd214b..572af1e8 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;
+            let layer = &mut self.layers[self.render_layer];
 
-            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,
-                );
-
-                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 50231f7c..6e1acc06 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 041/440] Reuse a `RenderPass` as much as possible in
 `iced_wgpu`

---
 examples/integration/src/main.rs |   1 +
 wgpu/Cargo.toml                  |   5 +-
 wgpu/src/backend.rs              | 263 ++++++++++++++++++++-----------
 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, 197 insertions(+), 171 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 5af30ab1..a7a90ced 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 b3fbfc00..7a6b75f0 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 8c4c0daa..9d1e3d1c 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,
-            );
+            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,
-                });
-
-            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,
-            );
-
-            self.triangle_pipeline.render(
-                device,
-                encoder,
-                target,
-                target_size,
-                &layer.meshes,
-                scale_factor,
-            );
-        }
-
-        #[cfg(any(feature = "image", feature = "svg"))]
-        {
-            if !layer.images.is_empty() {
+            if !layer.meshes.is_empty() {
                 let scaled = transformation
                     * Transformation::scale(scale_factor, scale_factor);
 
-                self.image_pipeline.prepare(
+                self.triangle_pipeline.prepare(
                     device,
                     queue,
-                    encoder,
-                    &layer.images,
+                    &layer.meshes,
                     scaled,
+                );
+            }
+
+            #[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"))]
+        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();
+
+            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,
+                    encoder,
+                    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.render(text_layer, &mut render_pass);
+
+                text_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);
-        }
+        let _ = ManuallyDrop::into_inner(render_pass);
     }
 }
 
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 5d1ae8d7..db05d2ff 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 c1aa49c4..246cc5e1 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 95994a4e..73708fd8 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 572af1e8..1b537bf4 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 6e1acc06..365cb603 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 042/440] 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 7a6b75f0..46115a3c 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 043/440] 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 9d1e3d1c..d07898f7 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 73708fd8..655ad987 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 044/440] Grow atlas in `text::Pipeline` when necessary

---
 wgpu/Cargo.toml     |  2 +-
 wgpu/src/backend.rs | 55 +++++++++++++++++++++++++++++++++------------
 wgpu/src/text.rs    | 52 ++++++++++++++++++++++++++++--------------
 3 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 46115a3c..6132768d 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 d07898f7..7f44fafa 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 655ad987..4406177a 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");
+            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),
+            );
 
-            self.prepare_layer += 1;
-        });
+            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 045/440] 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 6132768d..632873a3 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 046/440] 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 7ae7edd2..d8ae116e 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 1b537bf4..4b4fa16d 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 047/440] 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 7f44fafa..e650d9a5 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 4406177a..c0f49417 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 048/440] 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 c0f49417..dea6ab18 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 049/440] 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 1bbd36cc..4c72abc3 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 f51416e1..65a9bd3b 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 050/440] 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 42c9488c..5fc0cc10 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 10d3778b..00000000
--- 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 45e8ee6b..00000000
--- 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 5921bdd0..00000000
--- 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 33afd664..00000000
--- 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 17c5ab97..31ec4f48 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 ce07b0dd..13b3af7c 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 78d58000..5c64727b 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 051/440] 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 5fc0cc10..551e12ac 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 052/440] 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
zcmZQzWME+6WoTevW(aU|3-MjR{fUQxf$a_h1A~mai>n)hI)elQ1KS=31_lNHV0|Ng
zA=Whv42%&B3=9d$xrqhrg_qtiFfd+WU|>v1Pb@BAU|<knU|`$Az`($fo>Q4-sZbop
zz`*Rmz`&@Hk(!vI^s6SFfq?;JzF9^_Y9f0s^Kk|SMiB-E29=E5k_zrs3<(Sjj5`<@
z7^HIYlM@*-7`8AlFk67k%}uN*VBlm>XJB9i@fGqCb5m!}{Km<^z*4}#!1$>kzqo{Z
zS9Jjc16v9M1497VZww3!qP|>m@%%Pl8Ms*(K;VJ!wP|2lE-@2CGp}aO2Dz7k3B+Sy
z0O?~s@c#e<14KRZYLEz24nnbkMc5fs!88M0Cqx!RGBY<YPGDeVU|^cbbcTU}p&vps
zzGg6H<OC@|!i)k)95B;?f#D@1*bNTM2N)b6ZUW1I2n7a4h|3rl7(+n<5C^a@FeETQ
z_{<Cp3?M86bzd9<GnggAz{23fz`(%8z`?-8z{J4FpzxCM|KI=r!KNs@WPq^$KLPU@
z8Mwe|dBFBFGq5tSfy5cv7#J8qrh|k*VFtn=2^eOCg&a&^n9>{!91H>s5)1(hQ^27M
z@g@@kgC!_rAv|!@VC5$;I500@c3_ZaU|>{JS5snV<7ZTdFxc7H*+j&}#5ozw%*{;H
z)tF=C)Ybge)#S|0K@2rDc_l$XK|v+P7{(Ydi<wbgKtMo1-qKQmUqFCgL0MNfR#!*m
z-!#T72$O-4A(TM~oYGYo7=%H_b274t$TNx=nR7CV8QC+MnW%FznwjV`swuH^f`|=1
z{QQip|9<oHd-3TCGO{tU@#_eB@$>)t&BzK7`}gbLFMb_<<`^G-T|p3sPZy*Bs)=7m
zkdYHr6F5i&7>=QY7N`UQ<vCUceyBJT10rWJGbl0?Ld97aSQ+L+*{lrQ411w$HU?IP
zt57x<gA}76D7CY|av3uNBMT=3C@nKX#hDoR7(}6LW(Fq)T_~G{fs0`>l+DT@#;_F1
zW@F%DI0<EQF_<vi2KghCA(<hcA&;S$fgv+FKd+d9A&4QBA)TR=A%`K6p@@MYC^fw_
zC$Wfu!40gg1WXq(q%)*4C@>f?=rI^DC@@$tC@>&Qg7A$POc-<-jKJ7{!HB__fx#_5
zuf#3CC_PodNY6mQN&#%6f|Y`iiLQ~Zk%5sh1Cl8)_k=N|G88csGh~A8S70y%+sP1?
zT2!2wpQm7`XMjx?%(V(&m*#=ZNMtBsNM%T2P+&-6sAN!J@C5tammwc)vL3{J3hAkN
zsYQt;sVNFcl?tB8`M&x2d3vCrLN6acV#t`Cfq{{Ufr*isftitok(IqPFVn!lzyL}c
zf@oJu2;bGxz>tBFf${%;XlenKO`tpovIA5of@n~R0%1_9Vqjpne{&Z|6$5g)4*+x`
B*d+h}

delta 853
zcmeyt`-8KdfsuiMft#U$ftkU;KUm+0Ux>AVfq`KU0|P@sa&BUQc-W;51_nkM1_p+Z
z^u*!<1_lNJ1_nkD&5@o{nPwx9$IQUMSi!)+Xp)hdn4<LHV=Ds#(;5Z_2D6Ne)I|0;
z=Hm<uOivgX7*sNHODgyn7_KrfFmo_4Fi7O&Cp#uG9Ad~~U|?2YU|`_OO{^$j;9yW^
zU|=?2U|>+lOUzB3>Bae*fq^-Ifq}8DAiubTfti7Ufq~@)NS=Y2IdpOiW3(bj2qX@|
zG7OAhH8Kp$V9&`gurOFm{=%qO&-nkbI15x1qyvN*85sZnXW$2`1o0Udm>3w$EkU6|
zf><Gg19LyK0fRgP1EZR{ni4x3KchN?!Oq6cCL%5-&dE4=0kb!I3WFl^9OjtGpP1{l
z!Im&ET$$b@8qaU@m4TZD?1Bfv*QS9OFdD3$gHhIT4w8#N3K$sJAUYr%CQ!IAFch*d
zFr<J*xEMqj<QT#jW-%~;b+S#iW0bCEVBlj|2j+uB*`abEf3q_rK*gCE*cr^AY!(J~
zhEgb-m4TZ<6v}2}U}x}#vbh+f7`i|q%fiXP$iT<I4rMbj@G+!A*~|=l47Lo+^$d(G
zoD3`sd<->E304L%1_daaje(CL2+HPSFkx7dnVg@SpP$E&$&k#D&ydTI&ydfM7nWL7
zoSC1eV5n!n5XO+oP{dHokO`7tP+%}*&|@&bstY0*jAm9)YI<o-Vi7|SLn=c$Ln%WJ
xLn1>FL@Am|xBR>kh4j?C)S|?a)D(rJN(Im4eBb>1JiW<+Y-UUh%##zD<N$I_f6V{@

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index 09950bb8..77111490 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 0e21e995..6ba06d3b 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 053/440] 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 0509f7bc..bd58a122 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 6ba06d3b..cd8b9c6b 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 b4cda748..8ff82f3b 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 054/440] 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 551e12ac..d999febe 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 41bef2c3..bbbdfa0e 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 b052c094..859ebc04 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 a45a7ca1..3e6dfd9e 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 00000000..2a179f3a
--- /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 00000000..a9a09593
--- /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 00000000..d0ba6793
--- /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 00000000..c4dc248b
--- /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 00000000..a7c8911b
--- /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 00000000..ad78d8bf
--- /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 9a1c1855..b9871556 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 31ec4f48..bb162f2d 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 aac5fb9e..9545a14e 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 365cb603..7406bfb8 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 889becad..1bfce3a1 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 619086b8..8a7b2a11 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 055/440] 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 a9a09593..7b09eea8 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 056/440] 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 d999febe..b1f5cf66 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 2a179f3a..5ba5d426 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-image = ["iced_wgpu/image"]
-svg = ["iced_wgpu/svg"]
+image = ["iced_wgpu/image", "iced_tiny_skia/image"]
+svg = ["iced_wgpu/svg", "iced_tiny_skia/svg"]
 tracing = ["iced_wgpu/tracing"]
 
 [dependencies]
@@ -19,6 +19,10 @@ path = "../native"
 version = "0.7"
 path = "../graphics"
 
+[dependencies.iced_tiny_skia]
+version = "0.1"
+path = "../tiny_skia"
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 iced_wgpu = { version = "0.9", path = "../wgpu" }
 
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 7b09eea8..a46d6f9b 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -7,12 +7,14 @@ use std::borrow::Cow;
 
 pub enum Backend {
     Wgpu(iced_wgpu::Backend),
+    TinySkia(iced_tiny_skia::Backend),
 }
 
 impl iced_graphics::Backend for Backend {
     fn trim_measurements(&mut self) {
         match self {
             Self::Wgpu(backend) => backend.trim_measurements(),
+            Self::TinySkia(backend) => backend.trim_measurements(),
         }
     }
 }
@@ -25,12 +27,14 @@ impl backend::Text for Backend {
     fn default_font(&self) -> Font {
         match self {
             Self::Wgpu(backend) => backend.default_font(),
+            Self::TinySkia(backend) => backend.default_font(),
         }
     }
 
     fn default_size(&self) -> f32 {
         match self {
             Self::Wgpu(backend) => backend.default_size(),
+            Self::TinySkia(backend) => backend.default_size(),
         }
     }
 
@@ -45,6 +49,9 @@ impl backend::Text for Backend {
             Self::Wgpu(backend) => {
                 backend.measure(contents, size, font, bounds)
             }
+            Self::TinySkia(backend) => {
+                backend.measure(contents, size, font, bounds)
+            }
         }
     }
 
@@ -66,6 +73,14 @@ impl backend::Text for Backend {
                 position,
                 nearest_only,
             ),
+            Self::TinySkia(backend) => backend.hit_test(
+                contents,
+                size,
+                font,
+                bounds,
+                position,
+                nearest_only,
+            ),
         }
     }
 
@@ -74,6 +89,9 @@ impl backend::Text for Backend {
             Self::Wgpu(backend) => {
                 backend.load_font(font);
             }
+            Self::TinySkia(backend) => {
+                backend.load_font(font);
+            }
         }
     }
 }
@@ -83,6 +101,7 @@ impl backend::Image for Backend {
     fn dimensions(&self, handle: &iced_native::image::Handle) -> Size<u32> {
         match self {
             Self::Wgpu(backend) => backend.dimensions(handle),
+            Self::TinySkia(backend) => backend.dimensions(handle),
         }
     }
 }
@@ -95,6 +114,7 @@ impl backend::Svg for Backend {
     ) -> Size<u32> {
         match self {
             Self::Wgpu(backend) => backend.viewport_dimensions(handle),
+            Self::TinySkia(backend) => backend.viewport_dimensions(handle),
         }
     }
 }
diff --git a/renderer/src/window/compositor.rs b/renderer/src/window/compositor.rs
index ad78d8bf..42afddc4 100644
--- a/renderer/src/window/compositor.rs
+++ b/renderer/src/window/compositor.rs
@@ -6,10 +6,12 @@ pub use iced_graphics::window::compositor::{Information, SurfaceError};
 
 pub enum Compositor<Theme> {
     Wgpu(iced_wgpu::window::Compositor<Theme>),
+    TinySkia(iced_tiny_skia::window::Compositor<Theme>),
 }
 
 pub enum Surface {
     Wgpu(iced_wgpu::window::Surface),
+    TinySkia(iced_tiny_skia::window::Surface),
 }
 
 impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
@@ -19,21 +21,31 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
 
     fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
         settings: Self::Settings,
-        compatible_window: Option<&W>,
+        _compatible_window: Option<&W>,
     ) -> Result<(Self, Self::Renderer), Error> {
-        let (compositor, backend) = iced_wgpu::window::compositor::new(
-            iced_wgpu::Settings {
+        //let (compositor, backend) = iced_wgpu::window::compositor::new(
+        //    iced_wgpu::Settings {
+        //        default_font: settings.default_font,
+        //        default_text_size: settings.default_text_size,
+        //        antialiasing: settings.antialiasing,
+        //        ..iced_wgpu::Settings::from_env()
+        //    },
+        //    compatible_window,
+        //)?;
+
+        //Ok((
+        //    Self::Wgpu(compositor),
+        //    Renderer::new(Backend::Wgpu(backend)),
+        //))
+        let (compositor, backend) =
+            iced_tiny_skia::window::compositor::new(iced_tiny_skia::Settings {
                 default_font: settings.default_font,
                 default_text_size: settings.default_text_size,
-                antialiasing: settings.antialiasing,
-                ..iced_wgpu::Settings::from_env()
-            },
-            compatible_window,
-        )?;
+            });
 
         Ok((
-            Self::Wgpu(compositor),
-            Renderer::new(Backend::Wgpu(backend)),
+            Self::TinySkia(compositor),
+            Renderer::new(Backend::TinySkia(backend)),
         ))
     }
 
@@ -45,6 +57,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
             Self::Wgpu(compositor) => {
                 Surface::Wgpu(compositor.create_surface(window))
             }
+            Self::TinySkia(compositor) => {
+                Surface::TinySkia(compositor.create_surface(window))
+            }
         }
     }
 
@@ -58,12 +73,17 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
             (Self::Wgpu(compositor), Surface::Wgpu(surface)) => {
                 compositor.configure_surface(surface, width, height);
             }
+            (Self::TinySkia(compositor), Surface::TinySkia(surface)) => {
+                compositor.configure_surface(surface, width, height);
+            }
+            _ => unreachable!(),
         }
     }
 
     fn fetch_information(&self) -> Information {
         match self {
             Self::Wgpu(compositor) => compositor.fetch_information(),
+            Self::TinySkia(compositor) => compositor.fetch_information(),
         }
     }
 
@@ -90,6 +110,20 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                     background_color,
                     overlay,
                 ),
+                (
+                    Self::TinySkia(compositor),
+                    Backend::TinySkia(backend),
+                    Surface::TinySkia(surface),
+                ) => iced_tiny_skia::window::compositor::present(
+                    compositor,
+                    backend,
+                    surface,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                ),
+                _ => unreachable!(),
             }
         })
     }
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
new file mode 100644
index 00000000..7f4b0f8c
--- /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 00000000..4282a745
--- /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 00000000..fce44e9e
--- /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 00000000..88098345
--- /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 00000000..d8d9378e
--- /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 00000000..053bb29b
--- /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 057/440] 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 db4ba45d..15f8dab5 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 42afddc4..a11374ed 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 4282a745..62373ec7 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 053bb29b..164d99c6 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 7406bfb8..3a4a7123 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 1bfce3a1..b52f0197 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 058/440] 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 164d99c6..8bb52a03 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 059/440] 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 62373ec7..54752a21 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 060/440] 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 7f4b0f8c..70b1f5e7 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 54752a21..9eea1a32 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 8bb52a03..2bd5831e 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 061/440] 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 70b1f5e7..55f7f5b7 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 9eea1a32..5e743479 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 fce44e9e..420a1ffb 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 00000000..5bd6eff1
--- /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 062/440] 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 5bd6eff1..64f31aae 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 063/440] 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 64f31aae..fc26703b 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 064/440] 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 5e743479..cefed71f 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 065/440] 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 cefed71f..b1dd6a46 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 066/440] 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 a46d6f9b..b0a409dc 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 fc26703b..6d4cfe96 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 067/440] 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 55f7f5b7..7fee49cb 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 b1dd6a46..38a6c51d 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 068/440] 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 38a6c51d..d0977462 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 069/440] 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 d0977462..66d83221 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 070/440] 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 632873a3..9e80a76d 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 dea6ab18..3839b31f 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 071/440] 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 7fee49cb..781e7d34 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 6d4cfe96..cd7eb1ed 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 072/440] 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 cd7eb1ed..37b0fe47 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 073/440] 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 37b0fe47..da3a06bf 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 074/440] 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 b1f5cf66..942966e5 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 5ba5d426..1f21f06b 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 d0ba6793..f9bfc373 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 00000000..417cc06f
--- /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 0bfa3ff1..5326718f 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 e2b0537e..04cb0e50 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 075/440] 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             |  69 ++---
 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                     | 148 +++++++---
 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  |  82 +++---
 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, 1354 insertions(+), 570 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 43865e4d..7ccb7b7a 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 d7314851..1e4f0411 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 7b6ea0e1..d71ba6f6 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 7c3916d4..5bb463c3 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 a389c54f..6425e2da 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 a2df36c2..1109a883 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 ed911160..494f71a6 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 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);
 
-                    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);
+                        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));
+                        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 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 9bacce7f..a77772d5 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 28ed3e21..a43a2b2b 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 f5faae0f..7df6c929 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 1d25d171..e85f8391 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 9a4ee754..0023a69b 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 9795d31f..36d8a516 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 8658cffe..c44372e8 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 bbbdfa0e..576b2d78 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 5a163a2f..e4826591 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,6 +58,50 @@ pub enum Primitive {
         /// The bounds of the viewport
         bounds: Rectangle,
     },
+    /// 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: Mesh2D<ColoredVertex2D>,
+
+        /// The size of the drawable region of the mesh.
+        ///
+        /// Any geometry that falls out of this region will be clipped.
+        size: Size,
+    },
+    /// A low-level primitive to render a mesh of triangles with a gradient.
+    ///
+    /// It can be used to render many kinds of geometry freely.
+    GradientMesh {
+        /// The vertices and indices of the mesh.
+        buffers: Mesh2D<Vertex2D>,
+
+        /// The size of the drawable region of the mesh.
+        ///
+        /// Any geometry that falls out of this region will be clipped.
+        size: Size,
+
+        /// 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
@@ -81,45 +117,69 @@ pub enum Primitive {
         /// 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>,
-
-        /// The size of the drawable region of the mesh.
-        ///
-        /// Any geometry that falls out of this region will be clipped.
-        size: Size,
-    },
-    /// A low-level primitive to render a mesh of triangles with a gradient.
-    ///
-    /// It can be used to render many kinds of geometry freely.
-    GradientMesh {
-        /// The vertices and indices of the mesh.
-        buffers: triangle::Mesh2D<triangle::Vertex2D>,
-
-        /// The size of the drawable region of the mesh.
-        ///
-        /// Any geometry that falls out of this region will be clipped.
-        size: Size,
-
-        /// The [`Gradient`] to apply to the mesh.
-        gradient: Gradient,
-    },
     /// 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 859ebc04..793ee7d7 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 f52b2339..09b61767 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 3f92783e..23533e33 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 27b6fc0d..c98827e7 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 2b3ca7be..27330894 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 a8d050f5..8a9addd2 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 9588d129..ef6a7771 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 7c733a4d..1d726577 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 e954ebb5..92b1e47e 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 aeb2589e..30c387c5 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 b8e72daf..e0747d3e 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 5121aa68..84fda052 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 656dbfa6..17a5a137 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 4c19251d..ab4727b2 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 6794f2e7..2642fdb8 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 1f21f06b..429b55c2 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 b0a409dc..6c0b4e5c 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 f9bfc373..d9c85e82 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 417cc06f..6c0c2a83 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 00000000..f40a1097
--- /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 00000000..7d6b4811
--- /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 12ce5b1f..aae4ec88 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));
+        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,
-            );
+                // 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));
+                // 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;
+                // 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,
-                    );
-                });
-        });
+                        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 04cb0e50..f3a66101 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 781e7d34..5f39fce2 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 66d83221..e08cede7 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 00000000..c3b8b316
--- /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 420a1ffb..e66e6412 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 00000000..22daaedc
--- /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 2bd5831e..08159cd8 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 632873a3..0bcef71c 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 e650d9a5..10dc5b4f 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 db05d2ff..2159a3ec 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 f6eb2fdd..0840555a 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 7661c5c9..5c1e41ad 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 9da40572..8be12602 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 246cc5e1..8a568968 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 dea6ab18..0dc8a64c 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 4b4fa16d..706e4282 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 e7fab97c..8d05041e 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 00000000..41444fcf
--- /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 52217bbb..09b26b90 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 d68548ae..987570ec 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 076/440] 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 494f71a6..cdb33aca 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 e08cede7..838426f5 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 077/440] 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 c3b8b316..59765f59 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 078/440] 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 59765f59..958063d2 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 079/440] 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 27330894..f107cd69 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 080/440] 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 838426f5..2e4663ea 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 08159cd8..76f371e1 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 081/440] 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 36d8a516..62e67cf8 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 e4826591..5a48639d 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 5f39fce2..72181735 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 0840555a..69fcf899 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 082/440] 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 5a48639d..f900b3fd 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 f40a1097..35c8fff9 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 2e4663ea..6883a953 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 987570ec..e8d540c3 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 8be12602..31db16a8 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 8d05041e..00000000
--- 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 41444fcf..00000000
--- 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 09b26b90..00000000
--- 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 e8ac621d..00000000
--- 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 083/440] 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          | 81 +++++++------------
 {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, 140 insertions(+), 148 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 942966e5..28938df9 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 d71ba6f6..80ad0b5b 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 5bb463c3..f1c83a16 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 1109a883..5c4304ee 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 cdb33aca..eab8908b 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 e85f8391..4faac6d6 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 0023a69b..f2606feb 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 62e67cf8..98e6f474 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 c44372e8..8658cffe 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 00000000..29ac84d6
--- /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 92b1e47e..109d5e99 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 84fda052..4a9c5e36 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 ab4727b2..b551a9c9 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 2642fdb8..6794f2e7 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 576b2d78..e56f8ad8 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 793ee7d7..cb57f429 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 23533e33..1eedf0da 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 429b55c2..189f5309 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 6c0b4e5c..b0a409dc 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 35c8fff9..e491ea73 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 7d6b4811..1f1febdd 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 d9c85e82..aae3322d 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 f3a66101..19434e84 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 8a9addd2..bc5995c6 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 1d726577..7c733a4d 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 17a5a137..fd15663a 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 aae4ec88..66442d5d 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 72181735..c4c36aba 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 6883a953..050c6c75 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 958063d2..73fc1ebd 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 e66e6412..ef5c6b1d 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 0bcef71c..2e39a9e7 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 10dc5b4f..6f39a5fe 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 e8d540c3..11e8126f 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 31db16a8..4439b185 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 084/440] 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 f107cd69..2b3ca7be 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 085/440] 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               |  71 ++--
 {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              |  83 ++--
 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                             |  23 +-
 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          |  46 +--
 {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    |  38 +-
 .../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   | 170 ++++----
 {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  |  35 +-
 winit/Cargo.toml                              |   6 +-
 winit/src/application.rs                      |  75 ++--
 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, 1959 insertions(+), 2183 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 28938df9..49a52311 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 7ccb7b7a..9edc20f6 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 00000000..081b4004
--- /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 0a677d20..98c53737 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;
+    /// #
+    /// #     pub mod widget {
+    /// #         pub struct Row<Message> {
+    /// #             _t: std::marker::PhantomData<Message>,
+    /// #         }
+    /// #
+    /// #         impl<Message> Row<Message> {
+    /// #             pub fn new() -> Self {
+    /// #                 unimplemented!()
+    /// #             }
+    /// #
+    /// #             pub fn spacing(mut self, _: u32) -> Self {
+    /// #                 unimplemented!()
+    /// #             }
+    /// #
+    /// #             pub fn push(
+    /// #                 mut self,
+    /// #                 _: iced_core::Element<Message, iced_core::renderer::Null>,
+    /// #             ) -> Self {
+    /// #                 unimplemented!()
+    /// #             }
+    /// #         }
+    /// #     }
     /// # }
     /// #
-    /// # use counter::Counter;
-    /// #
-    /// # struct ManyCounters {
-    /// #     counters: Vec<Counter>,
-    /// # }
-    /// #
-    /// # #[derive(Debug, Clone, Copy)]
-    /// # pub enum Message {
-    /// #    Counter(usize, counter::Message)
-    /// # }
-    /// 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 bcfaf891..953cd73f 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 1e4f0411..5bdcee6a 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 48214f65..0c405ce6 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 6cada416..b9f3c735 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 1126f0cf..0c48df34 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 2ac78982..d6247e39 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 150ee786..d93338ae 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 00000000..70e2c2d9
--- /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 4b8fedf1..ae739bb7 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 aede754a..485bb542 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 00000000..d829a4b4
--- /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 dd435201..9db1e6b4 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 c407bb06..e59588b1 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 39154786..f097c2dd 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 6509887c..b07f42ce 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 067aab4a..dda0efe8 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 f6bb3b1e..7854548c 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 8c56e471..15ffc0af 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 1b97018e..7f3a5e1d 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 22ede0e0..79fe52d5 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 a77772d5..5cb41184 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 200306aa..60390242 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 533cb6e2..16e21709 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 a7a90ced..c1f1f076 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 (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();
+            let adapter_features = adapter.features();
 
-        #[cfg(target_arch = "wasm32")]
-        let needed_limits = wgpu::Limits::downlevel_webgl2_defaults()
-            .using_resolution(adapter.limits());
+            #[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();
+            #[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
+                    .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 3e41fbda..90c7efbf 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 79255c25..e03e89a9 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 6512106f..e1cdaefe 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 8770acac..3ac61e6a 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 54555684..214ec97e 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 dfd6dfa9..4c0bf072 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 c9f1376c..dfb80853 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 f1f986aa..f703572c 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 e74b3ee6..78fb9de1 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 63c7ec27..4dcff92d 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 3257b519..f63fa06a 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 98e6f474..4bb22b6c 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 8658cffe..dd2888ab 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 15f8dab5..d55e801a 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 29ac84d6..8db1594a 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 109d5e99..2e8c1669 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 30c387c5..c3127bdf 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 e0747d3e..2cdebb66 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 4a9c5e36..794dd3bc 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 b551a9c9..2d760a6c 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 6794f2e7..be9ee376 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 8c0b2dfb..06e0b4d0 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 da46c30f..03211160 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 1b5b5c35..4caa6141 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 c950ccd6..32729acd 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 e56f8ad8..c6f9cf57 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 bc0ed744..00000000
--- 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 8b489e5e..00000000
--- 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 f900b3fd..195b62da 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 cb57f429..7bc462ef 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 2c0b541a..5792555d 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 a38b81f3..00000000
--- 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 3e6dfd9e..00000000
--- 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 c739b312..00000000
--- 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 1eedf0da..bc4e7ca1 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 c9105bc0..e727c4a7 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 ca9d0b64..39bee8f6 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 92f614da..32f725a1 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 c98827e7..0fc4f324 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 9ee406cf..00000000
--- 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 25cab332..44585cc5 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 8ae1cacb..2fa9934d 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 5b0a6925..1b81314f 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 16e78e82..b16bcb03 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 68ccda55..315027fa 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 2b3ca7be..0fdade54 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 3f1b6b6c..f50d7aec 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 d13eca75..00000000
--- 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 a5cdc8ce..97a96e54 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 ce36d129..c1dbd84f 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 189f5309..d0420ad0 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 b0a409dc..bf5da322 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 a11374ed..0cdcb293 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 e491ea73..361fc86b 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 1f1febdd..2a3534d0 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 aae3322d..22ec7bd1 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 c4dc248b..d32c87d3 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 a7c8911b..00000000
--- 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 00000000..714076e0
--- /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 b9871556..f5cf3317 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 dde17051..00000000
--- 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 2eb1bb4d..00000000
--- 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 5326718f..111bedf2 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 36ae274e..00000000
--- 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 2134a66b..00000000
--- 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 bb162f2d..b71b7781 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 iced_native::theme;
-pub use runtime::event;
-pub use runtime::font;
-pub use runtime::subscription;
+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};
+}
+
+#[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 d61ed09a..00000000
--- 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 c0f4c492..00000000
--- 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 ef565bd6..00000000
--- 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 0b77c386..f2bdfca8 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 19434e84..00000000
--- 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 2018053f..26239065 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 59eb1eb8..286ff9db 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 f31c2306..d5a16bef 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 4ba4facf..b507d096 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 050c6c75..d364e36a 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 73fc1ebd..c66621dd 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 ef5c6b1d..bf83e400 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 88098345..9e4be0c4 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 da3a06bf..7a5034c2 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 76f371e1..cea1cabf 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 2e39a9e7..f3ea66dd 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 6f39a5fe..9c9a1b76 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 11e8126f..59ec31fe 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 2159a3ec..5eaa9a86 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 crate::layer;
-use crate::{Buffer, Transformation};
 use atlas::Atlas;
 
-use iced_native::{Rectangle, Size};
+use crate::core::{Rectangle, Size};
+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;
@@ -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 7df67abd..0a17ca33 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 43aba875..11289771 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 03effdcb..204a5c26 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 69c05a50..4b06bd95 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 69fcf899..cb9d5e2f 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 3eff2397..0de589f8 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 5c1e41ad..9dd14391 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 38d62616..fdbdaafb 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 4439b185..473f3621 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 8a568968..b55216d7 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 bd9cf473..7c0750ef 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 0dc8a64c..d7a27f3a 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 706e4282..9fa521d7 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 a3016ff8..7144125c 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 3a4a7123..a67ac3c0 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 00000000..fb617079
--- /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 39387173..d6fd3997 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 bc5995c6..171c4534 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::*;
+pub use crate::graphics::geometry::*;
+pub use crate::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 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 ef6a7771..5a65e9a7 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 7c733a4d..4508c184 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 fd15663a..efb33c56 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 cd8b9c6b..6a062f94 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 ebe579d5..8f363ec6 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 b77bf50d..9d932772 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 00000000..1a73c16f
--- /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 73257a74..22a3a1a1 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 1f8d5d7a..0d60d818 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 5e909a49..b08ed8cb 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 5b4a39f6..e7b87614 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 b23da9f7..0b8070af 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 41a28773..be60bb78 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 57c07de1..7b2fc37c 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 00000000..4c1e7c1c
--- /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 00000000..b9a0e3e0
--- /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 bd58a122..c322c8ba 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 bcb17ebd..a97cef60 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};
+pub use crate::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::{
+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 02bde064..a3049230 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 7d68fb46..ddbc3bc2 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 c9b0df07..035ef05b 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 6044871d..a9274dad 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 cc304b96..3976acd8 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 c4ae0a0e..a6e2ec7f 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 107078ef..2129937b 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 8ff82f3b..cd23cdd2 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 dd46fa76..896d40fe 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 66442d5d..7709125f 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 5f60eaef..e5c67f3d 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 286c1c2d..3ce363f8 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 1ab6a0d3..3749d7ce 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 c1df8c39..49c780de 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 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)
+            }
         }
     }
 
-    /// 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)
-        }
+    /// The handle of a [`Scrollbar`].
+    #[derive(Debug, Clone, Copy)]
+    pub struct Scroller {
+        /// The bounds of the [`Scroller`].
+        pub bounds: Rectangle,
     }
 }
-
-/// The handle of a [`Scrollbar`].
-#[derive(Debug, Clone, Copy)]
-struct Scroller {
-    /// The bounds of the [`Scroller`].
-    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 d3715b1c..70a84fc6 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 a6fc977e..e1e09d5a 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 f5ed0a6c..89017fcf 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 00000000..04c31edc
--- /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 65a9bd3b..67d80e2b 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 4f3b159b..9680dfd7 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 d53fa8d9..f1fd641f 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 d9c80ebe..f23f9b27 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 2a24c055..084650d1 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 f1687e38..64a9583c 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};
+pub use crate::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,
+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 60e464c6..21c14f68 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 b52f0197..c8162c9b 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 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 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 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 8d6a1df1..b727e03c 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 c1fd8813..22509130 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 1b2ead36..0759ad9d 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 eaeafd51..7687fb17 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 3a33e174..0d8c04d3 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 7b9074d7..1d6c48bb 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 8a7b2a11..3a6a8a8e 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 961562bd..6ac58e20 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 086/440] 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 4cdd6c68..50a81a91 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 087/440] 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 f38679ea..212832f4 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 39dd843f..5ff951b3 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 c25f067b..03b240c6 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 e74768a6..122c20db 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 dd234984..168a635e 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 e4d355ee..411e7c2a 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 b324dbf1..52b0e914 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 d5201cde..30bc8291 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 dd818bd1..4698a105 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 c0982db7..39137de2 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 24f9f241..2241a494 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 fe53fd7e..876f29c2 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 9fe110b0..ae71cd25 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 0fc4f324..2d2e5b38 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 1b81314f..00000000
--- 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 b16bcb03..d4176ab5 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 97a96e54..aa3f35c7 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 714076e0..9621c3bc 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 b71b7781..b9f87d5d 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 c8162c9b..c95dbf62 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 088/440] 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 d4176ab5..00000000
--- 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 d6fd3997..7eee69cb 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 6a062f94..d1f886c6 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 22a3a1a1..abcb6ef2 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 a97cef60..257c0144 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 896d40fe..ef0d87d5 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 e5c67f3d..c2b6b017 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 70a84fc6..e1153d2d 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 67d80e2b..d1c48fbd 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 f23f9b27..713a9c30 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 64a9583c..62dc997f 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 089/440] 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 b726501a..2666f1b4 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 090/440] 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 53688a21..ad188c36 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 3d1ec3f9..00000000
--- 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 39137de2..397fc2d2 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 39bee8f6..cd4c51ff 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 d1589c05..6c74f0ef 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 2d2e5b38..aa45e57a 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 0fdade54..00000000
--- 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 f50d7aec..00000000
--- 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 c95dbf62..d863c846 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 091/440] 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 49a52311..a677569a 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 16e21709..5849f730 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 c1f1f076..9707eda7 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 aa3f35c7..00000000
--- 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 bc4e7ca1..2d3e8db3 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 e727c4a7..bc450912 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 315027fa..2c76fd8a 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 6ac58e20..236064f7 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 9621c3bc..7afba85c 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 f5cf3317..c9ddf840 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 b9f87d5d..c59d5058 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 26239065..824915b2 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 c4c36aba..08e79bb8 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 7a5034c2..c4edadb3 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 fb617079..4c23f3e8 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 1a73c16f..a43e7248 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 4c1e7c1c..a3e7c8bc 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 49c780de..5a7481f7 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 d1c48fbd..d066109a 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 21c14f68..bfd22093 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 d863c846..9666fcae 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 b727e03c..c37ccca6 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 22509130..7271441d 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 0d8c04d3..5cde510a 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 3a6a8a8e..069efa29 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 092/440] 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 996daa76..497fd145 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 093/440] 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 60390242..f429977f 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 d0420ad0..560bf2e1 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 50a81a91..5601c0de 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 094/440] Introduce backend feature flags in `iced_renderer`

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

diff --git a/Cargo.toml b/Cargo.toml
index a677569a..38c35f43 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 560bf2e1..629c11ba 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 bf5da322..e77b708b 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(
+        delegate!(
+            self,
+            backend,
+            backend.hit_test(
                 contents,
                 size,
                 font,
                 bounds,
                 position,
-                nearest_only,
-            ),
-            Self::TinySkia(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 0cdcb293..218e7e33 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,
-        //)?;
+        #[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(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::Wgpu(compositor),
+                Renderer::new(crate::Backend::Wgpu(backend)),
+            ))
+        };
 
-        Ok((
-            Self::TinySkia(compositor),
-            Renderer::new(Backend::TinySkia(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 361fc86b..21ef2c06 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 22ec7bd1..ba737b11 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 095/440] 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 4bb22b6c..a08c6707 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 04f4ff9d..2f634252 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 03211160..00000000
--- 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 c6f9cf57..0c50db52 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 5601c0de..6a313d4f 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 9c9a1b76..88c58554 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 5eaa9a86..4163e338 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 0a17ca33..c00b8cef 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 4b06bd95..7e4c92a2 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 00000000..9b38dce4
--- /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 32729acd..3624e46b 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 096/440] 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 08e79bb8..647ec12a 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 d364e36a..d894ab95 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 bf83e400..d03bdcc2 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 00000000..e57f0e50
--- /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 097/440] 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 fbe940ef..7ef2f602 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 f5a6eaa2..7b45c672 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 647ec12a..69197589 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 d894ab95..3c2a97b9 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 d03bdcc2..83baef1c 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 c4edadb3..bfe5da9d 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 00000000..fd9cfdc5
--- /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 098/440] 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 3c2a97b9..b3c7d2bc 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 e57f0e50..2fd73f8c 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 099/440] 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 7b45c672..f5a6eaa2 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 100/440] 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 bfe5da9d..f2935efa 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 101/440] 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 fd9cfdc5..89063c4c 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 102/440] 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 390e7bf3..a9a9b3f9 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 f429977f..f6863cd3 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 046f3596ca88c1ad4c2941f2f74007684920e5d5 Mon Sep 17 00:00:00 2001
From: FinnPerry <finnperry3@gmail.com>
Date: Wed, 8 Mar 2023 11:33:13 +1100
Subject: [PATCH 103/440] fix: add `width` to scrollables

---
 native/src/widget/scrollable.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index c1df8c39..45cd2a0e 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -33,6 +33,7 @@ where
     Renderer::Theme: StyleSheet,
 {
     id: Option<Id>,
+    width: Length,
     height: Length,
     vertical: Properties,
     horizontal: Option<Properties>,
@@ -50,6 +51,7 @@ where
     pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
         Scrollable {
             id: None,
+            width: Length::Shrink,
             height: Length::Shrink,
             vertical: Properties::default(),
             horizontal: None,
@@ -65,6 +67,12 @@ where
         self
     }
 
+    /// Sets the width of the [`Scrollable`].
+    pub fn width(mut self, width: impl Into<Length>) -> Self {
+        self.width = width.into();
+        self
+    }
+
     /// Sets the height of the [`Scrollable`].
     pub fn height(mut self, height: impl Into<Length>) -> Self {
         self.height = height.into();
@@ -173,7 +181,7 @@ where
     }
 
     fn width(&self) -> Length {
-        self.content.as_widget().width()
+        self.width
     }
 
     fn height(&self) -> Length {
@@ -188,7 +196,7 @@ where
         layout(
             renderer,
             limits,
-            Widget::<Message, Renderer>::width(self),
+            self.width,
             self.height,
             self.horizontal.is_some(),
             |renderer, limits| {

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 104/440] 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 b3c7d2bc..ba063f4e 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 89063c4c..8509b761 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 1816c985fad2ead8dc1e7b62dc8e4bafeed856b2 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, 14 Mar 2023 11:11:17 +0100
Subject: [PATCH 105/440] Fix `clippy` lints for Rust 1.68

---
 core/src/font.rs                     |  9 ++-------
 core/src/mouse/interaction.rs        |  9 ++-------
 examples/pick_list/src/main.rs       |  9 ++-------
 examples/todos/src/main.rs           | 11 ++++-------
 graphics/src/primitive.rs            |  9 ++-------
 graphics/src/widget/canvas/cache.rs  |  7 ++-----
 graphics/src/widget/canvas/stroke.rs | 18 ++++--------------
 7 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/core/src/font.rs b/core/src/font.rs
index 3f9ad2b5..d8c34e5a 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,10 +1,11 @@
 /// A font.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub enum Font {
     /// The default font.
     ///
     /// This is normally a font configured in a renderer or loaded from the
     /// system.
+    #[default]
     Default,
 
     /// An external font.
@@ -16,9 +17,3 @@ pub enum Font {
         bytes: &'static [u8],
     },
 }
-
-impl Default for Font {
-    fn default() -> Font {
-        Font::Default
-    }
-}
diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
index 664147a7..57da93fe 100644
--- a/core/src/mouse/interaction.rs
+++ b/core/src/mouse/interaction.rs
@@ -1,7 +1,8 @@
 /// The interaction of a mouse cursor.
-#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord, Default)]
 #[allow(missing_docs)]
 pub enum Interaction {
+    #[default]
     Idle,
     Pointer,
     Grab,
@@ -12,9 +13,3 @@ pub enum Interaction {
     ResizingHorizontally,
     ResizingVertically,
 }
-
-impl Default for Interaction {
-    fn default() -> Interaction {
-        Interaction::Idle
-    }
-}
diff --git a/examples/pick_list/src/main.rs b/examples/pick_list/src/main.rs
index 62a4ef88..21200621 100644
--- a/examples/pick_list/src/main.rs
+++ b/examples/pick_list/src/main.rs
@@ -61,8 +61,9 @@ impl Sandbox for Example {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum Language {
+    #[default]
     Rust,
     Elm,
     Ruby,
@@ -84,12 +85,6 @@ impl Language {
     ];
 }
 
-impl Default for Language {
-    fn default() -> Language {
-        Language::Rust
-    }
-}
-
 impl std::fmt::Display for Language {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 6a87f58c..6361667e 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -435,19 +435,16 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
     .into()
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize,
+)]
 pub enum Filter {
+    #[default]
     All,
     Active,
     Completed,
 }
 
-impl Default for Filter {
-    fn default() -> Self {
-        Filter::All
-    }
-}
-
 impl Filter {
     fn matches(&self, task: &Task) -> bool {
         match self {
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 5a163a2f..cef422a2 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -9,9 +9,10 @@ use crate::triangle;
 use std::sync::Arc;
 
 /// A rendering primitive.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub enum Primitive {
     /// An empty primitive
+    #[default]
     None,
     /// A group of primitives
     Group {
@@ -117,9 +118,3 @@ pub enum Primitive {
         cache: Arc<Primitive>,
     },
 }
-
-impl Default for Primitive {
-    fn default() -> Primitive {
-        Primitive::None
-    }
-}
diff --git a/graphics/src/widget/canvas/cache.rs b/graphics/src/widget/canvas/cache.rs
index 52217bbb..678b0f92 100644
--- a/graphics/src/widget/canvas/cache.rs
+++ b/graphics/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
diff --git a/graphics/src/widget/canvas/stroke.rs b/graphics/src/widget/canvas/stroke.rs
index 4c19251d..49f5701c 100644
--- a/graphics/src/widget/canvas/stroke.rs
+++ b/graphics/src/widget/canvas/stroke.rs
@@ -59,9 +59,10 @@ impl<'a> Default for Stroke<'a> {
 }
 
 /// The shape used at the end of open subpaths when they are stroked.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub enum LineCap {
     /// The stroke for each sub-path does not extend beyond its two endpoints.
+    #[default]
     Butt,
     /// At the end of each sub-path, the shape representing the stroke will be
     /// extended by a square.
@@ -71,12 +72,6 @@ pub enum LineCap {
     Round,
 }
 
-impl Default for LineCap {
-    fn default() -> LineCap {
-        LineCap::Butt
-    }
-}
-
 impl From<LineCap> for lyon::tessellation::LineCap {
     fn from(line_cap: LineCap) -> lyon::tessellation::LineCap {
         match line_cap {
@@ -89,9 +84,10 @@ impl From<LineCap> for lyon::tessellation::LineCap {
 
 /// The shape used at the corners of paths or basic shapes when they are
 /// stroked.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub enum LineJoin {
     /// A sharp corner.
+    #[default]
     Miter,
     /// A round corner.
     Round,
@@ -99,12 +95,6 @@ pub enum LineJoin {
     Bevel,
 }
 
-impl Default for LineJoin {
-    fn default() -> LineJoin {
-        LineJoin::Miter
-    }
-}
-
 impl From<LineJoin> for lyon::tessellation::LineJoin {
     fn from(line_join: LineJoin) -> lyon::tessellation::LineJoin {
         match line_join {

From ed7b61380473c7c88c25b5d4d17112b844a9364d Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 23 Feb 2023 14:33:53 +0100
Subject: [PATCH 106/440] Added macOS platform specific options

---
 src/window.rs                |  2 +-
 src/window/settings.rs       | 18 +++++++++++++++++-
 src/window/settings/macos.rs | 20 ++++++++++++++++++++
 src/window/settings/other.rs |  9 +++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 src/window/settings/macos.rs
 create mode 100644 src/window/settings/other.rs

diff --git a/src/window.rs b/src/window.rs
index 5a199580..aba4bce8 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -6,6 +6,6 @@ pub mod icon;
 
 pub use icon::Icon;
 pub use position::Position;
-pub use settings::Settings;
+pub use settings::{PlatformSpecific, Settings};
 
 pub use crate::runtime::window::*;
diff --git a/src/window/settings.rs b/src/window/settings.rs
index 24d0f4f9..a039e213 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,5 +1,15 @@
 use crate::window::{Icon, Position};
 
+#[cfg(target_os = "macos")]
+#[path = "settings/macos.rs"]
+mod platform;
+
+#[cfg(not(target_os = "macos"))]
+#[path = "settings/other.rs"]
+mod platform;
+
+pub use platform::PlatformSpecific;
+
 /// The window settings of an application.
 #[derive(Debug, Clone)]
 pub struct Settings {
@@ -32,6 +42,9 @@ pub struct Settings {
 
     /// The icon of the window.
     pub icon: Option<Icon>,
+
+    /// Platform specific settings.
+    pub platform_specific: platform::PlatformSpecific,
 }
 
 impl Default for Settings {
@@ -47,6 +60,7 @@ impl Default for Settings {
             transparent: false,
             always_on_top: false,
             icon: None,
+            platform_specific: Default::default(),
         }
     }
 }
@@ -64,7 +78,9 @@ impl From<Settings> for iced_winit::settings::Window {
             transparent: settings.transparent,
             always_on_top: settings.always_on_top,
             icon: settings.icon.map(Icon::into),
-            platform_specific: Default::default(),
+            platform_specific: iced_winit::settings::PlatformSpecific::from(
+                settings.platform_specific,
+            ),
         }
     }
 }
diff --git a/src/window/settings/macos.rs b/src/window/settings/macos.rs
new file mode 100644
index 00000000..c08020cf
--- /dev/null
+++ b/src/window/settings/macos.rs
@@ -0,0 +1,20 @@
+/// The platform specific window settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct PlatformSpecific {
+    /// Hides the window title.
+    pub title_hidden: bool,
+    /// Makes the titlebar transparent and allows the content to appear behind it.
+    pub titlebar_transparent: bool,
+    /// Makes the window content appear behind the titlebar.
+    pub fullsize_content_view: bool,
+}
+
+impl From<PlatformSpecific> for iced_winit::settings::PlatformSpecific {
+    fn from(platform_specific: PlatformSpecific) -> Self {
+        Self {
+            title_hidden: platform_specific.title_hidden,
+            titlebar_transparent: platform_specific.titlebar_transparent,
+            fullsize_content_view: platform_specific.fullsize_content_view,
+        }
+    }
+}
diff --git a/src/window/settings/other.rs b/src/window/settings/other.rs
new file mode 100644
index 00000000..943d9f0d
--- /dev/null
+++ b/src/window/settings/other.rs
@@ -0,0 +1,9 @@
+/// The platform specific window settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct PlatformSpecific;
+
+impl From<PlatformSpecific> for iced_winit::settings::PlatformSpecific {
+    fn from(_: PlatformSpecific) -> Self {
+        Default::default()
+    }
+}

From 4405a3d483286faf962930ca3b294b34f86bd2f4 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, 14 Mar 2023 11:22:06 +0100
Subject: [PATCH 107/440] Re-export `settings::PlatformSpecific` from
 `iced_winit` directly

---
 src/window/settings.rs       | 16 +++-------------
 src/window/settings/macos.rs | 20 --------------------
 src/window/settings/other.rs |  9 ---------
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 src/window/settings/macos.rs
 delete mode 100644 src/window/settings/other.rs

diff --git a/src/window/settings.rs b/src/window/settings.rs
index a039e213..3c8da62f 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,14 +1,6 @@
 use crate::window::{Icon, Position};
 
-#[cfg(target_os = "macos")]
-#[path = "settings/macos.rs"]
-mod platform;
-
-#[cfg(not(target_os = "macos"))]
-#[path = "settings/other.rs"]
-mod platform;
-
-pub use platform::PlatformSpecific;
+pub use iced_winit::settings::PlatformSpecific;
 
 /// The window settings of an application.
 #[derive(Debug, Clone)]
@@ -44,7 +36,7 @@ pub struct Settings {
     pub icon: Option<Icon>,
 
     /// Platform specific settings.
-    pub platform_specific: platform::PlatformSpecific,
+    pub platform_specific: PlatformSpecific,
 }
 
 impl Default for Settings {
@@ -78,9 +70,7 @@ impl From<Settings> for iced_winit::settings::Window {
             transparent: settings.transparent,
             always_on_top: settings.always_on_top,
             icon: settings.icon.map(Icon::into),
-            platform_specific: iced_winit::settings::PlatformSpecific::from(
-                settings.platform_specific,
-            ),
+            platform_specific: settings.platform_specific,
         }
     }
 }
diff --git a/src/window/settings/macos.rs b/src/window/settings/macos.rs
deleted file mode 100644
index c08020cf..00000000
--- a/src/window/settings/macos.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-/// The platform specific window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub struct PlatformSpecific {
-    /// Hides the window title.
-    pub title_hidden: bool,
-    /// Makes the titlebar transparent and allows the content to appear behind it.
-    pub titlebar_transparent: bool,
-    /// Makes the window content appear behind the titlebar.
-    pub fullsize_content_view: bool,
-}
-
-impl From<PlatformSpecific> for iced_winit::settings::PlatformSpecific {
-    fn from(platform_specific: PlatformSpecific) -> Self {
-        Self {
-            title_hidden: platform_specific.title_hidden,
-            titlebar_transparent: platform_specific.titlebar_transparent,
-            fullsize_content_view: platform_specific.fullsize_content_view,
-        }
-    }
-}
diff --git a/src/window/settings/other.rs b/src/window/settings/other.rs
deleted file mode 100644
index 943d9f0d..00000000
--- a/src/window/settings/other.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-/// The platform specific window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub struct PlatformSpecific;
-
-impl From<PlatformSpecific> for iced_winit::settings::PlatformSpecific {
-    fn from(_: PlatformSpecific) -> Self {
-        Default::default()
-    }
-}

From a3f6b782a16a2bacdedccb4f6919e952ca28368d Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Wed, 8 Feb 2023 23:17:05 -0800
Subject: [PATCH 108/440] optimization: reduce unnecessary rebuilds in
 `Component`

---
 lazy/src/component.rs | 236 ++++++++++++++++++++++++++++--------------
 1 file changed, 157 insertions(+), 79 deletions(-)

diff --git a/lazy/src/component.rs b/lazy/src/component.rs
index b23da9f7..f6c331b9 100644
--- a/lazy/src/component.rs
+++ b/lazy/src/component.rs
@@ -13,6 +13,7 @@ use iced_native::{
 use ouroboros::self_referencing;
 use std::cell::RefCell;
 use std::marker::PhantomData;
+use std::rc::Rc;
 
 /// A reusable, custom widget that uses The Elm Architecture.
 ///
@@ -58,6 +59,8 @@ pub trait Component<Message, Renderer> {
     }
 }
 
+struct Tag<T>(T);
+
 /// Turns an implementor of [`Component`] into an [`Element`] that can be
 /// embedded in any application.
 pub fn view<'a, C, Message, Renderer>(
@@ -79,11 +82,13 @@ where
             }
             .build(),
         )),
+        tree: RefCell::new(Rc::new(RefCell::new(None))),
     })
 }
 
 struct Instance<'a, Message, Renderer, Event, S> {
     state: RefCell<Option<State<'a, Message, Renderer, Event, S>>>,
+    tree: RefCell<Rc<RefCell<Option<Tree>>>>,
 }
 
 #[self_referencing]
@@ -100,40 +105,91 @@ struct State<'a, Message: 'a, Renderer: 'a, Event: 'a, S: 'a> {
 
 impl<'a, Message, Renderer, Event, S> Instance<'a, Message, Renderer, Event, S>
 where
-    S: Default,
+    S: Default + 'static,
+    Renderer: iced_native::Renderer,
 {
-    fn rebuild_element(&self, state: &S) {
-        let heads = self.state.borrow_mut().take().unwrap().into_heads();
+    fn diff_self(&self) {
+        self.with_element(|element| {
+            self.tree
+                .borrow_mut()
+                .borrow_mut()
+                .as_mut()
+                .unwrap()
+                .diff_children(std::slice::from_ref(&element));
+        });
+    }
 
-        *self.state.borrow_mut() = Some(
-            StateBuilder {
-                component: heads.component,
-                message: PhantomData,
-                state: PhantomData,
-                element_builder: |component| Some(component.view(state)),
-            }
-            .build(),
-        );
+    fn rebuild_element_if_necessary(&self) {
+        let inner = self.state.borrow_mut().take().unwrap();
+        if inner.borrow_element().is_none() {
+            let heads = inner.into_heads();
+
+            *self.state.borrow_mut() = Some(
+                StateBuilder {
+                    component: heads.component,
+                    message: PhantomData,
+                    state: PhantomData,
+                    element_builder: |component| {
+                        Some(
+                            component.view(
+                                self.tree
+                                    .borrow()
+                                    .borrow()
+                                    .as_ref()
+                                    .unwrap()
+                                    .state
+                                    .downcast_ref::<S>(),
+                            ),
+                        )
+                    },
+                }
+                .build(),
+            );
+            self.diff_self();
+        } else {
+            *self.state.borrow_mut() = Some(inner);
+        }
     }
 
     fn rebuild_element_with_operation(
         &self,
-        state: &mut S,
         operation: &mut dyn widget::Operation<Message>,
     ) {
         let heads = self.state.borrow_mut().take().unwrap().into_heads();
 
-        heads.component.operate(state, operation);
+        heads.component.operate(
+            self.tree
+                .borrow_mut()
+                .borrow_mut()
+                .as_mut()
+                .unwrap()
+                .state
+                .downcast_mut(),
+            operation,
+        );
 
         *self.state.borrow_mut() = Some(
             StateBuilder {
                 component: heads.component,
                 message: PhantomData,
                 state: PhantomData,
-                element_builder: |component| Some(component.view(state)),
+                element_builder: |component| {
+                    Some(
+                        component.view(
+                            self.tree
+                                .borrow()
+                                .borrow()
+                                .as_ref()
+                                .unwrap()
+                                .state
+                                .downcast_ref(),
+                        ),
+                    )
+                },
             }
             .build(),
         );
+        self.diff_self();
     }
 
     fn with_element<T>(
@@ -147,6 +203,7 @@ where
         &self,
         f: impl FnOnce(&mut Element<'_, Event, Renderer>) -> T,
     ) -> T {
+        self.rebuild_element_if_necessary();
         self.state
             .borrow_mut()
             .as_mut()
@@ -162,24 +219,27 @@ where
     Renderer: iced_native::Renderer,
 {
     fn tag(&self) -> tree::Tag {
-        struct Tag<T>(T);
         tree::Tag::of::<Tag<S>>()
     }
 
     fn state(&self) -> tree::State {
-        tree::State::new(S::default())
+        let state = Rc::new(RefCell::new(Some(Tree {
+            tag: tree::Tag::of::<Tag<S>>(),
+            state: tree::State::new(S::default()),
+            children: vec![Tree::empty()],
+        })));
+        *self.tree.borrow_mut() = state.clone();
+        tree::State::new(state)
     }
 
     fn children(&self) -> Vec<Tree> {
-        self.rebuild_element(&S::default());
-        self.with_element(|element| vec![Tree::new(element)])
+        vec![]
     }
 
     fn diff(&self, tree: &mut Tree) {
-        self.rebuild_element(tree.state.downcast_ref());
-        self.with_element(|element| {
-            tree.diff_children(std::slice::from_ref(&element))
-        })
+        let tree = tree.state.downcast_ref::<Rc<RefCell<Option<Tree>>>>();
+        *self.tree.borrow_mut() = tree.clone();
+        self.rebuild_element_if_necessary();
     }
 
     fn width(&self) -> Length {
@@ -213,9 +273,10 @@ where
         let mut local_messages = Vec::new();
         let mut local_shell = Shell::new(&mut local_messages);
 
+        let t = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();
         let event_status = self.with_element_mut(|element| {
             element.as_widget_mut().on_event(
-                &mut tree.children[0],
+                &mut t.borrow_mut().as_mut().unwrap().children[0],
                 event,
                 layout,
                 cursor_position,
@@ -235,9 +296,10 @@ where
             let mut heads = self.state.take().unwrap().into_heads();
 
             for message in local_messages.into_iter().filter_map(|message| {
-                heads
-                    .component
-                    .update(tree.state.downcast_mut::<S>(), message)
+                heads.component.update(
+                    t.borrow_mut().as_mut().unwrap().state.downcast_mut(),
+                    message,
+                )
             }) {
                 shell.publish(message);
             }
@@ -247,17 +309,11 @@ where
                     component: heads.component,
                     message: PhantomData,
                     state: PhantomData,
-                    element_builder: |state| {
-                        Some(state.view(tree.state.downcast_ref::<S>()))
-                    },
+                    element_builder: |_| None,
                 }
                 .build(),
             ));
 
-            self.with_element(|element| {
-                tree.diff_children(std::slice::from_ref(&element))
-            });
-
             shell.invalidate_layout();
         }
 
@@ -271,10 +327,7 @@ where
         renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
-        self.rebuild_element_with_operation(
-            tree.state.downcast_mut(),
-            operation,
-        );
+        self.rebuild_element_with_operation(operation);
 
         struct MapOperation<'a, B> {
             operation: &'a mut dyn widget::Operation<B>,
@@ -310,11 +363,10 @@ where
             }
         }
 
+        let tree = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();
         self.with_element(|element| {
-            tree.diff_children(std::slice::from_ref(&element));
-
             element.as_widget().operate(
-                &mut tree.children[0],
+                &mut tree.borrow_mut().as_mut().unwrap().children[0],
                 layout,
                 renderer,
                 &mut MapOperation { operation },
@@ -332,9 +384,10 @@ where
         cursor_position: Point,
         viewport: &Rectangle,
     ) {
+        let tree = tree.state.downcast_ref::<Rc<RefCell<Option<Tree>>>>();
         self.with_element(|element| {
             element.as_widget().draw(
-                &tree.children[0],
+                &tree.borrow().as_ref().unwrap().children[0],
                 renderer,
                 theme,
                 style,
@@ -353,9 +406,10 @@ where
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
+        let tree = tree.state.downcast_ref::<Rc<RefCell<Option<Tree>>>>();
         self.with_element(|element| {
             element.as_widget().mouse_interaction(
-                &tree.children[0],
+                &tree.borrow().as_ref().unwrap().children[0],
                 layout,
                 cursor_position,
                 viewport,
@@ -370,25 +424,34 @@ where
         layout: Layout<'_>,
         renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        let overlay = OverlayBuilder {
-            instance: self,
-            tree,
-            types: PhantomData,
-            overlay_builder: |instance, tree| {
-                instance.state.get_mut().as_mut().unwrap().with_element_mut(
-                    move |element| {
-                        element.as_mut().unwrap().as_widget_mut().overlay(
-                            &mut tree.children[0],
-                            layout,
-                            renderer,
-                        )
-                    },
-                )
-            },
-        }
-        .build();
+        self.rebuild_element_if_necessary();
+        let tree = tree
+            .state
+            .downcast_mut::<Rc<RefCell<Option<Tree>>>>()
+            .borrow_mut()
+            .take()
+            .unwrap();
+        let overlay = Overlay(Some(
+            InnerBuilder {
+                instance: self,
+                tree,
+                types: PhantomData,
+                overlay_builder: |instance, tree| {
+                    instance.state.get_mut().as_mut().unwrap().with_element_mut(
+                        move |element| {
+                            element.as_mut().unwrap().as_widget_mut().overlay(
+                                &mut tree.children[0],
+                                layout,
+                                renderer,
+                            )
+                        },
+                    )
+                },
+            }
+            .build(),
+        ));
 
-        let has_overlay = overlay.with_overlay(|overlay| {
+        let has_overlay = overlay.0.as_ref().unwrap().with_overlay(|overlay| {
             overlay.as_ref().map(overlay::Element::position)
         });
 
@@ -403,10 +466,24 @@ where
     }
 }
 
+struct Overlay<'a, 'b, Message, Renderer, Event, S>(
+    Option<Inner<'a, 'b, Message, Renderer, Event, S>>,
+);
+
+impl<'a, 'b, Message, Renderer, Event, S> Drop
+    for Overlay<'a, 'b, Message, Renderer, Event, S>
+{
+    fn drop(&mut self) {
+        if let Some(heads) = self.0.take().map(|inner| inner.into_heads()) {
+            *heads.instance.tree.borrow_mut().borrow_mut() = Some(heads.tree);
+        }
+    }
+}
+
 #[self_referencing]
-struct Overlay<'a, 'b, Message, Renderer, Event, S> {
+struct Inner<'a, 'b, Message, Renderer, Event, S> {
     instance: &'a mut Instance<'b, Message, Renderer, Event, S>,
-    tree: &'a mut Tree,
+    tree: Tree,
     types: PhantomData<(Message, Event, S)>,
 
     #[borrows(mut instance, mut tree)]
@@ -426,6 +503,9 @@ impl<'a, 'b, Message, Renderer, Event, S>
         f: impl FnOnce(&overlay::Element<'_, Event, Renderer>) -> T,
     ) -> Option<T> {
         self.overlay
+            .as_ref()
+            .unwrap()
+            .0
             .as_ref()
             .unwrap()
             .borrow_overlay()
@@ -438,6 +518,9 @@ impl<'a, 'b, Message, Renderer, Event, S>
         f: impl FnOnce(&mut overlay::Element<'_, Event, Renderer>) -> T,
     ) -> Option<T> {
         self.overlay
+            .as_mut()
+            .unwrap()
+            .0
             .as_mut()
             .unwrap()
             .with_overlay_mut(|overlay| overlay.as_mut().map(f))
@@ -523,42 +606,37 @@ where
         local_shell.revalidate_layout(|| shell.invalidate_layout());
 
         if !local_messages.is_empty() {
-            let overlay = self.overlay.take().unwrap().into_heads();
-            let mut heads = overlay.instance.state.take().unwrap().into_heads();
+            let mut inner =
+                self.overlay.take().unwrap().0.take().unwrap().into_heads();
+            let mut heads = inner.instance.state.take().unwrap().into_heads();
 
             for message in local_messages.into_iter().filter_map(|message| {
                 heads
                     .component
-                    .update(overlay.tree.state.downcast_mut::<S>(), message)
+                    .update(inner.tree.state.downcast_mut(), message)
             }) {
                 shell.publish(message);
             }
 
-            *overlay.instance.state.borrow_mut() = Some(
+            *inner.instance.state.borrow_mut() = Some(
                 StateBuilder {
                     component: heads.component,
                     message: PhantomData,
                     state: PhantomData,
-                    element_builder: |state| {
-                        Some(state.view(overlay.tree.state.downcast_ref::<S>()))
-                    },
+                    element_builder: |_| None,
                 }
                 .build(),
             );
 
-            overlay.instance.with_element(|element| {
-                overlay.tree.diff_children(std::slice::from_ref(&element))
-            });
-
-            self.overlay = Some(
-                OverlayBuilder {
-                    instance: overlay.instance,
-                    tree: overlay.tree,
+            self.overlay = Some(Overlay(Some(
+                InnerBuilder {
+                    instance: inner.instance,
+                    tree: inner.tree,
                     types: PhantomData,
                     overlay_builder: |_, _| None,
                 }
                 .build(),
-            );
+            )));
 
             shell.invalidate_layout();
         }

From 257264de1c41435328ef685b8b66a71c7666764f Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@proton.me>
Date: Tue, 14 Mar 2023 14:34:32 -0600
Subject: [PATCH 109/440] Working on Radio example

---
 examples/radio/Cargo.toml  | 10 ++++++++++
 examples/radio/src/main.rs |  3 +++
 2 files changed, 13 insertions(+)
 create mode 100644 examples/radio/Cargo.toml
 create mode 100644 examples/radio/src/main.rs

diff --git a/examples/radio/Cargo.toml b/examples/radio/Cargo.toml
new file mode 100644
index 00000000..a8c7f351
--- /dev/null
+++ b/examples/radio/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "radio"
+version = "0.1.0"
+authors = ["Aaron Honeycutt <aaronhoneycutt@proton.me>"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+iced = { path = "../.." }
diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
new file mode 100644
index 00000000..e7a11a96
--- /dev/null
+++ b/examples/radio/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

From 6d9cf0b60198e7d6c9615f539dac4b06eada5851 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@proton.me>
Date: Tue, 14 Mar 2023 14:36:31 -0600
Subject: [PATCH 110/440] Cleaning up from the Checkbox example that this is
 based on

---
 examples/radio/src/main.rs | 59 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
index e7a11a96..3baccbe2 100644
--- a/examples/radio/src/main.rs
+++ b/examples/radio/src/main.rs
@@ -1,3 +1,58 @@
-fn main() {
-    println!("Hello, world!");
+use iced::widget::{column, container, Radio};
+use iced::{Element, Length, Sandbox, Settings};
+
+pub fn main() -> iced::Result {
+    Example::run(Settings::default())
+}
+
+#[derive(Default)]
+struct Example {
+    default_checkbox: bool,
+    custom_checkbox: bool,
+}
+
+#[derive(Debug, Clone, Copy)]
+enum Message {
+    DefaultChecked(bool),
+    CustomChecked(bool),
+}
+
+impl Sandbox for Example {
+    type Message = Message;
+
+    fn new() -> Self {
+        Default::default()
+    }
+
+    fn title(&self) -> String {
+        String::from("Checkbox - Iced")
+    }
+
+    fn update(&mut self, message: Message) {
+        match message {
+            Message::DefaultChecked(value) => self.default_checkbox = value,
+            Message::CustomChecked(value) => self.custom_checkbox = value,
+        }
+    }
+
+    fn view(&self) -> Element<Message> {
+        let default_checkbox =
+            checkbox("Default", self.default_checkbox, Message::DefaultChecked);
+        let custom_checkbox =
+            checkbox("Custom", self.custom_checkbox, Message::CustomChecked)
+                .icon(checkbox::Icon {
+                    font: ICON_FONT,
+                    code_point: '\u{e901}',
+                    size: None,
+                });
+
+        let content = column![default_checkbox, custom_checkbox].spacing(22);
+
+        container(content)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .center_x()
+            .center_y()
+            .into()
+    }
 }

From c96ab27b24a5775aeef7d8a0ed31214a5cb3f0a7 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@proton.me>
Date: Tue, 14 Mar 2023 14:39:26 -0600
Subject: [PATCH 111/440] Work on example more

---
 examples/radio/src/main.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
index 3baccbe2..424fdf42 100644
--- a/examples/radio/src/main.rs
+++ b/examples/radio/src/main.rs
@@ -25,7 +25,7 @@ impl Sandbox for Example {
     }
 
     fn title(&self) -> String {
-        String::from("Checkbox - Iced")
+        String::from("Radio - Iced")
     }
 
     fn update(&mut self, message: Message) {
@@ -36,17 +36,12 @@ impl Sandbox for Example {
     }
 
     fn view(&self) -> Element<Message> {
-        let default_checkbox =
-            checkbox("Default", self.default_checkbox, Message::DefaultChecked);
-        let custom_checkbox =
-            checkbox("Custom", self.custom_checkbox, Message::CustomChecked)
-                .icon(checkbox::Icon {
-                    font: ICON_FONT,
-                    code_point: '\u{e901}',
-                    size: None,
-                });
+        let selected_choice = Some(Choice::A);
 
-        let content = column![default_checkbox, custom_checkbox].spacing(22);
+	Radio::new(Choice::A, "This is A", selected_choice, Message::RadioSelected);
+        Radio::new(Choice::B, "This is B", selected_choice, Message::RadioSelected);
+
+        let content = column![selected_choice].spacing(22);
 
         container(content)
             .width(Length::Fill)

From addc443f8ddb688248cc1d34e55ee7beed42195c Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 14 Mar 2023 15:46:04 -0600
Subject: [PATCH 112/440] Working more on example

---
 examples/radio/src/main.rs | 46 +++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
index 424fdf42..8881f059 100644
--- a/examples/radio/src/main.rs
+++ b/examples/radio/src/main.rs
@@ -7,14 +7,12 @@ pub fn main() -> iced::Result {
 
 #[derive(Default)]
 struct Example {
-    default_checkbox: bool,
-    custom_checkbox: bool,
+    selected_radio: Option<Choice>,
 }
 
 #[derive(Debug, Clone, Copy)]
 enum Message {
-    DefaultChecked(bool),
-    CustomChecked(bool),
+    RadioSelected(Choice),
 }
 
 impl Sandbox for Example {
@@ -30,18 +28,19 @@ impl Sandbox for Example {
 
     fn update(&mut self, message: Message) {
         match message {
-            Message::DefaultChecked(value) => self.default_checkbox = value,
-            Message::CustomChecked(value) => self.custom_checkbox = value,
+            Message::RadioSelected(value) => {
+                self.selected_radio = Some(choice);
+            }
         }
     }
 
     fn view(&self) -> Element<Message> {
-        let selected_choice = Some(Choice::A);
+        let selected_radio = Some(Choice::A);
 
-	Radio::new(Choice::A, "This is A", selected_choice, Message::RadioSelected);
-        Radio::new(Choice::B, "This is B", selected_choice, Message::RadioSelected);
+	    Radio::new(Choice::A, "This is A", selected_radio, Message::RadioSelected);
+        Radio::new(Choice::B, "This is B", selected_radio, Message::RadioSelected);
 
-        let content = column![selected_choice].spacing(22);
+        let content = column![selected_radio].spacing(22);
 
         container(content)
             .width(Length::Fill)
@@ -51,3 +50,30 @@ impl Sandbox for Example {
             .into()
     }
 }
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum Choice {
+    #[default]
+    A,
+    B,
+}
+
+impl Choice {
+    const ALL: [Choice; 2] = [
+        Choice::A,
+        Choice::B,
+    ];
+}
+
+impl std::fmt::Display for Choice {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                Choice::A => "A",
+                Choice::B => "B",
+            }
+        )
+    }
+}

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 113/440] 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 ba063f4e..271d026f 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 114/440] 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 f2935efa..714695b9 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 e99844e6..35f24cd9 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.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();
     }
 }
 

From d5f26c3d39079e5a1d8aa4a18b9fb04e8834022f Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 17 Mar 2023 13:12:33 -0600
Subject: [PATCH 115/440] More work on example

---
 examples/radio/src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
index 8881f059..73b03610 100644
--- a/examples/radio/src/main.rs
+++ b/examples/radio/src/main.rs
@@ -1,4 +1,4 @@
-use iced::widget::{column, container, Radio};
+use iced::widget::{column, container, radio};
 use iced::{Element, Length, Sandbox, Settings};
 
 pub fn main() -> iced::Result {
@@ -37,10 +37,10 @@ impl Sandbox for Example {
     fn view(&self) -> Element<Message> {
         let selected_radio = Some(Choice::A);
 
-	    Radio::new(Choice::A, "This is A", selected_radio, Message::RadioSelected);
-        Radio::new(Choice::B, "This is B", selected_radio, Message::RadioSelected);
-
-        let content = column![selected_radio].spacing(22);
+        let content = column![
+	    Radio::new(Choice::A, "This is A", selected_radio, Message::RadioSelected),
+            Radio::new(Choice::B, "This is B", selected_radio, Message::RadioSelected),
+        ];
 
         container(content)
             .width(Length::Fill)

From 4fdd76c07c15f85a518c240aca0e55f482b18bc3 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 17 Mar 2023 13:32:11 -0600
Subject: [PATCH 116/440] Now is a working example

---
 examples/radio/src/main.rs | 65 +++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
index 73b03610..3b19924e 100644
--- a/examples/radio/src/main.rs
+++ b/examples/radio/src/main.rs
@@ -7,7 +7,7 @@ pub fn main() -> iced::Result {
 
 #[derive(Default)]
 struct Example {
-    selected_radio: Option<Choice>,
+    radio: Option<Choice>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -29,18 +29,44 @@ impl Sandbox for Example {
     fn update(&mut self, message: Message) {
         match message {
             Message::RadioSelected(value) => {
-                self.selected_radio = Some(choice);
+                self.radio = Some(value);
             }
         }
     }
 
     fn view(&self) -> Element<Message> {
-        let selected_radio = Some(Choice::A);
+	let a_checkbox = radio(
+            "A",
+            Choice::A,
+            self.radio,
+            Message::RadioSelected,
+        );
+
+        let b_checkbox = radio(
+	    "B",
+            Choice::B,
+            self.radio,
+            Message::RadioSelected,
+        );
+
+        let c_checkbox = radio(
+            "C",
+            Choice::C,
+            self.radio,
+            Message::RadioSelected,
+        );
+
+        let all_checkbox = radio("All of the above", Choice::All, self.radio, Message::RadioSelected);
 
         let content = column![
-	    Radio::new(Choice::A, "This is A", selected_radio, Message::RadioSelected),
-            Radio::new(Choice::B, "This is B", selected_radio, Message::RadioSelected),
-        ];
+            a_checkbox,
+            b_checkbox,
+            c_checkbox,
+            all_checkbox,
+        ]
+	.spacing(20)
+        .padding(20)
+        .max_width(600);
 
         container(content)
             .width(Length::Fill)
@@ -51,29 +77,10 @@ impl Sandbox for Example {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum Choice {
-    #[default]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum Choice {
     A,
     B,
-}
-
-impl Choice {
-    const ALL: [Choice; 2] = [
-        Choice::A,
-        Choice::B,
-    ];
-}
-
-impl std::fmt::Display for Choice {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Choice::A => "A",
-                Choice::B => "B",
-            }
-        )
-    }
+    C,
+    All,
 }

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 117/440] Update `cosmic-text` to latest :tada:

---
 tiny_skia/Cargo.toml  |   5 +-
 tiny_skia/src/text.rs | 258 +++++++++++++----------------
 wgpu/Cargo.toml       |   3 +-
 wgpu/src/text.rs      | 372 +++++++++++++++++++-----------------------
 4 files changed, 278 insertions(+), 360 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 69197589..31f5cb6b 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 714695b9..8391571c 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();
+        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,
-            };
+                // 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 (_, 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_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 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 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 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);
+        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, &mut swash)
-                    {
-                        let pixmap = tiny_skia::PixmapRef::from_bytes(
-                            buffer,
-                            placement.width,
-                            placement.height,
-                        )
-                        .expect("Create glyph pixel map");
+        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,
-                        );
-                    }
+                    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 mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        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(
@@ -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 mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        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();
     }
 }
 
@@ -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 6a313d4f..3aef4ff4 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 35f24cd9..ac116f69 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 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 =
+                    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;
 
-            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(),
-                            },
-                        },
-                    );
-
-                    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),
-            );
-
-            match result {
-                Ok(()) => {
-                    self.prepare_layer += 1;
-
+                #[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 mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        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 mut measurement_cache = self.measurement_cache.borrow_mut();
 
-            let (_, paragraph) = measurement_cache.allocate(
-                fields.fonts,
-                Key {
-                    content,
-                    size,
-                    font,
-                    bounds,
-                },
-            );
+        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 0231ed6f1d5929d84bb81e6673d3319a24f08b16 Mon Sep 17 00:00:00 2001
From: traxys <quentin+dev@familleboyer.net>
Date: Mon, 20 Mar 2023 00:18:41 +0100
Subject: [PATCH 118/440] winit: Fix replacement of node in wasm

Replacing a node ends up with the following error:
Node.replaceChild: Child to be replaced is not a child of this node

It seems that Node.replaceChild is not recommended, and instead
Element.replaceWith should be preferred. Using it avoids the panic.
---
 winit/src/application.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/winit/src/application.rs b/winit/src/application.rs
index b13b7214..31654f26 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -179,13 +179,17 @@ where
                 .unwrap_or(None)
         });
 
-        let _ = match target {
-            Some(node) => node
-                .replace_child(&canvas, &node)
-                .expect(&format!("Could not replace #{}", node.id())),
-            None => body
-                .append_child(&canvas)
-                .expect("Append canvas to HTML body"),
+        match target {
+            Some(node) => {
+                let _ = node
+                    .replace_with_with_node_1(&canvas)
+                    .expect(&format!("Could not replace #{}", node.id()));
+            }
+            None => {
+                let _ = body
+                    .append_child(&canvas)
+                    .expect("Append canvas to HTML body");
+            }
         };
     }
 

From c337bf297d1836c429cd24964e8b3bdcc13850be Mon Sep 17 00:00:00 2001
From: Giuliano Bellini s294739 <s294739@studenti.polito.it>
Date: Sat, 25 Mar 2023 01:05:56 +0100
Subject: [PATCH 119/440] renamed scrollable styles

---
 native/src/widget/scrollable.rs |  8 ++++----
 style/src/scrollable.rs         | 14 +++++++-------
 style/src/theme.rs              | 20 ++++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index b88b77e5..be81bee1 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -858,9 +858,9 @@ pub fn draw<Renderer>(
                     let style = if state.y_scroller_grabbed_at.is_some() {
                         theme.dragging(style)
                     } else if mouse_over_y_scrollbar {
-                        theme.hovered(style)
+                        theme.hovered_scrollbar(style)
                     } else if mouse_over_scrollable {
-                        theme.focused(style)
+                        theme.hovered(style)
                     } else {
                         theme.active(style)
                     };
@@ -873,9 +873,9 @@ pub fn draw<Renderer>(
                     let style = if state.x_scroller_grabbed_at.is_some() {
                         theme.dragging_horizontal(style)
                     } else if mouse_over_x_scrollbar {
-                        theme.hovered_horizontal(style)
+                        theme.hovered_scrollbar_horizontal(style)
                     } else if mouse_over_scrollable {
-                        theme.focused_horizontal(style)
+                        theme.hovered_horizontal(style)
                     } else {
                         theme.active_horizontal(style)
                     };
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index a3f3db20..f3c04235 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -38,15 +38,15 @@ pub trait StyleSheet {
     fn active(&self, style: &Self::Style) -> Scrollbar;
 
     /// Produces the style of a hovered scrollbar.
-    fn hovered(&self, style: &Self::Style) -> Scrollbar;
+    fn hovered_scrollbar(&self, style: &Self::Style) -> Scrollbar;
 
     /// Produces the style of a scrollbar that is being dragged.
     fn dragging(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style)
+        self.hovered_scrollbar(style)
     }
 
     /// Produces the style of a scrollbar when mouse is over the scrollable area.
-    fn focused(&self, style: &Self::Style) -> Scrollbar {
+    fn hovered(&self, style: &Self::Style) -> Scrollbar {
         self.active(style)
     }
 
@@ -56,17 +56,17 @@ pub trait StyleSheet {
     }
 
     /// Produces the style of a hovered horizontal scrollbar.
-    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style)
+    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> Scrollbar {
+        self.hovered_scrollbar(style)
     }
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_horizontal(style)
+        self.hovered_scrollbar_horizontal(style)
     }
 
     /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
-    fn focused_horizontal(&self, style: &Self::Style) -> Scrollbar {
+    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
         self.active_horizontal(style)
     }
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 1d262562..9a3105b5 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -906,7 +906,7 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered_scrollbar(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => {
                 let palette = self.extended_palette();
@@ -924,21 +924,21 @@ impl scrollable::StyleSheet for Theme {
                     },
                 }
             }
-            Scrollable::Custom(custom) => custom.hovered(self),
+            Scrollable::Custom(custom) => custom.hovered_scrollbar(self),
         }
     }
 
     fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered(style),
+            Scrollable::Default => self.hovered_scrollbar(style),
             Scrollable::Custom(custom) => custom.dragging(self),
         }
     }
 
-    fn focused(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
-            Scrollable::Custom(custom) => custom.focused(self),
+            Scrollable::Custom(custom) => custom.hovered(self),
         }
     }
 
@@ -949,10 +949,10 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered(style),
-            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
+            Scrollable::Default => self.hovered_scrollbar(style),
+            Scrollable::Custom(custom) => custom.hovered_scrollbar_horizontal(self),
         }
     }
 
@@ -966,13 +966,13 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn focused_horizontal(
+    fn hovered_horizontal(
         &self,
         style: &Self::Style,
     ) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active_horizontal(style),
-            Scrollable::Custom(custom) => custom.focused_horizontal(self),
+            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
         }
     }
 }

From c407b4504cd5e7dcb04a8fd31ad0400c891fc3e1 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 Mar 2023 15:51:32 +0200
Subject: [PATCH 120/440] Introduce `is_mouse_over_scrollbar` to
 `StyleSheet::hovered` for `Scrollable`

---
 examples/scrollable/src/main.rs | 36 ++++++++++++------
 native/src/widget/scrollable.rs |  8 +---
 style/src/scrollable.rs         | 32 ++++++++--------
 style/src/theme.rs              | 65 ++++++++++++++++-----------------
 4 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 7c858961..f8c5aa74 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -339,22 +339,36 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
         style.active(&theme::Scrollable::Default)
     }
 
-    fn hovered(&self, style: &Self::Style) -> Scrollbar {
-        style.hovered(&theme::Scrollable::Default)
+    fn hovered(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar {
+        style.hovered(&theme::Scrollable::Default, is_mouse_over_scrollbar)
     }
 
-    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        Scrollbar {
-            background: style.active(&theme::Scrollable::default()).background,
-            border_radius: 0.0,
-            border_width: 0.0,
-            border_color: Default::default(),
-            scroller: Scroller {
-                color: Color::from_rgb8(250, 85, 134),
+    fn hovered_horizontal(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar {
+        if is_mouse_over_scrollbar {
+            Scrollbar {
+                background: style
+                    .active(&theme::Scrollable::default())
+                    .background,
                 border_radius: 0.0,
                 border_width: 0.0,
                 border_color: Default::default(),
-            },
+                scroller: Scroller {
+                    color: Color::from_rgb8(250, 85, 134),
+                    border_radius: 0.0,
+                    border_width: 0.0,
+                    border_color: Default::default(),
+                },
+            }
+        } else {
+            self.active(style)
         }
     }
 }
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index be81bee1..d9cdf296 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -857,10 +857,8 @@ pub fn draw<Renderer>(
                 if let Some(scrollbar) = scrollbars.y {
                     let style = if state.y_scroller_grabbed_at.is_some() {
                         theme.dragging(style)
-                    } else if mouse_over_y_scrollbar {
-                        theme.hovered_scrollbar(style)
                     } else if mouse_over_scrollable {
-                        theme.hovered(style)
+                        theme.hovered(style, mouse_over_y_scrollbar)
                     } else {
                         theme.active(style)
                     };
@@ -872,10 +870,8 @@ pub fn draw<Renderer>(
                 if let Some(scrollbar) = scrollbars.x {
                     let style = if state.x_scroller_grabbed_at.is_some() {
                         theme.dragging_horizontal(style)
-                    } else if mouse_over_x_scrollbar {
-                        theme.hovered_scrollbar_horizontal(style)
                     } else if mouse_over_scrollable {
-                        theme.hovered_horizontal(style)
+                        theme.hovered_horizontal(style, mouse_over_x_scrollbar)
                     } else {
                         theme.active_horizontal(style)
                     };
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index f3c04235..64a91b69 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -37,17 +37,16 @@ pub trait StyleSheet {
     /// Produces the style of an active scrollbar.
     fn active(&self, style: &Self::Style) -> Scrollbar;
 
-    /// Produces the style of a hovered scrollbar.
-    fn hovered_scrollbar(&self, style: &Self::Style) -> Scrollbar;
+    /// Produces the style of a scrollbar when the scrollable is being hovered.
+    fn hovered(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar;
 
     /// Produces the style of a scrollbar that is being dragged.
     fn dragging(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar(style)
-    }
-
-    /// Produces the style of a scrollbar when mouse is over the scrollable area.
-    fn hovered(&self, style: &Self::Style) -> Scrollbar {
-        self.active(style)
+        self.hovered(style, true)
     }
 
     /// Produces the style of an active horizontal scrollbar.
@@ -55,18 +54,17 @@ pub trait StyleSheet {
         self.active(style)
     }
 
-    /// Produces the style of a hovered horizontal scrollbar.
-    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar(style)
+    /// Produces the style of a horizontal scrollbar when the scrollable is being hovered.
+    fn hovered_horizontal(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> Scrollbar {
+        self.hovered(style, is_mouse_over_scrollbar)
     }
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered_scrollbar_horizontal(style)
-    }
-
-    /// Produces the style of a horizontal scrollbar when mouse is over the scrollable area.
-    fn hovered_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.active_horizontal(style)
+        self.hovered(style, true)
     }
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 9a3105b5..0ebd82a4 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -906,42 +906,45 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_scrollbar(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => {
-                let palette = self.extended_palette();
+                if is_mouse_over_scrollbar {
+                    let palette = self.extended_palette();
 
-                scrollable::Scrollbar {
-                    background: palette.background.weak.color.into(),
-                    border_radius: 2.0,
-                    border_width: 0.0,
-                    border_color: Color::TRANSPARENT,
-                    scroller: scrollable::Scroller {
-                        color: palette.primary.strong.color,
+                    scrollable::Scrollbar {
+                        background: palette.background.weak.color.into(),
                         border_radius: 2.0,
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
-                    },
+                        scroller: scrollable::Scroller {
+                            color: palette.primary.strong.color,
+                            border_radius: 2.0,
+                            border_width: 0.0,
+                            border_color: Color::TRANSPARENT,
+                        },
+                    }
+                } else {
+                    self.active(style)
                 }
             }
-            Scrollable::Custom(custom) => custom.hovered_scrollbar(self),
+            Scrollable::Custom(custom) => {
+                custom.hovered(self, is_mouse_over_scrollbar)
+            }
         }
     }
 
     fn dragging(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered_scrollbar(style),
+            Scrollable::Default => self.hovered(style, true),
             Scrollable::Custom(custom) => custom.dragging(self),
         }
     }
 
-    fn hovered(&self, style: &Self::Style) -> scrollable::Scrollbar {
-        match style {
-            Scrollable::Default => self.active(style),
-            Scrollable::Custom(custom) => custom.hovered(self),
-        }
-    }
-
     fn active_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
         match style {
             Scrollable::Default => self.active(style),
@@ -949,10 +952,16 @@ impl scrollable::StyleSheet for Theme {
         }
     }
 
-    fn hovered_scrollbar_horizontal(&self, style: &Self::Style) -> scrollable::Scrollbar {
+    fn hovered_horizontal(
+        &self,
+        style: &Self::Style,
+        is_mouse_over_scrollbar: bool,
+    ) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered_scrollbar(style),
-            Scrollable::Custom(custom) => custom.hovered_scrollbar_horizontal(self),
+            Scrollable::Default => self.hovered(style, is_mouse_over_scrollbar),
+            Scrollable::Custom(custom) => {
+                custom.hovered_horizontal(self, is_mouse_over_scrollbar)
+            }
         }
     }
 
@@ -961,20 +970,10 @@ impl scrollable::StyleSheet for Theme {
         style: &Self::Style,
     ) -> scrollable::Scrollbar {
         match style {
-            Scrollable::Default => self.hovered_horizontal(style),
+            Scrollable::Default => self.hovered_horizontal(style, true),
             Scrollable::Custom(custom) => custom.dragging_horizontal(self),
         }
     }
-
-    fn hovered_horizontal(
-        &self,
-        style: &Self::Style,
-    ) -> scrollable::Scrollbar {
-        match style {
-            Scrollable::Default => self.active_horizontal(style),
-            Scrollable::Custom(custom) => custom.hovered_horizontal(self),
-        }
-    }
 }
 
 /// The style of text.

From dcccf7064d506abb3aab15227e6cdf34d852514d 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 Mar 2023 15:57:51 +0200
Subject: [PATCH 121/440] Fix inconsistency in default implementation of
 `scrollable::StyleSheet`

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

diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index 64a91b69..b528c444 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -65,6 +65,6 @@ pub trait StyleSheet {
 
     /// Produces the style of a horizontal scrollbar that is being dragged.
     fn dragging_horizontal(&self, style: &Self::Style) -> Scrollbar {
-        self.hovered(style, true)
+        self.hovered_horizontal(style, true)
     }
 }

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 122/440] 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 7afba85c..82c18e59 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 123/440] 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 82c18e59..77a26d62 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 124/440] 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 c59d5058..26d1a358 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 125/440] 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 77a26d62..2071aed0 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 126/440] 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 b67c08af..920b3dd5 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 d93338ae..88c58825 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 77111490..c5f3c134 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 48b4f2f8..ed3684d3 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 06e0b4d0..0befd635 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 e77b708b..120dd644 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 d32c87d3..2e51f339 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 13b3af7c..0dd46584 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 271d026f..58076b84 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 9e4be0c4..abffbfe6 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 8391571c..c9bb9873 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 88c58554..9772781a 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 cb9d5e2f..c4723397 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 7c0750ef..ff041bdf 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 ac116f69..b0b7a198 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 127/440] 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 920b3dd5..bb425fd6 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 c9bb9873..865132b4 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 b0b7a198..dd674279 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 cb78dc548b04b951d9ee86d18a5fbef8c591dd4e Mon Sep 17 00:00:00 2001
From: Jacob Kiesel <jacob@airhartaero.com>
Date: Fri, 31 Mar 2023 20:37:09 -0600
Subject: [PATCH 128/440] re-expose winit features for window servers in Linux

---
 winit/Cargo.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index dd5c12c2..255b28bb 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -11,11 +11,16 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
+default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
 trace = ["tracing", "tracing-core", "tracing-subscriber"]
 chrome-trace = ["trace", "tracing-chrome"]
 debug = ["iced_native/debug"]
 system = ["sysinfo"]
 application = []
+x11 = ["winit/x11"]
+wayland = ["winit/wayland"]
+wayland-dlopen = ["winit/wayland-dlopen"]
+wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
 
 [dependencies]
 window_clipboard = "0.2"
@@ -26,6 +31,7 @@ thiserror = "1.0"
 version = "0.27"
 git = "https://github.com/iced-rs/winit.git"
 rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
+default-features = false
 
 [dependencies.iced_native]
 version = "0.9"

From 703484c5fdd87c64a41d3e627b0c79b43179e124 Mon Sep 17 00:00:00 2001
From: David Huculak <davidhuculak5@gmail.com>
Date: Sat, 1 Apr 2023 16:10:28 -0400
Subject: [PATCH 129/440] remove colons from shader labels

---
 wgpu/src/image.rs         | 2 +-
 wgpu/src/quad.rs          | 2 +-
 wgpu/src/triangle.rs      | 4 ++--
 wgpu/src/triangle/msaa.rs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index a5e63b17..9f56c188 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -141,7 +141,7 @@ impl Pipeline {
 
         let shader =
             device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu::image::shader"),
+                label: Some("iced_wgpu image shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
                     include_str!("shader/image.wgsl"),
                 )),
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 2f5fcc6b..1343181e 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -63,7 +63,7 @@ impl Pipeline {
 
         let shader =
             device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu::quad::shader"),
+                label: Some("iced_wgpu quad shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
                     include_str!("shader/quad.wgsl"),
                 )),
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index efdd214b..162428f0 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -457,7 +457,7 @@ mod solid {
             let shader =
                 device.create_shader_module(wgpu::ShaderModuleDescriptor {
                     label: Some(
-                        "iced_wgpu::triangle::solid create shader module",
+                        "iced_wgpu triangle solid create shader module",
                     ),
                     source: wgpu::ShaderSource::Wgsl(
                         std::borrow::Cow::Borrowed(include_str!(
@@ -654,7 +654,7 @@ mod gradient {
             let shader =
                 device.create_shader_module(wgpu::ShaderModuleDescriptor {
                     label: Some(
-                        "iced_wgpu::triangle::gradient create shader module",
+                        "iced_wgpu triangle gradient create shader module",
                     ),
                     source: wgpu::ShaderSource::Wgsl(
                         std::borrow::Cow::Borrowed(include_str!(
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index a3016ff8..e76f7d5e 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -75,7 +75,7 @@ impl Blit {
 
         let shader =
             device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu::triangle::blit_shader"),
+                label: Some("iced_wgpu triangle blit_shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
                     include_str!("../shader/blit.wgsl"),
                 )),

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 130/440] 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 31f5cb6b..349f6903 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 c66621dd..4e3941f3 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 131/440] 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 4e3941f3..508965ad 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 132/440] 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 38c35f43..854dc8a0 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 70fbade0..618235ef 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 4fe91519..5cdcbe78 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 9b98877a..54e9434e 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 195b62da..bbf300b0 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 7bc462ef..23e594be 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 32f725a1..e9be4c84 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 58076b84..fe84f83b 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 22daaedc..00000000
--- 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 d066109a..4f018284 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 133/440] Keep playing with incremental rendering (still very
 slow)

---
 graphics/src/primitive.rs |  12 +-
 tiny_skia/src/backend.rs  | 234 ++++++++++++++++++++++++--------------
 2 files changed, 161 insertions(+), 85 deletions(-)

diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index bbf300b0..f079ff6f 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 fe84f83b..8101082a 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,46 +117,63 @@ impl Backend {
                 tiny_skia::Transform::identity(),
                 None,
             );
+
+            adjust_clip_mask(clip_mask, pixels, region);
+
+            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 primitive in primitives {
-            self.draw_primitive(
-                primitive,
-                pixels,
-                clip_mask,
-                None,
-                scale_factor,
-                Vector::ZERO,
-                &damage,
-            );
-        }
+        //for (i, text) in overlay.iter().enumerate() {
+        //    const OVERLAY_TEXT_SIZE: f32 = 20.0;
 
-        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,
-                &[],
-            );
-        }
+        //    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();
 
@@ -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);
-
-                self.draw_primitive(
-                    content,
-                    pixels,
-                    clip_mask,
-                    Some(bounds),
-                    scale_factor,
-                    translation,
-                    damage,
-                );
-
-                if let Some(bounds) = clip_bounds {
+                if let Some(bounds) = clip_bounds.intersection(&bounds) {
                     adjust_clip_mask(clip_mask, pixels, bounds);
-                } else {
-                    clip_mask.clear();
+
+                    self.draw_primitive(
+                        content,
+                        pixels,
+                        clip_mask,
+                        bounds,
+                        scale_factor,
+                        translation,
+                    );
+
+                    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 134/440] Group damage regions by area increase

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

diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index 5cdcbe78..7ff324cb 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 f079ff6f..01546dcb 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 8101082a..b1417409 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());
+        let damage = group_damage(damage, scale_factor, physical_size);
 
-        '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 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;
+        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,
+            };
 
-        //    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,
-        //    );
-        //}
+            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 865132b4..512503e0 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 135/440] 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 618235ef..85d9d475 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 136/440] 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 b1417409..8bc2321c 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 137/440] 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 8bc2321c..0b534bba 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 cea1cabf..6e4bb6ef 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 138/440] Switch debug mode to fade old primitives and display
 damage in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 91 +++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 34 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 0b534bba..974faa74 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,
-            };
+        //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);
+        //    adjust_clip_mask(clip_mask, pixels, bounds);
 
-            for (i, text) in overlay.iter().enumerate() {
-                const OVERLAY_TEXT_SIZE: f32 = 20.0;
+        //    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.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 139/440] 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 349f6903..db590fc2 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 6e4bb6ef..5b1e56a4 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 140/440] 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 db590fc2..349f6903 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 5b1e56a4..6e4bb6ef 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 15125c23f1896f5fa5f4d61a362add691f3cb131 Mon Sep 17 00:00:00 2001
From: bq_wrongway <97843623+bq-wrongway@users.noreply.github.com>
Date: Wed, 5 Apr 2023 20:00:25 +0200
Subject: [PATCH 141/440] Updating Roadmap.md

I collapsed Animations because the underlying issue was resolved, and i added issue #343 to 3D Canvas widget
---
 ROADMAP.md | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index ef6df0e4..c30c591b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -19,6 +19,7 @@ Once a step is completed, it is collapsed and added to this list:
   * [x] Custom styling ([#146])
   * [x] Canvas for 2D graphics ([#193])
   * [x] Basic overlay support ([#444])
+  * [x] Animations [#31]
 
 [#24]: https://github.com/iced-rs/iced/issues/24
 [#25]: https://github.com/iced-rs/iced/issues/25
@@ -29,6 +30,7 @@ Once a step is completed, it is collapsed and added to this list:
 [#146]: https://github.com/iced-rs/iced/pull/146
 [#193]: https://github.com/iced-rs/iced/pull/193
 [#444]: https://github.com/iced-rs/iced/pull/444
+[#31]: https://github.com/iced-rs/iced/issues/31
 
 ### Multi-window support ([#27])
 Open and control multiple windows at runtime.
@@ -39,16 +41,7 @@ This approach should also allow us to perform custom optimizations for this part
 
 [#27]: https://github.com/iced-rs/iced/issues/27
 
-### Animations ([#31])
-Allow widgets to request a redraw at a specific time.
-
-This is a necessary feature to render loading spinners, a blinking text cursor, GIF images, etc.
-
-[`winit`] allows flexible control of its event loop. We may be able to use [`ControlFlow::WaitUntil`](https://docs.rs/winit/0.20.0-alpha3/winit/event_loop/enum.ControlFlow.html#variant.WaitUntil) for this purpose.
-
-[#31]: https://github.com/iced-rs/iced/issues/31
-
-### Canvas widget for 3D graphics ([#32])
+### Canvas widget for 3D graphics (~~[#32]~~ [#343])
 A widget to draw freely in 3D. It could be used to draw charts, implement a Paint clone, a CAD application, etc.
 
 As a first approach, we could expose the underlying renderer directly here, and couple this widget with it ([`wgpu`] for now). Once [`wgpu`] gets WebGL or WebGPU support, this widget will be able to run on the web too. The renderer primitive could be a simple texture that the widget draws to.
@@ -56,6 +49,7 @@ As a first approach, we could expose the underlying renderer directly here, and
 In the long run, we could expose a renderer-agnostic abstraction to perform the drawing.
 
 [#32]: https://github.com/iced-rs/iced/issues/32
+[#343] https://github.com/iced-rs/iced/issues/343
 
 ### Text shaping and font fallback ([#33])
 [`wgpu_glyph`] uses [`glyph_brush`], which in turn uses [`rusttype`]. While the current implementation is able to layout text quite nicely, it does not perform any [text shaping].

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 142/440] 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 9707eda7..949a726a 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 349f6903..7a5f5b17 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 865132b4..e0e893bd 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 3aef4ff4..36c891bb 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 c00b8cef..39b6e5d2 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 dd674279..f01e0b42 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 7144125c..14522c89 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 a67ac3c0..025cd43a 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 143/440] 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 7a5f5b17..731e06de 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 6e4bb6ef..5a0097df 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(())
+                Ok(())
+            }
+            #[cfg(feature = "gpu")]
+            Surface::Gpu { pixels } => {
+                pixels.render().map_err(|_| compositor::SurfaceError::Lost)
+            }
+        }
+    } else {
+        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 144/440] 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 ff041bdf..266a2c87 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 025cd43a..15bef60c 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 145/440] 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 218e7e33..1ce13c7d 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 146/440] 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 1ce13c7d..484d91eb 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 147/440] 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 01546dcb..7f2c8ae2 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 148/440] Update `glyphon`

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

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 36c891bb..c1f23246 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 7b369842959511f17d5c27941fd0308484bff8ea Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 13 Feb 2023 11:38:05 +0100
Subject: [PATCH 149/440] feat: added handle to text_input

---
 examples/text_input/Cargo.toml      |   9 +++
 examples/text_input/README.md       |  10 +++
 examples/text_input/fonts/icons.ttf | Bin 0 -> 1612 bytes
 examples/text_input/src/main.rs     |  93 ++++++++++++++++++++++
 native/src/widget/text_input.rs     | 119 +++++++++++++++++++++++++++-
 src/widget.rs                       |   2 +-
 style/src/text_input.rs             |   2 +
 style/src/theme.rs                  |   3 +
 8 files changed, 236 insertions(+), 2 deletions(-)
 create mode 100644 examples/text_input/Cargo.toml
 create mode 100644 examples/text_input/README.md
 create mode 100644 examples/text_input/fonts/icons.ttf
 create mode 100644 examples/text_input/src/main.rs

diff --git a/examples/text_input/Cargo.toml b/examples/text_input/Cargo.toml
new file mode 100644
index 00000000..5937ef8e
--- /dev/null
+++ b/examples/text_input/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "text_input"
+version = "0.1.0"
+authors = ["Casper Rogild Storm<casper@rogildstorm.com>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+iced = { path = "../..", features = ["debug"] }
diff --git a/examples/text_input/README.md b/examples/text_input/README.md
new file mode 100644
index 00000000..2b2d8059
--- /dev/null
+++ b/examples/text_input/README.md
@@ -0,0 +1,10 @@
+## TextInput
+
+A `TextInput` is a field that can be filled with text.
+
+You can run it with `cargo run`:
+```
+cargo run --package text_input
+```
+
+[`main`]: src/main.rs
diff --git a/examples/text_input/fonts/icons.ttf b/examples/text_input/fonts/icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..bfe8a24b966869737a85aac1242d5a35f32381b2
GIT binary patch
literal 1612
zcmZQzWME+6W@unwW-#y%);Ho8VqL?)z_5pbfgvF|H?crG>{2HK1EUNB14Br9VsQZj
z1A_nq10#s$NYANEn|YgSF9QQ(1p@<9OGav9in7qU;|vVUe;61T%rY`k6WOOTpI~5M
zF=1d}P|3(GsSsjd_`$%y62ZX0Ad{1yoX9A`c!z<3r37SdZem3N0}q260|QG70|SFX
zUSe+QOfSyg3=Aww7#JAa3i69f7?>Ft7#P@eK=KUC%ngha7+4t?m}WAaVPIhBhtQ0#
z8H^b@LF$k&qW}^I%yeL2c*(?k;Qs*z2j&9|4h#(7umDSeO$V_+wt=t=10&dG83tys
zDj5bA1`7rT1}+8;1||k321W*jmrVcv{{Iis#Gvq!0nBFn|5%&_ssk(mwuABie+GWA
zDG)Ix1_pCWP&5!N#=?-#;J`eQS&M<6L6yOf!I^=9(MU{OSd2|sQAy2Q*pAWIREdq9
znU7Iij?q}r$jsbKO`TbfQCV1oO<76J)Wpo#NX*<sO<9ReR76Z%j?vJ-%-oKVi9tw-
z?~k;K=|2Wj73n{GN<x~Rl7A%GL`8fInHUUxL`2yn|44djnk$HlD}XSks<gB!6SJU}
zmLM||(^YY?f6=;*j=GFX#l%B(HUC9xg{r7%XsD=!YB4U+(*64ytV>bxrL?N5G#d|_
zPFk7{8xI2m0~3Sx|JTe{nWr+Sf&8MXZpUb9qOQlNuBNQS&d12kCMqH>$0#mlY-DB*
z@{y65sfn68qlvj4qq&)}5m-)C1guh739QeQdCyr{c{#ZZH@AQQH@6HqISAV_UFR&X
zynwP15AR<|K>;gubzL2Gbt?fuFk43#%&s}BlWvKu3&NI{J<H2uq%17Y#W)k95UdHs
z0FYne7(|&DF=sPKGng_kFrqpO#mT}TAF{FYF)Aymsp~O<-7f};E_J4>0)kfR>N+5|
z2?`*y&&p=H3u_7}IIF2SD+p)`yJyOZTNp4cGO!S5$~M*4cNGy45pmVmH#ODMcNG;8
z5p~tq`}@%<MwXqCOITP~n2m)?Hr7(h&tDgu7Qrcyzv1NJcz&C&4BRYW{saE4svri0
zhQ<s7IHiMx!TAK7Zx|rznXe+HT!;#Ghzx|o#J~Vjna{$&pv}U-5C<0JVh~}FV`yV|
z!{`Lo&CcKgQUp#7U<D`yAHzDZDv;gmaF;VNurnk;#hDq{8O)$;76x{PQYf31ftx`T
z%4TC=XYhuyxfrAvx<Gl8g_D7ifscV5%4TBVV@QXxnHl&PY@uux20n%wD4Uf*j6ng)
zW@F%E2!gV?7)%(JWG3h5=I7@zWHKZ(<TK<l<TK<m<b|ac6=&w>DH!S*FoZFrG88cs
zGh~7!7!()`8T1$ou<F7p7?he`nv+<>5X6wmkj_xbki(G3P=r;bTYg@NLV9XmYEfcI
zYKlTqrGjU2zHfeho*si6*zOVr1%`BnRE9jTixL@17*ZKh7!(+i7%CYQ7(Brq@P&AQ
PL63m}Tmqs*3n~WyV}A4q

literal 0
HcmV?d00001

diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
new file mode 100644
index 00000000..b25ed7e1
--- /dev/null
+++ b/examples/text_input/src/main.rs
@@ -0,0 +1,93 @@
+use iced::widget::{checkbox, column, container, text_input};
+use iced::{Element, Font, Length, Sandbox, Settings};
+
+const ICON_FONT: Font = Font::External {
+    name: "Icons",
+    bytes: include_bytes!("../fonts/icons.ttf"),
+};
+
+pub fn main() -> iced::Result {
+    Example::run(Settings::default())
+}
+
+#[derive(Default)]
+struct Example {
+    value: String,
+    is_showing_handle: bool,
+}
+
+#[derive(Debug, Clone)]
+enum Message {
+    Changed(String),
+    ToggleHandle(bool),
+}
+
+impl Sandbox for Example {
+    type Message = Message;
+
+    fn new() -> Self {
+        Self::default()
+    }
+
+    fn title(&self) -> String {
+        String::from("Text Input - Iced")
+    }
+
+    fn update(&mut self, message: Message) {
+        match message {
+            Message::Changed(value) => self.value = value,
+            Message::ToggleHandle(_) => {
+                self.is_showing_handle = !self.is_showing_handle
+            }
+        }
+    }
+
+    fn view(&self) -> Element<Message> {
+        let checkbox =
+            checkbox("Handle", self.is_showing_handle, Message::ToggleHandle)
+                .spacing(5)
+                .text_size(16);
+
+        let mut text_input =
+            text_input("Placeholder", self.value.as_str(), Message::Changed);
+
+        if self.is_showing_handle {
+            text_input = text_input.handle(text_input::Handle {
+                font: ICON_FONT,
+                text: String::from('\u{e900}'),
+                size: Some(18),
+                position: text_input::HandlePosition::Right,
+            });
+        }
+
+        let content = column!["What is blazing fast?", text_input, checkbox]
+            .width(Length::Units(200))
+            .spacing(10);
+
+        container(content)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .center_x()
+            .center_y()
+            .into()
+    }
+
+    fn theme(&self) -> iced::Theme {
+        iced::Theme::default()
+    }
+
+    fn style(&self) -> iced::theme::Application {
+        iced::theme::Application::default()
+    }
+
+    fn scale_factor(&self) -> f64 {
+        1.0
+    }
+
+    fn run(settings: Settings<()>) -> Result<(), iced::Error>
+    where
+        Self: 'static + Sized,
+    {
+        <Self as iced::Application>::run(settings)
+    }
+}
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index ee0473ea..7696da99 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -31,6 +31,47 @@ use crate::{
 
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
+/// The position of the [`Handle`].
+#[derive(Clone, Default, Debug)]
+pub enum HandlePosition {
+    /// Position the handle to the left.
+    Left,
+    /// Position the handle to the left.
+    ///
+    /// This is the default.
+    #[default]
+    Right,
+}
+
+/// The content of the [`Handle`].
+#[derive(Clone)]
+pub struct Handle<Renderer>
+where
+    Renderer: text::Renderer,
+{
+    /// Font that will be used to display the `text`.
+    pub font: Renderer::Font,
+    /// Text that will be shown.
+    pub text: String,
+    /// Font size of the content.
+    pub size: Option<u16>,
+    /// Position of the handle.
+    pub position: HandlePosition,
+}
+
+impl<Renderer> std::fmt::Debug for Handle<Renderer>
+where
+    Renderer: text::Renderer,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Handle")
+            .field("text", &self.text)
+            .field("size", &self.size)
+            .field("position", &self.position)
+            .finish()
+    }
+}
+
 /// A field that can be filled with text.
 ///
 /// # Example
@@ -68,6 +109,7 @@ where
     on_change: Box<dyn Fn(String) -> Message + 'a>,
     on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_submit: Option<Message>,
+    handle: Option<Handle<Renderer>>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -99,6 +141,7 @@ where
             on_change: Box::new(on_change),
             on_paste: None,
             on_submit: None,
+            handle: None,
             style: Default::default(),
         }
     }
@@ -132,6 +175,13 @@ where
         self.font = font;
         self
     }
+
+    /// Sets the [`Handle`] of the [`TextInput`].
+    pub fn handle(mut self, handle: Handle<Renderer>) -> Self {
+        self.handle = Some(handle);
+        self
+    }
+
     /// Sets the width of the [`TextInput`].
     pub fn width(mut self, width: impl Into<Length>) -> Self {
         self.width = width.into();
@@ -188,8 +238,10 @@ where
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
+            self.padding,
             &self.font,
             self.is_secure,
+            self.handle.as_ref(),
             &self.style,
         )
     }
@@ -286,8 +338,10 @@ where
             &self.value,
             &self.placeholder,
             self.size,
+            self.padding,
             &self.font,
             self.is_secure,
+            self.handle.as_ref(),
             &self.style,
         )
     }
@@ -812,8 +866,10 @@ pub fn draw<Renderer>(
     value: &Value,
     placeholder: &str,
     size: Option<f32>,
+    padding: Padding,
     font: &Renderer::Font,
     is_secure: bool,
+    handle: Option<&Handle<Renderer>>,
     style: &<Renderer::Theme as StyleSheet>::Style,
 ) where
     Renderer: text::Renderer,
@@ -823,7 +879,37 @@ pub fn draw<Renderer>(
     let value = secure_value.as_ref().unwrap_or(value);
 
     let bounds = layout.bounds();
-    let text_bounds = layout.children().next().unwrap().bounds();
+    let text_bounds = {
+        let bounds = layout.children().next().unwrap().bounds();
+        if let Some(handle) = handle {
+            let Handle {
+                font,
+                size,
+                text,
+                position,
+            } = handle;
+
+            let padding = f32::from(padding.horizontal());
+            let size = size.unwrap_or_else(|| renderer.default_size());
+            let width =
+                renderer.measure_width(text.as_str(), size, font.clone());
+
+            match position {
+                HandlePosition::Left => Rectangle {
+                    x: bounds.x + (width + padding),
+                    width: bounds.width - (width + padding),
+                    ..bounds
+                },
+                HandlePosition::Right => Rectangle {
+                    x: bounds.x,
+                    width: bounds.width - (width + padding),
+                    ..bounds
+                },
+            }
+        } else {
+            bounds
+        }
+    };
 
     let is_mouse_over = bounds.contains(cursor_position);
 
@@ -845,6 +931,37 @@ pub fn draw<Renderer>(
         appearance.background,
     );
 
+    if let Some(handle) = handle {
+        let Handle {
+            size,
+            font,
+            text,
+            position,
+        } = handle;
+
+        let padding = f32::from(padding.horizontal());
+        let size = size.unwrap_or_else(|| renderer.default_size());
+        let width = renderer.measure_width(text.as_str(), size, font.clone());
+
+        renderer.fill_text(Text {
+            content: text,
+            size: f32::from(size),
+            font: font.clone(),
+            color: appearance.handle_color,
+            bounds: Rectangle {
+                x: match position {
+                    HandlePosition::Left => bounds.x + width + padding,
+                    HandlePosition::Right => bounds.x + bounds.width - padding,
+                },
+                y: bounds.center_y() - f32::from(size) / 2.0,
+                height: f32::from(size),
+                ..bounds
+            },
+            horizontal_alignment: alignment::Horizontal::Right,
+            vertical_alignment: alignment::Vertical::Top,
+        });
+    }
+
     let text = value.to_string();
     let size = size.unwrap_or_else(|| renderer.default_size());
 
diff --git a/src/widget.rs b/src/widget.rs
index e2b0537e..948456d3 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -124,7 +124,7 @@ 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,
+        select_all, Appearance, Handle, HandlePosition, Id, StyleSheet,
     };
 
     /// A field that can be filled with text.
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index d97016dc..5e703e61 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -12,6 +12,8 @@ pub struct Appearance {
     pub border_width: f32,
     /// The border [`Color`] of the text input.
     pub border_color: Color,
+    /// The handle [`Color`] of the text input.
+    pub handle_color: Color,
 }
 
 /// A set of rules that dictate the style of a text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 0ebd82a4..de46d7d4 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1028,6 +1028,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.strong.color,
+            handle_color: palette.background.weak.text,
         }
     }
 
@@ -1043,6 +1044,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.base.text,
+            handle_color: palette.background.weak.text,
         }
     }
 
@@ -1058,6 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
+            handle_color: palette.primary.weak.text,
         }
     }
 

From bfc5db9009f10a67ed277ce9d1997bcdea3f6acd Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 13 Feb 2023 12:00:08 +0100
Subject: [PATCH 150/440] Updated `handle_color` for focused state

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

diff --git a/style/src/theme.rs b/style/src/theme.rs
index de46d7d4..4837e10b 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1060,7 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
-            handle_color: palette.primary.weak.text,
+            handle_color: palette.background.weak.text,
         }
     }
 

From d24a4a46895ed711ddfc3199a0445f0b69a812e4 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 16 Feb 2023 14:32:59 +0100
Subject: [PATCH 151/440] Changed `Handle` to `Icon` to be consistent

---
 examples/text_input/src/main.rs | 18 +++----
 native/src/widget/text_input.rs | 87 +++++++++++++++++----------------
 src/widget.rs                   |  2 +-
 style/src/text_input.rs         |  4 +-
 style/src/theme.rs              |  6 +--
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
index b25ed7e1..e0ba1983 100644
--- a/examples/text_input/src/main.rs
+++ b/examples/text_input/src/main.rs
@@ -13,13 +13,13 @@ pub fn main() -> iced::Result {
 #[derive(Default)]
 struct Example {
     value: String,
-    is_showing_handle: bool,
+    is_showing_icon: bool,
 }
 
 #[derive(Debug, Clone)]
 enum Message {
     Changed(String),
-    ToggleHandle(bool),
+    ToggleIcon(bool),
 }
 
 impl Sandbox for Example {
@@ -36,27 +36,27 @@ impl Sandbox for Example {
     fn update(&mut self, message: Message) {
         match message {
             Message::Changed(value) => self.value = value,
-            Message::ToggleHandle(_) => {
-                self.is_showing_handle = !self.is_showing_handle
+            Message::ToggleIcon(_) => {
+                self.is_showing_icon = !self.is_showing_icon
             }
         }
     }
 
     fn view(&self) -> Element<Message> {
         let checkbox =
-            checkbox("Handle", self.is_showing_handle, Message::ToggleHandle)
+            checkbox("Icon", self.is_showing_icon, Message::ToggleIcon)
                 .spacing(5)
                 .text_size(16);
 
         let mut text_input =
             text_input("Placeholder", self.value.as_str(), Message::Changed);
 
-        if self.is_showing_handle {
-            text_input = text_input.handle(text_input::Handle {
+        if self.is_showing_icon {
+            text_input = text_input.icon(text_input::Icon {
                 font: ICON_FONT,
-                text: String::from('\u{e900}'),
+                code_point: '\u{e900}',
                 size: Some(18),
-                position: text_input::HandlePosition::Right,
+                position: text_input::IconPosition::Right,
             });
         }
 
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 7696da99..575f4436 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -31,41 +31,38 @@ use crate::{
 
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
-/// The position of the [`Handle`].
+/// The position of the [`Icon`].
 #[derive(Clone, Default, Debug)]
-pub enum HandlePosition {
-    /// Position the handle to the left.
+pub enum IconPosition {
+    /// Position the [`Icon`] to the left.
     Left,
-    /// Position the handle to the left.
+    /// Position the [`Icon`] to the left.
     ///
     /// This is the default.
     #[default]
     Right,
 }
 
-/// The content of the [`Handle`].
+/// The content of the [`Icon`].
 #[derive(Clone)]
-pub struct Handle<Renderer>
-where
-    Renderer: text::Renderer,
-{
-    /// Font that will be used to display the `text`.
-    pub font: Renderer::Font,
-    /// Text that will be shown.
-    pub text: String,
+pub struct Icon<Font> {
+    /// Font that will be used to display the `code_point`.
+    pub font: Font,
+    /// The unicode code point that will be used as the icon.
+    pub code_point: char,
     /// Font size of the content.
     pub size: Option<u16>,
-    /// Position of the handle.
-    pub position: HandlePosition,
+    /// Position of the icon.
+    pub position: IconPosition,
 }
 
-impl<Renderer> std::fmt::Debug for Handle<Renderer>
+impl<Renderer> std::fmt::Debug for Icon<Renderer>
 where
     Renderer: text::Renderer,
 {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Handle")
-            .field("text", &self.text)
+        f.debug_struct("Icon")
+            .field("code_point", &self.code_point)
             .field("size", &self.size)
             .field("position", &self.position)
             .finish()
@@ -109,7 +106,7 @@ where
     on_change: Box<dyn Fn(String) -> Message + 'a>,
     on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_submit: Option<Message>,
-    handle: Option<Handle<Renderer>>,
+    icon: Option<Icon<Renderer::Font>>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -141,7 +138,7 @@ where
             on_change: Box::new(on_change),
             on_paste: None,
             on_submit: None,
-            handle: None,
+            icon: None,
             style: Default::default(),
         }
     }
@@ -176,9 +173,9 @@ where
         self
     }
 
-    /// Sets the [`Handle`] of the [`TextInput`].
-    pub fn handle(mut self, handle: Handle<Renderer>) -> Self {
-        self.handle = Some(handle);
+    /// Sets the [`Icon`] of the [`TextInput`].
+    pub fn icon(mut self, icon: Icon<Renderer::Font>) -> Self {
+        self.icon = Some(icon);
         self
     }
 
@@ -241,7 +238,7 @@ where
             self.padding,
             &self.font,
             self.is_secure,
-            self.handle.as_ref(),
+            self.icon.as_ref(),
             &self.style,
         )
     }
@@ -341,7 +338,7 @@ where
             self.padding,
             &self.font,
             self.is_secure,
-            self.handle.as_ref(),
+            self.icon.as_ref(),
             &self.style,
         )
     }
@@ -869,7 +866,7 @@ pub fn draw<Renderer>(
     padding: Padding,
     font: &Renderer::Font,
     is_secure: bool,
-    handle: Option<&Handle<Renderer>>,
+    icon: Option<&Icon<Renderer::Font>>,
     style: &<Renderer::Theme as StyleSheet>::Style,
 ) where
     Renderer: text::Renderer,
@@ -881,26 +878,29 @@ pub fn draw<Renderer>(
     let bounds = layout.bounds();
     let text_bounds = {
         let bounds = layout.children().next().unwrap().bounds();
-        if let Some(handle) = handle {
-            let Handle {
+        if let Some(icon) = icon {
+            let Icon {
                 font,
                 size,
-                text,
+                code_point,
                 position,
-            } = handle;
+            } = icon;
 
             let padding = f32::from(padding.horizontal());
             let size = size.unwrap_or_else(|| renderer.default_size());
-            let width =
-                renderer.measure_width(text.as_str(), size, font.clone());
+            let width = renderer.measure_width(
+                &code_point.to_string(),
+                size,
+                font.clone(),
+            );
 
             match position {
-                HandlePosition::Left => Rectangle {
+                IconPosition::Left => Rectangle {
                     x: bounds.x + (width + padding),
                     width: bounds.width - (width + padding),
                     ..bounds
                 },
-                HandlePosition::Right => Rectangle {
+                IconPosition::Right => Rectangle {
                     x: bounds.x,
                     width: bounds.width - (width + padding),
                     ..bounds
@@ -931,27 +931,28 @@ pub fn draw<Renderer>(
         appearance.background,
     );
 
-    if let Some(handle) = handle {
-        let Handle {
+    if let Some(icon) = icon {
+        let Icon {
             size,
             font,
-            text,
+            code_point,
             position,
-        } = handle;
+        } = icon;
 
         let padding = f32::from(padding.horizontal());
         let size = size.unwrap_or_else(|| renderer.default_size());
-        let width = renderer.measure_width(text.as_str(), size, font.clone());
+        let width =
+            renderer.measure_width(&code_point.to_string(), size, font.clone());
 
         renderer.fill_text(Text {
-            content: text,
+            content: &code_point.to_string(),
             size: f32::from(size),
             font: font.clone(),
-            color: appearance.handle_color,
+            color: appearance.icon_color,
             bounds: Rectangle {
                 x: match position {
-                    HandlePosition::Left => bounds.x + width + padding,
-                    HandlePosition::Right => bounds.x + bounds.width - padding,
+                    IconPosition::Left => bounds.x + width + padding,
+                    IconPosition::Right => bounds.x + bounds.width - padding,
                 },
                 y: bounds.center_y() - f32::from(size) / 2.0,
                 height: f32::from(size),
diff --git a/src/widget.rs b/src/widget.rs
index 948456d3..d3c16088 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -124,7 +124,7 @@ 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, Handle, HandlePosition, Id, StyleSheet,
+        select_all, Appearance, Icon, IconPosition, Id, StyleSheet,
     };
 
     /// A field that can be filled with text.
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 5e703e61..73b05852 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -12,8 +12,8 @@ pub struct Appearance {
     pub border_width: f32,
     /// The border [`Color`] of the text input.
     pub border_color: Color,
-    /// The handle [`Color`] of the text input.
-    pub handle_color: Color,
+    /// The icon [`Color`] of the text input.
+    pub icon_color: Color,
 }
 
 /// A set of rules that dictate the style of a text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4837e10b..0d974a19 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1028,7 +1028,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.strong.color,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 
@@ -1044,7 +1044,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.background.base.text,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 
@@ -1060,7 +1060,7 @@ impl text_input::StyleSheet for Theme {
             border_radius: 2.0,
             border_width: 1.0,
             border_color: palette.primary.strong.color,
-            handle_color: palette.background.weak.text,
+            icon_color: palette.background.weak.text,
         }
     }
 

From 898307e9ac8e11de275d7d4d58b93a6f24a1e800 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 20 Feb 2023 14:42:10 +0100
Subject: [PATCH 152/440] Removed text_input example in favor for Tour

---
 examples/text_input/Cargo.toml                |   9 --
 examples/text_input/README.md                 |  10 --
 examples/text_input/src/main.rs               |  93 ------------------
 examples/{text_input => tour}/fonts/icons.ttf | Bin
 examples/tour/src/main.rs                     |  78 ++++++++++++---
 5 files changed, 66 insertions(+), 124 deletions(-)
 delete mode 100644 examples/text_input/Cargo.toml
 delete mode 100644 examples/text_input/README.md
 delete mode 100644 examples/text_input/src/main.rs
 rename examples/{text_input => tour}/fonts/icons.ttf (100%)

diff --git a/examples/text_input/Cargo.toml b/examples/text_input/Cargo.toml
deleted file mode 100644
index 5937ef8e..00000000
--- a/examples/text_input/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "text_input"
-version = "0.1.0"
-authors = ["Casper Rogild Storm<casper@rogildstorm.com>"]
-edition = "2021"
-publish = false
-
-[dependencies]
-iced = { path = "../..", features = ["debug"] }
diff --git a/examples/text_input/README.md b/examples/text_input/README.md
deleted file mode 100644
index 2b2d8059..00000000
--- a/examples/text_input/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## TextInput
-
-A `TextInput` is a field that can be filled with text.
-
-You can run it with `cargo run`:
-```
-cargo run --package text_input
-```
-
-[`main`]: src/main.rs
diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
deleted file mode 100644
index e0ba1983..00000000
--- a/examples/text_input/src/main.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use iced::widget::{checkbox, column, container, text_input};
-use iced::{Element, Font, Length, Sandbox, Settings};
-
-const ICON_FONT: Font = Font::External {
-    name: "Icons",
-    bytes: include_bytes!("../fonts/icons.ttf"),
-};
-
-pub fn main() -> iced::Result {
-    Example::run(Settings::default())
-}
-
-#[derive(Default)]
-struct Example {
-    value: String,
-    is_showing_icon: bool,
-}
-
-#[derive(Debug, Clone)]
-enum Message {
-    Changed(String),
-    ToggleIcon(bool),
-}
-
-impl Sandbox for Example {
-    type Message = Message;
-
-    fn new() -> Self {
-        Self::default()
-    }
-
-    fn title(&self) -> String {
-        String::from("Text Input - Iced")
-    }
-
-    fn update(&mut self, message: Message) {
-        match message {
-            Message::Changed(value) => self.value = value,
-            Message::ToggleIcon(_) => {
-                self.is_showing_icon = !self.is_showing_icon
-            }
-        }
-    }
-
-    fn view(&self) -> Element<Message> {
-        let checkbox =
-            checkbox("Icon", self.is_showing_icon, Message::ToggleIcon)
-                .spacing(5)
-                .text_size(16);
-
-        let mut text_input =
-            text_input("Placeholder", self.value.as_str(), Message::Changed);
-
-        if self.is_showing_icon {
-            text_input = text_input.icon(text_input::Icon {
-                font: ICON_FONT,
-                code_point: '\u{e900}',
-                size: Some(18),
-                position: text_input::IconPosition::Right,
-            });
-        }
-
-        let content = column!["What is blazing fast?", text_input, checkbox]
-            .width(Length::Units(200))
-            .spacing(10);
-
-        container(content)
-            .width(Length::Fill)
-            .height(Length::Fill)
-            .center_x()
-            .center_y()
-            .into()
-    }
-
-    fn theme(&self) -> iced::Theme {
-        iced::Theme::default()
-    }
-
-    fn style(&self) -> iced::theme::Application {
-        iced::theme::Application::default()
-    }
-
-    fn scale_factor(&self) -> f64 {
-        1.0
-    }
-
-    fn run(settings: Settings<()>) -> Result<(), iced::Error>
-    where
-        Self: 'static + Sized,
-    {
-        <Self as iced::Application>::run(settings)
-    }
-}
diff --git a/examples/text_input/fonts/icons.ttf b/examples/tour/fonts/icons.ttf
similarity index 100%
rename from examples/text_input/fonts/icons.ttf
rename to examples/tour/fonts/icons.ttf
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index de063d00..5edee850 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -5,8 +5,14 @@ use iced::widget::{
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
+use iced::Font;
 use iced::{Color, Element, Length, Renderer, Sandbox, Settings};
 
+const ICON_FONT: Font = Font::External {
+    name: "Icons",
+    bytes: include_bytes!("../fonts/icons.ttf"),
+};
+
 pub fn main() -> iced::Result {
     env_logger::init();
 
@@ -127,6 +133,7 @@ impl Steps {
                 Step::TextInput {
                     value: String::new(),
                     is_secure: false,
+                    is_showing_icon: false,
                 },
                 Step::Debugger,
                 Step::End,
@@ -171,14 +178,32 @@ impl Steps {
 
 enum Step {
     Welcome,
-    Slider { value: u8 },
-    RowsAndColumns { layout: Layout, spacing: u16 },
-    Text { size: u16, color: Color },
-    Radio { selection: Option<Language> },
-    Toggler { can_continue: bool },
-    Image { width: u16 },
+    Slider {
+        value: u8,
+    },
+    RowsAndColumns {
+        layout: Layout,
+        spacing: u16,
+    },
+    Text {
+        size: u16,
+        color: Color,
+    },
+    Radio {
+        selection: Option<Language>,
+    },
+    Toggler {
+        can_continue: bool,
+    },
+    Image {
+        width: u16,
+    },
     Scrollable,
-    TextInput { value: String, is_secure: bool },
+    TextInput {
+        value: String,
+        is_secure: bool,
+        is_showing_icon: bool,
+    },
     Debugger,
     End,
 }
@@ -194,6 +219,7 @@ pub enum StepMessage {
     ImageWidthChanged(u16),
     InputChanged(String),
     ToggleSecureInput(bool),
+    ToggleTextInputIcon(bool),
     DebugToggled(bool),
     TogglerChanged(bool),
 }
@@ -256,6 +282,14 @@ impl<'a> Step {
                     *can_continue = value;
                 }
             }
+            StepMessage::ToggleTextInputIcon(toggle) => {
+                if let Step::TextInput {
+                    is_showing_icon, ..
+                } = self
+                {
+                    *is_showing_icon = toggle
+                }
+            }
         };
     }
 
@@ -303,9 +337,11 @@ impl<'a> Step {
                 Self::rows_and_columns(*layout, *spacing)
             }
             Step::Scrollable => Self::scrollable(),
-            Step::TextInput { value, is_secure } => {
-                Self::text_input(value, *is_secure)
-            }
+            Step::TextInput {
+                value,
+                is_secure,
+                is_showing_icon,
+            } => Self::text_input(value, *is_secure, *is_showing_icon),
             Step::Debugger => Self::debugger(debug),
             Step::End => Self::end(),
         }
@@ -530,8 +566,12 @@ impl<'a> Step {
             )
     }
 
-    fn text_input(value: &str, is_secure: bool) -> Column<'a, StepMessage> {
-        let text_input = text_input(
+    fn text_input(
+        value: &str,
+        is_secure: bool,
+        is_showing_icon: bool,
+    ) -> Column<'a, StepMessage> {
+        let mut text_input = text_input(
             "Type something to continue...",
             value,
             StepMessage::InputChanged,
@@ -539,6 +579,15 @@ impl<'a> Step {
         .padding(10)
         .size(30);
 
+        if is_showing_icon {
+            text_input = text_input.icon(text_input::Icon {
+                font: ICON_FONT,
+                code_point: '\u{e900}',
+                size: Some(35),
+                position: text_input::IconPosition::Right,
+            });
+        }
+
         Self::container("Text input")
             .push("Use a text input to ask for different kinds of information.")
             .push(if is_secure {
@@ -551,6 +600,11 @@ impl<'a> Step {
                 is_secure,
                 StepMessage::ToggleSecureInput,
             ))
+            .push(checkbox(
+                "Show icon",
+                is_showing_icon,
+                StepMessage::ToggleTextInputIcon,
+            ))
             .push(
                 "A text input produces a message every time it changes. It is \
                  very easy to keep track of its contents:",

From 0e2fc99eb864800d2d1522c015054d84cad078f4 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, 11 Apr 2023 05:13:56 +0200
Subject: [PATCH 153/440] Use `f32` for `Icon::size` and remove unnecessary
 conversions

---
 examples/tour/src/main.rs       |  2 +-
 native/src/widget/text_input.rs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 5edee850..6a1380d7 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -583,7 +583,7 @@ impl<'a> Step {
             text_input = text_input.icon(text_input::Icon {
                 font: ICON_FONT,
                 code_point: '\u{e900}',
-                size: Some(35),
+                size: Some(35.0),
                 position: text_input::IconPosition::Right,
             });
         }
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 575f4436..95e3b720 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -51,7 +51,7 @@ pub struct Icon<Font> {
     /// The unicode code point that will be used as the icon.
     pub code_point: char,
     /// Font size of the content.
-    pub size: Option<u16>,
+    pub size: Option<f32>,
     /// Position of the icon.
     pub position: IconPosition,
 }
@@ -886,7 +886,7 @@ pub fn draw<Renderer>(
                 position,
             } = icon;
 
-            let padding = f32::from(padding.horizontal());
+            let padding = padding.horizontal();
             let size = size.unwrap_or_else(|| renderer.default_size());
             let width = renderer.measure_width(
                 &code_point.to_string(),
@@ -939,14 +939,14 @@ pub fn draw<Renderer>(
             position,
         } = icon;
 
-        let padding = f32::from(padding.horizontal());
+        let padding = padding.horizontal();
         let size = size.unwrap_or_else(|| renderer.default_size());
         let width =
             renderer.measure_width(&code_point.to_string(), size, font.clone());
 
         renderer.fill_text(Text {
             content: &code_point.to_string(),
-            size: f32::from(size),
+            size,
             font: font.clone(),
             color: appearance.icon_color,
             bounds: Rectangle {
@@ -954,8 +954,8 @@ pub fn draw<Renderer>(
                     IconPosition::Left => bounds.x + width + padding,
                     IconPosition::Right => bounds.x + bounds.width - padding,
                 },
-                y: bounds.center_y() - f32::from(size) / 2.0,
-                height: f32::from(size),
+                y: bounds.center_y() - size / 2.0,
+                height: size,
                 ..bounds
             },
             horizontal_alignment: alignment::Horizontal::Right,

From 9852b4b36442ef036f0b308f798e892ddaa06c2d 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, 11 Apr 2023 05:45:55 +0200
Subject: [PATCH 154/440] Move `Icon` layout logic to `layout` in `text_input`

Also add `Icon::spacing` field.
---
 examples/tour/src/main.rs       |   5 +-
 native/src/widget/text_input.rs | 127 ++++++++++++++++----------------
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 6a1380d7..8a1b8d5a 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -138,7 +138,7 @@ impl Steps {
                 Step::Debugger,
                 Step::End,
             ],
-            current: 0,
+            current: 8,
         }
     }
 
@@ -582,8 +582,9 @@ impl<'a> Step {
         if is_showing_icon {
             text_input = text_input.icon(text_input::Icon {
                 font: ICON_FONT,
-                code_point: '\u{e900}',
+                code_point: '\u{E900}',
                 size: Some(35.0),
+                spacing: 10.0,
                 position: text_input::IconPosition::Right,
             });
         }
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 95e3b720..f331f05a 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -52,6 +52,8 @@ pub struct Icon<Font> {
     pub code_point: char,
     /// Font size of the content.
     pub size: Option<f32>,
+    /// The spacing between the [`Icon`] and the text in a [`TextInput`].
+    pub spacing: f32,
     /// Position of the icon.
     pub position: IconPosition,
 }
@@ -235,7 +237,6 @@ where
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
-            self.padding,
             &self.font,
             self.is_secure,
             self.icon.as_ref(),
@@ -272,7 +273,14 @@ where
         renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
-        layout(renderer, limits, self.width, self.padding, self.size)
+        layout(
+            renderer,
+            limits,
+            self.width,
+            self.padding,
+            self.size,
+            self.icon.as_ref(),
+        )
     }
 
     fn operate(
@@ -335,7 +343,6 @@ where
             &self.value,
             &self.placeholder,
             self.size,
-            self.padding,
             &self.font,
             self.is_secure,
             self.icon.as_ref(),
@@ -431,6 +438,7 @@ pub fn layout<Renderer>(
     width: Length,
     padding: Padding,
     size: Option<f32>,
+    icon: Option<&Icon<Renderer::Font>>,
 ) -> layout::Node
 where
     Renderer: text::Renderer,
@@ -440,10 +448,51 @@ where
     let padding = padding.fit(Size::ZERO, limits.max());
     let limits = limits.width(width).pad(padding).height(text_size);
 
-    let mut text = layout::Node::new(limits.resolve(Size::ZERO));
-    text.move_to(Point::new(padding.left, padding.top));
+    let text_bounds = limits.resolve(Size::ZERO);
 
-    layout::Node::with_children(text.size().pad(padding), vec![text])
+    if let Some(icon) = icon {
+        let icon_width = renderer.measure_width(
+            &icon.code_point.to_string(),
+            icon.size.unwrap_or_else(|| renderer.default_size()),
+            icon.font.clone(),
+        );
+
+        let mut text_node = layout::Node::new(
+            text_bounds - Size::new(icon_width + icon.spacing, 0.0),
+        );
+
+        let mut icon_node =
+            layout::Node::new(Size::new(icon_width, text_bounds.height));
+
+        match icon.position {
+            IconPosition::Left => {
+                text_node.move_to(Point::new(
+                    padding.left + icon_width + icon.spacing,
+                    padding.top,
+                ));
+
+                icon_node.move_to(Point::new(padding.left, padding.top));
+            }
+            IconPosition::Right => {
+                text_node.move_to(Point::new(padding.left, padding.top));
+
+                icon_node.move_to(Point::new(
+                    padding.left + text_bounds.width - icon_width,
+                    padding.top,
+                ));
+            }
+        };
+
+        layout::Node::with_children(
+            text_bounds.pad(padding),
+            vec![text_node, icon_node],
+        )
+    } else {
+        let mut text = layout::Node::new(text_bounds);
+        text.move_to(Point::new(padding.left, padding.top));
+
+        layout::Node::with_children(text.size().pad(padding), vec![text])
+    }
 }
 
 /// Processes an [`Event`] and updates the [`State`] of a [`TextInput`]
@@ -863,7 +912,6 @@ pub fn draw<Renderer>(
     value: &Value,
     placeholder: &str,
     size: Option<f32>,
-    padding: Padding,
     font: &Renderer::Font,
     is_secure: bool,
     icon: Option<&Icon<Renderer::Font>>,
@@ -876,40 +924,9 @@ pub fn draw<Renderer>(
     let value = secure_value.as_ref().unwrap_or(value);
 
     let bounds = layout.bounds();
-    let text_bounds = {
-        let bounds = layout.children().next().unwrap().bounds();
-        if let Some(icon) = icon {
-            let Icon {
-                font,
-                size,
-                code_point,
-                position,
-            } = icon;
 
-            let padding = padding.horizontal();
-            let size = size.unwrap_or_else(|| renderer.default_size());
-            let width = renderer.measure_width(
-                &code_point.to_string(),
-                size,
-                font.clone(),
-            );
-
-            match position {
-                IconPosition::Left => Rectangle {
-                    x: bounds.x + (width + padding),
-                    width: bounds.width - (width + padding),
-                    ..bounds
-                },
-                IconPosition::Right => Rectangle {
-                    x: bounds.x,
-                    width: bounds.width - (width + padding),
-                    ..bounds
-                },
-            }
-        } else {
-            bounds
-        }
-    };
+    let mut children_layout = layout.children();
+    let text_bounds = children_layout.next().unwrap().bounds();
 
     let is_mouse_over = bounds.contains(cursor_position);
 
@@ -932,33 +949,15 @@ pub fn draw<Renderer>(
     );
 
     if let Some(icon) = icon {
-        let Icon {
-            size,
-            font,
-            code_point,
-            position,
-        } = icon;
-
-        let padding = padding.horizontal();
-        let size = size.unwrap_or_else(|| renderer.default_size());
-        let width =
-            renderer.measure_width(&code_point.to_string(), size, font.clone());
+        let icon_layout = children_layout.next().unwrap();
 
         renderer.fill_text(Text {
-            content: &code_point.to_string(),
-            size,
-            font: font.clone(),
+            content: &icon.code_point.to_string(),
+            size: icon.size.unwrap_or_else(|| renderer.default_size()),
+            font: icon.font.clone(),
             color: appearance.icon_color,
-            bounds: Rectangle {
-                x: match position {
-                    IconPosition::Left => bounds.x + width + padding,
-                    IconPosition::Right => bounds.x + bounds.width - padding,
-                },
-                y: bounds.center_y() - size / 2.0,
-                height: size,
-                ..bounds
-            },
-            horizontal_alignment: alignment::Horizontal::Right,
+            bounds: icon_layout.bounds(),
+            horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
         });
     }

From 870b2fe513bd5b3fbcf3ba369afb14d68324aaa2 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, 11 Apr 2023 05:48:12 +0200
Subject: [PATCH 155/440] Derive `Debug` for `text_input::Icon`

---
 native/src/widget/text_input.rs | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index f331f05a..a7fdcb1c 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -32,19 +32,16 @@ use crate::{
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
 /// The position of the [`Icon`].
-#[derive(Clone, Default, Debug)]
+#[derive(Debug, Clone)]
 pub enum IconPosition {
     /// Position the [`Icon`] to the left.
     Left,
-    /// Position the [`Icon`] to the left.
-    ///
-    /// This is the default.
-    #[default]
+    /// Position the [`Icon`] to the right.
     Right,
 }
 
 /// The content of the [`Icon`].
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Icon<Font> {
     /// Font that will be used to display the `code_point`.
     pub font: Font,
@@ -58,19 +55,6 @@ pub struct Icon<Font> {
     pub position: IconPosition,
 }
 
-impl<Renderer> std::fmt::Debug for Icon<Renderer>
-where
-    Renderer: text::Renderer,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Icon")
-            .field("code_point", &self.code_point)
-            .field("size", &self.size)
-            .field("position", &self.position)
-            .finish()
-    }
-}
-
 /// A field that can be filled with text.
 ///
 /// # Example

From 57265ff211e8d040dce2a13e71409bdd6482204c 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, 11 Apr 2023 05:53:22 +0200
Subject: [PATCH 156/440] Move `Icon` definitions after `Widget` implementation

---
 native/src/widget/checkbox.rs   | 22 +++++++--------
 native/src/widget/text_input.rs | 48 ++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 9b69e574..ad05a8e7 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -14,17 +14,6 @@ use crate::{
 
 pub use iced_style::checkbox::{Appearance, StyleSheet};
 
-/// The icon in a [`Checkbox`].
-#[derive(Debug, Clone, PartialEq)]
-pub struct Icon<Font> {
-    /// Font that will be used to display the `code_point`,
-    pub font: Font,
-    /// The unicode code point that will be used as the icon.
-    pub code_point: char,
-    /// Font size of the content.
-    pub size: Option<f32>,
-}
-
 /// A box that can be checked.
 ///
 /// # Example
@@ -319,3 +308,14 @@ where
         Element::new(checkbox)
     }
 }
+
+/// The icon in a [`Checkbox`].
+#[derive(Debug, Clone, PartialEq)]
+pub struct Icon<Font> {
+    /// Font that will be used to display the `code_point`,
+    pub font: Font,
+    /// The unicode code point that will be used as the icon.
+    pub code_point: char,
+    /// Font size of the content.
+    pub size: Option<f32>,
+}
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index a7fdcb1c..c43b735c 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -31,30 +31,6 @@ use crate::{
 
 pub use iced_style::text_input::{Appearance, StyleSheet};
 
-/// The position of the [`Icon`].
-#[derive(Debug, Clone)]
-pub enum IconPosition {
-    /// Position the [`Icon`] to the left.
-    Left,
-    /// Position the [`Icon`] to the right.
-    Right,
-}
-
-/// The content of the [`Icon`].
-#[derive(Debug, Clone)]
-pub struct Icon<Font> {
-    /// Font that will be used to display the `code_point`.
-    pub font: Font,
-    /// The unicode code point that will be used as the icon.
-    pub code_point: char,
-    /// Font size of the content.
-    pub size: Option<f32>,
-    /// The spacing between the [`Icon`] and the text in a [`TextInput`].
-    pub spacing: f32,
-    /// Position of the icon.
-    pub position: IconPosition,
-}
-
 /// A field that can be filled with text.
 ///
 /// # Example
@@ -360,6 +336,30 @@ where
     }
 }
 
+/// The content of the [`Icon`].
+#[derive(Debug, Clone)]
+pub struct Icon<Font> {
+    /// The font that will be used to display the `code_point`.
+    pub font: Font,
+    /// The unicode code point that will be used as the icon.
+    pub code_point: char,
+    /// The font size of the content.
+    pub size: Option<f32>,
+    /// The spacing between the [`Icon`] and the text in a [`TextInput`].
+    pub spacing: f32,
+    /// The position of the icon.
+    pub position: IconPosition,
+}
+
+/// The position of an [`Icon`].
+#[derive(Debug, Clone)]
+pub enum IconPosition {
+    /// Position the [`Icon`] on the left side of a [`TextInput`].
+    Left,
+    /// Position the [`Icon`] on the right side of a [`TextInput`].
+    Right,
+}
+
 /// The identifier of a [`TextInput`].
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Id(widget::Id);

From cf9d8e01048845ee503a62eb55e634a76a0e9163 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, 11 Apr 2023 05:54:51 +0200
Subject: [PATCH 157/440] Rename `IconPosition` to `Side` in `text_input`

---
 examples/tour/src/main.rs       |  2 +-
 native/src/widget/text_input.rs | 18 +++++++++---------
 src/widget.rs                   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 8a1b8d5a..40ab33c2 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -585,7 +585,7 @@ impl<'a> Step {
                 code_point: '\u{E900}',
                 size: Some(35.0),
                 spacing: 10.0,
-                position: text_input::IconPosition::Right,
+                side: text_input::Side::Right,
             });
         }
 
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index c43b735c..bb397645 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -347,16 +347,16 @@ pub struct Icon<Font> {
     pub size: Option<f32>,
     /// The spacing between the [`Icon`] and the text in a [`TextInput`].
     pub spacing: f32,
-    /// The position of the icon.
-    pub position: IconPosition,
+    /// The side of a [`TextInput`] where to display the [`Icon`].
+    pub side: Side,
 }
 
-/// The position of an [`Icon`].
+/// The side of a [`TextInput`].
 #[derive(Debug, Clone)]
-pub enum IconPosition {
-    /// Position the [`Icon`] on the left side of a [`TextInput`].
+pub enum Side {
+    /// The left side of a [`TextInput`].
     Left,
-    /// Position the [`Icon`] on the right side of a [`TextInput`].
+    /// The right side of a [`TextInput`].
     Right,
 }
 
@@ -448,8 +448,8 @@ where
         let mut icon_node =
             layout::Node::new(Size::new(icon_width, text_bounds.height));
 
-        match icon.position {
-            IconPosition::Left => {
+        match icon.side {
+            Side::Left => {
                 text_node.move_to(Point::new(
                     padding.left + icon_width + icon.spacing,
                     padding.top,
@@ -457,7 +457,7 @@ where
 
                 icon_node.move_to(Point::new(padding.left, padding.top));
             }
-            IconPosition::Right => {
+            Side::Right => {
                 text_node.move_to(Point::new(padding.left, padding.top));
 
                 icon_node.move_to(Point::new(
diff --git a/src/widget.rs b/src/widget.rs
index d3c16088..c0ac716f 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -124,7 +124,7 @@ 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, Icon, IconPosition, Id, StyleSheet,
+        select_all, Appearance, Icon, Id, Side, StyleSheet,
     };
 
     /// A field that can be filled with text.

From c794d8ba788b388d4fb7a8ef1bba208b98e1bd02 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, 11 Apr 2023 05:56:34 +0200
Subject: [PATCH 158/440] Collapse `Font` import in `tour` example

---
 examples/tour/src/main.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 40ab33c2..9ee386d4 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -5,8 +5,7 @@ use iced::widget::{
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
-use iced::Font;
-use iced::{Color, Element, Length, Renderer, Sandbox, Settings};
+use iced::{Color, Element, Font, Length, Renderer, Sandbox, Settings};
 
 const ICON_FONT: Font = Font::External {
     name: "Icons",

From aa0be30656e30d116e60a5d06557aea27442ce76 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, 11 Apr 2023 05:57:01 +0200
Subject: [PATCH 159/440] Move `ICON_FONT` constant in `tour` to `text_input`
 helper

---
 examples/tour/src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 9ee386d4..e9b9fb3a 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -7,11 +7,6 @@ use iced::widget::{
 use iced::widget::{Button, Column, Container, Slider};
 use iced::{Color, Element, Font, Length, Renderer, Sandbox, Settings};
 
-const ICON_FONT: Font = Font::External {
-    name: "Icons",
-    bytes: include_bytes!("../fonts/icons.ttf"),
-};
-
 pub fn main() -> iced::Result {
     env_logger::init();
 
@@ -570,6 +565,11 @@ impl<'a> Step {
         is_secure: bool,
         is_showing_icon: bool,
     ) -> Column<'a, StepMessage> {
+        const ICON_FONT: Font = Font::External {
+            name: "Icons",
+            bytes: include_bytes!("../fonts/icons.ttf"),
+        };
+
         let mut text_input = text_input(
             "Type something to continue...",
             value,

From 45015e37d4123f01b546337e741820975fccf66a 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, 11 Apr 2023 05:57:31 +0200
Subject: [PATCH 160/440] Fix `current` step in `tour`

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

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index e9b9fb3a..90868877 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -132,7 +132,7 @@ impl Steps {
                 Step::Debugger,
                 Step::End,
             ],
-            current: 8,
+            current: 0,
         }
     }
 

From 927c3a8caaefc241c48d6200266d286e20dc2076 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, 11 Apr 2023 05:59:08 +0200
Subject: [PATCH 161/440] Reuse `text_bounds` in `text_input::layout`

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

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index bb397645..fd61a849 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -475,7 +475,7 @@ where
         let mut text = layout::Node::new(text_bounds);
         text.move_to(Point::new(padding.left, padding.top));
 
-        layout::Node::with_children(text.size().pad(padding), vec![text])
+        layout::Node::with_children(text_bounds.pad(padding), vec![text])
     }
 }
 

From ae7e6b3d481e420acf981fabbeff9745d4b5347d 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, 11 Apr 2023 07:46:54 +0200
Subject: [PATCH 162/440] Implement `subscription::channel` and simplify
 `unfold`

---
 examples/download_progress/src/download.rs | 17 ++--
 examples/websocket/src/echo.rs             | 98 +++++++++++-----------
 native/src/subscription.rs                 | 91 +++++++++++++-------
 3 files changed, 121 insertions(+), 85 deletions(-)

diff --git a/examples/download_progress/src/download.rs b/examples/download_progress/src/download.rs
index 39dd843f..cd7647e8 100644
--- a/examples/download_progress/src/download.rs
+++ b/examples/download_progress/src/download.rs
@@ -18,10 +18,7 @@ pub struct Download<I> {
     url: String,
 }
 
-async fn download<I: Copy>(
-    id: I,
-    state: State,
-) -> (Option<(I, Progress)>, State) {
+async fn download<I: Copy>(id: I, state: State) -> ((I, Progress), State) {
     match state {
         State::Ready(url) => {
             let response = reqwest::get(&url).await;
@@ -30,7 +27,7 @@ async fn download<I: Copy>(
                 Ok(response) => {
                     if let Some(total) = response.content_length() {
                         (
-                            Some((id, Progress::Started)),
+                            (id, Progress::Started),
                             State::Downloading {
                                 response,
                                 total,
@@ -38,10 +35,10 @@ async fn download<I: Copy>(
                             },
                         )
                     } else {
-                        (Some((id, Progress::Errored)), State::Finished)
+                        ((id, Progress::Errored), State::Finished)
                     }
                 }
-                Err(_) => (Some((id, Progress::Errored)), State::Finished),
+                Err(_) => ((id, Progress::Errored), State::Finished),
             }
         }
         State::Downloading {
@@ -55,7 +52,7 @@ async fn download<I: Copy>(
                 let percentage = (downloaded as f32 / total as f32) * 100.0;
 
                 (
-                    Some((id, Progress::Advanced(percentage))),
+                    (id, Progress::Advanced(percentage)),
                     State::Downloading {
                         response,
                         total,
@@ -63,8 +60,8 @@ async fn download<I: Copy>(
                     },
                 )
             }
-            Ok(None) => (Some((id, Progress::Finished)), State::Finished),
-            Err(_) => (Some((id, Progress::Errored)), State::Finished),
+            Ok(None) => ((id, Progress::Finished), State::Finished),
+            Err(_) => ((id, Progress::Errored), State::Finished),
         },
         State::Finished => {
             // We do not let the stream die, as it would start a
diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index e74768a6..4fabb660 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -13,63 +13,67 @@ use std::fmt;
 pub fn connect() -> Subscription<Event> {
     struct Connect;
 
-    subscription::unfold(
+    subscription::channel(
         std::any::TypeId::of::<Connect>(),
-        State::Disconnected,
-        |state| async move {
-            match state {
-                State::Disconnected => {
-                    const ECHO_SERVER: &str = "ws://localhost:3030";
+        100,
+        |mut output| async move {
+            let mut state = State::Disconnected;
 
-                    match async_tungstenite::tokio::connect_async(ECHO_SERVER)
+            loop {
+                match &mut state {
+                    State::Disconnected => {
+                        const ECHO_SERVER: &str = "ws://localhost:3030";
+
+                        match async_tungstenite::tokio::connect_async(
+                            ECHO_SERVER,
+                        )
                         .await
-                    {
-                        Ok((websocket, _)) => {
-                            let (sender, receiver) = mpsc::channel(100);
+                        {
+                            Ok((websocket, _)) => {
+                                let (sender, receiver) = mpsc::channel(100);
 
-                            (
-                                Some(Event::Connected(Connection(sender))),
-                                State::Connected(websocket, receiver),
-                            )
-                        }
-                        Err(_) => {
-                            tokio::time::sleep(
-                                tokio::time::Duration::from_secs(1),
-                            )
-                            .await;
+                                let _ = output
+                                    .send(Event::Connected(Connection(sender)))
+                                    .await;
 
-                            (Some(Event::Disconnected), State::Disconnected)
-                        }
-                    }
-                }
-                State::Connected(mut websocket, mut input) => {
-                    let mut fused_websocket = websocket.by_ref().fuse();
+                                state = State::Connected(websocket, receiver);
+                            }
+                            Err(_) => {
+                                tokio::time::sleep(
+                                    tokio::time::Duration::from_secs(1),
+                                )
+                                .await;
 
-                    futures::select! {
-                        received = fused_websocket.select_next_some() => {
-                            match received {
-                                Ok(tungstenite::Message::Text(message)) => {
-                                    (
-                                        Some(Event::MessageReceived(Message::User(message))),
-                                        State::Connected(websocket, input)
-                                    )
-                                }
-                                Ok(_) => {
-                                    (None, State::Connected(websocket, input))
-                                }
-                                Err(_) => {
-                                    (Some(Event::Disconnected), State::Disconnected)
-                                }
+                                let _ = output.send(Event::Disconnected).await;
                             }
                         }
+                    }
+                    State::Connected(websocket, input) => {
+                        let mut fused_websocket = websocket.by_ref().fuse();
 
-                        message = input.select_next_some() => {
-                            let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
+                        futures::select! {
+                            received = fused_websocket.select_next_some() => {
+                                match received {
+                                    Ok(tungstenite::Message::Text(message)) => {
+                                       let _ = output.send(Event::MessageReceived(Message::User(message))).await;
+                                    }
+                                    Err(_) => {
+                                        let _ = output.send(Event::Disconnected).await;
 
-                            if result.is_ok() {
-                                (None, State::Connected(websocket, input))
-                            } else {
-                                (Some(Event::Disconnected), State::Disconnected)
+                                        state = State::Disconnected;
+                                    }
+                                    Ok(_) => continue,
+                                }
+                            }
+
+                            message = input.select_next_some() => {
+                                let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
+
+                                if !result.is_ok() {
+                                    let _ = output.send(Event::Disconnected).await;
+
+                                    state = State::Disconnected;
+                                }
                             }
                         }
                     }
diff --git a/native/src/subscription.rs b/native/src/subscription.rs
index 16e78e82..0ff5e320 100644
--- a/native/src/subscription.rs
+++ b/native/src/subscription.rs
@@ -3,6 +3,8 @@ use crate::event::{self, Event};
 use crate::window;
 use crate::Hasher;
 
+use iced_futures::futures::channel::mpsc;
+use iced_futures::futures::never::Never;
 use iced_futures::futures::{self, Future, Stream};
 use iced_futures::{BoxStream, MaybeSend};
 
@@ -133,6 +135,27 @@ where
 /// [`Stream`] that will call the provided closure to produce every `Message`.
 ///
 /// The `id` will be used to uniquely identify the [`Subscription`].
+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 = (Message, T)> + MaybeSend + 'static,
+    Message: 'static + MaybeSend,
+{
+    use futures::future::FutureExt;
+
+    run_with_id(
+        id,
+        futures::stream::unfold(initial, move |state| f(state).map(Some)),
+    )
+}
+
+/// Creates a [`Subscription`] that publishes the events sent from a [`Future`]
+/// to an [`mpsc::Sender`] with the given bounds.
 ///
 /// # Creating an asynchronous worker with bidirectional communication
 /// You can leverage this helper to create a [`Subscription`] that spawns
@@ -145,6 +168,7 @@ where
 /// ```
 /// use iced_native::subscription::{self, Subscription};
 /// use iced_native::futures::channel::mpsc;
+/// use iced_native::futures::sink::SinkExt;
 ///
 /// pub enum Event {
 ///     Ready(mpsc::Sender<Input>),
@@ -165,27 +189,35 @@ where
 /// 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);
+///     subscription::channel(std::any::TypeId::of::<SomeWorker>(), 100, |mut output| async move {
+///         let mut state = State::Starting;
 ///
-///                 (Some(Event::Ready(sender)), State::Ready(receiver))
-///             }
-///             State::Ready(mut receiver) => {
-///                 use iced_native::futures::StreamExt;
+///         loop {
+///             match &mut state {
+///                 State::Starting => {
+///                     // Create channel
+///                     let (sender, receiver) = mpsc::channel(100);
 ///
-///                 // Read next input sent from `Application`
-///                 let input = receiver.select_next_some().await;
+///                     // Send the sender back to the application
+///                     output.send(Event::Ready(sender)).await;
 ///
-///                 match input {
-///                     Input::DoSomeWork => {
-///                         // Do some async work...
+///                     // We are ready to receive messages
+///                     state = State::Ready(receiver);
+///                 }
+///                 State::Ready(receiver) => {
+///                     use iced_native::futures::StreamExt;
 ///
-///                         // Finally, we can optionally return a message to tell the
-///                         // `Application` the work is done
-///                         (Some(Event::WorkFinished), State::Ready(receiver))
+///                     // 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 produce a message to tell the
+///                             // `Application` the work is done
+///                             output.send(Event::WorkFinished).await;
+///                         }
 ///                     }
 ///                 }
 ///             }
@@ -198,25 +230,28 @@ where
 /// connection open.
 ///
 /// [`websocket`]: https://github.com/iced-rs/iced/tree/0.8/examples/websocket
-pub fn unfold<I, T, Fut, Message>(
+pub fn channel<I, Fut, Message>(
     id: I,
-    initial: T,
-    mut f: impl FnMut(T) -> Fut + MaybeSend + Sync + 'static,
+    size: usize,
+    f: impl Fn(mpsc::Sender<Message>) -> Fut + MaybeSend + Sync + 'static,
 ) -> Subscription<Message>
 where
     I: Hash + 'static,
-    T: MaybeSend + 'static,
-    Fut: Future<Output = (Option<Message>, T)> + MaybeSend + 'static,
+    Fut: Future<Output = Never> + MaybeSend + 'static,
     Message: 'static + MaybeSend,
 {
-    use futures::future::{self, FutureExt};
-    use futures::stream::StreamExt;
+    use futures::stream::{self, StreamExt};
 
-    run_with_id(
+    Subscription::from_recipe(Runner {
         id,
-        futures::stream::unfold(initial, move |state| f(state).map(Some))
-            .filter_map(future::ready),
-    )
+        spawn: move |_| {
+            let (sender, receiver) = mpsc::channel(size);
+
+            let runner = stream::once(f(sender)).map(|_| unreachable!());
+
+            stream::select(receiver, runner)
+        },
+    })
 }
 
 struct Runner<I, F, S, Message>

From 5908205a62eb160af745039b9ce0aa5329f984ba 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, 11 Apr 2023 07:48:30 +0200
Subject: [PATCH 163/440] Use `127.0.0.1` instead of `localhost` in `websocket`
 example

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

diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index 4fabb660..f6c46e95 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -22,7 +22,7 @@ pub fn connect() -> Subscription<Event> {
             loop {
                 match &mut state {
                     State::Disconnected => {
-                        const ECHO_SERVER: &str = "ws://localhost:3030";
+                        const ECHO_SERVER: &str = "ws://127.0.0.1:3030";
 
                         match async_tungstenite::tokio::connect_async(
                             ECHO_SERVER,

From 0ed54346b0d6271cf5874debef1de57f8322a249 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, 11 Apr 2023 07:53:26 +0200
Subject: [PATCH 164/440] Use `Result::is_err` in `websocket` example

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

diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index f6c46e95..f9807172 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -69,7 +69,7 @@ pub fn connect() -> Subscription<Event> {
                             message = input.select_next_some() => {
                                 let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
 
-                                if !result.is_ok() {
+                                if result.is_err() {
                                     let _ = output.send(Event::Disconnected).await;
 
                                     state = State::Disconnected;

From f10e936f00d4b83dcacfdebd2727b1a5cd1add95 Mon Sep 17 00:00:00 2001
From: Dan Mishin <danila.mishin.2001@gmail.com>
Date: Fri, 3 Mar 2023 10:01:49 +0300
Subject: [PATCH 165/440] Introduce disabled state for `TextInput`

---
 examples/component/src/main.rs            |   2 +-
 examples/integration_wgpu/src/controls.rs |   9 +-
 examples/lazy/src/main.rs                 |   9 +-
 examples/modal/src/main.rs                |  14 +-
 examples/qr_code/src/main.rs              |  12 +-
 examples/styling/src/main.rs              |  11 +-
 examples/text_input/Cargo.toml            |  11 +
 examples/text_input/README.md             |  15 +
 examples/text_input/src/main.rs           |  94 +++++
 examples/toast/src/main.rs                |   6 +-
 examples/todos/src/main.rs                |  29 +-
 examples/tour/src/main.rs                 |  11 +-
 examples/websocket/src/main.rs            |   9 +-
 native/src/widget/helpers.rs              |   3 +-
 native/src/widget/text_input.rs           | 397 ++++++++++++----------
 style/src/text_input.rs                   |   6 +
 style/src/theme.rs                        |  26 ++
 17 files changed, 410 insertions(+), 254 deletions(-)
 create mode 100644 examples/text_input/Cargo.toml
 create mode 100644 examples/text_input/README.md
 create mode 100644 examples/text_input/src/main.rs

diff --git a/examples/component/src/main.rs b/examples/component/src/main.rs
index bbf549e7..8be3f076 100644
--- a/examples/component/src/main.rs
+++ b/examples/component/src/main.rs
@@ -141,8 +141,8 @@ mod numeric_input {
                         .map(u32::to_string)
                         .as_deref()
                         .unwrap_or(""),
-                    Event::InputChanged,
                 )
+                .on_change(Event::InputChanged)
                 .padding(10),
                 button("+", Event::IncrementPressed),
             ]
diff --git a/examples/integration_wgpu/src/controls.rs b/examples/integration_wgpu/src/controls.rs
index 533cb6e2..8c42513f 100644
--- a/examples/integration_wgpu/src/controls.rs
+++ b/examples/integration_wgpu/src/controls.rs
@@ -100,11 +100,10 @@ impl Program for Controls {
                                     .size(14)
                                     .style(Color::WHITE),
                             )
-                            .push(text_input(
-                                "Placeholder",
-                                text,
-                                Message::TextChanged,
-                            )),
+                            .push(
+                                text_input("Placeholder", text)
+                                    .on_change(Message::TextChanged),
+                            ),
                     ),
             )
             .into()
diff --git a/examples/lazy/src/main.rs b/examples/lazy/src/main.rs
index 6512106f..6b6dca26 100644
--- a/examples/lazy/src/main.rs
+++ b/examples/lazy/src/main.rs
@@ -214,12 +214,9 @@ impl Sandbox for App {
         column![
             scrollable(options).height(Length::Fill),
             row![
-                text_input(
-                    "Add a new option",
-                    &self.input,
-                    Message::InputChanged,
-                )
-                .on_submit(Message::AddItem(self.input.clone())),
+                text_input("Add a new option", &self.input)
+                    .on_change(Message::InputChanged)
+                    .on_submit(Message::AddItem(self.input.clone())),
                 button(text(format!("Toggle Order ({})", self.order)))
                     .on_press(Message::ToggleOrder)
             ]
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 54555684..1377f054 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -133,18 +133,16 @@ impl Application for App {
                     column![
                         column![
                             text("Email").size(12),
-                            text_input(
-                                "abc@123.com",
-                                &self.email,
-                                Message::Email
-                            )
-                            .on_submit(Message::Submit)
-                            .padding(5),
+                            text_input("abc@123.com", &self.email,)
+                                .on_change(Message::Email)
+                                .on_submit(Message::Submit)
+                                .padding(5),
                         ]
                         .spacing(5),
                         column![
                             text("Password").size(12),
-                            text_input("", &self.password, Message::Password)
+                            text_input("", &self.password)
+                                .on_change(Message::Password)
                                 .on_submit(Message::Submit)
                                 .password()
                                 .padding(5),
diff --git a/examples/qr_code/src/main.rs b/examples/qr_code/src/main.rs
index d8041745..0486b068 100644
--- a/examples/qr_code/src/main.rs
+++ b/examples/qr_code/src/main.rs
@@ -49,13 +49,11 @@ impl Sandbox for QRGenerator {
             .size(70)
             .style(Color::from([0.5, 0.5, 0.5]));
 
-        let input = text_input(
-            "Type the data of your QR code here...",
-            &self.data,
-            Message::DataChanged,
-        )
-        .size(30)
-        .padding(15);
+        let input =
+            text_input("Type the data of your QR code here...", &self.data)
+                .on_change(Message::DataChanged)
+                .size(30)
+                .padding(15);
 
         let mut content = column![title, input]
             .width(700)
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index 448c9792..58f983df 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -90,13 +90,10 @@ impl Sandbox for Styling {
                     },
                 );
 
-        let text_input = text_input(
-            "Type something...",
-            &self.input_value,
-            Message::InputChanged,
-        )
-        .padding(10)
-        .size(20);
+        let text_input = text_input("Type something...", &self.input_value)
+            .on_change(Message::InputChanged)
+            .padding(10)
+            .size(20);
 
         let button = button("Submit")
             .padding(10)
diff --git a/examples/text_input/Cargo.toml b/examples/text_input/Cargo.toml
new file mode 100644
index 00000000..aead9896
--- /dev/null
+++ b/examples/text_input/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "text_input"
+authors = ["Dan Mishin <jungletryne@yandex.com>"]
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+iced = { path = "../..", features = ["tokio"] }
+tokio = { version = "1.26.0", features = ["time"] }
diff --git a/examples/text_input/README.md b/examples/text_input/README.md
new file mode 100644
index 00000000..435989cc
--- /dev/null
+++ b/examples/text_input/README.md
@@ -0,0 +1,15 @@
+# Text Input
+
+This example shows basic usage of text edit.
+The button delays the change of the text field state to allow testing of the corner cases.
+
+<div align="center">
+  <a href="https://gfycat.com/everycarelessisabellinewheatear">
+    <img src="https://thumbs.gfycat.com/EveryCarelessIsabellinewheatear-max-1mb.gif" height="400px">
+  </a>
+</div>
+
+You can run it with cargo run:
+```bash
+cargo run --package text_input
+```
\ No newline at end of file
diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
new file mode 100644
index 00000000..977b5099
--- /dev/null
+++ b/examples/text_input/src/main.rs
@@ -0,0 +1,94 @@
+use crate::Message::{StartTimer, TextEditModeChange};
+use iced::widget::{button, column, container, row, text, text_input};
+use iced::{
+    executor, window, Application, Command, Element, Length, Renderer,
+    Settings, Theme,
+};
+use tokio::time::{sleep, Duration};
+
+fn main() -> iced::Result {
+    let settings = Settings {
+        window: window::Settings {
+            size: (700, 100),
+            ..window::Settings::default()
+        },
+        ..Settings::default()
+    };
+
+    Example::run(settings)
+}
+
+#[derive(Default)]
+struct Example {
+    data: String,
+    text_edit_enabled: bool,
+}
+
+#[derive(Debug, Clone)]
+enum Message {
+    StartTimer,
+    TextEditModeChange,
+    TextInputChanged(String),
+}
+
+impl Application for Example {
+    type Executor = executor::Default;
+    type Message = Message;
+    type Theme = Theme;
+    type Flags = ();
+
+    fn new(_flags: Self::Flags) -> (Self, Command<Self::Message>) {
+        (Self::default(), Command::none())
+    }
+
+    fn title(&self) -> String {
+        "TextInput example".into()
+    }
+
+    fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
+        match message {
+            Message::TextEditModeChange => {
+                self.text_edit_enabled = !self.text_edit_enabled;
+                Command::none()
+            }
+            Message::TextInputChanged(updated_text) => {
+                self.data = updated_text;
+                Command::none()
+            }
+            StartTimer => {
+                let timer_f = async {
+                    sleep(Duration::from_secs(3)).await;
+                };
+                Command::perform(timer_f, |_| TextEditModeChange)
+            }
+        }
+    }
+
+    fn view(&self) -> Element<'_, Self::Message, Renderer<Self::Theme>> {
+        let placeholder = if self.text_edit_enabled {
+            "Enabled TextEdit"
+        } else {
+            "Disabled TextEdit"
+        };
+
+        let mut txt_input = text_input(placeholder, &self.data);
+
+        if self.text_edit_enabled {
+            txt_input = txt_input.on_change(Message::TextInputChanged);
+        }
+
+        let btn = button("Enable/Disable").on_press(StartTimer);
+        let label = text(
+            "The mode will be changed after 3s when the button is pressed",
+        );
+
+        let content = row![txt_input, btn].spacing(10);
+        let content = column![content, label].spacing(10);
+
+        container(content)
+            .width(Length::Shrink)
+            .height(Length::Shrink)
+            .padding(20)
+            .into()
+    }
+}
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index e74b3ee6..765afb8f 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -119,13 +119,15 @@ impl Application for App {
             column![
                 subtitle(
                     "Title",
-                    text_input("", &self.editing.title, Message::Title)
+                    text_input("", &self.editing.title)
+                        .on_change(Message::Title)
                         .on_submit(Message::Add)
                         .into()
                 ),
                 subtitle(
                     "Message",
-                    text_input("", &self.editing.body, Message::Body)
+                    text_input("", &self.editing.body)
+                        .on_change(Message::Body)
                         .on_submit(Message::Add)
                         .into()
                 ),
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 6361667e..a6670626 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -204,15 +204,12 @@ impl Application for Todos {
                     .style(Color::from([0.5, 0.5, 0.5]))
                     .horizontal_alignment(alignment::Horizontal::Center);
 
-                let input = text_input(
-                    "What needs to be done?",
-                    input_value,
-                    Message::InputChanged,
-                )
-                .id(INPUT_ID.clone())
-                .padding(15)
-                .size(30)
-                .on_submit(Message::CreateTask);
+                let input = text_input("What needs to be done?", input_value)
+                    .on_change(Message::InputChanged)
+                    .id(INPUT_ID.clone())
+                    .padding(15)
+                    .size(30)
+                    .on_submit(Message::CreateTask);
 
                 let controls = view_controls(tasks, *filter);
                 let filtered_tasks =
@@ -375,14 +372,12 @@ impl Task {
                 .into()
             }
             TaskState::Editing => {
-                let text_input = text_input(
-                    "Describe your task...",
-                    &self.description,
-                    TaskMessage::DescriptionEdited,
-                )
-                .id(Self::text_input_id(i))
-                .on_submit(TaskMessage::FinishEdition)
-                .padding(10);
+                let text_input =
+                    text_input("Describe your task...", &self.description)
+                        .id(Self::text_input_id(i))
+                        .on_change(TaskMessage::DescriptionEdited)
+                        .on_submit(TaskMessage::FinishEdition)
+                        .padding(10);
 
                 row![
                     text_input,
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 90868877..3b4cfd2d 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -570,13 +570,10 @@ impl<'a> Step {
             bytes: include_bytes!("../fonts/icons.ttf"),
         };
 
-        let mut text_input = text_input(
-            "Type something to continue...",
-            value,
-            StepMessage::InputChanged,
-        )
-        .padding(10)
-        .size(30);
+        let mut text_input = text_input("Type something to continue...", value)
+            .on_change(StepMessage::InputChanged)
+            .padding(10)
+            .size(30);
 
         if is_showing_icon {
             text_input = text_input.icon(text_input::Icon {
diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs
index e617b8ce..1fda7f18 100644
--- a/examples/websocket/src/main.rs
+++ b/examples/websocket/src/main.rs
@@ -125,12 +125,9 @@ impl Application for WebSocket {
         };
 
         let new_message_input = {
-            let mut input = text_input(
-                "Type a message...",
-                &self.new_message,
-                Message::NewMessageChanged,
-            )
-            .padding(10);
+            let mut input = text_input("Type a message...", &self.new_message)
+                .on_change(Message::NewMessageChanged)
+                .padding(10);
 
             let mut button = button(
                 text("Send")
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
index d13eca75..0363fc99 100644
--- a/native/src/widget/helpers.rs
+++ b/native/src/widget/helpers.rs
@@ -171,14 +171,13 @@ where
 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)
+    widget::TextInput::new(placeholder, value)
 }
 
 /// Creates a new [`Slider`].
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index fd61a849..65897a68 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -46,8 +46,8 @@ pub use iced_style::text_input::{Appearance, StyleSheet};
 /// let input = TextInput::new(
 ///     "This is the placeholder...",
 ///     value,
-///     Message::TextInputChanged,
 /// )
+/// .on_change(|_| Message::TextInputChanged)
 /// .padding(10);
 /// ```
 /// ![Text input drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/text_input.png?raw=true)
@@ -65,7 +65,7 @@ where
     width: Length,
     padding: Padding,
     size: Option<f32>,
-    on_change: Box<dyn Fn(String) -> Message + 'a>,
+    on_change: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_submit: Option<Message>,
     icon: Option<Icon<Renderer::Font>>,
@@ -82,12 +82,8 @@ where
     ///
     /// It expects:
     /// - a placeholder,
-    /// - the current value, and
-    /// - a function that produces a message when the [`TextInput`] changes.
-    pub fn new<F>(placeholder: &str, value: &str, on_change: F) -> Self
-    where
-        F: 'a + Fn(String) -> Message,
-    {
+    /// - the current value
+    pub fn new(placeholder: &str, value: &str) -> Self {
         TextInput {
             id: None,
             placeholder: String::from(placeholder),
@@ -97,7 +93,7 @@ where
             width: Length::Fill,
             padding: Padding::new(5.0),
             size: None,
-            on_change: Box::new(on_change),
+            on_change: None,
             on_paste: None,
             on_submit: None,
             icon: None,
@@ -175,6 +171,16 @@ where
         self
     }
 
+    /// Sets the callback which is called when the text gets changed
+    /// If not specified, the widget will be disabled
+    pub fn on_change<F>(mut self, callback: F) -> Self
+    where
+        F: 'a + Fn(String) -> Message,
+    {
+        self.on_change = Some(Box::new(callback));
+        self
+    }
+
     /// Draws the [`TextInput`] with the given [`Renderer`], overriding its
     /// [`Value`] if provided.
     ///
@@ -201,6 +207,7 @@ where
             self.is_secure,
             self.icon.as_ref(),
             &self.style,
+            self.on_change.is_none(),
         )
     }
 }
@@ -277,7 +284,7 @@ where
             self.size,
             &self.font,
             self.is_secure,
-            self.on_change.as_ref(),
+            self.on_change.as_deref(),
             self.on_paste.as_deref(),
             &self.on_submit,
             || tree.state.downcast_mut::<State>(),
@@ -307,6 +314,7 @@ where
             self.is_secure,
             self.icon.as_ref(),
             &self.style,
+            self.on_change.is_none(),
         )
     }
 
@@ -492,7 +500,7 @@ pub fn update<'a, Message, Renderer>(
     size: Option<f32>,
     font: &Renderer::Font,
     is_secure: bool,
-    on_change: &dyn Fn(String) -> Message,
+    on_change: Option<&dyn Fn(String) -> Message>,
     on_paste: Option<&dyn Fn(String) -> Message>,
     on_submit: &Option<Message>,
     state: impl FnOnce() -> &'a mut State,
@@ -501,11 +509,14 @@ where
     Message: Clone,
     Renderer: text::Renderer,
 {
+    let is_disabled = on_change.is_none();
+
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let state = state();
             let is_clicked = layout.bounds().contains(cursor_position);
+            let is_clicked = is_clicked && !is_disabled;
 
             state.is_focused = if is_clicked {
                 state.is_focused.or_else(|| {
@@ -635,20 +646,22 @@ where
             let state = state();
 
             if let Some(focus) = &mut state.is_focused {
-                if state.is_pasting.is_none()
-                    && !state.keyboard_modifiers.command()
-                    && !c.is_control()
-                {
-                    let mut editor = Editor::new(value, &mut state.cursor);
+                if let Some(on_change) = on_change {
+                    if state.is_pasting.is_none()
+                        && !state.keyboard_modifiers.command()
+                        && !c.is_control()
+                    {
+                        let mut editor = Editor::new(value, &mut state.cursor);
 
-                    editor.insert(c);
+                        editor.insert(c);
 
-                    let message = (on_change)(editor.contents());
-                    shell.publish(message);
+                        let message = (on_change)(editor.contents());
+                        shell.publish(message);
 
-                    focus.updated_at = Instant::now();
+                        focus.updated_at = Instant::now();
 
-                    return event::Status::Captured;
+                        return event::Status::Captured;
+                    }
                 }
             }
         }
@@ -656,181 +669,188 @@ where
             let state = state();
 
             if let Some(focus) = &mut state.is_focused {
-                let modifiers = state.keyboard_modifiers;
-                focus.updated_at = Instant::now();
+                if let Some(on_change) = on_change {
+                    let modifiers = state.keyboard_modifiers;
+                    focus.updated_at = Instant::now();
 
-                match key_code {
-                    keyboard::KeyCode::Enter
-                    | keyboard::KeyCode::NumpadEnter => {
-                        if let Some(on_submit) = on_submit.clone() {
-                            shell.publish(on_submit);
-                        }
-                    }
-                    keyboard::KeyCode::Backspace => {
-                        if platform::is_jump_modifier_pressed(modifiers)
-                            && state.cursor.selection(value).is_none()
-                        {
-                            if is_secure {
-                                let cursor_pos = state.cursor.end(value);
-                                state.cursor.select_range(0, cursor_pos);
-                            } else {
-                                state.cursor.select_left_by_words(value);
+                    match key_code {
+                        keyboard::KeyCode::Enter
+                        | keyboard::KeyCode::NumpadEnter => {
+                            if let Some(on_submit) = on_submit.clone() {
+                                shell.publish(on_submit);
                             }
                         }
-
-                        let mut editor = Editor::new(value, &mut state.cursor);
-                        editor.backspace();
-
-                        let message = (on_change)(editor.contents());
-                        shell.publish(message);
-                    }
-                    keyboard::KeyCode::Delete => {
-                        if platform::is_jump_modifier_pressed(modifiers)
-                            && state.cursor.selection(value).is_none()
-                        {
-                            if is_secure {
-                                let cursor_pos = state.cursor.end(value);
-                                state
-                                    .cursor
-                                    .select_range(cursor_pos, value.len());
-                            } else {
-                                state.cursor.select_right_by_words(value);
-                            }
-                        }
-
-                        let mut editor = Editor::new(value, &mut state.cursor);
-                        editor.delete();
-
-                        let message = (on_change)(editor.contents());
-                        shell.publish(message);
-                    }
-                    keyboard::KeyCode::Left => {
-                        if platform::is_jump_modifier_pressed(modifiers)
-                            && !is_secure
-                        {
-                            if modifiers.shift() {
-                                state.cursor.select_left_by_words(value);
-                            } else {
-                                state.cursor.move_left_by_words(value);
-                            }
-                        } else if modifiers.shift() {
-                            state.cursor.select_left(value)
-                        } else {
-                            state.cursor.move_left(value);
-                        }
-                    }
-                    keyboard::KeyCode::Right => {
-                        if platform::is_jump_modifier_pressed(modifiers)
-                            && !is_secure
-                        {
-                            if modifiers.shift() {
-                                state.cursor.select_right_by_words(value);
-                            } else {
-                                state.cursor.move_right_by_words(value);
-                            }
-                        } else if modifiers.shift() {
-                            state.cursor.select_right(value)
-                        } else {
-                            state.cursor.move_right(value);
-                        }
-                    }
-                    keyboard::KeyCode::Home => {
-                        if modifiers.shift() {
-                            state
-                                .cursor
-                                .select_range(state.cursor.start(value), 0);
-                        } else {
-                            state.cursor.move_to(0);
-                        }
-                    }
-                    keyboard::KeyCode::End => {
-                        if modifiers.shift() {
-                            state.cursor.select_range(
-                                state.cursor.start(value),
-                                value.len(),
-                            );
-                        } else {
-                            state.cursor.move_to(value.len());
-                        }
-                    }
-                    keyboard::KeyCode::C
-                        if state.keyboard_modifiers.command() =>
-                    {
-                        if let Some((start, end)) =
-                            state.cursor.selection(value)
-                        {
-                            clipboard
-                                .write(value.select(start, end).to_string());
-                        }
-                    }
-                    keyboard::KeyCode::X
-                        if state.keyboard_modifiers.command() =>
-                    {
-                        if let Some((start, end)) =
-                            state.cursor.selection(value)
-                        {
-                            clipboard
-                                .write(value.select(start, end).to_string());
-                        }
-
-                        let mut editor = Editor::new(value, &mut state.cursor);
-                        editor.delete();
-
-                        let message = (on_change)(editor.contents());
-                        shell.publish(message);
-                    }
-                    keyboard::KeyCode::V => {
-                        if state.keyboard_modifiers.command() {
-                            let content = match state.is_pasting.take() {
-                                Some(content) => content,
-                                None => {
-                                    let content: String = clipboard
-                                        .read()
-                                        .unwrap_or_default()
-                                        .chars()
-                                        .filter(|c| !c.is_control())
-                                        .collect();
-
-                                    Value::new(&content)
+                        keyboard::KeyCode::Backspace => {
+                            if platform::is_jump_modifier_pressed(modifiers)
+                                && state.cursor.selection(value).is_none()
+                            {
+                                if is_secure {
+                                    let cursor_pos = state.cursor.end(value);
+                                    state.cursor.select_range(0, cursor_pos);
+                                } else {
+                                    state.cursor.select_left_by_words(value);
                                 }
-                            };
+                            }
 
                             let mut editor =
                                 Editor::new(value, &mut state.cursor);
+                            editor.backspace();
 
-                            editor.paste(content.clone());
-
-                            let message = if let Some(paste) = &on_paste {
-                                (paste)(editor.contents())
-                            } else {
-                                (on_change)(editor.contents())
-                            };
+                            let message = (on_change)(editor.contents());
                             shell.publish(message);
-
-                            state.is_pasting = Some(content);
-                        } else {
-                            state.is_pasting = None;
                         }
-                    }
-                    keyboard::KeyCode::A
-                        if state.keyboard_modifiers.command() =>
-                    {
-                        state.cursor.select_all(value);
-                    }
-                    keyboard::KeyCode::Escape => {
-                        state.is_focused = None;
-                        state.is_dragging = false;
-                        state.is_pasting = None;
+                        keyboard::KeyCode::Delete => {
+                            if platform::is_jump_modifier_pressed(modifiers)
+                                && state.cursor.selection(value).is_none()
+                            {
+                                if is_secure {
+                                    let cursor_pos = state.cursor.end(value);
+                                    state
+                                        .cursor
+                                        .select_range(cursor_pos, value.len());
+                                } else {
+                                    state.cursor.select_right_by_words(value);
+                                }
+                            }
 
-                        state.keyboard_modifiers =
-                            keyboard::Modifiers::default();
+                            let mut editor =
+                                Editor::new(value, &mut state.cursor);
+                            editor.delete();
+
+                            let message = (on_change)(editor.contents());
+                            shell.publish(message);
+                        }
+                        keyboard::KeyCode::Left => {
+                            if platform::is_jump_modifier_pressed(modifiers)
+                                && !is_secure
+                            {
+                                if modifiers.shift() {
+                                    state.cursor.select_left_by_words(value);
+                                } else {
+                                    state.cursor.move_left_by_words(value);
+                                }
+                            } else if modifiers.shift() {
+                                state.cursor.select_left(value)
+                            } else {
+                                state.cursor.move_left(value);
+                            }
+                        }
+                        keyboard::KeyCode::Right => {
+                            if platform::is_jump_modifier_pressed(modifiers)
+                                && !is_secure
+                            {
+                                if modifiers.shift() {
+                                    state.cursor.select_right_by_words(value);
+                                } else {
+                                    state.cursor.move_right_by_words(value);
+                                }
+                            } else if modifiers.shift() {
+                                state.cursor.select_right(value)
+                            } else {
+                                state.cursor.move_right(value);
+                            }
+                        }
+                        keyboard::KeyCode::Home => {
+                            if modifiers.shift() {
+                                state
+                                    .cursor
+                                    .select_range(state.cursor.start(value), 0);
+                            } else {
+                                state.cursor.move_to(0);
+                            }
+                        }
+                        keyboard::KeyCode::End => {
+                            if modifiers.shift() {
+                                state.cursor.select_range(
+                                    state.cursor.start(value),
+                                    value.len(),
+                                );
+                            } else {
+                                state.cursor.move_to(value.len());
+                            }
+                        }
+                        keyboard::KeyCode::C
+                            if state.keyboard_modifiers.command() =>
+                        {
+                            if let Some((start, end)) =
+                                state.cursor.selection(value)
+                            {
+                                clipboard.write(
+                                    value.select(start, end).to_string(),
+                                );
+                            }
+                        }
+                        keyboard::KeyCode::X
+                            if state.keyboard_modifiers.command() =>
+                        {
+                            if let Some((start, end)) =
+                                state.cursor.selection(value)
+                            {
+                                clipboard.write(
+                                    value.select(start, end).to_string(),
+                                );
+                            }
+
+                            let mut editor =
+                                Editor::new(value, &mut state.cursor);
+                            editor.delete();
+
+                            let message = (on_change)(editor.contents());
+                            shell.publish(message);
+                        }
+                        keyboard::KeyCode::V => {
+                            if state.keyboard_modifiers.command() {
+                                let content = match state.is_pasting.take() {
+                                    Some(content) => content,
+                                    None => {
+                                        let content: String = clipboard
+                                            .read()
+                                            .unwrap_or_default()
+                                            .chars()
+                                            .filter(|c| !c.is_control())
+                                            .collect();
+
+                                        Value::new(&content)
+                                    }
+                                };
+
+                                let mut editor =
+                                    Editor::new(value, &mut state.cursor);
+
+                                editor.paste(content.clone());
+
+                                let message = if let Some(paste) = &on_paste {
+                                    (paste)(editor.contents())
+                                } else {
+                                    (on_change)(editor.contents())
+                                };
+                                shell.publish(message);
+
+                                state.is_pasting = Some(content);
+                            } else {
+                                state.is_pasting = None;
+                            }
+                        }
+                        keyboard::KeyCode::A
+                            if state.keyboard_modifiers.command() =>
+                        {
+                            state.cursor.select_all(value);
+                        }
+                        keyboard::KeyCode::Escape => {
+                            state.is_focused = None;
+                            state.is_dragging = false;
+                            state.is_pasting = None;
+
+                            state.keyboard_modifiers =
+                                keyboard::Modifiers::default();
+                        }
+                        keyboard::KeyCode::Tab
+                        | keyboard::KeyCode::Up
+                        | keyboard::KeyCode::Down => {
+                            return event::Status::Ignored;
+                        }
+                        _ => {}
                     }
-                    keyboard::KeyCode::Tab
-                    | keyboard::KeyCode::Up
-                    | keyboard::KeyCode::Down => {
-                        return event::Status::Ignored;
-                    }
-                    _ => {}
                 }
 
                 return event::Status::Captured;
@@ -900,6 +920,7 @@ pub fn draw<Renderer>(
     is_secure: bool,
     icon: Option<&Icon<Renderer::Font>>,
     style: &<Renderer::Theme as StyleSheet>::Style,
+    is_disabled: bool,
 ) where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -914,7 +935,9 @@ pub fn draw<Renderer>(
 
     let is_mouse_over = bounds.contains(cursor_position);
 
-    let appearance = if state.is_focused() {
+    let appearance = if is_disabled {
+        theme.disabled(style)
+    } else if state.is_focused() {
         theme.focused(style)
     } else if is_mouse_over {
         theme.hovered(style)
@@ -968,7 +991,7 @@ pub fn draw<Renderer>(
                     % 2
                     == 0;
 
-                let cursor = if is_cursor_visible {
+                let cursor = if is_cursor_visible && !is_disabled {
                     Some((
                         renderer::Quad {
                             bounds: Rectangle {
@@ -1057,6 +1080,8 @@ pub fn draw<Renderer>(
             content: if text.is_empty() { placeholder } else { &text },
             color: if text.is_empty() {
                 theme.placeholder_color(style)
+            } else if is_disabled {
+                theme.disabled_color(style)
             } else {
                 theme.value_color(style)
             },
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 73b05852..2616ad5a 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -33,6 +33,9 @@ pub trait StyleSheet {
     /// Produces the [`Color`] of the value of a text input.
     fn value_color(&self, style: &Self::Style) -> Color;
 
+    /// Produces the [`Color`] of the value of a disabled text input.
+    fn disabled_color(&self, style: &Self::Style) -> Color;
+
     /// Produces the [`Color`] of the selection of a text input.
     fn selection_color(&self, style: &Self::Style) -> Color;
 
@@ -40,4 +43,7 @@ pub trait StyleSheet {
     fn hovered(&self, style: &Self::Style) -> Appearance {
         self.focused(style)
     }
+
+    /// Produces the style of a disabled text input.
+    fn disabled(&self, style: &Self::Style) -> Appearance;
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 0d974a19..e13edb05 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1093,4 +1093,30 @@ impl text_input::StyleSheet for Theme {
 
         palette.primary.weak.color
     }
+
+    fn disabled(&self, style: &Self::Style) -> text_input::Appearance {
+        if let TextInput::Custom(custom) = style {
+            return custom.disabled(self);
+        }
+
+        let palette = self.extended_palette();
+
+        text_input::Appearance {
+            background: palette.background.base.color.into(),
+            border_radius: 2.0,
+            border_width: 1.0,
+            border_color: palette.background.weak.color,
+            icon_color: palette.background.weak.color,
+        }
+    }
+
+    fn disabled_color(&self, style: &Self::Style) -> Color {
+        if let TextInput::Custom(custom) = style {
+            return custom.value_color(self);
+        }
+
+        let palette = self.extended_palette();
+
+        palette.secondary.strong.color
+    }
 }

From e6a93e960c3ac71a74f11555fd2d225c185f6e8c 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, 12 Apr 2023 04:13:36 +0200
Subject: [PATCH 166/440] Rename `on_change` to `on_input` for `TextInput`

---
 examples/component/src/main.rs            |   2 +-
 examples/integration_wgpu/src/controls.rs |   2 +-
 examples/lazy/src/main.rs                 |   2 +-
 examples/modal/src/main.rs                |   4 +-
 examples/qr_code/src/main.rs              |   2 +-
 examples/styling/src/main.rs              |   2 +-
 examples/text_input/src/main.rs           |   2 +-
 examples/toast/src/main.rs                |   4 +-
 examples/todos/src/main.rs                |   8 +-
 examples/tour/src/main.rs                 |   2 +-
 examples/websocket/src/main.rs            |   2 +-
 native/src/widget/text_input.rs           | 385 +++++++++++-----------
 12 files changed, 205 insertions(+), 212 deletions(-)

diff --git a/examples/component/src/main.rs b/examples/component/src/main.rs
index 8be3f076..21c2747c 100644
--- a/examples/component/src/main.rs
+++ b/examples/component/src/main.rs
@@ -142,7 +142,7 @@ mod numeric_input {
                         .as_deref()
                         .unwrap_or(""),
                 )
-                .on_change(Event::InputChanged)
+                .on_input(Event::InputChanged)
                 .padding(10),
                 button("+", Event::IncrementPressed),
             ]
diff --git a/examples/integration_wgpu/src/controls.rs b/examples/integration_wgpu/src/controls.rs
index 8c42513f..42623b15 100644
--- a/examples/integration_wgpu/src/controls.rs
+++ b/examples/integration_wgpu/src/controls.rs
@@ -102,7 +102,7 @@ impl Program for Controls {
                             )
                             .push(
                                 text_input("Placeholder", text)
-                                    .on_change(Message::TextChanged),
+                                    .on_input(Message::TextChanged),
                             ),
                     ),
             )
diff --git a/examples/lazy/src/main.rs b/examples/lazy/src/main.rs
index 6b6dca26..55b13bcf 100644
--- a/examples/lazy/src/main.rs
+++ b/examples/lazy/src/main.rs
@@ -215,7 +215,7 @@ impl Sandbox for App {
             scrollable(options).height(Length::Fill),
             row![
                 text_input("Add a new option", &self.input)
-                    .on_change(Message::InputChanged)
+                    .on_input(Message::InputChanged)
                     .on_submit(Message::AddItem(self.input.clone())),
                 button(text(format!("Toggle Order ({})", self.order)))
                     .on_press(Message::ToggleOrder)
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 1377f054..49038475 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -134,7 +134,7 @@ impl Application for App {
                         column![
                             text("Email").size(12),
                             text_input("abc@123.com", &self.email,)
-                                .on_change(Message::Email)
+                                .on_input(Message::Email)
                                 .on_submit(Message::Submit)
                                 .padding(5),
                         ]
@@ -142,7 +142,7 @@ impl Application for App {
                         column![
                             text("Password").size(12),
                             text_input("", &self.password)
-                                .on_change(Message::Password)
+                                .on_input(Message::Password)
                                 .on_submit(Message::Submit)
                                 .password()
                                 .padding(5),
diff --git a/examples/qr_code/src/main.rs b/examples/qr_code/src/main.rs
index 0486b068..867ebfa4 100644
--- a/examples/qr_code/src/main.rs
+++ b/examples/qr_code/src/main.rs
@@ -51,7 +51,7 @@ impl Sandbox for QRGenerator {
 
         let input =
             text_input("Type the data of your QR code here...", &self.data)
-                .on_change(Message::DataChanged)
+                .on_input(Message::DataChanged)
                 .size(30)
                 .padding(15);
 
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index 58f983df..e2015bac 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -91,7 +91,7 @@ impl Sandbox for Styling {
                 );
 
         let text_input = text_input("Type something...", &self.input_value)
-            .on_change(Message::InputChanged)
+            .on_input(Message::InputChanged)
             .padding(10)
             .size(20);
 
diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
index 977b5099..418593f4 100644
--- a/examples/text_input/src/main.rs
+++ b/examples/text_input/src/main.rs
@@ -74,7 +74,7 @@ impl Application for Example {
         let mut txt_input = text_input(placeholder, &self.data);
 
         if self.text_edit_enabled {
-            txt_input = txt_input.on_change(Message::TextInputChanged);
+            txt_input = txt_input.on_input(Message::TextInputChanged);
         }
 
         let btn = button("Enable/Disable").on_press(StartTimer);
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 765afb8f..b4b4e007 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -120,14 +120,14 @@ impl Application for App {
                 subtitle(
                     "Title",
                     text_input("", &self.editing.title)
-                        .on_change(Message::Title)
+                        .on_input(Message::Title)
                         .on_submit(Message::Add)
                         .into()
                 ),
                 subtitle(
                     "Message",
                     text_input("", &self.editing.body)
-                        .on_change(Message::Body)
+                        .on_input(Message::Body)
                         .on_submit(Message::Add)
                         .into()
                 ),
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index a6670626..99cdb8f9 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -205,11 +205,11 @@ impl Application for Todos {
                     .horizontal_alignment(alignment::Horizontal::Center);
 
                 let input = text_input("What needs to be done?", input_value)
-                    .on_change(Message::InputChanged)
                     .id(INPUT_ID.clone())
+                    .on_input(Message::InputChanged)
+                    .on_submit(Message::CreateTask)
                     .padding(15)
-                    .size(30)
-                    .on_submit(Message::CreateTask);
+                    .size(30);
 
                 let controls = view_controls(tasks, *filter);
                 let filtered_tasks =
@@ -375,7 +375,7 @@ impl Task {
                 let text_input =
                     text_input("Describe your task...", &self.description)
                         .id(Self::text_input_id(i))
-                        .on_change(TaskMessage::DescriptionEdited)
+                        .on_input(TaskMessage::DescriptionEdited)
                         .on_submit(TaskMessage::FinishEdition)
                         .padding(10);
 
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 3b4cfd2d..16ee19c0 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -571,7 +571,7 @@ impl<'a> Step {
         };
 
         let mut text_input = text_input("Type something to continue...", value)
-            .on_change(StepMessage::InputChanged)
+            .on_input(StepMessage::InputChanged)
             .padding(10)
             .size(30);
 
diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs
index 1fda7f18..920189f5 100644
--- a/examples/websocket/src/main.rs
+++ b/examples/websocket/src/main.rs
@@ -126,7 +126,7 @@ impl Application for WebSocket {
 
         let new_message_input = {
             let mut input = text_input("Type a message...", &self.new_message)
-                .on_change(Message::NewMessageChanged)
+                .on_input(Message::NewMessageChanged)
                 .padding(10);
 
             let mut button = button(
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 65897a68..0cbc65db 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -47,7 +47,7 @@ pub use iced_style::text_input::{Appearance, StyleSheet};
 ///     "This is the placeholder...",
 ///     value,
 /// )
-/// .on_change(|_| Message::TextInputChanged)
+/// .on_input(Message::TextInputChanged)
 /// .padding(10);
 /// ```
 /// ![Text input drawn by `iced_wgpu`](https://github.com/iced-rs/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/text_input.png?raw=true)
@@ -65,7 +65,7 @@ where
     width: Length,
     padding: Padding,
     size: Option<f32>,
-    on_change: Option<Box<dyn Fn(String) -> Message + 'a>>,
+    on_input: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
     on_submit: Option<Message>,
     icon: Option<Icon<Renderer::Font>>,
@@ -93,7 +93,7 @@ where
             width: Length::Fill,
             padding: Padding::new(5.0),
             size: None,
-            on_change: None,
+            on_input: None,
             on_paste: None,
             on_submit: None,
             icon: None,
@@ -113,6 +113,23 @@ where
         self
     }
 
+    /// Sets the callback which is called when the text gets changed
+    /// If not specified, the widget will be disabled
+    pub fn on_input<F>(mut self, callback: F) -> Self
+    where
+        F: 'a + Fn(String) -> Message,
+    {
+        self.on_input = Some(Box::new(callback));
+        self
+    }
+
+    /// Sets the message that should be produced when the [`TextInput`] is
+    /// focused and the enter key is pressed.
+    pub fn on_submit(mut self, message: Message) -> Self {
+        self.on_submit = Some(message);
+        self
+    }
+
     /// Sets the message that should be produced when some text is pasted into
     /// the [`TextInput`].
     pub fn on_paste(
@@ -155,13 +172,6 @@ where
         self
     }
 
-    /// Sets the message that should be produced when the [`TextInput`] is
-    /// focused and the enter key is pressed.
-    pub fn on_submit(mut self, message: Message) -> Self {
-        self.on_submit = Some(message);
-        self
-    }
-
     /// Sets the style of the [`TextInput`].
     pub fn style(
         mut self,
@@ -171,16 +181,6 @@ where
         self
     }
 
-    /// Sets the callback which is called when the text gets changed
-    /// If not specified, the widget will be disabled
-    pub fn on_change<F>(mut self, callback: F) -> Self
-    where
-        F: 'a + Fn(String) -> Message,
-    {
-        self.on_change = Some(Box::new(callback));
-        self
-    }
-
     /// Draws the [`TextInput`] with the given [`Renderer`], overriding its
     /// [`Value`] if provided.
     ///
@@ -204,10 +204,10 @@ where
             &self.placeholder,
             self.size,
             &self.font,
+            self.on_input.is_none(),
             self.is_secure,
             self.icon.as_ref(),
             &self.style,
-            self.on_change.is_none(),
         )
     }
 }
@@ -284,7 +284,7 @@ where
             self.size,
             &self.font,
             self.is_secure,
-            self.on_change.as_deref(),
+            self.on_input.as_deref(),
             self.on_paste.as_deref(),
             &self.on_submit,
             || tree.state.downcast_mut::<State>(),
@@ -311,10 +311,10 @@ where
             &self.placeholder,
             self.size,
             &self.font,
+            self.on_input.is_none(),
             self.is_secure,
             self.icon.as_ref(),
             &self.style,
-            self.on_change.is_none(),
         )
     }
 
@@ -500,7 +500,7 @@ pub fn update<'a, Message, Renderer>(
     size: Option<f32>,
     font: &Renderer::Font,
     is_secure: bool,
-    on_change: Option<&dyn Fn(String) -> Message>,
+    on_input: Option<&dyn Fn(String) -> Message>,
     on_paste: Option<&dyn Fn(String) -> Message>,
     on_submit: &Option<Message>,
     state: impl FnOnce() -> &'a mut State,
@@ -509,14 +509,12 @@ where
     Message: Clone,
     Renderer: text::Renderer,
 {
-    let is_disabled = on_change.is_none();
-
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let state = state();
-            let is_clicked = layout.bounds().contains(cursor_position);
-            let is_clicked = is_clicked && !is_disabled;
+            let is_clicked =
+                layout.bounds().contains(cursor_position) && on_input.is_some();
 
             state.is_focused = if is_clicked {
                 state.is_focused.or_else(|| {
@@ -646,22 +644,22 @@ where
             let state = state();
 
             if let Some(focus) = &mut state.is_focused {
-                if let Some(on_change) = on_change {
-                    if state.is_pasting.is_none()
-                        && !state.keyboard_modifiers.command()
-                        && !c.is_control()
-                    {
-                        let mut editor = Editor::new(value, &mut state.cursor);
+                let Some(on_input) = on_input else { return event::Status::Ignored };
 
-                        editor.insert(c);
+                if state.is_pasting.is_none()
+                    && !state.keyboard_modifiers.command()
+                    && !c.is_control()
+                {
+                    let mut editor = Editor::new(value, &mut state.cursor);
 
-                        let message = (on_change)(editor.contents());
-                        shell.publish(message);
+                    editor.insert(c);
 
-                        focus.updated_at = Instant::now();
+                    let message = (on_input)(editor.contents());
+                    shell.publish(message);
 
-                        return event::Status::Captured;
-                    }
+                    focus.updated_at = Instant::now();
+
+                    return event::Status::Captured;
                 }
             }
         }
@@ -669,188 +667,183 @@ where
             let state = state();
 
             if let Some(focus) = &mut state.is_focused {
-                if let Some(on_change) = on_change {
-                    let modifiers = state.keyboard_modifiers;
-                    focus.updated_at = Instant::now();
+                let Some(on_input) = on_input else { return event::Status::Ignored };
 
-                    match key_code {
-                        keyboard::KeyCode::Enter
-                        | keyboard::KeyCode::NumpadEnter => {
-                            if let Some(on_submit) = on_submit.clone() {
-                                shell.publish(on_submit);
-                            }
+                let modifiers = state.keyboard_modifiers;
+                focus.updated_at = Instant::now();
+
+                match key_code {
+                    keyboard::KeyCode::Enter
+                    | keyboard::KeyCode::NumpadEnter => {
+                        if let Some(on_submit) = on_submit.clone() {
+                            shell.publish(on_submit);
                         }
-                        keyboard::KeyCode::Backspace => {
-                            if platform::is_jump_modifier_pressed(modifiers)
-                                && state.cursor.selection(value).is_none()
-                            {
-                                if is_secure {
-                                    let cursor_pos = state.cursor.end(value);
-                                    state.cursor.select_range(0, cursor_pos);
-                                } else {
-                                    state.cursor.select_left_by_words(value);
-                                }
-                            }
-
-                            let mut editor =
-                                Editor::new(value, &mut state.cursor);
-                            editor.backspace();
-
-                            let message = (on_change)(editor.contents());
-                            shell.publish(message);
-                        }
-                        keyboard::KeyCode::Delete => {
-                            if platform::is_jump_modifier_pressed(modifiers)
-                                && state.cursor.selection(value).is_none()
-                            {
-                                if is_secure {
-                                    let cursor_pos = state.cursor.end(value);
-                                    state
-                                        .cursor
-                                        .select_range(cursor_pos, value.len());
-                                } else {
-                                    state.cursor.select_right_by_words(value);
-                                }
-                            }
-
-                            let mut editor =
-                                Editor::new(value, &mut state.cursor);
-                            editor.delete();
-
-                            let message = (on_change)(editor.contents());
-                            shell.publish(message);
-                        }
-                        keyboard::KeyCode::Left => {
-                            if platform::is_jump_modifier_pressed(modifiers)
-                                && !is_secure
-                            {
-                                if modifiers.shift() {
-                                    state.cursor.select_left_by_words(value);
-                                } else {
-                                    state.cursor.move_left_by_words(value);
-                                }
-                            } else if modifiers.shift() {
-                                state.cursor.select_left(value)
+                    }
+                    keyboard::KeyCode::Backspace => {
+                        if platform::is_jump_modifier_pressed(modifiers)
+                            && state.cursor.selection(value).is_none()
+                        {
+                            if is_secure {
+                                let cursor_pos = state.cursor.end(value);
+                                state.cursor.select_range(0, cursor_pos);
                             } else {
-                                state.cursor.move_left(value);
+                                state.cursor.select_left_by_words(value);
                             }
                         }
-                        keyboard::KeyCode::Right => {
-                            if platform::is_jump_modifier_pressed(modifiers)
-                                && !is_secure
-                            {
-                                if modifiers.shift() {
-                                    state.cursor.select_right_by_words(value);
-                                } else {
-                                    state.cursor.move_right_by_words(value);
-                                }
-                            } else if modifiers.shift() {
-                                state.cursor.select_right(value)
-                            } else {
-                                state.cursor.move_right(value);
-                            }
-                        }
-                        keyboard::KeyCode::Home => {
-                            if modifiers.shift() {
+
+                        let mut editor = Editor::new(value, &mut state.cursor);
+                        editor.backspace();
+
+                        let message = (on_input)(editor.contents());
+                        shell.publish(message);
+                    }
+                    keyboard::KeyCode::Delete => {
+                        if platform::is_jump_modifier_pressed(modifiers)
+                            && state.cursor.selection(value).is_none()
+                        {
+                            if is_secure {
+                                let cursor_pos = state.cursor.end(value);
                                 state
                                     .cursor
-                                    .select_range(state.cursor.start(value), 0);
+                                    .select_range(cursor_pos, value.len());
                             } else {
-                                state.cursor.move_to(0);
+                                state.cursor.select_right_by_words(value);
                             }
                         }
-                        keyboard::KeyCode::End => {
+
+                        let mut editor = Editor::new(value, &mut state.cursor);
+                        editor.delete();
+
+                        let message = (on_input)(editor.contents());
+                        shell.publish(message);
+                    }
+                    keyboard::KeyCode::Left => {
+                        if platform::is_jump_modifier_pressed(modifiers)
+                            && !is_secure
+                        {
                             if modifiers.shift() {
-                                state.cursor.select_range(
-                                    state.cursor.start(value),
-                                    value.len(),
-                                );
+                                state.cursor.select_left_by_words(value);
                             } else {
-                                state.cursor.move_to(value.len());
+                                state.cursor.move_left_by_words(value);
                             }
+                        } else if modifiers.shift() {
+                            state.cursor.select_left(value)
+                        } else {
+                            state.cursor.move_left(value);
                         }
-                        keyboard::KeyCode::C
-                            if state.keyboard_modifiers.command() =>
+                    }
+                    keyboard::KeyCode::Right => {
+                        if platform::is_jump_modifier_pressed(modifiers)
+                            && !is_secure
                         {
-                            if let Some((start, end)) =
-                                state.cursor.selection(value)
-                            {
-                                clipboard.write(
-                                    value.select(start, end).to_string(),
-                                );
+                            if modifiers.shift() {
+                                state.cursor.select_right_by_words(value);
+                            } else {
+                                state.cursor.move_right_by_words(value);
                             }
+                        } else if modifiers.shift() {
+                            state.cursor.select_right(value)
+                        } else {
+                            state.cursor.move_right(value);
                         }
-                        keyboard::KeyCode::X
-                            if state.keyboard_modifiers.command() =>
+                    }
+                    keyboard::KeyCode::Home => {
+                        if modifiers.shift() {
+                            state
+                                .cursor
+                                .select_range(state.cursor.start(value), 0);
+                        } else {
+                            state.cursor.move_to(0);
+                        }
+                    }
+                    keyboard::KeyCode::End => {
+                        if modifiers.shift() {
+                            state.cursor.select_range(
+                                state.cursor.start(value),
+                                value.len(),
+                            );
+                        } else {
+                            state.cursor.move_to(value.len());
+                        }
+                    }
+                    keyboard::KeyCode::C
+                        if state.keyboard_modifiers.command() =>
+                    {
+                        if let Some((start, end)) =
+                            state.cursor.selection(value)
                         {
-                            if let Some((start, end)) =
-                                state.cursor.selection(value)
-                            {
-                                clipboard.write(
-                                    value.select(start, end).to_string(),
-                                );
-                            }
+                            clipboard
+                                .write(value.select(start, end).to_string());
+                        }
+                    }
+                    keyboard::KeyCode::X
+                        if state.keyboard_modifiers.command() =>
+                    {
+                        if let Some((start, end)) =
+                            state.cursor.selection(value)
+                        {
+                            clipboard
+                                .write(value.select(start, end).to_string());
+                        }
+
+                        let mut editor = Editor::new(value, &mut state.cursor);
+                        editor.delete();
+
+                        let message = (on_input)(editor.contents());
+                        shell.publish(message);
+                    }
+                    keyboard::KeyCode::V => {
+                        if state.keyboard_modifiers.command() {
+                            let content = match state.is_pasting.take() {
+                                Some(content) => content,
+                                None => {
+                                    let content: String = clipboard
+                                        .read()
+                                        .unwrap_or_default()
+                                        .chars()
+                                        .filter(|c| !c.is_control())
+                                        .collect();
+
+                                    Value::new(&content)
+                                }
+                            };
 
                             let mut editor =
                                 Editor::new(value, &mut state.cursor);
-                            editor.delete();
 
-                            let message = (on_change)(editor.contents());
-                            shell.publish(message);
-                        }
-                        keyboard::KeyCode::V => {
-                            if state.keyboard_modifiers.command() {
-                                let content = match state.is_pasting.take() {
-                                    Some(content) => content,
-                                    None => {
-                                        let content: String = clipboard
-                                            .read()
-                                            .unwrap_or_default()
-                                            .chars()
-                                            .filter(|c| !c.is_control())
-                                            .collect();
+                            editor.paste(content.clone());
 
-                                        Value::new(&content)
-                                    }
-                                };
-
-                                let mut editor =
-                                    Editor::new(value, &mut state.cursor);
-
-                                editor.paste(content.clone());
-
-                                let message = if let Some(paste) = &on_paste {
-                                    (paste)(editor.contents())
-                                } else {
-                                    (on_change)(editor.contents())
-                                };
-                                shell.publish(message);
-
-                                state.is_pasting = Some(content);
+                            let message = if let Some(paste) = &on_paste {
+                                (paste)(editor.contents())
                             } else {
-                                state.is_pasting = None;
-                            }
-                        }
-                        keyboard::KeyCode::A
-                            if state.keyboard_modifiers.command() =>
-                        {
-                            state.cursor.select_all(value);
-                        }
-                        keyboard::KeyCode::Escape => {
-                            state.is_focused = None;
-                            state.is_dragging = false;
-                            state.is_pasting = None;
+                                (on_input)(editor.contents())
+                            };
+                            shell.publish(message);
 
-                            state.keyboard_modifiers =
-                                keyboard::Modifiers::default();
+                            state.is_pasting = Some(content);
+                        } else {
+                            state.is_pasting = None;
                         }
-                        keyboard::KeyCode::Tab
-                        | keyboard::KeyCode::Up
-                        | keyboard::KeyCode::Down => {
-                            return event::Status::Ignored;
-                        }
-                        _ => {}
                     }
+                    keyboard::KeyCode::A
+                        if state.keyboard_modifiers.command() =>
+                    {
+                        state.cursor.select_all(value);
+                    }
+                    keyboard::KeyCode::Escape => {
+                        state.is_focused = None;
+                        state.is_dragging = false;
+                        state.is_pasting = None;
+
+                        state.keyboard_modifiers =
+                            keyboard::Modifiers::default();
+                    }
+                    keyboard::KeyCode::Tab
+                    | keyboard::KeyCode::Up
+                    | keyboard::KeyCode::Down => {
+                        return event::Status::Ignored;
+                    }
+                    _ => {}
                 }
 
                 return event::Status::Captured;
@@ -917,10 +910,10 @@ pub fn draw<Renderer>(
     placeholder: &str,
     size: Option<f32>,
     font: &Renderer::Font,
+    is_disabled: bool,
     is_secure: bool,
     icon: Option<&Icon<Renderer::Font>>,
     style: &<Renderer::Theme as StyleSheet>::Style,
-    is_disabled: bool,
 ) where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,

From 250ba3a7f1b41c7f7ca32b8db40a8c4069ebef77 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, 12 Apr 2023 04:19:54 +0200
Subject: [PATCH 167/440] Remove `text_input` example

---
 examples/text_input/Cargo.toml  | 11 ----
 examples/text_input/README.md   | 15 ------
 examples/text_input/src/main.rs | 94 ---------------------------------
 3 files changed, 120 deletions(-)
 delete mode 100644 examples/text_input/Cargo.toml
 delete mode 100644 examples/text_input/README.md
 delete mode 100644 examples/text_input/src/main.rs

diff --git a/examples/text_input/Cargo.toml b/examples/text_input/Cargo.toml
deleted file mode 100644
index aead9896..00000000
--- a/examples/text_input/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "text_input"
-authors = ["Dan Mishin <jungletryne@yandex.com>"]
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-iced = { path = "../..", features = ["tokio"] }
-tokio = { version = "1.26.0", features = ["time"] }
diff --git a/examples/text_input/README.md b/examples/text_input/README.md
deleted file mode 100644
index 435989cc..00000000
--- a/examples/text_input/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Text Input
-
-This example shows basic usage of text edit.
-The button delays the change of the text field state to allow testing of the corner cases.
-
-<div align="center">
-  <a href="https://gfycat.com/everycarelessisabellinewheatear">
-    <img src="https://thumbs.gfycat.com/EveryCarelessIsabellinewheatear-max-1mb.gif" height="400px">
-  </a>
-</div>
-
-You can run it with cargo run:
-```bash
-cargo run --package text_input
-```
\ No newline at end of file
diff --git a/examples/text_input/src/main.rs b/examples/text_input/src/main.rs
deleted file mode 100644
index 418593f4..00000000
--- a/examples/text_input/src/main.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use crate::Message::{StartTimer, TextEditModeChange};
-use iced::widget::{button, column, container, row, text, text_input};
-use iced::{
-    executor, window, Application, Command, Element, Length, Renderer,
-    Settings, Theme,
-};
-use tokio::time::{sleep, Duration};
-
-fn main() -> iced::Result {
-    let settings = Settings {
-        window: window::Settings {
-            size: (700, 100),
-            ..window::Settings::default()
-        },
-        ..Settings::default()
-    };
-
-    Example::run(settings)
-}
-
-#[derive(Default)]
-struct Example {
-    data: String,
-    text_edit_enabled: bool,
-}
-
-#[derive(Debug, Clone)]
-enum Message {
-    StartTimer,
-    TextEditModeChange,
-    TextInputChanged(String),
-}
-
-impl Application for Example {
-    type Executor = executor::Default;
-    type Message = Message;
-    type Theme = Theme;
-    type Flags = ();
-
-    fn new(_flags: Self::Flags) -> (Self, Command<Self::Message>) {
-        (Self::default(), Command::none())
-    }
-
-    fn title(&self) -> String {
-        "TextInput example".into()
-    }
-
-    fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
-        match message {
-            Message::TextEditModeChange => {
-                self.text_edit_enabled = !self.text_edit_enabled;
-                Command::none()
-            }
-            Message::TextInputChanged(updated_text) => {
-                self.data = updated_text;
-                Command::none()
-            }
-            StartTimer => {
-                let timer_f = async {
-                    sleep(Duration::from_secs(3)).await;
-                };
-                Command::perform(timer_f, |_| TextEditModeChange)
-            }
-        }
-    }
-
-    fn view(&self) -> Element<'_, Self::Message, Renderer<Self::Theme>> {
-        let placeholder = if self.text_edit_enabled {
-            "Enabled TextEdit"
-        } else {
-            "Disabled TextEdit"
-        };
-
-        let mut txt_input = text_input(placeholder, &self.data);
-
-        if self.text_edit_enabled {
-            txt_input = txt_input.on_input(Message::TextInputChanged);
-        }
-
-        let btn = button("Enable/Disable").on_press(StartTimer);
-        let label = text(
-            "The mode will be changed after 3s when the button is pressed",
-        );
-
-        let content = row![txt_input, btn].spacing(10);
-        let content = column![content, label].spacing(10);
-
-        container(content)
-            .width(Length::Shrink)
-            .height(Length::Shrink)
-            .padding(20)
-            .into()
-    }
-}

From 7e69cb4b18cde29eceb57e3712c0630d279e7984 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, 12 Apr 2023 04:20:04 +0200
Subject: [PATCH 168/440] Unfocus `TextInput` if it becomes disabled

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

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 0cbc65db..4c10f5bb 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -227,6 +227,18 @@ where
         tree::State::new(State::new())
     }
 
+    fn diff(&self, tree: &mut Tree) {
+        let state = tree.state.downcast_mut::<State>();
+
+        // Unfocus text input if it becomes disabled
+        if self.on_input.is_none() {
+            state.last_click = None;
+            state.is_focused = None;
+            state.is_pasting = None;
+            state.is_dragging = false;
+        }
+    }
+
     fn width(&self) -> Length {
         self.width
     }

From 70e4af46aaa9f0750bad2b8b6ed676dd841d6401 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, 12 Apr 2023 04:21:58 +0200
Subject: [PATCH 169/440] Improve consistency of `on_input` documentation

---
 native/src/widget/text_input.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 4c10f5bb..63751b4d 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -113,8 +113,10 @@ where
         self
     }
 
-    /// Sets the callback which is called when the text gets changed
-    /// If not specified, the widget will be disabled
+    /// Sets the message that should be produced when some text is typed into
+    /// the [`TextInput`].
+    ///
+    /// If this method is not called, the [`TextInput`] will be disabled.
     pub fn on_input<F>(mut self, callback: F) -> Self
     where
         F: 'a + Fn(String) -> Message,

From 6b8548869ea25ad7bb7a49fad77adfa3b43cc87d 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, 12 Apr 2023 04:25:02 +0200
Subject: [PATCH 170/440] Remove unnecessary `is_disabled` check in
 `text_input::draw`

A disabled `TextInput` cannot be focused.
---
 native/src/widget/text_input.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 63751b4d..d704692d 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -998,7 +998,7 @@ pub fn draw<Renderer>(
                     % 2
                     == 0;
 
-                let cursor = if is_cursor_visible && !is_disabled {
+                let cursor = if is_cursor_visible {
                     Some((
                         renderer::Quad {
                             bounds: Rectangle {

From 1de794aabfaa651f021ff2e5831397d7ce9fc53c 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, 12 Apr 2023 04:34:37 +0200
Subject: [PATCH 171/440] Fine-tune built-in styling of disabled `TextInput`

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

diff --git a/style/src/theme.rs b/style/src/theme.rs
index e13edb05..6bd82a96 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -1102,21 +1102,19 @@ impl text_input::StyleSheet for Theme {
         let palette = self.extended_palette();
 
         text_input::Appearance {
-            background: palette.background.base.color.into(),
+            background: palette.background.weak.color.into(),
             border_radius: 2.0,
             border_width: 1.0,
-            border_color: palette.background.weak.color,
-            icon_color: palette.background.weak.color,
+            border_color: palette.background.strong.color,
+            icon_color: palette.background.strong.color,
         }
     }
 
     fn disabled_color(&self, style: &Self::Style) -> Color {
         if let TextInput::Custom(custom) = style {
-            return custom.value_color(self);
+            return custom.disabled_color(self);
         }
 
-        let palette = self.extended_palette();
-
-        palette.secondary.strong.color
+        self.placeholder_color(style)
     }
 }

From 7e7e66586d990788ffd77b17e98357e74252f497 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, 12 Apr 2023 04:37:39 +0200
Subject: [PATCH 172/440] Show `NotAllowed` as mouse icon when hovering a
 disabled `TextInput`

---
 core/src/mouse/interaction.rs   | 1 +
 native/src/widget/text_input.rs | 9 +++++++--
 winit/src/conversion.rs         | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
index 57da93fe..072033fd 100644
--- a/core/src/mouse/interaction.rs
+++ b/core/src/mouse/interaction.rs
@@ -12,4 +12,5 @@ pub enum Interaction {
     Grabbing,
     ResizingHorizontally,
     ResizingVertically,
+    NotAllowed,
 }
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index d704692d..8627aa98 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -340,7 +340,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(layout, cursor_position)
+        mouse_interaction(layout, cursor_position, self.on_input.is_none())
     }
 }
 
@@ -1117,9 +1117,14 @@ pub fn draw<Renderer>(
 pub fn mouse_interaction(
     layout: Layout<'_>,
     cursor_position: Point,
+    is_disabled: bool,
 ) -> mouse::Interaction {
     if layout.bounds().contains(cursor_position) {
-        mouse::Interaction::Text
+        if is_disabled {
+            mouse::Interaction::NotAllowed
+        } else {
+            mouse::Interaction::Text
+        }
     } else {
         mouse::Interaction::default()
     }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 1b2ead36..d2dc9c06 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -236,6 +236,7 @@ pub fn mouse_interaction(
             winit::window::CursorIcon::EwResize
         }
         Interaction::ResizingVertically => winit::window::CursorIcon::NsResize,
+        Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed,
     }
 }
 

From de51bc3f41752634c0ccce8484d0a9bade62a45a Mon Sep 17 00:00:00 2001
From: Night_Hunter <samuelhuntnz@gmail.com>
Date: Fri, 6 Jan 2023 14:55:09 +1300
Subject: [PATCH 173/440] Introduce left and right colors for slider rails

---
 native/src/widget/slider.rs          | 92 ++++++++++++++++------------
 native/src/widget/vertical_slider.rs | 87 +++++++++++++++-----------
 style/src/slider.rs                  | 17 ++++-
 style/src/theme.rs                   | 14 +++--
 4 files changed, 130 insertions(+), 80 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index d3715b1c..b3f3306c 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -8,13 +8,15 @@ use crate::renderer;
 use crate::touch;
 use crate::widget::tree::{self, Tree};
 use crate::{
-    Background, Clipboard, Color, Element, Layout, Length, Pixels, Point,
-    Rectangle, Shell, Size, Widget,
+    Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
+    Widget,
 };
 
 use std::ops::RangeInclusive;
 
-pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
+pub use iced_style::slider::{
+    Appearance, Handle, HandleShape, Rail, StyleSheet,
+};
 
 /// An horizontal bar and a handle that selects a single value from a range of
 /// values.
@@ -368,37 +370,7 @@ pub fn draw<T, R>(
         style_sheet.active(style)
     };
 
-    let rail_y = bounds.y + (bounds.height / 2.0).round();
-
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: Rectangle {
-                x: bounds.x,
-                y: rail_y - 1.0,
-                width: bounds.width,
-                height: 2.0,
-            },
-            border_radius: 0.0.into(),
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        },
-        style.rail_colors.0,
-    );
-
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: Rectangle {
-                x: bounds.x,
-                y: rail_y + 1.0,
-                width: bounds.width,
-                height: 2.0,
-            },
-            border_radius: 0.0.into(),
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        },
-        Background::Color(style.rail_colors.1),
-    );
+    let value = value.into() as f32;
 
     let (handle_width, handle_height, handle_border_radius) = match style
         .handle
@@ -411,25 +383,69 @@ pub fn draw<T, R>(
         } => (f32::from(width), bounds.height, border_radius),
     };
 
-    let value = value.into() as f32;
     let (range_start, range_end) = {
         let (start, end) = range.clone().into_inner();
 
         (start.into() as f32, end.into() as f32)
     };
 
-    let handle_offset = if range_start >= range_end {
+    let offset = if range_start >= range_end {
         0.0
     } else {
         (bounds.width - handle_width) * (value - range_start)
             / (range_end - range_start)
     };
 
+    let line_y = bounds.y + bounds.height / 2.0 - style.rail.size / 2.0;
+    let line_offset = offset + handle_width / 2.0;
+
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: bounds.x + handle_offset.round(),
-                y: rail_y - handle_height / 2.0,
+                x: bounds.x,
+                y: line_y,
+                width: line_offset,
+                height: style.rail.size,
+            },
+            border_radius: [
+                style.rail.border_radius,
+                0.0,
+                0.0,
+                style.rail.border_radius,
+            ]
+            .into(),
+            border_width: style.rail.border_width,
+            border_color: style.rail.border_color,
+        },
+        style.rail.colors.0,
+    );
+
+    renderer.fill_quad(
+        renderer::Quad {
+            bounds: Rectangle {
+                x: bounds.x + line_offset.round(),
+                y: line_y,
+                width: bounds.width - line_offset,
+                height: style.rail.size,
+            },
+            border_radius: [
+                0.0,
+                style.rail.border_radius,
+                style.rail.border_radius,
+                0.0,
+            ]
+            .into(),
+            border_width: style.rail.border_width,
+            border_color: style.rail.border_color,
+        },
+        style.rail.colors.1,
+    );
+
+    renderer.fill_quad(
+        renderer::Quad {
+            bounds: Rectangle {
+                x: bounds.x + offset.round(),
+                y: bounds.y + bounds.height / 2.0 - handle_height / 2.0,
                 width: handle_width,
                 height: handle_height,
             },
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index f1687e38..3a8c30b6 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -8,8 +8,8 @@ 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,
+    layout, mouse, renderer, touch, Clipboard, Element, Layout, Length, Pixels,
+    Point, Rectangle, Shell, Size, Widget,
 };
 
 /// An vertical bar and a handle that selects a single value from a range of
@@ -363,38 +363,6 @@ pub fn draw<T, R>(
         style_sheet.active(style)
     };
 
-    let rail_x = bounds.x + (bounds.width / 2.0).round();
-
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: Rectangle {
-                x: rail_x - 1.0,
-                y: bounds.y,
-                width: 2.0,
-                height: bounds.height,
-            },
-            border_radius: 0.0.into(),
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        },
-        style.rail_colors.0,
-    );
-
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: Rectangle {
-                x: rail_x + 1.0,
-                y: bounds.y,
-                width: 2.0,
-                height: bounds.height,
-            },
-            border_radius: 0.0.into(),
-            border_width: 0.0,
-            border_color: Color::TRANSPARENT,
-        },
-        Background::Color(style.rail_colors.1),
-    );
-
     let (handle_width, handle_height, handle_border_radius) = match style
         .handle
         .shape
@@ -413,18 +381,63 @@ pub fn draw<T, R>(
         (start.into() as f32, end.into() as f32)
     };
 
-    let handle_offset = if range_start >= range_end {
+    let offset = if range_start >= range_end {
         0.0
     } else {
         (bounds.height - handle_width) * (value - range_end)
             / (range_start - range_end)
     };
 
+    let line_x = bounds.x + bounds.width / 2.0 - style.rail.size / 2.0;
+    let line_offset = offset + handle_width / 2.0;
+
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: rail_x - (handle_height / 2.0),
-                y: bounds.y + handle_offset.round(),
+                x: line_x,
+                y: bounds.y,
+                width: style.rail.size,
+                height: line_offset,
+            },
+            border_radius: [
+                style.rail.border_radius,
+                style.rail.border_radius,
+                0.0,
+                0.0,
+            ]
+            .into(),
+            border_width: style.rail.border_width,
+            border_color: style.rail.border_color,
+        },
+        style.rail.colors.1,
+    );
+
+    renderer.fill_quad(
+        renderer::Quad {
+            bounds: Rectangle {
+                x: line_x,
+                y: bounds.y + line_offset.round(),
+                width: style.rail.size,
+                height: bounds.height - line_offset,
+            },
+            border_radius: [
+                0.0,
+                0.0,
+                style.rail.border_radius,
+                style.rail.border_radius,
+            ]
+            .into(),
+            border_width: style.rail.border_width,
+            border_color: style.rail.border_color,
+        },
+        style.rail.colors.0,
+    );
+
+    renderer.fill_quad(
+        renderer::Quad {
+            bounds: Rectangle {
+                x: bounds.x + bounds.width / 2.0 - handle_height / 2.0,
+                y: bounds.y + offset.round(),
                 width: handle_height,
                 height: handle_width,
             },
diff --git a/style/src/slider.rs b/style/src/slider.rs
index 4b52fad3..c143915e 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -5,11 +5,26 @@ use iced_core::Color;
 #[derive(Debug, Clone, Copy)]
 pub struct Appearance {
     /// The colors of the rail of the slider.
-    pub rail_colors: (Color, Color),
+    pub rail: Rail,
     /// The appearance of the [`Handle`] of the slider.
     pub handle: Handle,
 }
 
+/// The appearance of a slider rail
+#[derive(Debug, Clone, Copy)]
+pub struct Rail {
+    /// The colors of the rail of the slider.
+    pub colors: (Color, Color),
+    /// The height of a slider rail and the width of a vertical slider.
+    pub size: f32,
+    /// The border radius of the slider.
+    pub border_radius: f32,
+    /// The border width of the slider.
+    pub border_width: f32,
+    /// The border [`Color`] of the slider.
+    pub border_color: Color,
+}
+
 /// The appearance of the handle of a slider.
 #[derive(Debug, Clone, Copy)]
 pub struct Handle {
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 6bd82a96..417680a1 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -416,10 +416,16 @@ impl slider::StyleSheet for Theme {
                 };
 
                 slider::Appearance {
-                    rail_colors: (
-                        palette.primary.base.color,
-                        Color::TRANSPARENT,
-                    ),
+                    rail: slider::Rail {
+                        colors: (
+                            palette.primary.base.color,
+                            palette.primary.base.color,
+                        ),
+                        size: 2.0,
+                        border_radius: 0.0,
+                        border_width: 0.0,
+                        border_color: Color::TRANSPARENT,
+                    },
                     handle: slider::Handle {
                         color: palette.background.base.color,
                         border_color: palette.primary.base.color,

From 45cfce3f6dcf2773bc8ccc7e356906cb778f2f27 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, 12 Apr 2023 05:19:01 +0200
Subject: [PATCH 174/440] Simplify `draw` logic of sliders

---
 native/src/widget/slider.rs          | 18 ++++++++----------
 native/src/widget/vertical_slider.rs | 15 +++++++--------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index b3f3306c..2f946a8a 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -370,8 +370,6 @@ pub fn draw<T, R>(
         style_sheet.active(style)
     };
 
-    let value = value.into() as f32;
-
     let (handle_width, handle_height, handle_border_radius) = match style
         .handle
         .shape
@@ -383,6 +381,7 @@ pub fn draw<T, R>(
         } => (f32::from(width), bounds.height, border_radius),
     };
 
+    let value = value.into() as f32;
     let (range_start, range_end) = {
         let (start, end) = range.clone().into_inner();
 
@@ -396,15 +395,14 @@ pub fn draw<T, R>(
             / (range_end - range_start)
     };
 
-    let line_y = bounds.y + bounds.height / 2.0 - style.rail.size / 2.0;
-    let line_offset = offset + handle_width / 2.0;
+    let rail_y = bounds.y + bounds.height / 2.0;
 
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
                 x: bounds.x,
-                y: line_y,
-                width: line_offset,
+                y: rail_y - style.rail.size / 2.0,
+                width: offset,
                 height: style.rail.size,
             },
             border_radius: [
@@ -423,9 +421,9 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: bounds.x + line_offset.round(),
-                y: line_y,
-                width: bounds.width - line_offset,
+                x: bounds.x + offset,
+                y: rail_y - style.rail.size / 2.0,
+                width: bounds.width - offset,
                 height: style.rail.size,
             },
             border_radius: [
@@ -445,7 +443,7 @@ pub fn draw<T, R>(
         renderer::Quad {
             bounds: Rectangle {
                 x: bounds.x + offset.round(),
-                y: bounds.y + bounds.height / 2.0 - handle_height / 2.0,
+                y: rail_y - handle_height / 2.0,
                 width: handle_width,
                 height: handle_height,
             },
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 3a8c30b6..8c6d1e5d 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -388,16 +388,15 @@ pub fn draw<T, R>(
             / (range_start - range_end)
     };
 
-    let line_x = bounds.x + bounds.width / 2.0 - style.rail.size / 2.0;
-    let line_offset = offset + handle_width / 2.0;
+    let rail_x = bounds.x + bounds.width / 2.0;
 
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: line_x,
+                x: rail_x - style.rail.size / 2.0,
                 y: bounds.y,
                 width: style.rail.size,
-                height: line_offset,
+                height: offset,
             },
             border_radius: [
                 style.rail.border_radius,
@@ -415,10 +414,10 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: line_x,
-                y: bounds.y + line_offset.round(),
+                x: rail_x - style.rail.size / 2.0,
+                y: bounds.y + offset,
                 width: style.rail.size,
-                height: bounds.height - line_offset,
+                height: bounds.height - offset,
             },
             border_radius: [
                 0.0,
@@ -436,7 +435,7 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: bounds.x + bounds.width / 2.0 - handle_height / 2.0,
+                x: rail_x - handle_height / 2.0,
                 y: bounds.y + offset.round(),
                 width: handle_height,
                 height: handle_width,

From c2cc9a835d8281c1d26c861ecac7991a924c3785 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, 12 Apr 2023 05:21:46 +0200
Subject: [PATCH 175/440] Remove `border_width` support in `slider::Rail`

---
 native/src/widget/slider.rs          | 12 ++++++------
 native/src/widget/vertical_slider.rs | 12 ++++++------
 style/src/slider.rs                  |  4 ----
 style/src/theme.rs                   |  2 --
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 2f946a8a..5b26ae01 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -8,8 +8,8 @@ use crate::renderer;
 use crate::touch;
 use crate::widget::tree::{self, Tree};
 use crate::{
-    Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size,
-    Widget,
+    Clipboard, Color, Element, Layout, Length, Pixels, Point, Rectangle, Shell,
+    Size, Widget,
 };
 
 use std::ops::RangeInclusive;
@@ -412,8 +412,8 @@ pub fn draw<T, R>(
                 style.rail.border_radius,
             ]
             .into(),
-            border_width: style.rail.border_width,
-            border_color: style.rail.border_color,
+            border_width: 0.0,
+            border_color: Color::TRANSPARENT,
         },
         style.rail.colors.0,
     );
@@ -433,8 +433,8 @@ pub fn draw<T, R>(
                 0.0,
             ]
             .into(),
-            border_width: style.rail.border_width,
-            border_color: style.rail.border_color,
+            border_width: 0.0,
+            border_color: Color::TRANSPARENT,
         },
         style.rail.colors.1,
     );
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 8c6d1e5d..5fb6022a 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -8,8 +8,8 @@ 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, Clipboard, Element, Layout, Length, Pixels,
-    Point, Rectangle, Shell, Size, Widget,
+    layout, mouse, renderer, touch, Clipboard, Color, Element, Layout, Length,
+    Pixels, Point, Rectangle, Shell, Size, Widget,
 };
 
 /// An vertical bar and a handle that selects a single value from a range of
@@ -405,8 +405,8 @@ pub fn draw<T, R>(
                 0.0,
             ]
             .into(),
-            border_width: style.rail.border_width,
-            border_color: style.rail.border_color,
+            border_width: 0.0,
+            border_color: Color::TRANSPARENT,
         },
         style.rail.colors.1,
     );
@@ -426,8 +426,8 @@ pub fn draw<T, R>(
                 style.rail.border_radius,
             ]
             .into(),
-            border_width: style.rail.border_width,
-            border_color: style.rail.border_color,
+            border_width: 0.0,
+            border_color: Color::TRANSPARENT,
         },
         style.rail.colors.0,
     );
diff --git a/style/src/slider.rs b/style/src/slider.rs
index c143915e..bb36a176 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -19,10 +19,6 @@ pub struct Rail {
     pub size: f32,
     /// The border radius of the slider.
     pub border_radius: f32,
-    /// The border width of the slider.
-    pub border_width: f32,
-    /// The border [`Color`] of the slider.
-    pub border_color: Color,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 417680a1..669d9157 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -423,8 +423,6 @@ impl slider::StyleSheet for Theme {
                         ),
                         size: 2.0,
                         border_radius: 0.0,
-                        border_width: 0.0,
-                        border_color: Color::TRANSPARENT,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,

From 6e6804c5c9d0dba921f2e25d2c888b136d22d35e 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, 12 Apr 2023 05:25:27 +0200
Subject: [PATCH 176/440] Use a `border_radius` of `2.0` for slider rails in
 built-in theme

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

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 669d9157..2eb825e6 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -422,7 +422,7 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                         ),
                         size: 2.0,
-                        border_radius: 0.0,
+                        border_radius: 2.0,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,

From 9b39a17628e92b66ac3649e879478ed23635fa76 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, 12 Apr 2023 05:27:32 +0200
Subject: [PATCH 177/440] Rename `Rail::size` to `width`

---
 native/src/widget/slider.rs          | 8 ++++----
 native/src/widget/vertical_slider.rs | 8 ++++----
 style/src/slider.rs                  | 4 ++--
 style/src/theme.rs                   | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 5b26ae01..69c06140 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -401,9 +401,9 @@ pub fn draw<T, R>(
         renderer::Quad {
             bounds: Rectangle {
                 x: bounds.x,
-                y: rail_y - style.rail.size / 2.0,
+                y: rail_y - style.rail.width / 2.0,
                 width: offset,
-                height: style.rail.size,
+                height: style.rail.width,
             },
             border_radius: [
                 style.rail.border_radius,
@@ -422,9 +422,9 @@ pub fn draw<T, R>(
         renderer::Quad {
             bounds: Rectangle {
                 x: bounds.x + offset,
-                y: rail_y - style.rail.size / 2.0,
+                y: rail_y - style.rail.width / 2.0,
                 width: bounds.width - offset,
-                height: style.rail.size,
+                height: style.rail.width,
             },
             border_radius: [
                 0.0,
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 5fb6022a..a06a200f 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -393,9 +393,9 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: rail_x - style.rail.size / 2.0,
+                x: rail_x - style.rail.width / 2.0,
                 y: bounds.y,
-                width: style.rail.size,
+                width: style.rail.width,
                 height: offset,
             },
             border_radius: [
@@ -414,9 +414,9 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: rail_x - style.rail.size / 2.0,
+                x: rail_x - style.rail.width / 2.0,
                 y: bounds.y + offset,
-                width: style.rail.size,
+                width: style.rail.width,
                 height: bounds.height - offset,
             },
             border_radius: [
diff --git a/style/src/slider.rs b/style/src/slider.rs
index bb36a176..d5db1853 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -15,8 +15,8 @@ pub struct Appearance {
 pub struct Rail {
     /// The colors of the rail of the slider.
     pub colors: (Color, Color),
-    /// The height of a slider rail and the width of a vertical slider.
-    pub size: f32,
+    /// The width of the stroke of a slider rail.
+    pub width: f32,
     /// The border radius of the slider.
     pub border_radius: f32,
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 2eb825e6..b195940e 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -421,7 +421,7 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                             palette.primary.base.color,
                         ),
-                        size: 2.0,
+                        width: 2.0,
                         border_radius: 2.0,
                     },
                     handle: slider::Handle {

From b505b7203563b8a75a65451f47a3386c50864e6d 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, 12 Apr 2023 06:43:58 +0200
Subject: [PATCH 178/440] Move `radio` example to `Radio` docs

---
 examples/radio/Cargo.toml    | 10 -----
 examples/radio/src/main.rs   | 86 ------------------------------------
 native/src/widget/helpers.rs |  2 +-
 native/src/widget/radio.rs   | 37 +++++++++++++---
 4 files changed, 33 insertions(+), 102 deletions(-)
 delete mode 100644 examples/radio/Cargo.toml
 delete mode 100644 examples/radio/src/main.rs

diff --git a/examples/radio/Cargo.toml b/examples/radio/Cargo.toml
deleted file mode 100644
index a8c7f351..00000000
--- a/examples/radio/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "radio"
-version = "0.1.0"
-authors = ["Aaron Honeycutt <aaronhoneycutt@proton.me>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-iced = { path = "../.." }
diff --git a/examples/radio/src/main.rs b/examples/radio/src/main.rs
deleted file mode 100644
index 3b19924e..00000000
--- a/examples/radio/src/main.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use iced::widget::{column, container, radio};
-use iced::{Element, Length, Sandbox, Settings};
-
-pub fn main() -> iced::Result {
-    Example::run(Settings::default())
-}
-
-#[derive(Default)]
-struct Example {
-    radio: Option<Choice>,
-}
-
-#[derive(Debug, Clone, Copy)]
-enum Message {
-    RadioSelected(Choice),
-}
-
-impl Sandbox for Example {
-    type Message = Message;
-
-    fn new() -> Self {
-        Default::default()
-    }
-
-    fn title(&self) -> String {
-        String::from("Radio - Iced")
-    }
-
-    fn update(&mut self, message: Message) {
-        match message {
-            Message::RadioSelected(value) => {
-                self.radio = Some(value);
-            }
-        }
-    }
-
-    fn view(&self) -> Element<Message> {
-	let a_checkbox = radio(
-            "A",
-            Choice::A,
-            self.radio,
-            Message::RadioSelected,
-        );
-
-        let b_checkbox = radio(
-	    "B",
-            Choice::B,
-            self.radio,
-            Message::RadioSelected,
-        );
-
-        let c_checkbox = radio(
-            "C",
-            Choice::C,
-            self.radio,
-            Message::RadioSelected,
-        );
-
-        let all_checkbox = radio("All of the above", Choice::All, self.radio, Message::RadioSelected);
-
-        let content = column![
-            a_checkbox,
-            b_checkbox,
-            c_checkbox,
-            all_checkbox,
-        ]
-	.spacing(20)
-        .padding(20)
-        .max_width(600);
-
-        container(content)
-            .width(Length::Fill)
-            .height(Length::Fill)
-            .center_x()
-            .center_y()
-            .into()
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Choice {
-    A,
-    B,
-    C,
-    All,
-}
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
index d13eca75..24853eaa 100644
--- a/native/src/widget/helpers.rs
+++ b/native/src/widget/helpers.rs
@@ -147,7 +147,7 @@ where
     Renderer::Theme: widget::radio::StyleSheet,
     V: Copy + Eq,
 {
-    widget::Radio::new(value, label, selected, on_click)
+    widget::Radio::new(label, value, selected, on_click)
 }
 
 /// Creates a new [`Toggler`].
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index 9daddfbc..3ca041bf 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -21,10 +21,13 @@ pub use iced_style::radio::{Appearance, StyleSheet};
 /// # type Radio<Message> =
 /// #     iced_native::widget::Radio<Message, iced_native::renderer::Null>;
 /// #
+/// # use iced_native::column;
 /// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 /// pub enum Choice {
 ///     A,
 ///     B,
+///     C,
+///     All,
 /// }
 ///
 /// #[derive(Debug, Clone, Copy)]
@@ -34,12 +37,36 @@ pub use iced_style::radio::{Appearance, StyleSheet};
 ///
 /// let selected_choice = Some(Choice::A);
 ///
-/// Radio::new(Choice::A, "This is A", selected_choice, Message::RadioSelected);
+/// let a = Radio::new(
+///     "A",
+///     Choice::A,
+///     selected_choice,
+///     Message::RadioSelected,
+/// );
 ///
-/// Radio::new(Choice::B, "This is B", selected_choice, Message::RadioSelected);
+/// let b = Radio::new(
+///     "B",
+///     Choice::B,
+///     selected_choice,
+///     Message::RadioSelected,
+/// );
+///
+/// let c = Radio::new(
+///     "C",
+///     Choice::C,
+///     selected_choice,
+///     Message::RadioSelected,
+/// );
+///
+/// let all = Radio::new(
+///     "All of the above",
+///     Choice::All,
+///     selected_choice,
+///     Message::RadioSelected
+/// );
+///
+/// let content = column![a, b, c, all];
 /// ```
-///
-/// ![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>
 where
@@ -78,8 +105,8 @@ where
     ///   * a function that will be called when the [`Radio`] is selected. It
     ///   receives the value of the radio and must produce a `Message`.
     pub fn new<F, V>(
-        value: V,
         label: impl Into<String>,
+        value: V,
         selected: Option<V>,
         f: F,
     ) -> Self

From 5a056ce0510343621305474af74ade1db028c01a Mon Sep 17 00:00:00 2001
From: Night_Hunter <samuelhuntnz@gmail.com>
Date: Wed, 12 Apr 2023 18:47:53 +1200
Subject: [PATCH 179/440] add action set icon while running (#1590)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* set windows icon live action

* change get icon to insto raw

* remove mobile docs

* format

* fix format

* add file methods to Icon

* Rename action to `ChangeIcon` and tidy up `Icon` modules

* Fix documentation of `icon::Error`

* Remove unnecessary `\` in `icon` documentation

* Remove `etc.` from `Icon` documentation

---------

Co-authored-by: Héctor Ramón Jiménez <hector0193@gmail.com>
---
 native/Cargo.toml           |   1 +
 native/src/window.rs        |   3 +
 native/src/window/action.rs |  21 +++-
 native/src/window/icon.rs   |  80 ++++++++++++++
 src/window/icon.rs          | 207 +++++++++---------------------------
 winit/src/application.rs    |   3 +
 winit/src/conversion.rs     |   9 ++
 winit/src/settings.rs       |   7 +-
 winit/src/window.rs         |   9 +-
 9 files changed, 177 insertions(+), 163 deletions(-)
 create mode 100644 native/src/window/icon.rs

diff --git a/native/Cargo.toml b/native/Cargo.toml
index 3f92783e..1eedf0da 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -14,6 +14,7 @@ debug = []
 twox-hash = { version = "1.5", default-features = false }
 unicode-segmentation = "1.6"
 num-traits = "0.2"
+thiserror = "1"
 
 [dependencies.iced_core]
 version = "0.8"
diff --git a/native/src/window.rs b/native/src/window.rs
index a5cdc8ce..1ae89dba 100644
--- a/native/src/window.rs
+++ b/native/src/window.rs
@@ -5,8 +5,11 @@ mod mode;
 mod redraw_request;
 mod user_attention;
 
+pub mod icon;
+
 pub use action::Action;
 pub use event::Event;
+pub use icon::Icon;
 pub use mode::Mode;
 pub use redraw_request::RedrawRequest;
 pub use user_attention::UserAttention;
diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index ce36d129..095a8eec 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -1,4 +1,4 @@
-use crate::window::{Mode, UserAttention};
+use crate::window::{Icon, Mode, UserAttention};
 
 use iced_futures::MaybeSend;
 use std::fmt;
@@ -78,6 +78,21 @@ pub enum Action<T> {
     ChangeAlwaysOnTop(bool),
     /// Fetch an identifier unique to the window.
     FetchId(Box<dyn FnOnce(u64) -> T + 'static>),
+    /// Changes the window [`Icon`].
+    ///
+    /// On Windows and X11, this is typically the small icon in the top-left
+    /// corner of the titlebar.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web / Wayland / macOS:** Unsupported.
+    ///
+    /// - **Windows:** Sets `ICON_SMALL`. The base size for a window icon is 16x16, but it's
+    ///   recommended to account for screen scaling and pick a multiple of that, i.e. 32x32.
+    ///
+    /// - **X11:** Has no universal guidelines for icon sizes, so you're at the whims of the WM. That
+    ///   said, it's usually in the same ballpark as on Windows.
+    ChangeIcon(Icon),
 }
 
 impl<T> Action<T> {
@@ -108,6 +123,7 @@ impl<T> Action<T> {
                 Action::ChangeAlwaysOnTop(on_top)
             }
             Self::FetchId(o) => Action::FetchId(Box::new(move |s| f(o(s)))),
+            Self::ChangeIcon(icon) => Action::ChangeIcon(icon),
         }
     }
 }
@@ -142,6 +158,9 @@ impl<T> fmt::Debug for Action<T> {
                 write!(f, "Action::AlwaysOnTop({on_top})")
             }
             Self::FetchId(_) => write!(f, "Action::FetchId"),
+            Self::ChangeIcon(_icon) => {
+                write!(f, "Action::ChangeIcon(icon)")
+            }
         }
     }
 }
diff --git a/native/src/window/icon.rs b/native/src/window/icon.rs
new file mode 100644
index 00000000..31868ecf
--- /dev/null
+++ b/native/src/window/icon.rs
@@ -0,0 +1,80 @@
+//! Change the icon of a window.
+use crate::Size;
+
+use std::mem;
+
+/// Builds an  [`Icon`] from its RGBA pixels in the sRGB color space.
+pub fn from_rgba(
+    rgba: Vec<u8>,
+    width: u32,
+    height: u32,
+) -> Result<Icon, Error> {
+    const PIXEL_SIZE: usize = mem::size_of::<u8>() * 4;
+
+    if rgba.len() % PIXEL_SIZE != 0 {
+        return Err(Error::ByteCountNotDivisibleBy4 {
+            byte_count: rgba.len(),
+        });
+    }
+
+    let pixel_count = rgba.len() / PIXEL_SIZE;
+
+    if pixel_count != (width * height) as usize {
+        return Err(Error::DimensionsVsPixelCount {
+            width,
+            height,
+            width_x_height: (width * height) as usize,
+            pixel_count,
+        });
+    }
+
+    Ok(Icon {
+        rgba,
+        size: Size::new(width, height),
+    })
+}
+
+/// An window icon normally used for the titlebar or taskbar.
+#[derive(Debug, Clone)]
+pub struct Icon {
+    rgba: Vec<u8>,
+    size: Size<u32>,
+}
+
+impl Icon {
+    /// Returns the raw data of the [`Icon`].
+    pub fn into_raw(self) -> (Vec<u8>, Size<u32>) {
+        (self.rgba, self.size)
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+/// An error produced when using [`Icon::from_rgba`] with invalid arguments.
+pub enum Error {
+    /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
+    /// safely interpreted as 32bpp RGBA pixels.
+    #[error(
+        "The provided RGBA data (with length {byte_count}) isn't divisible \
+        by 4. Therefore, it cannot be safely interpreted as 32bpp RGBA pixels"
+    )]
+    ByteCountNotDivisibleBy4 {
+        /// The length of the provided RGBA data.
+        byte_count: usize,
+    },
+    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
+    /// At least one of your arguments is incorrect.
+    #[error(
+        "The number of RGBA pixels ({pixel_count}) does not match the \
+        provided dimensions ({width}x{height})."
+    )]
+    DimensionsVsPixelCount {
+        /// The provided width.
+        width: u32,
+        /// The provided height.
+        height: u32,
+        /// The product of `width` and `height`.
+        width_x_height: usize,
+        /// The amount of pixels of the provided RGBA data.
+        pixel_count: usize,
+    },
+}
diff --git a/src/window/icon.rs b/src/window/icon.rs
index 659d2b64..e09dd048 100644
--- a/src/window/icon.rs
+++ b/src/window/icon.rs
@@ -1,175 +1,66 @@
 //! Attach an icon to the window of your application.
-use std::fmt;
+pub use crate::runtime::window::icon::*;
+
+use crate::runtime::window::icon;
+
 use std::io;
 
-#[cfg(feature = "image_rs")]
+#[cfg(feature = "image")]
 use std::path::Path;
 
-/// The icon of a window.
-#[derive(Clone)]
-pub struct Icon(iced_winit::winit::window::Icon);
+/// Creates an icon from an image file.
+///
+/// This will return an error in case the file is missing at run-time. You may prefer [`Self::from_file_data`] instead.
+#[cfg(feature = "image")]
+#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
+pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Icon, Error> {
+    let icon = image_rs::io::Reader::open(icon_path)?.decode()?.to_rgba8();
 
-impl fmt::Debug for Icon {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("Icon").field(&format_args!("_")).finish()
-    }
+    Ok(icon::from_rgba(icon.to_vec(), icon.width(), icon.height())?)
 }
 
-impl Icon {
-    /// Creates an icon from 32bpp RGBA data.
-    pub fn from_rgba(
-        rgba: Vec<u8>,
-        width: u32,
-        height: u32,
-    ) -> Result<Self, Error> {
-        let raw =
-            iced_winit::winit::window::Icon::from_rgba(rgba, width, height)?;
+/// Creates an icon from the content of an image file.
+///
+/// This content can be included in your application at compile-time, e.g. using the `include_bytes!` macro.
+/// You can pass an explicit file format. Otherwise, the file format will be guessed at runtime.
+#[cfg(feature = "image")]
+#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
+pub fn from_file_data(
+    data: &[u8],
+    explicit_format: Option<image_rs::ImageFormat>,
+) -> Result<Icon, Error> {
+    let mut icon = image_rs::io::Reader::new(std::io::Cursor::new(data));
+    let icon_with_format = match explicit_format {
+        Some(format) => {
+            icon.set_format(format);
+            icon
+        }
+        None => icon.with_guessed_format()?,
+    };
 
-        Ok(Icon(raw))
-    }
+    let pixels = icon_with_format.decode()?.to_rgba8();
 
-    /// Creates an icon from an image file.
-    ///
-    /// This will return an error in case the file is missing at run-time. You may prefer [`Self::from_file_data`] instead.
-    #[cfg(feature = "image_rs")]
-    pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Self, Error> {
-        let icon = image_rs::io::Reader::open(icon_path)?.decode()?.to_rgba8();
-
-        Self::from_rgba(icon.to_vec(), icon.width(), icon.height())
-    }
-
-    /// Creates an icon from the content of an image file.
-    ///
-    /// This content can be included in your application at compile-time, e.g. using the `include_bytes!` macro. \
-    /// You can pass an explicit file format. Otherwise, the file format will be guessed at runtime.
-    #[cfg(feature = "image_rs")]
-    pub fn from_file_data(
-        data: &[u8],
-        explicit_format: Option<image_rs::ImageFormat>,
-    ) -> Result<Self, Error> {
-        let mut icon = image_rs::io::Reader::new(std::io::Cursor::new(data));
-        let icon_with_format = match explicit_format {
-            Some(format) => {
-                icon.set_format(format);
-                icon
-            }
-            None => icon.with_guessed_format()?,
-        };
-
-        let pixels = icon_with_format.decode()?.to_rgba8();
-
-        Self::from_rgba(pixels.to_vec(), pixels.width(), pixels.height())
-    }
+    Ok(icon::from_rgba(
+        pixels.to_vec(),
+        pixels.width(),
+        pixels.height(),
+    )?)
 }
 
-/// An error produced when using `Icon::from_rgba` with invalid arguments.
-#[derive(Debug)]
+/// An error produced when creating an [`Icon`].
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
-    /// The provided RGBA data isn't divisble by 4.
-    ///
-    /// Therefore, it cannot be safely interpreted as 32bpp RGBA pixels.
-    InvalidData {
-        /// The length of the provided RGBA data.
-        byte_count: usize,
-    },
-
-    /// The number of RGBA pixels does not match the provided dimensions.
-    DimensionsMismatch {
-        /// The provided width.
-        width: u32,
-        /// The provided height.
-        height: u32,
-        /// The amount of pixels of the provided RGBA data.
-        pixel_count: usize,
-    },
+    /// The [`Icon`] is not valid.
+    #[error("The icon is invalid: {0}")]
+    InvalidError(#[from] icon::Error),
 
     /// The underlying OS failed to create the icon.
-    OsError(io::Error),
+    #[error("The underlying OS failted to create the window icon: {0}")]
+    OsError(#[from] io::Error),
 
-    /// The `image` crate reported an error
-    #[cfg(feature = "image_rs")]
-    ImageError(image_rs::error::ImageError),
-}
-
-impl From<std::io::Error> for Error {
-    fn from(os_error: std::io::Error) -> Self {
-        Error::OsError(os_error)
-    }
-}
-
-impl From<iced_winit::winit::window::BadIcon> for Error {
-    fn from(error: iced_winit::winit::window::BadIcon) -> Self {
-        use iced_winit::winit::window::BadIcon;
-
-        match error {
-            BadIcon::ByteCountNotDivisibleBy4 { byte_count } => {
-                Error::InvalidData { byte_count }
-            }
-            BadIcon::DimensionsVsPixelCount {
-                width,
-                height,
-                pixel_count,
-                ..
-            } => Error::DimensionsMismatch {
-                width,
-                height,
-                pixel_count,
-            },
-            BadIcon::OsError(os_error) => Error::OsError(os_error),
-        }
-    }
-}
-
-impl From<Icon> for iced_winit::winit::window::Icon {
-    fn from(icon: Icon) -> Self {
-        icon.0
-    }
-}
-
-#[cfg(feature = "image_rs")]
-impl From<image_rs::error::ImageError> for Error {
-    fn from(image_error: image_rs::error::ImageError) -> Self {
-        Self::ImageError(image_error)
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Error::InvalidData { byte_count } => {
-                write!(
-                    f,
-                    "The provided RGBA data (with length {byte_count:?}) isn't divisble by \
-                4. Therefore, it cannot be safely interpreted as 32bpp RGBA \
-                pixels."
-                )
-            }
-            Error::DimensionsMismatch {
-                width,
-                height,
-                pixel_count,
-            } => {
-                write!(
-                    f,
-                    "The number of RGBA pixels ({pixel_count:?}) does not match the provided \
-                dimensions ({width:?}x{height:?})."
-                )
-            }
-            Error::OsError(e) => write!(
-                f,
-                "The underlying OS failed to create the window \
-                icon: {e:?}"
-            ),
-            #[cfg(feature = "image_rs")]
-            Error::ImageError(e) => {
-                write!(f, "Unable to create icon from a file: {e:?}")
-            }
-        }
-    }
-}
-
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        Some(self)
-    }
+    /// The `image` crate reported an error.
+    #[cfg(feature = "image")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
+    #[error("Unable to create icon from a file: {0}")]
+    ImageError(#[from] image_rs::error::ImageError),
 }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 31654f26..dd345785 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -770,6 +770,9 @@ pub fn run_command<A, E>(
                         mode,
                     ));
                 }
+                window::Action::ChangeIcon(icon) => {
+                    window.set_window_icon(conversion::icon(icon))
+                }
                 window::Action::FetchMode(tag) => {
                     let mode = if window.is_visible().unwrap_or(true) {
                         conversion::mode(window.fullscreen())
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index d2dc9c06..cf066ef6 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -510,6 +510,15 @@ pub fn user_attention(
     }
 }
 
+/// Converts some [`Icon`] into it's `winit` counterpart.
+///
+/// Returns `None` if there is an error during the conversion.
+pub fn icon(icon: window::Icon) -> Option<winit::window::Icon> {
+    let (pixels, size) = icon.into_raw();
+
+    winit::window::Icon::from_rgba(pixels, size.width, size.height).ok()
+}
+
 // As defined in: http://www.unicode.org/faq/private_use.html
 pub(crate) fn is_private_use_character(c: char) -> bool {
     matches!(
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 78d58000..6658773d 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -92,7 +92,7 @@ pub struct Window {
     pub always_on_top: bool,
 
     /// The window icon, which is also usually used in the taskbar
-    pub icon: Option<winit::window::Icon>,
+    pub icon: Option<crate::window::Icon>,
 
     /// Platform specific settings.
     pub platform_specific: platform::PlatformSpecific,
@@ -134,8 +134,9 @@ impl Window {
             .with_resizable(self.resizable)
             .with_decorations(self.decorations)
             .with_transparent(self.transparent)
-            .with_window_icon(self.icon)
-            .with_always_on_top(self.always_on_top);
+            .with_window_icon(self.icon.and_then(conversion::icon))
+            .with_always_on_top(self.always_on_top)
+            .with_visible(self.visible);
 
         if let Some(position) = conversion::position(
             primary_monitor.as_ref(),
diff --git a/winit/src/window.rs b/winit/src/window.rs
index 961562bd..ba0180c8 100644
--- a/winit/src/window.rs
+++ b/winit/src/window.rs
@@ -2,7 +2,9 @@
 use crate::command::{self, Command};
 use iced_native::window;
 
-pub use window::{frames, Event, Mode, RedrawRequest, UserAttention};
+pub use window::{
+    frames, icon, Event, Icon, Mode, RedrawRequest, UserAttention,
+};
 
 /// Closes the current window and exits the application.
 pub fn close<Message>() -> Command<Message> {
@@ -104,3 +106,8 @@ pub fn fetch_id<Message>(
         f,
     ))))
 }
+
+/// Changes the [`Icon`] of the window.
+pub fn change_icon<Message>(icon: Icon) -> Command<Message> {
+    Command::single(command::Action::Window(window::Action::ChangeIcon(icon)))
+}

From ee32af2606e7c24cbe9e1c221af0ed1a2c44be50 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 12 Apr 2023 10:32:35 -0700
Subject: [PATCH 180/440] Don't publish redundant on_scroll offsets

---
 native/src/widget/scrollable.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index d9cdf296..23fa20f4 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -895,7 +895,7 @@ pub fn draw<Renderer>(
 }
 
 fn notify_on_scroll<Message>(
-    state: &State,
+    state: &mut State,
     on_scroll: &Option<Box<dyn Fn(RelativeOffset) -> Message + '_>>,
     bounds: Rectangle,
     content_bounds: Rectangle,
@@ -916,7 +916,21 @@ fn notify_on_scroll<Message>(
             .absolute(bounds.height, content_bounds.height)
             / (content_bounds.height - bounds.height);
 
-        shell.publish(on_scroll(RelativeOffset { x, y }))
+        let new_offset = RelativeOffset { x, y };
+
+        // Don't publish redundant offsets to shell
+        if let Some(prev_offset) = state.last_notified {
+            let unchanged = |a: f32, b: f32| (a - b).abs() <= f32::EPSILON;
+
+            if unchanged(prev_offset.x, new_offset.x)
+                && unchanged(prev_offset.y, new_offset.y)
+            {
+                return;
+            }
+        }
+
+        shell.publish(on_scroll(new_offset));
+        state.last_notified = Some(new_offset);
     }
 }
 
@@ -929,6 +943,7 @@ pub struct State {
     offset_x: Offset,
     x_scroller_grabbed_at: Option<f32>,
     keyboard_modifiers: keyboard::Modifiers,
+    last_notified: Option<RelativeOffset>,
 }
 
 impl Default for State {
@@ -940,6 +955,7 @@ impl Default for State {
             offset_x: Offset::Absolute(0.0),
             x_scroller_grabbed_at: None,
             keyboard_modifiers: keyboard::Modifiers::default(),
+            last_notified: None,
         }
     }
 }

From 4125c034f5c512365c6ef73678dc0801db79b249 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 12 Apr 2023 12:47:24 -0700
Subject: [PATCH 181/440] Include NaN in unchaged logic

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

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 23fa20f4..c0590b1e 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -920,7 +920,9 @@ fn notify_on_scroll<Message>(
 
         // Don't publish redundant offsets to shell
         if let Some(prev_offset) = state.last_notified {
-            let unchanged = |a: f32, b: f32| (a - b).abs() <= f32::EPSILON;
+            let unchanged = |a: f32, b: f32| {
+                (a - b).abs() <= f32::EPSILON || (a.is_nan() && b.is_nan())
+            };
 
             if unchanged(prev_offset.x, new_offset.x)
                 && unchanged(prev_offset.y, new_offset.y)

From 66939b22b0ee7e1dc0e5ef31594fae5810ffa7b2 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, 12 Apr 2023 23:40:36 +0200
Subject: [PATCH 182/440] Remove `max_width` and `max_height` calls in
 `scrollable::layout`

---
 native/src/widget/scrollable.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 45cd2a0e..8e8138cd 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -405,15 +405,7 @@ pub fn layout<Renderer>(
     horizontal_enabled: bool,
     layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
 ) -> layout::Node {
-    let limits = limits
-        .max_height(f32::INFINITY)
-        .max_width(if horizontal_enabled {
-            f32::INFINITY
-        } else {
-            limits.max().width
-        })
-        .width(width)
-        .height(height);
+    let limits = limits.width(width).height(height);
 
     let child_limits = layout::Limits::new(
         Size::new(limits.min().width, 0.0),

From d5453c62e9bdbf0cea030b009c41b892b700496d Mon Sep 17 00:00:00 2001
From: Elham Aryanpur <elhamaryanpur5@gmail.com>
Date: Wed, 12 Apr 2023 23:38:21 +0300
Subject: [PATCH 183/440] Update `wgpu` to `0.15`

---
 examples/integration_wgpu/src/main.rs | 37 +++++++++++++++++----------
 wgpu/Cargo.toml                       |  4 +--
 wgpu/src/image/atlas.rs               |  2 ++
 wgpu/src/triangle/msaa.rs             |  2 ++
 wgpu/src/window/compositor.rs         | 25 +++++++++++++++---
 5 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 2a56b6fa..6e868332 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -23,18 +23,17 @@ 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();
@@ -45,11 +44,10 @@ 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();
+    let window = winit::window::Window::new(&event_loop)?;
 
     let physical_size = window.inner_size();
     let mut viewport = Viewport::with_physical_size(
@@ -61,7 +59,6 @@ pub fn main() {
     let mut clipboard = Clipboard::connect(&window);
 
     // Initialize wgpu
-
     #[cfg(target_arch = "wasm32")]
     let default_backend = wgpu::Backends::GL;
     #[cfg(not(target_arch = "wasm32"))]
@@ -70,8 +67,12 @@ 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::executor::block_on(async {
         let adapter = wgpu::util::initialize_adapter_from_env_or_default(
@@ -93,9 +94,15 @@ pub fn main() {
 
         (
             surface
-                .get_supported_formats(&adapter)
-                .first()
+                .get_capabilities(&adapter)
+                .formats
+                .iter()
+                .filter(|format| format.describe().srgb)
                 .copied()
+                .next()
+                .or_else(|| {
+                    surface.get_capabilities(&adapter).formats.first().copied()
+                })
                 .expect("Get preferred format"),
             adapter
                 .request_device(
@@ -120,6 +127,7 @@ pub fn main() {
             height: physical_size.height,
             present_mode: wgpu::PresentMode::AutoVsync,
             alpha_mode: wgpu::CompositeAlphaMode::Auto,
+            view_formats: vec![],
         },
     );
 
@@ -214,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/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f1e22cf6..4dcd07f7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -28,8 +28,8 @@ spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
 [dependencies]
-wgpu = "0.14"
-wgpu_glyph = "0.18"
+wgpu = "0.15"
+wgpu_glyph = "0.19"
 glyph_brush = "0.7"
 raw-window-handle = "0.5"
 log = "0.4"
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index eafe2f96..82504147 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -39,6 +39,7 @@ impl Atlas {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            view_formats: &[],
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
@@ -247,6 +248,7 @@ impl Atlas {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            view_formats: &[],
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index e76f7d5e..d24f8e1a 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -222,6 +222,7 @@ impl Targets {
             sample_count,
             dimension: wgpu::TextureDimension::D2,
             format,
+            view_formats: &[],
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
         });
 
@@ -232,6 +233,7 @@ impl Targets {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format,
+            view_formats: &[],
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT
                 | wgpu::TextureUsages::TEXTURE_BINDING,
         });
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 6d0c36f6..d66aca71 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,18 @@ 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
+                .iter()
+                .filter(|format| format.describe().srgb)
+                .copied()
+                .next()
+                .or_else(|| {
+                    log::warn!("No sRGB format found!");
+
+                    surface.get_capabilities(&adapter).formats.first().copied()
+                })
         })?;
 
         log::info!("Selected format: {:?}", format);
@@ -144,7 +158,9 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
     ) -> wgpu::Surface {
         #[allow(unsafe_code)]
         unsafe {
-            self.instance.create_surface(window)
+            self.instance
+                .create_surface(window)
+                .expect("Create surface")
         }
     }
 
@@ -163,6 +179,7 @@ impl<Theme> iced_graphics::window::Compositor for Compositor<Theme> {
                 width,
                 height,
                 alpha_mode: wgpu::CompositeAlphaMode::Auto,
+                view_formats: vec![],
             },
         );
     }

From b677345ac1b1d087bc7f331c9c8c5be06933ba6e 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, 13 Apr 2023 05:42:56 +0200
Subject: [PATCH 184/440] Get surface capabilities only once in `iced_wgpu`

---
 examples/integration_wgpu/src/main.rs | 9 ++++-----
 wgpu/src/window/compositor.rs         | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 6e868332..8e0056f3 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -92,17 +92,16 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
         #[cfg(not(target_arch = "wasm32"))]
         let needed_limits = wgpu::Limits::default();
 
+        let capabilities = surface.get_capabilities(&adapter);
+
         (
-            surface
-                .get_capabilities(&adapter)
+            capabilities
                 .formats
                 .iter()
                 .filter(|format| format.describe().srgb)
                 .copied()
                 .next()
-                .or_else(|| {
-                    surface.get_capabilities(&adapter).formats.first().copied()
-                })
+                .or_else(|| capabilities.formats.first().copied())
                 .expect("Get preferred format"),
             adapter
                 .request_device(
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index d66aca71..d4a59471 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -66,8 +66,9 @@ impl<Theme> Compositor<Theme> {
         log::info!("Selected: {:#?}", adapter.get_info());
 
         let format = compatible_surface.as_ref().and_then(|surface| {
-            surface
-                .get_capabilities(&adapter)
+            let capabilities = surface.get_capabilities(&adapter);
+
+            capabilities
                 .formats
                 .iter()
                 .filter(|format| format.describe().srgb)
@@ -76,7 +77,7 @@ impl<Theme> Compositor<Theme> {
                 .or_else(|| {
                     log::warn!("No sRGB format found!");
 
-                    surface.get_capabilities(&adapter).formats.first().copied()
+                    capabilities.formats.first().copied()
                 })
         })?;
 

From 9410fb98275fb51f67c55b676d8b37a5197222b3 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, 13 Apr 2023 05:46:18 +0200
Subject: [PATCH 185/440] Update `env_logger` in `integration_wgpu` example

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

diff --git a/examples/integration_wgpu/Cargo.toml b/examples/integration_wgpu/Cargo.toml
index eaa1df7e..c0e4fd81 100644
--- a/examples/integration_wgpu/Cargo.toml
+++ b/examples/integration_wgpu/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 iced_winit = { path = "../../winit" }
 iced_wgpu = { path = "../../wgpu", features = ["webgl"] }
-env_logger = "0.8"
+env_logger = "0.10"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.7"

From 52c84c4975d75baf313243d422d96581daca19bf 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, 13 Apr 2023 05:53:40 +0200
Subject: [PATCH 186/440] Remove `border_radius` support for `slider::Rail`

Our current quad shader may produce weird-looking results with
non-integral scaling factors.
---
 native/src/widget/slider.rs          | 16 ++--------------
 native/src/widget/vertical_slider.rs | 16 ++--------------
 style/src/slider.rs                  |  2 --
 style/src/theme.rs                   |  1 -
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 69c06140..199dc9b3 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -405,13 +405,7 @@ pub fn draw<T, R>(
                 width: offset,
                 height: style.rail.width,
             },
-            border_radius: [
-                style.rail.border_radius,
-                0.0,
-                0.0,
-                style.rail.border_radius,
-            ]
-            .into(),
+            border_radius: Default::default(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -426,13 +420,7 @@ pub fn draw<T, R>(
                 width: bounds.width - offset,
                 height: style.rail.width,
             },
-            border_radius: [
-                0.0,
-                style.rail.border_radius,
-                style.rail.border_radius,
-                0.0,
-            ]
-            .into(),
+            border_radius: Default::default(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index a06a200f..b445b9ec 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -398,13 +398,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: offset,
             },
-            border_radius: [
-                style.rail.border_radius,
-                style.rail.border_radius,
-                0.0,
-                0.0,
-            ]
-            .into(),
+            border_radius: Default::default(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -419,13 +413,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: bounds.height - offset,
             },
-            border_radius: [
-                0.0,
-                0.0,
-                style.rail.border_radius,
-                style.rail.border_radius,
-            ]
-            .into(),
+            border_radius: Default::default(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
diff --git a/style/src/slider.rs b/style/src/slider.rs
index d5db1853..884d3871 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -17,8 +17,6 @@ pub struct Rail {
     pub colors: (Color, Color),
     /// The width of the stroke of a slider rail.
     pub width: f32,
-    /// The border radius of the slider.
-    pub border_radius: f32,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index b195940e..6711fd72 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -422,7 +422,6 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                         ),
                         width: 2.0,
-                        border_radius: 2.0,
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,

From 2be79d7b6be377c26f2d328058177179377fba46 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, 13 Apr 2023 06:02:30 +0200
Subject: [PATCH 187/440] Fix handle position of sliders

---
 native/src/widget/slider.rs          | 8 ++++----
 native/src/widget/vertical_slider.rs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 199dc9b3..ba467834 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -391,7 +391,7 @@ pub fn draw<T, R>(
     let offset = if range_start >= range_end {
         0.0
     } else {
-        (bounds.width - handle_width) * (value - range_start)
+        (bounds.width - handle_width / 2.0) * (value - range_start)
             / (range_end - range_start)
     };
 
@@ -402,7 +402,7 @@ pub fn draw<T, R>(
             bounds: Rectangle {
                 x: bounds.x,
                 y: rail_y - style.rail.width / 2.0,
-                width: offset,
+                width: offset + handle_width / 2.0,
                 height: style.rail.width,
             },
             border_radius: Default::default(),
@@ -415,7 +415,7 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: bounds.x + offset,
+                x: bounds.x + offset + handle_width / 2.0,
                 y: rail_y - style.rail.width / 2.0,
                 width: bounds.width - offset,
                 height: style.rail.width,
@@ -430,7 +430,7 @@ pub fn draw<T, R>(
     renderer.fill_quad(
         renderer::Quad {
             bounds: Rectangle {
-                x: bounds.x + offset.round(),
+                x: bounds.x + offset,
                 y: rail_y - handle_height / 2.0,
                 width: handle_width,
                 height: handle_height,
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index b445b9ec..5af69676 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -384,7 +384,7 @@ pub fn draw<T, R>(
     let offset = if range_start >= range_end {
         0.0
     } else {
-        (bounds.height - handle_width) * (value - range_end)
+        (bounds.height - handle_width / 2.0) * (value - range_end)
             / (range_start - range_end)
     };
 
@@ -396,7 +396,7 @@ pub fn draw<T, R>(
                 x: rail_x - style.rail.width / 2.0,
                 y: bounds.y,
                 width: style.rail.width,
-                height: offset,
+                height: offset + handle_width / 2.0,
             },
             border_radius: Default::default(),
             border_width: 0.0,
@@ -409,7 +409,7 @@ pub fn draw<T, R>(
         renderer::Quad {
             bounds: Rectangle {
                 x: rail_x - style.rail.width / 2.0,
-                y: bounds.y + offset,
+                y: bounds.y + offset + handle_width / 2.0,
                 width: style.rail.width,
                 height: bounds.height - offset,
             },
@@ -424,7 +424,7 @@ pub fn draw<T, R>(
         renderer::Quad {
             bounds: Rectangle {
                 x: rail_x - handle_height / 2.0,
-                y: bounds.y + offset.round(),
+                y: bounds.y + offset,
                 width: handle_height,
                 height: handle_width,
             },

From db4b899fd215f0607474006a9aef0361e74d481f 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, 13 Apr 2023 06:03:44 +0200
Subject: [PATCH 188/440] Fix Wasm target for `integration_wgpu`

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

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 8e0056f3..3ac458b3 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -33,7 +33,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("Canvas with id `iced_canvas` is missing")
     };
     #[cfg(not(target_arch = "wasm32"))]
     env_logger::init();

From dfc1868179d96236ddf2a9eb590832d810afb6c3 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Mon, 12 Dec 2022 01:53:45 +0100
Subject: [PATCH 189/440] feat(native): Add MouseListener widget

---
 native/src/widget.rs                |   3 +
 native/src/widget/helpers.rs        |  10 +
 native/src/widget/mouse_listener.rs | 403 ++++++++++++++++++++++++++++
 src/widget.rs                       |   8 +
 4 files changed, 424 insertions(+)
 create mode 100644 native/src/widget/mouse_listener.rs

diff --git a/native/src/widget.rs b/native/src/widget.rs
index 2b3ca7be..4eb3d1ba 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -17,6 +17,7 @@ pub mod column;
 pub mod container;
 pub mod helpers;
 pub mod image;
+pub mod mouse_listener;
 pub mod operation;
 pub mod pane_grid;
 pub mod pick_list;
@@ -51,6 +52,8 @@ pub use helpers::*;
 #[doc(no_inline)]
 pub use image::Image;
 #[doc(no_inline)]
+pub use mouse_listener::MouseListener;
+#[doc(no_inline)]
 pub use pane_grid::PaneGrid;
 #[doc(no_inline)]
 pub use pick_list::PickList;
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
index b25e064d..88986d60 100644
--- a/native/src/widget/helpers.rs
+++ b/native/src/widget/helpers.rs
@@ -314,3 +314,13 @@ where
 {
     widget::Svg::new(handle)
 }
+
+/// A container intercepting mouse events.
+pub fn mouse_listener<'a, Message, Renderer>(
+    widget: impl Into<Element<'a, Message, Renderer>>,
+) -> widget::MouseListener<'a, Message, Renderer>
+where
+    Renderer: crate::Renderer,
+{
+    widget::MouseListener::new(widget)
+}
diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
new file mode 100644
index 00000000..0add7c71
--- /dev/null
+++ b/native/src/widget/mouse_listener.rs
@@ -0,0 +1,403 @@
+//! A container for capturing mouse events.
+
+use crate::event::{self, Event};
+use crate::layout;
+use crate::mouse;
+use crate::overlay;
+use crate::renderer;
+use crate::touch;
+use crate::widget::{tree, Operation, Tree};
+use crate::{
+    Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Widget,
+};
+
+use std::u32;
+
+/// Emit messages on mouse events.
+#[allow(missing_debug_implementations)]
+pub struct MouseListener<'a, Message, Renderer> {
+    content: Element<'a, Message, Renderer>,
+
+    /// Sets the message to emit on a left mouse button press.
+    on_press: Option<Message>,
+
+    /// Sets the message to emit on a left mouse button release.
+    on_release: Option<Message>,
+
+    /// Sets the message to emit on a right mouse button press.
+    on_right_press: Option<Message>,
+
+    /// Sets the message to emit on a right mouse button release.
+    on_right_release: Option<Message>,
+
+    /// Sets the message to emit on a middle mouse button press.
+    on_middle_press: Option<Message>,
+
+    /// Sets the message to emit on a middle mouse button release.
+    on_middle_release: Option<Message>,
+
+    /// Sets the message to emit when the mouse enters the widget.
+    on_mouse_enter: Option<Message>,
+
+    /// Sets the messsage to emit when the mouse exits the widget.
+    on_mouse_exit: Option<Message>,
+}
+
+impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
+    /// The message to emit on a left button press.
+    #[must_use]
+    pub fn on_press(mut self, message: Message) -> Self {
+        self.on_press = Some(message);
+        self
+    }
+
+    /// The message to emit on a left button release.
+    #[must_use]
+    pub fn on_release(mut self, message: Message) -> Self {
+        self.on_release = Some(message);
+        self
+    }
+
+    /// The message to emit on a right button press.
+    #[must_use]
+    pub fn on_right_press(mut self, message: Message) -> Self {
+        self.on_right_press = Some(message);
+        self
+    }
+
+    /// The message to emit on a right button release.
+    #[must_use]
+    pub fn on_right_release(mut self, message: Message) -> Self {
+        self.on_right_release = Some(message);
+        self
+    }
+
+    /// The message to emit on a middle button press.
+    #[must_use]
+    pub fn on_middle_press(mut self, message: Message) -> Self {
+        self.on_middle_press = Some(message);
+        self
+    }
+
+    /// The message to emit on a middle button release.
+    #[must_use]
+    pub fn on_middle_release(mut self, message: Message) -> Self {
+        self.on_middle_release = Some(message);
+        self
+    }
+
+    /// The message to emit when the mouse enters the widget.
+    #[must_use]
+    pub fn on_mouse_enter(mut self, message: Message) -> Self {
+        self.on_mouse_enter = Some(message);
+        self
+    }
+
+    /// The messsage to emit when the mouse exits the widget.
+    #[must_use]
+    pub fn on_mouse_exit(mut self, message: Message) -> Self {
+        self.on_mouse_exit = Some(message);
+        self
+    }
+}
+
+/// Local state of the [`MouseListener`].
+#[derive(Default)]
+struct State {
+    hovered: bool,
+}
+
+impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
+    /// Creates an empty [`MouseListener`].
+    pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
+        MouseListener {
+            content: content.into(),
+            on_press: None,
+            on_release: None,
+            on_right_press: None,
+            on_right_release: None,
+            on_middle_press: None,
+            on_middle_release: None,
+            on_mouse_enter: None,
+            on_mouse_exit: None,
+        }
+    }
+}
+
+impl<'a, Message, Renderer> Widget<Message, Renderer>
+    for MouseListener<'a, Message, Renderer>
+where
+    Renderer: crate::Renderer,
+    Message: Clone,
+{
+    fn children(&self) -> Vec<Tree> {
+        vec![Tree::new(&self.content)]
+    }
+
+    fn diff(&self, tree: &mut Tree) {
+        tree.diff_children(std::slice::from_ref(&self.content));
+    }
+
+    fn width(&self) -> Length {
+        self.content.as_widget().width()
+    }
+
+    fn height(&self) -> Length {
+        self.content.as_widget().height()
+    }
+
+    fn layout(
+        &self,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        layout(
+            renderer,
+            limits,
+            Widget::<Message, Renderer>::width(self),
+            Widget::<Message, Renderer>::height(self),
+            u32::MAX,
+            u32::MAX,
+            |renderer, limits| {
+                self.content.as_widget().layout(renderer, limits)
+            },
+        )
+    }
+
+    fn operate(
+        &self,
+        tree: &mut Tree,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        operation: &mut dyn Operation<Message>,
+    ) {
+        operation.container(None, &mut |operation| {
+            self.content.as_widget().operate(
+                &mut tree.children[0],
+                layout.children().next().unwrap(),
+                renderer,
+                operation,
+            );
+        });
+    }
+
+    fn on_event(
+        &mut self,
+        tree: &mut Tree,
+        event: Event,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        renderer: &Renderer,
+        clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        if let event::Status::Captured = self.content.as_widget_mut().on_event(
+            &mut tree.children[0],
+            event.clone(),
+            layout.children().next().unwrap(),
+            cursor_position,
+            renderer,
+            clipboard,
+            shell,
+        ) {
+            return event::Status::Captured;
+        }
+
+        update(
+            self,
+            &event,
+            layout,
+            cursor_position,
+            shell,
+            tree.state.downcast_mut::<State>(),
+        )
+    }
+
+    fn mouse_interaction(
+        &self,
+        tree: &Tree,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+        renderer: &Renderer,
+    ) -> mouse::Interaction {
+        self.content.as_widget().mouse_interaction(
+            &tree.children[0],
+            layout.children().next().unwrap(),
+            cursor_position,
+            viewport,
+            renderer,
+        )
+    }
+
+    fn draw(
+        &self,
+        tree: &Tree,
+        renderer: &mut Renderer,
+        theme: &Renderer::Theme,
+        renderer_style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+    ) {
+        self.content.as_widget().draw(
+            &tree.children[0],
+            renderer,
+            theme,
+            renderer_style,
+            layout.children().next().unwrap(),
+            cursor_position,
+            viewport,
+        );
+    }
+
+    fn overlay<'b>(
+        &'b mut self,
+        tree: &'b mut Tree,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+    ) -> Option<overlay::Element<'b, Message, Renderer>> {
+        self.content.as_widget_mut().overlay(
+            &mut tree.children[0],
+            layout.children().next().unwrap(),
+            renderer,
+        )
+    }
+
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::of::<State>()
+    }
+
+    fn state(&self) -> tree::State {
+        tree::State::new(State::default())
+    }
+}
+
+impl<'a, Message, Renderer> From<MouseListener<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
+where
+    Message: 'a + Clone,
+    Renderer: 'a + crate::Renderer,
+{
+    fn from(
+        listener: MouseListener<'a, Message, Renderer>,
+    ) -> Element<'a, Message, Renderer> {
+        Element::new(listener)
+    }
+}
+
+/// Processes the given [`Event`] and updates the [`State`] of an [`MouseListener`]
+/// accordingly.
+fn update<Message: Clone, Renderer>(
+    widget: &mut MouseListener<'_, Message, Renderer>,
+    event: &Event,
+    layout: Layout<'_>,
+    cursor_position: Point,
+    shell: &mut Shell<'_, Message>,
+    state: &mut State,
+) -> event::Status {
+    let hovered = state.hovered;
+
+    if !layout.bounds().contains(cursor_position) {
+        if hovered {
+            state.hovered = false;
+            if let Some(message) = widget.on_mouse_exit.clone() {
+                shell.publish(message);
+                return event::Status::Captured;
+            }
+        }
+
+        return event::Status::Ignored;
+    }
+
+    state.hovered = true;
+
+    if !hovered {
+        if let Some(message) = widget.on_mouse_enter.clone() {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_press.clone() {
+        if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
+        | Event::Touch(touch::Event::FingerPressed { .. }) = event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_release.clone() {
+        if let Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
+        | Event::Touch(touch::Event::FingerLifted { .. }) = event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_right_press.clone() {
+        if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) =
+            event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_right_release.clone() {
+        if let Event::Mouse(mouse::Event::ButtonReleased(
+            mouse::Button::Right,
+        )) = event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_middle_press.clone() {
+        if let Event::Mouse(mouse::Event::ButtonPressed(
+            mouse::Button::Middle,
+        )) = event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    if let Some(message) = widget.on_middle_release.clone() {
+        if let Event::Mouse(mouse::Event::ButtonReleased(
+            mouse::Button::Middle,
+        )) = event
+        {
+            shell.publish(message);
+            return event::Status::Captured;
+        }
+    }
+
+    event::Status::Ignored
+}
+
+/// Computes the layout of a [`MouseListener`].
+pub fn layout<Renderer>(
+    renderer: &Renderer,
+    limits: &layout::Limits,
+    width: Length,
+    height: Length,
+    max_height: u32,
+    max_width: u32,
+    layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
+) -> layout::Node {
+    let limits = limits
+        .loose()
+        .max_height(max_height)
+        .max_width(max_width)
+        .width(width)
+        .height(height);
+
+    let content = layout_content(renderer, &limits);
+    let size = limits.resolve(content.size());
+
+    layout::Node::with_children(size, vec![content])
+}
diff --git a/src/widget.rs b/src/widget.rs
index c0ac716f..15b34ffa 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -47,6 +47,14 @@ pub mod container {
         iced_native::widget::Container<'a, Message, Renderer>;
 }
 
+pub mod mouse_listener {
+    //! Intercept mouse events on a widget.
+
+    /// A container intercepting mouse events.
+    pub type MouseListener<'a, Message, Renderer = crate::Renderer> =
+        iced_native::widget::MouseListener<'a, Message, Renderer>;
+}
+
 pub mod pane_grid {
     //! Let your users split regions of your application and organize layout dynamically.
     //!

From 28b0f7abf46ba6f6250e883104a6100e3e647172 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, 13 Apr 2023 06:28:33 +0200
Subject: [PATCH 190/440] Delegate `layout` directly to `content` in
 `MouseListener`

---
 native/src/widget/mouse_listener.rs | 59 ++++++-----------------------
 1 file changed, 11 insertions(+), 48 deletions(-)

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index 0add7c71..c4e91cba 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -11,8 +11,6 @@ use crate::{
     Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Widget,
 };
 
-use std::u32;
-
 /// Emit messages on mouse events.
 #[allow(missing_debug_implementations)]
 pub struct MouseListener<'a, Message, Renderer> {
@@ -151,17 +149,7 @@ where
         renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
-        layout(
-            renderer,
-            limits,
-            Widget::<Message, Renderer>::width(self),
-            Widget::<Message, Renderer>::height(self),
-            u32::MAX,
-            u32::MAX,
-            |renderer, limits| {
-                self.content.as_widget().layout(renderer, limits)
-            },
-        )
+        self.content.as_widget().layout(renderer, limits)
     }
 
     fn operate(
@@ -171,14 +159,12 @@ where
         renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
-        operation.container(None, &mut |operation| {
-            self.content.as_widget().operate(
-                &mut tree.children[0],
-                layout.children().next().unwrap(),
-                renderer,
-                operation,
-            );
-        });
+        self.content.as_widget().operate(
+            &mut tree.children[0],
+            layout,
+            renderer,
+            operation,
+        );
     }
 
     fn on_event(
@@ -194,7 +180,7 @@ where
         if let event::Status::Captured = self.content.as_widget_mut().on_event(
             &mut tree.children[0],
             event.clone(),
-            layout.children().next().unwrap(),
+            layout,
             cursor_position,
             renderer,
             clipboard,
@@ -223,7 +209,7 @@ where
     ) -> mouse::Interaction {
         self.content.as_widget().mouse_interaction(
             &tree.children[0],
-            layout.children().next().unwrap(),
+            layout,
             cursor_position,
             viewport,
             renderer,
@@ -245,7 +231,7 @@ where
             renderer,
             theme,
             renderer_style,
-            layout.children().next().unwrap(),
+            layout,
             cursor_position,
             viewport,
         );
@@ -259,7 +245,7 @@ where
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
         self.content.as_widget_mut().overlay(
             &mut tree.children[0],
-            layout.children().next().unwrap(),
+            layout,
             renderer,
         )
     }
@@ -378,26 +364,3 @@ fn update<Message: Clone, Renderer>(
 
     event::Status::Ignored
 }
-
-/// Computes the layout of a [`MouseListener`].
-pub fn layout<Renderer>(
-    renderer: &Renderer,
-    limits: &layout::Limits,
-    width: Length,
-    height: Length,
-    max_height: u32,
-    max_width: u32,
-    layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
-) -> layout::Node {
-    let limits = limits
-        .loose()
-        .max_height(max_height)
-        .max_width(max_width)
-        .width(width)
-        .height(height);
-
-    let content = layout_content(renderer, &limits);
-    let size = limits.resolve(content.size());
-
-    layout::Node::with_children(size, vec![content])
-}

From d508ed26371edb3438ee4d1c6c9358713acd3bde 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, 13 Apr 2023 06:29:24 +0200
Subject: [PATCH 191/440] Remove redundant comments in `MouseListener` fields

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

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index c4e91cba..0ac7f826 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -15,29 +15,13 @@ use crate::{
 #[allow(missing_debug_implementations)]
 pub struct MouseListener<'a, Message, Renderer> {
     content: Element<'a, Message, Renderer>,
-
-    /// Sets the message to emit on a left mouse button press.
     on_press: Option<Message>,
-
-    /// Sets the message to emit on a left mouse button release.
     on_release: Option<Message>,
-
-    /// Sets the message to emit on a right mouse button press.
     on_right_press: Option<Message>,
-
-    /// Sets the message to emit on a right mouse button release.
     on_right_release: Option<Message>,
-
-    /// Sets the message to emit on a middle mouse button press.
     on_middle_press: Option<Message>,
-
-    /// Sets the message to emit on a middle mouse button release.
     on_middle_release: Option<Message>,
-
-    /// Sets the message to emit when the mouse enters the widget.
     on_mouse_enter: Option<Message>,
-
-    /// Sets the messsage to emit when the mouse exits the widget.
     on_mouse_exit: Option<Message>,
 }
 

From 8bcb68d785cb1731894a00374970529cc59b0e76 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, 13 Apr 2023 06:30:09 +0200
Subject: [PATCH 192/440] Move `tag` and `state` definitions in `MouseListener`

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

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index 0ac7f826..3db2184e 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -112,6 +112,14 @@ where
     Renderer: crate::Renderer,
     Message: Clone,
 {
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::of::<State>()
+    }
+
+    fn state(&self) -> tree::State {
+        tree::State::new(State::default())
+    }
+
     fn children(&self) -> Vec<Tree> {
         vec![Tree::new(&self.content)]
     }
@@ -233,14 +241,6 @@ where
             renderer,
         )
     }
-
-    fn tag(&self) -> tree::Tag {
-        tree::Tag::of::<State>()
-    }
-
-    fn state(&self) -> tree::State {
-        tree::State::new(State::default())
-    }
 }
 
 impl<'a, Message, Renderer> From<MouseListener<'a, Message, Renderer>>

From f247528725982e3214df3b06c153347fe4945b0f 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, 13 Apr 2023 06:34:17 +0200
Subject: [PATCH 193/440] Ignore mouse movements events in `MouseListener`

These should be ignored generally, since they are considered passive
user actions.
---
 native/src/widget/mouse_listener.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index 3db2184e..f9c3acac 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -271,9 +271,9 @@ fn update<Message: Clone, Renderer>(
     if !layout.bounds().contains(cursor_position) {
         if hovered {
             state.hovered = false;
+
             if let Some(message) = widget.on_mouse_exit.clone() {
                 shell.publish(message);
-                return event::Status::Captured;
             }
         }
 
@@ -285,7 +285,8 @@ fn update<Message: Clone, Renderer>(
     if !hovered {
         if let Some(message) = widget.on_mouse_enter.clone() {
             shell.publish(message);
-            return event::Status::Captured;
+
+            return event::Status::Ignored;
         }
     }
 
@@ -294,6 +295,7 @@ fn update<Message: Clone, Renderer>(
         | Event::Touch(touch::Event::FingerPressed { .. }) = event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }
@@ -303,6 +305,7 @@ fn update<Message: Clone, Renderer>(
         | Event::Touch(touch::Event::FingerLifted { .. }) = event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }
@@ -312,6 +315,7 @@ fn update<Message: Clone, Renderer>(
             event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }
@@ -322,6 +326,7 @@ fn update<Message: Clone, Renderer>(
         )) = event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }
@@ -332,6 +337,7 @@ fn update<Message: Clone, Renderer>(
         )) = event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }
@@ -342,6 +348,7 @@ fn update<Message: Clone, Renderer>(
         )) = event
         {
             shell.publish(message);
+
             return event::Status::Captured;
         }
     }

From 29971c9d71fe81b12eae56eeaf87c6b6890c83f9 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, 13 Apr 2023 06:44:09 +0200
Subject: [PATCH 194/440] Avoid returning on mouse enter in `MouseListener`

The event that triggers a mouse enter could be a mouse button
press/release.
---
 native/src/widget/mouse_listener.rs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index f9c3acac..a7a06bcc 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -86,7 +86,7 @@ impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
 /// Local state of the [`MouseListener`].
 #[derive(Default)]
 struct State {
-    hovered: bool,
+    is_hovered: bool,
 }
 
 impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
@@ -266,27 +266,23 @@ fn update<Message: Clone, Renderer>(
     shell: &mut Shell<'_, Message>,
     state: &mut State,
 ) -> event::Status {
-    let hovered = state.hovered;
+    let was_hovered = state.is_hovered;
 
-    if !layout.bounds().contains(cursor_position) {
-        if hovered {
-            state.hovered = false;
+    state.is_hovered = layout.bounds().contains(cursor_position);
 
-            if let Some(message) = widget.on_mouse_exit.clone() {
-                shell.publish(message);
+    if !state.is_hovered {
+        if was_hovered {
+            if let Some(message) = widget.on_mouse_exit.as_ref() {
+                shell.publish(message.clone());
             }
         }
 
         return event::Status::Ignored;
     }
 
-    state.hovered = true;
-
-    if !hovered {
-        if let Some(message) = widget.on_mouse_enter.clone() {
-            shell.publish(message);
-
-            return event::Status::Ignored;
+    if !was_hovered {
+        if let Some(message) = widget.on_mouse_enter.as_ref() {
+            shell.publish(message.clone());
         }
     }
 

From 6b359b496cf435c26f982ee0e52d7324c79ad1d5 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, 13 Apr 2023 06:44:51 +0200
Subject: [PATCH 195/440] Avoid cloning messages unnecessarily in
 `MouseListener`

---
 native/src/widget/mouse_listener.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_listener.rs
index a7a06bcc..00e20c04 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_listener.rs
@@ -286,64 +286,64 @@ fn update<Message: Clone, Renderer>(
         }
     }
 
-    if let Some(message) = widget.on_press.clone() {
+    if let Some(message) = widget.on_press.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) = event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }
     }
 
-    if let Some(message) = widget.on_release.clone() {
+    if let Some(message) = widget.on_release.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerLifted { .. }) = event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }
     }
 
-    if let Some(message) = widget.on_right_press.clone() {
+    if let Some(message) = widget.on_right_press.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) =
             event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }
     }
 
-    if let Some(message) = widget.on_right_release.clone() {
+    if let Some(message) = widget.on_right_release.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonReleased(
             mouse::Button::Right,
         )) = event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }
     }
 
-    if let Some(message) = widget.on_middle_press.clone() {
+    if let Some(message) = widget.on_middle_press.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonPressed(
             mouse::Button::Middle,
         )) = event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }
     }
 
-    if let Some(message) = widget.on_middle_release.clone() {
+    if let Some(message) = widget.on_middle_release.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonReleased(
             mouse::Button::Middle,
         )) = event
         {
-            shell.publish(message);
+            shell.publish(message.clone());
 
             return event::Status::Captured;
         }

From f55a97b738096d85086858026234ee95dcd79289 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, 13 Apr 2023 06:46:33 +0200
Subject: [PATCH 196/440] Rename `MouseListener` to `MouseArea`

---
 native/src/widget.rs                          |  4 ++--
 native/src/widget/helpers.rs                  |  6 ++---
 .../{mouse_listener.rs => mouse_area.rs}      | 24 +++++++++----------
 src/widget.rs                                 |  6 ++---
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename native/src/widget/{mouse_listener.rs => mouse_area.rs} (93%)

diff --git a/native/src/widget.rs b/native/src/widget.rs
index 4eb3d1ba..6849da17 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -17,7 +17,7 @@ pub mod column;
 pub mod container;
 pub mod helpers;
 pub mod image;
-pub mod mouse_listener;
+pub mod mouse_area;
 pub mod operation;
 pub mod pane_grid;
 pub mod pick_list;
@@ -52,7 +52,7 @@ pub use helpers::*;
 #[doc(no_inline)]
 pub use image::Image;
 #[doc(no_inline)]
-pub use mouse_listener::MouseListener;
+pub use mouse_area::MouseArea;
 #[doc(no_inline)]
 pub use pane_grid::PaneGrid;
 #[doc(no_inline)]
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
index 88986d60..5f44e22c 100644
--- a/native/src/widget/helpers.rs
+++ b/native/src/widget/helpers.rs
@@ -316,11 +316,11 @@ where
 }
 
 /// A container intercepting mouse events.
-pub fn mouse_listener<'a, Message, Renderer>(
+pub fn mouse_area<'a, Message, Renderer>(
     widget: impl Into<Element<'a, Message, Renderer>>,
-) -> widget::MouseListener<'a, Message, Renderer>
+) -> widget::MouseArea<'a, Message, Renderer>
 where
     Renderer: crate::Renderer,
 {
-    widget::MouseListener::new(widget)
+    widget::MouseArea::new(widget)
 }
diff --git a/native/src/widget/mouse_listener.rs b/native/src/widget/mouse_area.rs
similarity index 93%
rename from native/src/widget/mouse_listener.rs
rename to native/src/widget/mouse_area.rs
index 00e20c04..1b8b318c 100644
--- a/native/src/widget/mouse_listener.rs
+++ b/native/src/widget/mouse_area.rs
@@ -13,7 +13,7 @@ use crate::{
 
 /// Emit messages on mouse events.
 #[allow(missing_debug_implementations)]
-pub struct MouseListener<'a, Message, Renderer> {
+pub struct MouseArea<'a, Message, Renderer> {
     content: Element<'a, Message, Renderer>,
     on_press: Option<Message>,
     on_release: Option<Message>,
@@ -25,7 +25,7 @@ pub struct MouseListener<'a, Message, Renderer> {
     on_mouse_exit: Option<Message>,
 }
 
-impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
+impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
     /// The message to emit on a left button press.
     #[must_use]
     pub fn on_press(mut self, message: Message) -> Self {
@@ -83,16 +83,16 @@ impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
     }
 }
 
-/// Local state of the [`MouseListener`].
+/// Local state of the [`MouseArea`].
 #[derive(Default)]
 struct State {
     is_hovered: bool,
 }
 
-impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
-    /// Creates an empty [`MouseListener`].
+impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
+    /// Creates an empty [`MouseArea`].
     pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
-        MouseListener {
+        MouseArea {
             content: content.into(),
             on_press: None,
             on_release: None,
@@ -107,7 +107,7 @@ impl<'a, Message, Renderer> MouseListener<'a, Message, Renderer> {
 }
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
-    for MouseListener<'a, Message, Renderer>
+    for MouseArea<'a, Message, Renderer>
 where
     Renderer: crate::Renderer,
     Message: Clone,
@@ -243,23 +243,23 @@ where
     }
 }
 
-impl<'a, Message, Renderer> From<MouseListener<'a, Message, Renderer>>
+impl<'a, Message, Renderer> From<MouseArea<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a + Clone,
     Renderer: 'a + crate::Renderer,
 {
     fn from(
-        listener: MouseListener<'a, Message, Renderer>,
+        area: MouseArea<'a, Message, Renderer>,
     ) -> Element<'a, Message, Renderer> {
-        Element::new(listener)
+        Element::new(area)
     }
 }
 
-/// Processes the given [`Event`] and updates the [`State`] of an [`MouseListener`]
+/// Processes the given [`Event`] and updates the [`State`] of an [`MouseArea`]
 /// accordingly.
 fn update<Message: Clone, Renderer>(
-    widget: &mut MouseListener<'_, Message, Renderer>,
+    widget: &mut MouseArea<'_, Message, Renderer>,
     event: &Event,
     layout: Layout<'_>,
     cursor_position: Point,
diff --git a/src/widget.rs b/src/widget.rs
index 15b34ffa..d06fdafb 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -47,12 +47,12 @@ pub mod container {
         iced_native::widget::Container<'a, Message, Renderer>;
 }
 
-pub mod mouse_listener {
+pub mod mouse_area {
     //! Intercept mouse events on a widget.
 
     /// A container intercepting mouse events.
-    pub type MouseListener<'a, Message, Renderer = crate::Renderer> =
-        iced_native::widget::MouseListener<'a, Message, Renderer>;
+    pub type MouseArea<'a, Message, Renderer = crate::Renderer> =
+        iced_native::widget::MouseArea<'a, Message, Renderer>;
 }
 
 pub mod pane_grid {

From 020f1120e332b450f12ccf7aa3f4a52c5ee282a8 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, 13 Apr 2023 06:50:00 +0200
Subject: [PATCH 197/440] Fix documentation of `MouseArea::new`

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

diff --git a/native/src/widget/mouse_area.rs b/native/src/widget/mouse_area.rs
index 1b8b318c..5bf096d3 100644
--- a/native/src/widget/mouse_area.rs
+++ b/native/src/widget/mouse_area.rs
@@ -90,7 +90,7 @@ struct State {
 }
 
 impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
-    /// Creates an empty [`MouseArea`].
+    /// Creates a [`MouseArea`] with the given content.
     pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
         MouseArea {
             content: content.into(),

From 0c39112a2e7c63e7f8c2a03e67216b3736cb3aeb 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, 13 Apr 2023 06:58:53 +0200
Subject: [PATCH 198/440] Remove support for `on_mouse_enter` and
 `on_mouse_exit` in `MouseArea`

These need continuity guarantees (e.g. mandatory widget id), which we
don't have yet!
---
 native/src/widget/mouse_area.rs | 48 +++------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/native/src/widget/mouse_area.rs b/native/src/widget/mouse_area.rs
index 5bf096d3..69cfddbf 100644
--- a/native/src/widget/mouse_area.rs
+++ b/native/src/widget/mouse_area.rs
@@ -21,8 +21,6 @@ pub struct MouseArea<'a, Message, Renderer> {
     on_right_release: Option<Message>,
     on_middle_press: Option<Message>,
     on_middle_release: Option<Message>,
-    on_mouse_enter: Option<Message>,
-    on_mouse_exit: Option<Message>,
 }
 
 impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
@@ -67,26 +65,12 @@ impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
         self.on_middle_release = Some(message);
         self
     }
-
-    /// The message to emit when the mouse enters the widget.
-    #[must_use]
-    pub fn on_mouse_enter(mut self, message: Message) -> Self {
-        self.on_mouse_enter = Some(message);
-        self
-    }
-
-    /// The messsage to emit when the mouse exits the widget.
-    #[must_use]
-    pub fn on_mouse_exit(mut self, message: Message) -> Self {
-        self.on_mouse_exit = Some(message);
-        self
-    }
 }
 
 /// Local state of the [`MouseArea`].
 #[derive(Default)]
 struct State {
-    is_hovered: bool,
+    // TODO: Support on_mouse_enter and on_mouse_exit
 }
 
 impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
@@ -100,8 +84,6 @@ impl<'a, Message, Renderer> MouseArea<'a, Message, Renderer> {
             on_right_release: None,
             on_middle_press: None,
             on_middle_release: None,
-            on_mouse_enter: None,
-            on_mouse_exit: None,
         }
     }
 }
@@ -181,14 +163,7 @@ where
             return event::Status::Captured;
         }
 
-        update(
-            self,
-            &event,
-            layout,
-            cursor_position,
-            shell,
-            tree.state.downcast_mut::<State>(),
-        )
+        update(self, &event, layout, cursor_position, shell)
     }
 
     fn mouse_interaction(
@@ -264,28 +239,11 @@ fn update<Message: Clone, Renderer>(
     layout: Layout<'_>,
     cursor_position: Point,
     shell: &mut Shell<'_, Message>,
-    state: &mut State,
 ) -> event::Status {
-    let was_hovered = state.is_hovered;
-
-    state.is_hovered = layout.bounds().contains(cursor_position);
-
-    if !state.is_hovered {
-        if was_hovered {
-            if let Some(message) = widget.on_mouse_exit.as_ref() {
-                shell.publish(message.clone());
-            }
-        }
-
+    if !layout.bounds().contains(cursor_position) {
         return event::Status::Ignored;
     }
 
-    if !was_hovered {
-        if let Some(message) = widget.on_mouse_enter.as_ref() {
-            shell.publish(message.clone());
-        }
-    }
-
     if let Some(message) = widget.on_press.as_ref() {
         if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) = event

From 4297d1a04a7d15abf5ec8ac2058a06df34aaf618 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 12 Apr 2023 22:45:43 -0700
Subject: [PATCH 199/440] Add missing operations for component

---
 lazy/src/component.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lazy/src/component.rs b/lazy/src/component.rs
index f6c331b9..4a43223d 100644
--- a/lazy/src/component.rs
+++ b/lazy/src/component.rs
@@ -361,6 +361,22 @@ where
             ) {
                 self.operation.text_input(state, id);
             }
+
+            fn scrollable(
+                &mut self,
+                state: &mut dyn widget::operation::Scrollable,
+                id: Option<&widget::Id>,
+            ) {
+                self.operation.scrollable(state, id);
+            }
+
+            fn custom(
+                &mut self,
+                state: &mut dyn std::any::Any,
+                id: Option<&widget::Id>,
+            ) {
+                self.operation.custom(state, id);
+            }
         }
 
         let tree = tree.state.downcast_mut::<Rc<RefCell<Option<Tree>>>>();

From b1a5341a45200defc84673b8edeeb99ec20ebb04 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, 13 Apr 2023 08:25:46 +0200
Subject: [PATCH 200/440] Add script to generate a release summary

Courtesy of GPT-4
---
 docs/release_summary.py | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 docs/release_summary.py

diff --git a/docs/release_summary.py b/docs/release_summary.py
new file mode 100644
index 00000000..cd4593b5
--- /dev/null
+++ b/docs/release_summary.py
@@ -0,0 +1,52 @@
+import re
+import sys
+import requests
+from typing import List, Tuple
+
+if len(sys.argv) < 3:
+    print("Usage: python release_summary.py <personal_access_token> <previous_release_branch>")
+    exit(1)
+
+TOKEN = sys.argv[1]
+HEADERS = {"Authorization": f"Bearer {TOKEN}"}
+PR_COMMIT_REGEX = re.compile(r"(?i)Merge pull request #(\d+).*")
+
+def get_merged_prs_since_release(repo: str, previous_release_branch: str) -> List[Tuple[str, int, str, str]]:
+    prs = []
+    compare_url = f"https://api.github.com/repos/{repo}/compare/{previous_release_branch}...master"
+    compare_response = requests.get(compare_url, headers=HEADERS)
+
+    if compare_response.status_code == 200:
+        compare_data = compare_response.json()
+        for commit in compare_data["commits"]:
+            match = PR_COMMIT_REGEX.search(commit["commit"]["message"])
+            if match:
+                pr_number = int(match.group(1))
+                pr_url = f"https://api.github.com/repos/{repo}/pulls/{pr_number}"
+                pr_response = requests.get(pr_url, headers=HEADERS)
+                if pr_response.status_code == 200:
+                    pr_data = pr_response.json()
+                    prs.append((pr_data["title"], pr_number, pr_data["html_url"], pr_data["user"]["login"]))
+                else:
+                    print(f"Error fetching PR {pr_number}: {pr_response.status_code}")
+    else:
+        print(f"Error comparing branches: {compare_response.status_code}")
+
+    return prs
+
+def print_pr_list(prs: List[Tuple[str, int, str, str]]):
+    for pr in prs:
+        print(f"- {pr[0]}. [#{pr[1]}]({pr[2]})")
+
+def print_authors(prs: List[Tuple[str, int, str, str]]):
+    authors = set(pr[3] for pr in prs)
+    print("\nAuthors:")
+    for author in sorted(authors, key=str.casefold):
+        print(f"- @{author}")
+
+if __name__ == "__main__":
+    repo = "iced-rs/iced"
+    previous_release_branch = sys.argv[2]
+    merged_prs = get_merged_prs_since_release(repo, previous_release_branch)
+    print_pr_list(merged_prs)
+    print_authors(merged_prs)

From c79cc2d2b3df99f69b048c68e503916c779a1102 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, 13 Apr 2023 08:31:17 +0200
Subject: [PATCH 201/440] Bump versions :tada:

---
 CHANGELOG.md                   | 56 +++++++++++++++++++++++++++++++++-
 Cargo.toml                     | 18 +++++------
 README.md                      |  4 +--
 core/Cargo.toml                |  2 +-
 core/README.md                 |  2 +-
 core/src/lib.rs                |  2 +-
 futures/src/subscription.rs    |  6 ++--
 glow/Cargo.toml                |  6 ++--
 glow/README.md                 |  2 +-
 glow/src/lib.rs                |  2 +-
 glutin/Cargo.toml              |  8 ++---
 glutin/README.md               |  2 +-
 graphics/Cargo.toml            |  6 ++--
 lazy/Cargo.toml                |  4 +--
 native/Cargo.toml              |  6 ++--
 native/README.md               |  2 +-
 native/src/lib.rs              |  4 +--
 native/src/subscription.rs     |  2 +-
 native/src/user_interface.rs   |  4 +--
 native/src/widget.rs           | 10 +++---
 native/src/widget/pane_grid.rs |  2 +-
 src/application.rs             | 18 +++++------
 src/lib.rs                     |  8 ++---
 src/sandbox.rs                 | 22 ++++++-------
 src/widget.rs                  |  2 +-
 style/Cargo.toml               |  4 +--
 wgpu/Cargo.toml                |  6 ++--
 wgpu/README.md                 |  2 +-
 wgpu/src/lib.rs                |  2 +-
 winit/Cargo.toml               |  6 ++--
 winit/README.md                |  2 +-
 winit/src/conversion.rs        | 12 ++++----
 winit/src/lib.rs               |  2 +-
 33 files changed, 145 insertions(+), 91 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d9d1fb3..077f4af3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,59 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2023-04-13
+### Added
+- `MouseArea` widget. [#1594](https://github.com/iced-rs/iced/pull/1594)
+- `channel` helper in `subscription`. [#1786](https://github.com/iced-rs/iced/pull/1786)
+- Configurable `width` for `Scrollable`. [#1749](https://github.com/iced-rs/iced/pull/1749)
+- Support for disabled `TextInput`. [#1744](https://github.com/iced-rs/iced/pull/1744)
+- Platform-specific window settings. [#1730](https://github.com/iced-rs/iced/pull/1730)
+- Left and right colors for sliders. [#1643](https://github.com/iced-rs/iced/pull/1643)
+- Icon for `TextInput`. [#1702](https://github.com/iced-rs/iced/pull/1702)
+- Mouse over scrollbar flag for `scrollable::StyleSheet`. [#1669](https://github.com/iced-rs/iced/pull/1669)
+- Better example for `Radio`. [#1762](https://github.com/iced-rs/iced/pull/1762)
+
+### Changed
+- `wgpu` has been updated to `0.15` in `iced_wgpu`. [#1789](https://github.com/iced-rs/iced/pull/1789)
+- `resvg` has been updated to `0.29` in `iced_graphics`. [#1733](https://github.com/iced-rs/iced/pull/1733)
+- `subscription::run` now takes a function pointer. [#1723](https://github.com/iced-rs/iced/pull/1723)
+
+### Fixed
+- Redundant `on_scroll` messages for `Scrollable`. [#1788](https://github.com/iced-rs/iced/pull/1788)
+- Outdated items in `ROADMAP.md` [#1782](https://github.com/iced-rs/iced/pull/1782)
+- Colons in shader labels causing compilation issues in `iced_wgpu`. [#1779](https://github.com/iced-rs/iced/pull/1779)
+- Re-expose winit features for window servers in Linux. [#1777](https://github.com/iced-rs/iced/pull/1777)
+- Replacement of application node in Wasm. [#1765](https://github.com/iced-rs/iced/pull/1765)
+- `clippy` lints for Rust 1.68. [#1755](https://github.com/iced-rs/iced/pull/1755)
+- Unnecessary `Component` rebuilds. [#1754](https://github.com/iced-rs/iced/pull/1754)
+- Incorrect package name in checkbox example docs. [#1750](https://github.com/iced-rs/iced/pull/1750)
+- Fullscreen only working on primary monitor. [#1742](https://github.com/iced-rs/iced/pull/1742)
+- `Padding::fit` on irregular values for an axis. [#1734](https://github.com/iced-rs/iced/pull/1734)
+- `Debug` implementation of `Font` displaying its bytes. [#1731](https://github.com/iced-rs/iced/pull/1731)
+- Sliders bleeding over their rail. [#1721](https://github.com/iced-rs/iced/pull/1721)
+
+### Removed
+- `Fill` variant for `Alignment`. [#1735](https://github.com/iced-rs/iced/pull/1735)
+
+Many thanks to...
+
+- @ahoneybun
+- @bq-wrongway
+- @bungoboingo
+- @casperstorm
+- @Davidster
+- @ElhamAryanpur
+- @FinnPerry
+- @GyulyVGC
+- @JungleTryne
+- @lupd
+- @mmstick
+- @nicksenger
+- @Night-Hunter-NF
+- @tarkah
+- @traxys
+- @Xaeroxe
+
 ## [0.8.0] - 2023-02-18
 ### Added
 - Generic pixel units. [#1711](https://github.com/iced-rs/iced/pull/1711)
@@ -414,7 +467,8 @@ Many thanks to...
 ### Added
 - First release! :tada:
 
-[Unreleased]: https://github.com/iced-rs/iced/compare/0.8.0...HEAD
+[Unreleased]: https://github.com/iced-rs/iced/compare/0.9.0...HEAD
+[0.9.0]: https://github.com/iced-rs/iced/compare/0.8.0...0.9.0
 [0.8.0]: https://github.com/iced-rs/iced/compare/0.7.0...0.8.0
 [0.7.0]: https://github.com/iced-rs/iced/compare/0.6.0...0.7.0
 [0.6.0]: https://github.com/iced-rs/iced/compare/0.5.0...0.6.0
diff --git a/Cargo.toml b/Cargo.toml
index d26ec2b6..1f8eb017 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A cross-platform GUI library inspired by Elm"
@@ -66,13 +66,13 @@ members = [
 ]
 
 [dependencies]
-iced_core = { version = "0.8", path = "core" }
+iced_core = { version = "0.9", path = "core" }
 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 }
-iced_glow = { version = "0.7", path = "glow", optional = true }
+iced_native = { version = "0.10", path = "native" }
+iced_graphics = { version = "0.8", path = "graphics" }
+iced_winit = { version = "0.9", path = "winit", features = ["application"] }
+iced_glutin = { version = "0.8", path = "glutin", optional = true }
+iced_glow = { version = "0.8", path = "glow", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]
@@ -81,10 +81,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.10", path = "wgpu", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-iced_wgpu = { version = "0.9", path = "wgpu", features = ["webgl"], optional = true }
+iced_wgpu = { version = "0.10", path = "wgpu", features = ["webgl"], optional = true }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/README.md b/README.md
index a5ebf230..fe2a4a64 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
 Add `iced` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced = "0.8"
+iced = "0.9"
 ```
 
 If your project is using a Rust edition older than 2021, then you will need to
@@ -215,7 +215,7 @@ cargo run --features iced/glow --package game_of_life
 and then use it in your project with
 
 ```toml
-iced = { version = "0.8", default-features = false, features = ["glow"] }
+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,
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 0d6310d3..3a00a53e 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_core"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "The essential concepts of Iced"
diff --git a/core/README.md b/core/README.md
index 64d92e78..519e0608 100644
--- a/core/README.md
+++ b/core/README.md
@@ -18,7 +18,7 @@ This crate is meant to be a starting point for an Iced runtime.
 Add `iced_core` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_core = "0.8"
+iced_core = "0.9"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d3596b4d..da3cb874 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -7,7 +7,7 @@
 //! ![The foundations of the Iced ecosystem](https://github.com/iced-rs/iced/blob/0525d76ff94e828b7b21634fa94a747022001c83/docs/graphs/foundations.png?raw=true)
 //!
 //! [Iced]: https://github.com/iced-rs/iced
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 //! [`iced_web`]: https://github.com/iced-rs/iced_web
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
diff --git a/futures/src/subscription.rs b/futures/src/subscription.rs
index fe53fd7e..18c66a5a 100644
--- a/futures/src/subscription.rs
+++ b/futures/src/subscription.rs
@@ -126,9 +126,9 @@ impl<I, O, H> std::fmt::Debug for Subscription<I, O, H> {
 /// - [`stopwatch`], a watch with start/stop and reset buttons showcasing how
 /// to listen to time.
 ///
-/// [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
+/// [examples]: https://github.com/iced-rs/iced/tree/0.9/examples
+/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.9/examples/download_progress
+/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.9/examples/stopwatch
 pub trait Recipe<Hasher: std::hash::Hasher, Event> {
     /// The events that will be produced by a [`Subscription`] with this
     /// [`Recipe`].
diff --git a/glow/Cargo.toml b/glow/Cargo.toml
index 1a848ab7..facc668a 100644
--- a/glow/Cargo.toml
+++ b/glow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_glow"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A glow renderer for iced"
@@ -34,11 +34,11 @@ bytemuck = "1.4"
 log = "0.4"
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
 
 [dependencies.iced_graphics]
-version = "0.7"
+version = "0.8"
 path = "../graphics"
 features = ["font-fallback", "font-icons", "opengl"]
 
diff --git a/glow/README.md b/glow/README.md
index 95c9d62a..aa3d4d12 100644
--- a/glow/README.md
+++ b/glow/README.md
@@ -28,7 +28,7 @@ Currently, `iced_glow` supports the following primitives:
 Add `iced_glow` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_glow = "0.7"
+iced_glow = "0.8"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/glow/src/lib.rs b/glow/src/lib.rs
index 9e7de0d9..4614abfd 100644
--- a/glow/src/lib.rs
+++ b/glow/src/lib.rs
@@ -3,7 +3,7 @@
 //! ![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
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 10d3778b..2858a088 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_glutin"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A glutin runtime for Iced"
@@ -24,16 +24,16 @@ git = "https://github.com/iced-rs/glutin"
 rev = "da8d291486b4c9bec12487a46c119c4b1d386abf"
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
 
 [dependencies.iced_winit]
-version = "0.8"
+version = "0.9"
 path = "../winit"
 features = ["application"]
 
 [dependencies.iced_graphics]
-version = "0.7"
+version = "0.8"
 path = "../graphics"
 features = ["opengl"]
 
diff --git a/glutin/README.md b/glutin/README.md
index 45e8ee6b..9c0ac459 100644
--- a/glutin/README.md
+++ b/glutin/README.md
@@ -20,7 +20,7 @@ It exposes a renderer-agnostic `Application` trait that can be implemented and t
 Add `iced_glutin` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_glutin = "0.7"
+iced_glutin = "0.8"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index a37c99a2..57b291e7 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_graphics"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A bunch of backend-agnostic types that can be leveraged to build a renderer for Iced"
@@ -44,11 +44,11 @@ version = "1.4"
 features = ["derive"]
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
 
 [dependencies.iced_style]
-version = "0.7"
+version = "0.8"
 path = "../style"
 
 [dependencies.lyon]
diff --git a/lazy/Cargo.toml b/lazy/Cargo.toml
index c739b312..8ca83ad0 100644
--- a/lazy/Cargo.toml
+++ b/lazy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_lazy"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "Lazy widgets for Iced"
@@ -14,5 +14,5 @@ categories = ["gui"]
 ouroboros = "0.13"
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 1eedf0da..869c1bb0 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_native"
-version = "0.9.1"
+version = "0.10.1"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A renderer-agnostic library for native GUIs"
@@ -17,7 +17,7 @@ num-traits = "0.2"
 thiserror = "1"
 
 [dependencies.iced_core]
-version = "0.8"
+version = "0.9"
 path = "../core"
 
 [dependencies.iced_futures]
@@ -26,5 +26,5 @@ path = "../futures"
 features = ["thread-pool"]
 
 [dependencies.iced_style]
-version = "0.7"
+version = "0.8"
 path = "../style"
diff --git a/native/README.md b/native/README.md
index 996daa76..cf36b224 100644
--- a/native/README.md
+++ b/native/README.md
@@ -28,7 +28,7 @@ To achieve this, it introduces a bunch of reusable interfaces:
 Add `iced_native` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_native = "0.9"
+iced_native = "0.10"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/native/src/lib.rs b/native/src/lib.rs
index ebdc8490..dc77950c 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -23,8 +23,8 @@
 //! - Build a new renderer, see the [renderer] module.
 //! - Build a custom widget, start at the [`Widget`] trait.
 //!
-//! [`iced_core`]: https://github.com/iced-rs/iced/tree/0.8/core
-//! [`iced_winit`]: https://github.com/iced-rs/iced/tree/0.8/winit
+//! [`iced_core`]: https://github.com/iced-rs/iced/tree/0.9/core
+//! [`iced_winit`]: https://github.com/iced-rs/iced/tree/0.9/winit
 //! [`druid`]: https://github.com/xi-editor/druid
 //! [`raw-window-handle`]: https://github.com/rust-windowing/raw-window-handle
 //! [renderer]: crate::renderer
diff --git a/native/src/subscription.rs b/native/src/subscription.rs
index 0ff5e320..115ffc42 100644
--- a/native/src/subscription.rs
+++ b/native/src/subscription.rs
@@ -229,7 +229,7 @@ where
 /// 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
+/// [`websocket`]: https://github.com/iced-rs/iced/tree/0.9/examples/websocket
 pub fn channel<I, Fut, Message>(
     id: I,
     size: usize,
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index 68ccda55..e5c90bbb 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -21,8 +21,8 @@ use crate::{
 /// The [`integration_opengl`] & [`integration_wgpu`] examples use a
 /// [`UserInterface`] to integrate Iced in an existing graphical application.
 ///
-/// [`integration_opengl`]: https://github.com/iced-rs/iced/tree/0.8/examples/integration_opengl
-/// [`integration_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/examples/integration_wgpu
+/// [`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
 #[allow(missing_debug_implementations)]
 pub struct UserInterface<'a, Message, Renderer> {
     root: Element<'a, Message, Renderer>,
diff --git a/native/src/widget.rs b/native/src/widget.rs
index 6849da17..6b83f1fa 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -113,12 +113,12 @@ use crate::{Clipboard, Layout, Length, Point, Rectangle, Shell};
 /// - [`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
+/// [examples]: https://github.com/iced-rs/iced/tree/0.9/examples
+/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.9/examples/bezier_tool
+/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.9/examples/custom_widget
+/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.9/examples/geometry
 /// [`lyon`]: https://github.com/nical/lyon
-/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/wgpu
+/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.9/wgpu
 pub trait Widget<Message, Renderer>
 where
     Renderer: crate::Renderer,
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index bcb17ebd..06ece7f4 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -6,7 +6,7 @@
 //! 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
+//! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.9/examples/pane_grid
 mod axis;
 mod configuration;
 mod content;
diff --git a/src/application.rs b/src/application.rs
index 1db5c93f..54d2e391 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -39,15 +39,15 @@ pub use iced_native::application::{Appearance, StyleSheet};
 /// to listen to time.
 /// - [`todos`], a todos tracker inspired by [TodoMVC].
 ///
-/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.8/examples
-/// [`clock`]: https://github.com/iced-rs/iced/tree/0.8/examples/clock
-/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.8/examples/download_progress
-/// [`events`]: https://github.com/iced-rs/iced/tree/0.8/examples/events
-/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.8/examples/game_of_life
-/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.8/examples/pokedex
-/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.8/examples/solar_system
-/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.8/examples/stopwatch
-/// [`todos`]: https://github.com/iced-rs/iced/tree/0.8/examples/todos
+/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.9/examples
+/// [`clock`]: https://github.com/iced-rs/iced/tree/0.9/examples/clock
+/// [`download_progress`]: https://github.com/iced-rs/iced/tree/0.9/examples/download_progress
+/// [`events`]: https://github.com/iced-rs/iced/tree/0.9/examples/events
+/// [`game_of_life`]: https://github.com/iced-rs/iced/tree/0.9/examples/game_of_life
+/// [`pokedex`]: https://github.com/iced-rs/iced/tree/0.9/examples/pokedex
+/// [`solar_system`]: https://github.com/iced-rs/iced/tree/0.9/examples/solar_system
+/// [`stopwatch`]: https://github.com/iced-rs/iced/tree/0.9/examples/stopwatch
+/// [`todos`]: https://github.com/iced-rs/iced/tree/0.9/examples/todos
 /// [`Sandbox`]: crate::Sandbox
 /// [`Canvas`]: crate::widget::Canvas
 /// [PokéAPI]: https://pokeapi.co/
diff --git a/src/lib.rs b/src/lib.rs
index 318852f9..62e5140f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,13 +24,13 @@
 //! [scrollables]: https://gfycat.com/perkybaggybaboon-rust-gui
 //! [Debug overlay with performance metrics]: https://gfycat.com/incredibledarlingbee
 //! [Modular ecosystem]: https://github.com/iced-rs/iced/blob/master/ECOSYSTEM.md
-//! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/tree/0.8/native
+//! [renderer-agnostic native runtime]: https://github.com/iced-rs/iced/tree/0.9/native
 //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
-//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.8/wgpu
-//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.8/winit
+//! [built-in renderer]: https://github.com/iced-rs/iced/tree/0.9/wgpu
+//! [windowing shell]: https://github.com/iced-rs/iced/tree/0.9/winit
 //! [`dodrio`]: https://github.com/fitzgen/dodrio
 //! [web runtime]: https://github.com/iced-rs/iced_web
-//! [examples]: https://github.com/iced-rs/iced/tree/0.8/examples
+//! [examples]: https://github.com/iced-rs/iced/tree/0.9/examples
 //! [repository]: https://github.com/iced-rs/iced
 //!
 //! # Overview
diff --git a/src/sandbox.rs b/src/sandbox.rs
index e8ed0f81..cca327b6 100644
--- a/src/sandbox.rs
+++ b/src/sandbox.rs
@@ -34,19 +34,19 @@ use crate::{Application, Command, Element, Error, Settings, Subscription};
 /// - [`tour`], a simple UI tour that can run both on native platforms and the
 /// web!
 ///
-/// [The repository has a bunch of 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
-/// [`counter`]: https://github.com/iced-rs/iced/tree/0.8/examples/counter
-/// [`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
-/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.8/examples/pane_grid
-/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.8/examples/progress_bar
-/// [`styling`]: https://github.com/iced-rs/iced/tree/0.8/examples/styling
-/// [`svg`]: https://github.com/iced-rs/iced/tree/0.8/examples/svg
-/// [`tour`]: https://github.com/iced-rs/iced/tree/0.8/examples/tour
+/// [The repository has a bunch of examples]: https://github.com/iced-rs/iced/tree/0.9/examples
+/// [`bezier_tool`]: https://github.com/iced-rs/iced/tree/0.9/examples/bezier_tool
+/// [`counter`]: https://github.com/iced-rs/iced/tree/0.9/examples/counter
+/// [`custom_widget`]: https://github.com/iced-rs/iced/tree/0.9/examples/custom_widget
+/// [`geometry`]: https://github.com/iced-rs/iced/tree/0.9/examples/geometry
+/// [`pane_grid`]: https://github.com/iced-rs/iced/tree/0.9/examples/pane_grid
+/// [`progress_bar`]: https://github.com/iced-rs/iced/tree/0.9/examples/progress_bar
+/// [`styling`]: https://github.com/iced-rs/iced/tree/0.9/examples/styling
+/// [`svg`]: https://github.com/iced-rs/iced/tree/0.9/examples/svg
+/// [`tour`]: https://github.com/iced-rs/iced/tree/0.9/examples/tour
 /// [`Canvas widget`]: crate::widget::Canvas
 /// [the overview]: index.html#overview
-/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.8/wgpu
+/// [`iced_wgpu`]: https://github.com/iced-rs/iced/tree/0.9/wgpu
 /// [`Svg` widget]: crate::widget::Svg
 /// [Ghostscript Tiger]: https://commons.wikimedia.org/wiki/File:Ghostscript_Tiger.svg
 ///
diff --git a/src/widget.rs b/src/widget.rs
index d06fdafb..44027811 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -64,7 +64,7 @@ pub mod pane_grid {
     //! 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
+    //! [`pane_grid` example]: https://github.com/iced-rs/iced/tree/0.9/examples/pane_grid
     pub use iced_native::widget::pane_grid::{
         Axis, Configuration, Direction, DragEvent, Line, Node, Pane,
         ResizeEvent, Split, State, StyleSheet,
diff --git a/style/Cargo.toml b/style/Cargo.toml
index 3b54f1ec..0bb354e0 100644
--- a/style/Cargo.toml
+++ b/style/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_style"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "The default set of styles of Iced"
@@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [dependencies.iced_core]
-version = "0.8"
+version = "0.9"
 path = "../core"
 features = ["palette"]
 
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 4dcd07f7..3478ef59 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_wgpu"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A wgpu renderer for Iced"
@@ -42,11 +42,11 @@ version = "1.9"
 features = ["derive"]
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
 
 [dependencies.iced_graphics]
-version = "0.7"
+version = "0.8"
 path = "../graphics"
 features = ["font-fallback", "font-icons"]
 
diff --git a/wgpu/README.md b/wgpu/README.md
index 3e6af103..f8c88374 100644
--- a/wgpu/README.md
+++ b/wgpu/README.md
@@ -30,7 +30,7 @@ Currently, `iced_wgpu` supports the following primitives:
 Add `iced_wgpu` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_wgpu = "0.9"
+iced_wgpu = "0.10"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 1a293681..969e3199 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -16,7 +16,7 @@
 //! - Meshes of triangles, useful to draw geometry freely.
 //!
 //! [Iced]: https://github.com/iced-rs/iced
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 //! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
 //! [WebGPU API]: https://gpuweb.github.io/gpuweb/
 //! [`wgpu_glyph`]: https://github.com/hecrj/wgpu_glyph
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 255b28bb..8788b667 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_winit"
-version = "0.8.0"
+version = "0.9.1"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A winit runtime for Iced"
@@ -34,11 +34,11 @@ rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
 default-features = false
 
 [dependencies.iced_native]
-version = "0.9"
+version = "0.10"
 path = "../native"
 
 [dependencies.iced_graphics]
-version = "0.7"
+version = "0.8"
 path = "../graphics"
 
 [dependencies.iced_futures]
diff --git a/winit/README.md b/winit/README.md
index 83810473..91307970 100644
--- a/winit/README.md
+++ b/winit/README.md
@@ -20,7 +20,7 @@ It exposes a renderer-agnostic `Application` trait that can be implemented and t
 Add `iced_winit` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced_winit = "0.8"
+iced_winit = "0.9"
 ```
 
 __Iced moves fast and the `master` branch can contain breaking changes!__ If
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index cf066ef6..e416c073 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -1,7 +1,7 @@
 //! Convert [`winit`] types into [`iced_native`] types, and viceversa.
 //!
 //! [`winit`]: https://github.com/rust-windowing/winit
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 use crate::keyboard;
 use crate::mouse;
 use crate::touch;
@@ -218,7 +218,7 @@ pub fn mode(mode: Option<winit::window::Fullscreen>) -> window::Mode {
 /// Converts a `MouseCursor` from [`iced_native`] to a [`winit`] cursor icon.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 pub fn mouse_interaction(
     interaction: mouse::Interaction,
 ) -> winit::window::CursorIcon {
@@ -243,7 +243,7 @@ pub fn mouse_interaction(
 /// Converts a `MouseButton` from [`winit`] to an [`iced_native`] mouse button.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
     match mouse_button {
         winit::event::MouseButton::Left => mouse::Button::Left,
@@ -259,7 +259,7 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
 /// modifiers state.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 pub fn modifiers(
     modifiers: winit::event::ModifiersState,
 ) -> keyboard::Modifiers {
@@ -286,7 +286,7 @@ pub fn cursor_position(
 /// Converts a `Touch` from [`winit`] to an [`iced_native`] touch event.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 pub fn touch_event(
     touch: winit::event::Touch,
     scale_factor: f64,
@@ -317,7 +317,7 @@ pub fn touch_event(
 /// Converts a `VirtualKeyCode` from [`winit`] to an [`iced_native`] key code.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
-/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+/// [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 pub fn key_code(
     virtual_keycode: winit::event::VirtualKeyCode,
 ) -> keyboard::KeyCode {
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 3a33e174..6b6c6045 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -11,7 +11,7 @@
 //! Additionally, a [`conversion`] module is available for users that decide to
 //! implement a custom event loop.
 //!
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.8/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.9/native
 //! [`winit`]: https://github.com/rust-windowing/winit
 //! [`conversion`]: crate::conversion
 #![doc(

From 4b05f42fd6d18bf572b772dd60d6a4309ea5f343 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, 13 Apr 2023 16:13:56 +0200
Subject: [PATCH 202/440] Bump version of `iced_lazy` :tada:

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

diff --git a/lazy/Cargo.toml b/lazy/Cargo.toml
index 8ca83ad0..36cf3f12 100644
--- a/lazy/Cargo.toml
+++ b/lazy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_lazy"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "Lazy widgets for Iced"

From b623f280ed43b04cef16a82de4cdf13497b5d63e Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Fri, 14 Apr 2023 13:32:44 -0700
Subject: [PATCH 203/440] Add `scroll_to` operation for absolute scroll

---
 examples/scrollable/src/main.rs           |  4 +-
 native/src/widget/operation/scrollable.rs | 50 ++++++++++++++++++++-
 native/src/widget/scrollable.rs           | 55 +++++++++++++++--------
 src/widget.rs                             |  4 +-
 4 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 2e99b1ac..be8d0f52 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -36,7 +36,7 @@ enum Message {
     ScrollerWidthChanged(u16),
     ScrollToBeginning,
     ScrollToEnd,
-    Scrolled(scrollable::RelativeOffset),
+    Scrolled(scrollable::CurrentOffset),
 }
 
 impl Application for ScrollableDemo {
@@ -105,7 +105,7 @@ impl Application for ScrollableDemo {
                 )
             }
             Message::Scrolled(offset) => {
-                self.current_scroll_offset = offset;
+                self.current_scroll_offset = offset.relative;
 
                 Command::none()
             }
diff --git a/native/src/widget/operation/scrollable.rs b/native/src/widget/operation/scrollable.rs
index 3b20631f..62f4c91e 100644
--- a/native/src/widget/operation/scrollable.rs
+++ b/native/src/widget/operation/scrollable.rs
@@ -5,6 +5,9 @@ use crate::widget::{Id, Operation};
 pub trait Scrollable {
     /// Snaps the scroll of the widget to the given `percentage` along the horizontal & vertical axis.
     fn snap_to(&mut self, offset: RelativeOffset);
+
+    /// Scroll the widget to the given [`AbsoluteOffset`] along the horizontal & vertical axis.
+    fn scroll_to(&mut self, offset: AbsoluteOffset);
 }
 
 /// Produces an [`Operation`] that snaps the widget with the given [`Id`] to
@@ -34,7 +37,52 @@ pub fn snap_to<T>(target: Id, offset: RelativeOffset) -> impl Operation<T> {
     SnapTo { target, offset }
 }
 
-/// The amount of offset in each direction of a [`Scrollable`].
+/// Produces an [`Operation`] that scrolls the widget with the given [`Id`] to
+/// the provided [`AbsoluteOffset`].
+pub fn scroll_to<T>(target: Id, offset: AbsoluteOffset) -> impl Operation<T> {
+    struct ScrollTo {
+        target: Id,
+        offset: AbsoluteOffset,
+    }
+
+    impl<T> Operation<T> for ScrollTo {
+        fn container(
+            &mut self,
+            _id: Option<&Id>,
+            operate_on_children: &mut dyn FnMut(&mut dyn Operation<T>),
+        ) {
+            operate_on_children(self)
+        }
+
+        fn scrollable(&mut self, state: &mut dyn Scrollable, id: Option<&Id>) {
+            if Some(&self.target) == id {
+                state.scroll_to(self.offset);
+            }
+        }
+    }
+
+    ScrollTo { target, offset }
+}
+
+/// The current absolute & relative offset of a [`Scrollable`]
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
+pub struct CurrentOffset {
+    /// The [`AbsoluteOffset`] of a [`Scrollable`]
+    pub absolute: AbsoluteOffset,
+    /// The [`RelativeOffset`] of a [`Scrollable`]
+    pub relative: RelativeOffset,
+}
+
+/// The amount of absolute offset in each direction of a [`Scrollable`].
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
+pub struct AbsoluteOffset {
+    /// The amount of horizontal offset
+    pub x: f32,
+    /// The amount of vertical offset
+    pub y: f32,
+}
+
+/// The amount of relative offset in each direction of a [`Scrollable`].
 ///
 /// A value of `0.0` means start, while `1.0` means end.
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 78dcdca2..eedddfd0 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -15,7 +15,9 @@ use crate::{
 };
 
 pub use iced_style::scrollable::StyleSheet;
-pub use operation::scrollable::RelativeOffset;
+pub use operation::scrollable::{
+    AbsoluteOffset, CurrentOffset, RelativeOffset,
+};
 
 pub mod style {
     //! The styles of a [`Scrollable`].
@@ -38,7 +40,7 @@ where
     vertical: Properties,
     horizontal: Option<Properties>,
     content: Element<'a, Message, Renderer>,
-    on_scroll: Option<Box<dyn Fn(RelativeOffset) -> Message + 'a>>,
+    on_scroll: Option<Box<dyn Fn(CurrentOffset) -> Message + 'a>>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -93,11 +95,10 @@ where
 
     /// Sets a function to call when the [`Scrollable`] is scrolled.
     ///
-    /// The function takes the new relative x & y offset of the [`Scrollable`]
-    /// (e.g. `0` means beginning, while `1` means end).
+    /// The function takes the [`CurrentOffset`] of the [`Scrollable`]
     pub fn on_scroll(
         mut self,
-        f: impl Fn(RelativeOffset) -> Message + 'a,
+        f: impl Fn(CurrentOffset) -> Message + 'a,
     ) -> Self {
         self.on_scroll = Some(Box::new(f));
         self
@@ -436,7 +437,7 @@ pub fn update<Message>(
     shell: &mut Shell<'_, Message>,
     vertical: &Properties,
     horizontal: Option<&Properties>,
-    on_scroll: &Option<Box<dyn Fn(RelativeOffset) -> Message + '_>>,
+    on_scroll: &Option<Box<dyn Fn(CurrentOffset) -> Message + '_>>,
     update_content: impl FnOnce(
         Event,
         Layout<'_>,
@@ -896,7 +897,7 @@ pub fn draw<Renderer>(
 
 fn notify_on_scroll<Message>(
     state: &mut State,
-    on_scroll: &Option<Box<dyn Fn(RelativeOffset) -> Message + '_>>,
+    on_scroll: &Option<Box<dyn Fn(CurrentOffset) -> Message + '_>>,
     bounds: Rectangle,
     content_bounds: Rectangle,
     shell: &mut Shell<'_, Message>,
@@ -908,31 +909,39 @@ fn notify_on_scroll<Message>(
             return;
         }
 
-        let x = state.offset_x.absolute(bounds.width, content_bounds.width)
-            / (content_bounds.width - bounds.width);
+        let absolute_x =
+            state.offset_x.absolute(bounds.width, content_bounds.width);
+        let relative_x = absolute_x / (content_bounds.width - bounds.width);
 
-        let y = state
+        let absolute_y = state
             .offset_y
-            .absolute(bounds.height, content_bounds.height)
-            / (content_bounds.height - bounds.height);
+            .absolute(bounds.height, content_bounds.height);
+        let relative_y = absolute_y / (content_bounds.height - bounds.height);
 
-        let new_offset = RelativeOffset { x, y };
+        let absolute = AbsoluteOffset {
+            x: absolute_x,
+            y: absolute_y,
+        };
+        let relative = RelativeOffset {
+            x: relative_x,
+            y: relative_y,
+        };
 
         // Don't publish redundant offsets to shell
-        if let Some(prev_offset) = state.last_notified {
+        if let Some(prev_relative) = state.last_notified {
             let unchanged = |a: f32, b: f32| {
                 (a - b).abs() <= f32::EPSILON || (a.is_nan() && b.is_nan())
             };
 
-            if unchanged(prev_offset.x, new_offset.x)
-                && unchanged(prev_offset.y, new_offset.y)
+            if unchanged(prev_relative.x, relative.x)
+                && unchanged(prev_relative.y, relative.y)
             {
                 return;
             }
         }
 
-        shell.publish(on_scroll(new_offset));
-        state.last_notified = Some(new_offset);
+        shell.publish(on_scroll(CurrentOffset { absolute, relative }));
+        state.last_notified = Some(relative);
     }
 }
 
@@ -966,6 +975,10 @@ impl operation::Scrollable for State {
     fn snap_to(&mut self, offset: RelativeOffset) {
         State::snap_to(self, offset);
     }
+
+    fn scroll_to(&mut self, offset: AbsoluteOffset) {
+        State::scroll_to(self, offset)
+    }
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -1052,6 +1065,12 @@ impl State {
         self.offset_y = Offset::Relative(offset.y.clamp(0.0, 1.0));
     }
 
+    /// Scroll to the provided [`AbsoluteOffset`].
+    pub fn scroll_to(&mut self, offset: AbsoluteOffset) {
+        self.offset_x = Offset::Absolute(offset.x.max(0.0));
+        self.offset_y = Offset::Absolute(offset.y.max(0.0));
+    }
+
     /// Unsnaps the current scroll position, if snapped, given the bounds of the
     /// [`Scrollable`] and its contents.
     pub fn unsnap(&mut self, bounds: Rectangle, content_bounds: Rectangle) {
diff --git a/src/widget.rs b/src/widget.rs
index 44027811..87e82f47 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -109,8 +109,8 @@ pub mod radio {
 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,
+        snap_to, style::Scrollbar, style::Scroller, AbsoluteOffset,
+        CurrentOffset, Id, Properties, RelativeOffset, StyleSheet,
     };
 
     /// A widget that can vertically display an infinite amount of content

From 6ad5e03d71db3dee174ac6512dceccc80e3a70a8 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 17 Apr 2023 13:55:40 -0700
Subject: [PATCH 204/440] Add scrollable `Viewport`

---
 examples/scrollable/src/main.rs           |  6 +-
 native/src/widget/operation/scrollable.rs |  9 ---
 native/src/widget/scrollable.rs           | 94 ++++++++++++++---------
 src/widget.rs                             |  4 +-
 4 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index be8d0f52..97344c94 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -36,7 +36,7 @@ enum Message {
     ScrollerWidthChanged(u16),
     ScrollToBeginning,
     ScrollToEnd,
-    Scrolled(scrollable::CurrentOffset),
+    Scrolled(scrollable::Viewport),
 }
 
 impl Application for ScrollableDemo {
@@ -104,8 +104,8 @@ impl Application for ScrollableDemo {
                     self.current_scroll_offset,
                 )
             }
-            Message::Scrolled(offset) => {
-                self.current_scroll_offset = offset.relative;
+            Message::Scrolled(viewport) => {
+                self.current_scroll_offset = viewport.relative_offset();
 
                 Command::none()
             }
diff --git a/native/src/widget/operation/scrollable.rs b/native/src/widget/operation/scrollable.rs
index 62f4c91e..f947344d 100644
--- a/native/src/widget/operation/scrollable.rs
+++ b/native/src/widget/operation/scrollable.rs
@@ -64,15 +64,6 @@ pub fn scroll_to<T>(target: Id, offset: AbsoluteOffset) -> impl Operation<T> {
     ScrollTo { target, offset }
 }
 
-/// The current absolute & relative offset of a [`Scrollable`]
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct CurrentOffset {
-    /// The [`AbsoluteOffset`] of a [`Scrollable`]
-    pub absolute: AbsoluteOffset,
-    /// The [`RelativeOffset`] of a [`Scrollable`]
-    pub relative: RelativeOffset,
-}
-
 /// The amount of absolute offset in each direction of a [`Scrollable`].
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub struct AbsoluteOffset {
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index eedddfd0..c66a166b 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -15,9 +15,7 @@ use crate::{
 };
 
 pub use iced_style::scrollable::StyleSheet;
-pub use operation::scrollable::{
-    AbsoluteOffset, CurrentOffset, RelativeOffset,
-};
+pub use operation::scrollable::{AbsoluteOffset, RelativeOffset};
 
 pub mod style {
     //! The styles of a [`Scrollable`].
@@ -40,7 +38,7 @@ where
     vertical: Properties,
     horizontal: Option<Properties>,
     content: Element<'a, Message, Renderer>,
-    on_scroll: Option<Box<dyn Fn(CurrentOffset) -> Message + 'a>>,
+    on_scroll: Option<Box<dyn Fn(Viewport) -> Message + 'a>>,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
@@ -95,11 +93,8 @@ where
 
     /// Sets a function to call when the [`Scrollable`] is scrolled.
     ///
-    /// The function takes the [`CurrentOffset`] of the [`Scrollable`]
-    pub fn on_scroll(
-        mut self,
-        f: impl Fn(CurrentOffset) -> Message + 'a,
-    ) -> Self {
+    /// The function takes the [`Viewport`] of the [`Scrollable`]
+    pub fn on_scroll(mut self, f: impl Fn(Viewport) -> Message + 'a) -> Self {
         self.on_scroll = Some(Box::new(f));
         self
     }
@@ -437,7 +432,7 @@ pub fn update<Message>(
     shell: &mut Shell<'_, Message>,
     vertical: &Properties,
     horizontal: Option<&Properties>,
-    on_scroll: &Option<Box<dyn Fn(CurrentOffset) -> Message + '_>>,
+    on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     update_content: impl FnOnce(
         Event,
         Layout<'_>,
@@ -897,7 +892,7 @@ pub fn draw<Renderer>(
 
 fn notify_on_scroll<Message>(
     state: &mut State,
-    on_scroll: &Option<Box<dyn Fn(CurrentOffset) -> Message + '_>>,
+    on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     bounds: Rectangle,
     content_bounds: Rectangle,
     shell: &mut Shell<'_, Message>,
@@ -909,39 +904,29 @@ fn notify_on_scroll<Message>(
             return;
         }
 
-        let absolute_x =
-            state.offset_x.absolute(bounds.width, content_bounds.width);
-        let relative_x = absolute_x / (content_bounds.width - bounds.width);
-
-        let absolute_y = state
-            .offset_y
-            .absolute(bounds.height, content_bounds.height);
-        let relative_y = absolute_y / (content_bounds.height - bounds.height);
-
-        let absolute = AbsoluteOffset {
-            x: absolute_x,
-            y: absolute_y,
-        };
-        let relative = RelativeOffset {
-            x: relative_x,
-            y: relative_y,
+        let viewport = Viewport {
+            offset_x: state.offset_x,
+            offset_y: state.offset_y,
+            bounds,
+            content_bounds,
         };
 
-        // Don't publish redundant offsets to shell
-        if let Some(prev_relative) = state.last_notified {
+        // Don't publish redundant viewports to shell
+        if let Some(last_notified) = state.last_notified {
+            let prev = last_notified.relative_offset();
+            let curr = viewport.relative_offset();
+
             let unchanged = |a: f32, b: f32| {
                 (a - b).abs() <= f32::EPSILON || (a.is_nan() && b.is_nan())
             };
 
-            if unchanged(prev_relative.x, relative.x)
-                && unchanged(prev_relative.y, relative.y)
-            {
+            if unchanged(prev.x, curr.x) && unchanged(prev.y, curr.y) {
                 return;
             }
         }
 
-        shell.publish(on_scroll(CurrentOffset { absolute, relative }));
-        state.last_notified = Some(relative);
+        shell.publish(on_scroll(viewport));
+        state.last_notified = Some(viewport);
     }
 }
 
@@ -954,7 +939,7 @@ pub struct State {
     offset_x: Offset,
     x_scroller_grabbed_at: Option<f32>,
     keyboard_modifiers: keyboard::Modifiers,
-    last_notified: Option<RelativeOffset>,
+    last_notified: Option<Viewport>,
 }
 
 impl Default for State {
@@ -988,18 +973,51 @@ enum Offset {
 }
 
 impl Offset {
-    fn absolute(self, window: f32, content: f32) -> f32 {
+    fn absolute(self, viewport: f32, content: f32) -> f32 {
         match self {
             Offset::Absolute(absolute) => {
-                absolute.min((content - window).max(0.0))
+                absolute.min((content - viewport).max(0.0))
             }
             Offset::Relative(percentage) => {
-                ((content - window) * percentage).max(0.0)
+                ((content - viewport) * percentage).max(0.0)
             }
         }
     }
 }
 
+/// The current [`Viewport`] of the [`Scrollable`].
+#[derive(Debug, Clone, Copy)]
+pub struct Viewport {
+    offset_x: Offset,
+    offset_y: Offset,
+    bounds: Rectangle,
+    content_bounds: Rectangle,
+}
+
+impl Viewport {
+    /// Returns the [`AbsoluteOffset`] of the current [`Viewport`].
+    pub fn absolute_offset(&self) -> AbsoluteOffset {
+        let x = self
+            .offset_x
+            .absolute(self.bounds.width, self.content_bounds.width);
+        let y = self
+            .offset_y
+            .absolute(self.bounds.height, self.content_bounds.height);
+
+        AbsoluteOffset { x, y }
+    }
+
+    /// Returns the [`RelativeOffset`] of the current [`Viewport`].
+    pub fn relative_offset(&self) -> RelativeOffset {
+        let AbsoluteOffset { x, y } = self.absolute_offset();
+
+        let x = x / (self.content_bounds.width - self.bounds.width);
+        let y = y / (self.content_bounds.height - self.bounds.height);
+
+        RelativeOffset { x, y }
+    }
+}
+
 impl State {
     /// Creates a new [`State`] with the scrollbar(s) at the beginning.
     pub fn new() -> Self {
diff --git a/src/widget.rs b/src/widget.rs
index 87e82f47..38995a45 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -109,8 +109,8 @@ pub mod radio {
 pub mod scrollable {
     //! Navigate an endless amount of content with a scrollbar.
     pub use iced_native::widget::scrollable::{
-        snap_to, style::Scrollbar, style::Scroller, AbsoluteOffset,
-        CurrentOffset, Id, Properties, RelativeOffset, StyleSheet,
+        snap_to, style::Scrollbar, style::Scroller, AbsoluteOffset, Id,
+        Properties, RelativeOffset, StyleSheet, Viewport,
     };
 
     /// A widget that can vertically display an infinite amount of content

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 205/440] 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 4559040e..14dcd550 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 07dfebfec00b29ef84a1624ac942bb433628eff6 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 17 Apr 2023 18:11:50 -0700
Subject: [PATCH 206/440] Invalidate responsive layout when layout is called

---
 lazy/src/responsive.rs | 51 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/lazy/src/responsive.rs b/lazy/src/responsive.rs
index 57c07de1..cdeec2ad 100644
--- a/lazy/src/responsive.rs
+++ b/lazy/src/responsive.rs
@@ -41,7 +41,7 @@ where
             view: Box::new(view),
             content: RefCell::new(Content {
                 size: Size::ZERO,
-                layout: layout::Node::new(Size::ZERO),
+                layout: None,
                 element: Element::new(horizontal_space(0)),
             }),
         }
@@ -50,7 +50,7 @@ where
 
 struct Content<'a, Message, Renderer> {
     size: Size,
-    layout: layout::Node,
+    layout: Option<layout::Node>,
     element: Element<'a, Message, Renderer>,
 }
 
@@ -58,10 +58,21 @@ impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
     Renderer: iced_native::Renderer,
 {
+    fn layout(&mut self, renderer: &Renderer) -> layout::Node {
+        if self.layout.is_none() {
+            self.layout =
+                Some(self.element.as_widget().layout(
+                    renderer,
+                    &layout::Limits::new(Size::ZERO, self.size),
+                ));
+        }
+
+        self.layout.clone().unwrap()
+    }
+
     fn update(
         &mut self,
         tree: &mut Tree,
-        renderer: &Renderer,
         new_size: Size,
         view: &dyn Fn(Size) -> Element<'a, Message, Renderer>,
     ) {
@@ -73,11 +84,6 @@ where
         self.size = new_size;
 
         tree.diff(&self.element);
-
-        self.layout = self
-            .element
-            .as_widget()
-            .layout(renderer, &layout::Limits::new(Size::ZERO, self.size));
     }
 
     fn resolve<R, T>(
@@ -96,12 +102,12 @@ where
     where
         R: Deref<Target = Renderer>,
     {
-        self.update(tree, renderer.deref(), layout.bounds().size(), view);
+        self.update(tree, layout.bounds().size(), view);
 
-        let content_layout = Layout::with_offset(
-            layout.position() - Point::ORIGIN,
-            &self.layout,
-        );
+        let node = self.layout(renderer.deref());
+
+        let content_layout =
+            Layout::with_offset(layout.position() - Point::ORIGIN, &node);
 
         f(tree, renderer, content_layout, &mut self.element)
     }
@@ -139,6 +145,8 @@ where
         _renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
+        let _ = self.content.borrow_mut().layout.take();
+
         layout::Node::new(limits.max())
     }
 
@@ -272,22 +280,15 @@ where
             tree: state.tree.borrow_mut(),
             types: PhantomData,
             overlay_builder: |content: &mut RefMut<Content<_, _>>, tree| {
-                content.update(
-                    tree,
-                    renderer,
-                    layout.bounds().size(),
-                    &self.view,
-                );
+                content.update(tree, layout.bounds().size(), &self.view);
 
-                let Content {
-                    element,
-                    layout: content_layout,
-                    ..
-                } = content.deref_mut();
+                let node = content.layout(renderer);
+
+                let Content { element, .. } = content.deref_mut();
 
                 let content_layout = Layout::with_offset(
                     layout.bounds().position() - Point::ORIGIN,
-                    content_layout,
+                    &node,
                 );
 
                 element

From ac7b77f59c720bdb618057df0435fa1170d9c84a Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 17 Apr 2023 18:40:41 -0700
Subject: [PATCH 207/440] Only invalidate layout if children layout is invalid

---
 lazy/src/responsive.rs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lazy/src/responsive.rs b/lazy/src/responsive.rs
index cdeec2ad..2f097ff5 100644
--- a/lazy/src/responsive.rs
+++ b/lazy/src/responsive.rs
@@ -145,8 +145,6 @@ where
         _renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
-        let _ = self.content.borrow_mut().layout.take();
-
         layout::Node::new(limits.max())
     }
 
@@ -186,7 +184,10 @@ where
         let state = tree.state.downcast_mut::<State>();
         let mut content = self.content.borrow_mut();
 
-        content.resolve(
+        let mut local_messages = vec![];
+        let mut local_shell = Shell::new(&mut local_messages);
+
+        let status = content.resolve(
             &mut state.tree.borrow_mut(),
             renderer,
             layout,
@@ -199,10 +200,18 @@ where
                     cursor_position,
                     renderer,
                     clipboard,
-                    shell,
+                    &mut local_shell,
                 )
             },
-        )
+        );
+
+        if local_shell.is_layout_invalid() {
+            let _ = content.layout.take();
+        }
+
+        shell.merge(local_shell, std::convert::identity);
+
+        status
     }
 
     fn draw(

From f42fb6af54ea6057a8476704c6756b59c3f3d631 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 17 Apr 2023 19:04:27 -0700
Subject: [PATCH 208/440] Update lazy/src/responsive.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Héctor Ramón <hector0193@gmail.com>
---
 lazy/src/responsive.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lazy/src/responsive.rs b/lazy/src/responsive.rs
index 2f097ff5..88ed6312 100644
--- a/lazy/src/responsive.rs
+++ b/lazy/src/responsive.rs
@@ -206,7 +206,7 @@ where
         );
 
         if local_shell.is_layout_invalid() {
-            let _ = content.layout.take();
+            content.layout = None;
         }
 
         shell.merge(local_shell, std::convert::identity);

From 399a22e61d8b3c265be636aab3645aba62dd5c89 Mon Sep 17 00:00:00 2001
From: Casper Rogild Storm <casper+github@rogildstorm.com>
Date: Thu, 20 Apr 2023 12:17:11 +0200
Subject: [PATCH 209/440] Centered icon vertically

---
 native/src/widget/text_input.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 8627aa98..6113cf94 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -970,9 +970,12 @@ pub fn draw<Renderer>(
             size: icon.size.unwrap_or_else(|| renderer.default_size()),
             font: icon.font.clone(),
             color: appearance.icon_color,
-            bounds: icon_layout.bounds(),
+            bounds: Rectangle {
+                y: text_bounds.center_y(),
+                ..icon_layout.bounds()
+            },
             horizontal_alignment: alignment::Horizontal::Left,
-            vertical_alignment: alignment::Vertical::Top,
+            vertical_alignment: alignment::Vertical::Center,
         });
     }
 

From 2e9129582a88ee0758c215847b0ec49baab79f11 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, 20 Apr 2023 15:25:37 +0200
Subject: [PATCH 210/440] Fix sliders drawing out of their bounds

---
 native/src/widget/slider.rs          | 4 ++--
 native/src/widget/vertical_slider.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index ba467834..cfb0a8fe 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -391,7 +391,7 @@ pub fn draw<T, R>(
     let offset = if range_start >= range_end {
         0.0
     } else {
-        (bounds.width - handle_width / 2.0) * (value - range_start)
+        (bounds.width - handle_width) * (value - range_start)
             / (range_end - range_start)
     };
 
@@ -417,7 +417,7 @@ pub fn draw<T, R>(
             bounds: Rectangle {
                 x: bounds.x + offset + handle_width / 2.0,
                 y: rail_y - style.rail.width / 2.0,
-                width: bounds.width - offset,
+                width: bounds.width - offset - handle_width / 2.0,
                 height: style.rail.width,
             },
             border_radius: Default::default(),
diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 5af69676..cb2de480 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -384,7 +384,7 @@ pub fn draw<T, R>(
     let offset = if range_start >= range_end {
         0.0
     } else {
-        (bounds.height - handle_width / 2.0) * (value - range_end)
+        (bounds.height - handle_width) * (value - range_end)
             / (range_start - range_end)
     };
 
@@ -411,7 +411,7 @@ pub fn draw<T, R>(
                 x: rail_x - style.rail.width / 2.0,
                 y: bounds.y + offset + handle_width / 2.0,
                 width: style.rail.width,
-                height: bounds.height - offset,
+                height: bounds.height - offset - handle_width / 2.0,
             },
             border_radius: Default::default(),
             border_width: 0.0,

From 477d9bd6ad0f6653f270e624eb4d31683779dc0a 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, 20 Apr 2023 15:26:26 +0200
Subject: [PATCH 211/440] Bump version of `iced_native` :tada:

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

diff --git a/native/Cargo.toml b/native/Cargo.toml
index 869c1bb0..d0ec403d 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_native"
-version = "0.10.1"
+version = "0.10.2"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A renderer-agnostic library for native GUIs"

From 2155d0af1f76b12cd05a1b8dba1afc1e5ecdefe5 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, 20 Apr 2023 15:31:15 +0200
Subject: [PATCH 212/440] Bump version of `iced_native` :tada:

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

diff --git a/native/Cargo.toml b/native/Cargo.toml
index d0ec403d..5ba06b67 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iced_native"
-version = "0.10.2"
+version = "0.10.3"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A renderer-agnostic library for native GUIs"

From 8a711408de26c53cf6b18045ea19c677e8edbd95 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, 20 Apr 2023 15:48:34 +0200
Subject: [PATCH 213/440] Compare absolute offsets as well in
 `notify_on_scroll`

---
 native/src/widget/scrollable.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index c66a166b..c9ad5947 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -913,14 +913,21 @@ fn notify_on_scroll<Message>(
 
         // Don't publish redundant viewports to shell
         if let Some(last_notified) = state.last_notified {
-            let prev = last_notified.relative_offset();
-            let curr = viewport.relative_offset();
+            let last_relative_offset = last_notified.relative_offset();
+            let current_relative_offset = viewport.relative_offset();
+
+            let last_absolute_offset = last_notified.absolute_offset();
+            let current_absolute_offset = viewport.absolute_offset();
 
             let unchanged = |a: f32, b: f32| {
                 (a - b).abs() <= f32::EPSILON || (a.is_nan() && b.is_nan())
             };
 
-            if unchanged(prev.x, curr.x) && unchanged(prev.y, curr.y) {
+            if unchanged(last_relative_offset.x, current_relative_offset.x)
+                && unchanged(last_relative_offset.y, current_relative_offset.y)
+                && unchanged(last_absolute_offset.x, current_absolute_offset.x)
+                && unchanged(last_absolute_offset.y, current_absolute_offset.y)
+            {
                 return;
             }
         }

From a38bf092a88a2d59a11d7bc428c7c242840d7d6d Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Thu, 20 Apr 2023 13:34:38 -0700
Subject: [PATCH 214/440] Export scroll_to helper

---
 native/src/widget/scrollable.rs | 9 +++++++++
 src/widget.rs                   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index c9ad5947..e35a4f96 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -392,6 +392,15 @@ pub fn snap_to<Message: 'static>(
     Command::widget(operation::scrollable::snap_to(id.0, offset))
 }
 
+/// Produces a [`Command`] that scrolls the [`Scrollable`] with the given [`Id`]
+/// to the provided [`AbsoluteOffset`] along the x & y axis.
+pub fn scroll_to<Message: 'static>(
+    id: Id,
+    offset: AbsoluteOffset,
+) -> Command<Message> {
+    Command::widget(operation::scrollable::scroll_to(id.0, offset))
+}
+
 /// Computes the layout of a [`Scrollable`].
 pub fn layout<Renderer>(
     renderer: &Renderer,
diff --git a/src/widget.rs b/src/widget.rs
index 38995a45..1163904d 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -109,8 +109,8 @@ pub mod radio {
 pub mod scrollable {
     //! Navigate an endless amount of content with a scrollbar.
     pub use iced_native::widget::scrollable::{
-        snap_to, style::Scrollbar, style::Scroller, AbsoluteOffset, Id,
-        Properties, RelativeOffset, StyleSheet, Viewport,
+        scroll_to, snap_to, style::Scrollbar, style::Scroller, AbsoluteOffset,
+        Id, Properties, RelativeOffset, StyleSheet, Viewport,
     };
 
     /// A widget that can vertically display an infinite amount of content

From 8122904ca46b73ceda54bd73bd68cf4138d22f1b Mon Sep 17 00:00:00 2001
From: David Huculak <davidhuculak5@gmail.com>
Date: Thu, 20 Apr 2023 21:28:47 -0400
Subject: [PATCH 215/440] wgpu 0.16

---
 examples/integration_wgpu/src/main.rs | 3 +--
 wgpu/Cargo.toml                       | 4 ++--
 wgpu/src/image/atlas.rs               | 4 ++--
 wgpu/src/window/compositor.rs         | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 3ac458b3..7b9f4d4c 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -72,7 +72,6 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
         backends: backend,
         ..Default::default()
     });
-
     let surface = unsafe { instance.create_surface(&window) }?;
 
     let (format, (device, queue)) = futures::executor::block_on(async {
@@ -99,7 +98,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.describe().srgb)
+                .filter(|format| format.is_srgb())
                 .copied()
                 .next()
                 .or_else(|| capabilities.formats.first().copied())
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 3478ef59..1ce07e0a 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -28,8 +28,8 @@ spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
 [dependencies]
-wgpu = "0.15"
-wgpu_glyph = "0.19"
+wgpu = "0.16"
+wgpu_glyph = "0.20"
 glyph_brush = "0.7"
 raw-window-handle = "0.5"
 log = "0.4"
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 82504147..1384949a 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -209,8 +209,8 @@ impl Atlas {
                 buffer,
                 layout: wgpu::ImageDataLayout {
                     offset: offset as u64,
-                    bytes_per_row: NonZeroU32::new(4 * image_width + padding),
-                    rows_per_image: NonZeroU32::new(image_height),
+                    bytes_per_row: Some(4 * image_width + padding),
+                    rows_per_image: Some(image_height),
                 },
             },
             wgpu::ImageCopyTexture {
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index d4a59471..8969ad6c 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -71,7 +71,7 @@ impl<Theme> Compositor<Theme> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.describe().srgb)
+                .filter(|format| format.is_srgb())
                 .copied()
                 .next()
                 .or_else(|| {

From cbb2ba38faadc52b9523918a2fbc2e2a78de9087 Mon Sep 17 00:00:00 2001
From: David Huculak <davidhuculak5@gmail.com>
Date: Thu, 20 Apr 2023 21:38:52 -0400
Subject: [PATCH 216/440] remove unused import

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

diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 1384949a..a0fdf146 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -15,8 +15,6 @@ pub const SIZE: u32 = 2048;
 use iced_graphics::image;
 use iced_graphics::Size;
 
-use std::num::NonZeroU32;
-
 #[derive(Debug)]
 pub struct Atlas {
     texture: wgpu::Texture,

From 3f0c226b74c6d0271e550161b6542e652c1875ca 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, 21 Apr 2023 21:36:30 +0200
Subject: [PATCH 217/440] Use point-free notation

---
 examples/integration_wgpu/src/main.rs | 2 +-
 wgpu/src/window/compositor.rs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 7b9f4d4c..f5fe7636 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -98,8 +98,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.is_srgb())
                 .copied()
+                .filter(wgpu::TextureFormat::is_srgb)
                 .next()
                 .or_else(|| capabilities.formats.first().copied())
                 .expect("Get preferred format"),
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 8969ad6c..3c51768a 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -71,8 +71,8 @@ impl<Theme> Compositor<Theme> {
             capabilities
                 .formats
                 .iter()
-                .filter(|format| format.is_srgb())
                 .copied()
+                .filter(wgpu::TextureFormat::is_srgb)
                 .next()
                 .or_else(|| {
                     log::warn!("No sRGB format found!");

From ecc1a4509ab25611397386c9f9c85fe7b269fda3 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, 21 Apr 2023 21:40:43 +0200
Subject: [PATCH 218/440] Avoid cloning `layout::Node` in `Responsive` widget

---
 lazy/src/responsive.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lazy/src/responsive.rs b/lazy/src/responsive.rs
index 88ed6312..d87815f6 100644
--- a/lazy/src/responsive.rs
+++ b/lazy/src/responsive.rs
@@ -58,7 +58,7 @@ impl<'a, Message, Renderer> Content<'a, Message, Renderer>
 where
     Renderer: iced_native::Renderer,
 {
-    fn layout(&mut self, renderer: &Renderer) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer) {
         if self.layout.is_none() {
             self.layout =
                 Some(self.element.as_widget().layout(
@@ -66,8 +66,6 @@ where
                     &layout::Limits::new(Size::ZERO, self.size),
                 ));
         }
-
-        self.layout.clone().unwrap()
     }
 
     fn update(
@@ -103,11 +101,12 @@ where
         R: Deref<Target = Renderer>,
     {
         self.update(tree, layout.bounds().size(), view);
+        self.layout(renderer.deref());
 
-        let node = self.layout(renderer.deref());
-
-        let content_layout =
-            Layout::with_offset(layout.position() - Point::ORIGIN, &node);
+        let content_layout = Layout::with_offset(
+            layout.position() - Point::ORIGIN,
+            self.layout.as_ref().unwrap(),
+        );
 
         f(tree, renderer, content_layout, &mut self.element)
     }
@@ -290,14 +289,17 @@ where
             types: PhantomData,
             overlay_builder: |content: &mut RefMut<Content<_, _>>, tree| {
                 content.update(tree, layout.bounds().size(), &self.view);
+                content.layout(renderer);
 
-                let node = content.layout(renderer);
-
-                let Content { element, .. } = content.deref_mut();
+                let Content {
+                    element,
+                    layout: content_layout_node,
+                    ..
+                } = content.deref_mut();
 
                 let content_layout = Layout::with_offset(
                     layout.bounds().position() - Point::ORIGIN,
-                    &node,
+                    content_layout_node.as_ref().unwrap(),
                 );
 
                 element

From cc20baad6f422271f052cf68474a4aee40dcdc82 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, 21 Apr 2023 21:46:02 +0200
Subject: [PATCH 219/440] Use `find(..)` instead of `filter(..).next()`

---
 examples/integration_wgpu/src/main.rs | 3 +--
 wgpu/src/window/compositor.rs         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index f5fe7636..15901db8 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -99,8 +99,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .formats
                 .iter()
                 .copied()
-                .filter(wgpu::TextureFormat::is_srgb)
-                .next()
+                .find(wgpu::TextureFormat::is_srgb)
                 .or_else(|| capabilities.formats.first().copied())
                 .expect("Get preferred format"),
             adapter
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 3c51768a..53af19bf 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -72,8 +72,7 @@ impl<Theme> Compositor<Theme> {
                 .formats
                 .iter()
                 .copied()
-                .filter(wgpu::TextureFormat::is_srgb)
-                .next()
+                .find(wgpu::TextureFormat::is_srgb)
                 .or_else(|| {
                     log::warn!("No sRGB format found!");
 

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 220/440] 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 a8342e5f..f629dab9 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 5a0097df..6e4bb6ef 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 221/440] 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 e9be4c84..32f725a1 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 222/440] 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 974faa74..756e46b3 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 223/440] Fix `Candidate::build` in `compositor` of
 `iced_renderer`

---
 renderer/src/compositor.rs | 71 ++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 484d91eb..e31c2bed 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,
-                        )?;
+                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`");
-                }
+                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,
-                            },
-                        );
+                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`");
-                }
+                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 224/440] 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 a3f09fa6..2f92f9db 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 f1ce6b3a..125ea17d 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 e31c2bed..48ed4b1f 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 f629dab9..a3bddc93 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 756e46b3..16a7f9b8 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 2fd73f8c..3887ec8d 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 f5994d09..1246bbd5 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 8509b761..fc411fdd 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 6e4bb6ef..7523e06f 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 14dcd550..ffae6e4a 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 3624e46b..58bdf64a 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 225/440] 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 ffae6e4a..9f9bd066 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 226/440] 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 00000000..63604150
--- /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 0c50db52..e3de4025 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 7f2c8ae2..1751d03a 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 16a7f9b8..9c69e1d2 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 7523e06f..d3dffb18 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 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"),
+    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);
+
+    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 227/440] 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 d3dffb18..1bcce6fe 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 228/440] 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 98d2bc59..d9aae7b9 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 229/440] 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 0df8dd02..eb15a458 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 230/440] 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 63604150..5aab06b1 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 1751d03a..d6a2c4c4 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 231/440] 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 1bcce6fe..3bc06970 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 232/440] 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 3bc06970..9999a188 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 dcc9a7073449a7cecafb913c0a27ecb3bd66bab1 Mon Sep 17 00:00:00 2001
From: Carlos Pizarro <kr105@kr105.com>
Date: Fri, 28 Apr 2023 08:36:14 -0400
Subject: [PATCH 233/440] Fix small typo on `ROADMAP.md`

Link works properly now
---
 ROADMAP.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index c30c591b..f1893664 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -49,7 +49,7 @@ As a first approach, we could expose the underlying renderer directly here, and
 In the long run, we could expose a renderer-agnostic abstraction to perform the drawing.
 
 [#32]: https://github.com/iced-rs/iced/issues/32
-[#343] https://github.com/iced-rs/iced/issues/343
+[#343]: https://github.com/iced-rs/iced/issues/343
 
 ### Text shaping and font fallback ([#33])
 [`wgpu_glyph`] uses [`glyph_brush`], which in turn uses [`rusttype`]. While the current implementation is able to layout text quite nicely, it does not perform any [text shaping].

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 234/440] 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 485bb542..3193ba84 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 d5a16bef..00000000
--- 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 235/440] 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 88c58825..f62a4338 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 4c72abc3..0111cf31 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 3193ba84..2df4556d 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 dd2888ab..0e107dd5 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 0befd635..f4af9ee4 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 d6a2c4c4..2d9c221b 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 23e594be..558e21dd 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 120dd644..a98e2479 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 a3bddc93..32645ac1 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 9c69e1d2..0a06f8c9 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 508965ad..7cdac1c8 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 1246bbd5..603a3e16 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 9f9bd066..254d32d6 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 9772781a..d09b2dba 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 59ec31fe..a85875a4 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 c4723397..7c5b43a3 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 fdbdaafb..d36ff273 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 f01e0b42..f433a5b6 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 6505cfdd..e28f76af 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 c322c8ba..c904730d 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 cd23cdd2..d44f4cae 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 c3229aed..b685c1a1 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 9db382f7..abf858ca 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 713a9c30..d3033ddb 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 236/440] 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 f62a4338..22afb058 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 0111cf31..c59d8fce 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 2df4556d..f0392168 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 8bc7be09..6ad7b4fb 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 0e107dd5..0c2a6d30 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 f4af9ee4..0f731e74 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 2d9c221b..db237035 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 558e21dd..605286d6 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 a98e2479..70b146f4 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 0a06f8c9..3ef7e717 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 7cdac1c8..7963fd89 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 603a3e16..a63da193 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{zYAcfsuiML4c8gfrWv=%`L=t*8k?+6Gdv7|MKcgoZ`#WbZ6pYLmBgVySK#i
s+k9n^XMVxJz`$_pz^gD2{UGIj#AXA=T7k)Pg(Np06Vzs6PPrce0NlGBwg3PC

delta 88
zcmeyO{zYAcfsuiML4c8gfrWv=%`L=t);zyA6Gdv7XWxjOIK`K#^!&ufhBB76D?Y^Y
s+k9n^XMVxJz`$_pz^gD2{eXE@=Vk-OT7k(CLXw-032HMjGq36d0LZHxi~s-t

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index d09b2dba..6b847aff 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 a85875a4..f6397ab7 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 7c5b43a3..b9fd044e 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 d36ff273..665f7188 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 f433a5b6..fc126125 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 e28f76af..2a09b8fd 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 c904730d..7de3cbae 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 d44f4cae..c0cb2946 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 b685c1a1..f62f4703 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 04c31edc..50aa1370 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 abf858ca..32d0b1f8 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 d3033ddb..639bbb3b 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 237/440] 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 c5f3c134..5852e978 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 32645ac1..400eee6a 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 a63da193..58079cc0 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 254d32d6..6934ae49 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 fc126125..ad7bdc8d 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 238/440] 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 bb925c4b..3adb996e 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 e42cd9f9..6a9e5c88 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 22afb058..f0cc952e 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 c59d8fce..1a867be3 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 f0392168..2d86e735 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 0c2a6d30..ae89da06 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 0f731e74..c584f3cd 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 db237035..d814c757 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 605286d6..aaf1737a 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 70b146f4..c1bec6af 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 3ef7e717..99230a2f 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 7963fd89..a445b561 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 58079cc0..ba8a4e4b 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 6b847aff..def80a81 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 f6397ab7..8cfed1e5 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 b9fd044e..dcae0648 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 665f7188..ba1bdca8 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 ad7bdc8d..ff68772d 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 2a09b8fd..c34fd0bb 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 7de3cbae..dfb6a22a 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 c0cb2946..bc2c9066 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 f62f4703..9dad1e22 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 364ec3cd..bbc07dac 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 639bbb3b..b1ba65c9 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 00700a4742102d77a1d05cf8c49463be49c0b76c 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, 5 May 2023 09:52:47 +0200
Subject: [PATCH 239/440] Fix `bounds` of selected option background in `Menu`

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

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 50f741ef..d93a3b56 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -473,7 +473,11 @@ where
             if is_selected {
                 renderer.fill_quad(
                     renderer::Quad {
-                        bounds,
+                        bounds: Rectangle {
+                            x: bounds.x + appearance.border_width,
+                            width: bounds.width - appearance.border_width * 2.0,
+                            ..bounds
+                        },
                         border_color: Color::TRANSPARENT,
                         border_width: 0.0,
                         border_radius: appearance.border_radius.into(),

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 240/440] 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 dcae0648..ab66264c 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 241/440] 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 99230a2f..b6adb8ce 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 242/440] 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 ab66264c..8af72b9d 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 243/440] 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 2d86e735..90af88b7 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 50aa1370..04c31edc 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 244/440] 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 5852e978..ef61a974 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 c34fd0bb..7d43bb4a 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 245/440] 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 ba8a4e4b..a34c7317 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 ff68772d..cf9fbad3 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 246/440] Clip text that exceeds section bounds in `iced_wgpu`

---
 wgpu/src/text.rs | 108 ++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 48 deletions(-)

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index cf9fbad3..714e0400 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");
+            sections
+                .iter()
+                .zip(keys.iter())
+                .filter_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_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 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 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 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;
+                    let section_bounds = Rectangle {
+                        x: left,
+                        y: top,
+                        width: section.bounds.width * scale_factor,
+                        height: section.bounds.height * scale_factor,
+                    };
 
-                glyphon::TextArea {
-                    buffer,
-                    left,
-                    top,
-                    bounds,
-                    default_color: {
-                        let [r, g, b, a] = section.color.into_linear();
+                    let clip_bounds = bounds.intersection(&section_bounds)?;
 
-                        glyphon::Color::rgba(
-                            (r * 255.0) as u8,
-                            (g * 255.0) as u8,
-                            (b * 255.0) as u8,
-                            (a * 255.0) as u8,
-                        )
-                    },
-                }
-            });
+                    // 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 247/440] 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 fc411fdd..a3f3c2e3 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 248/440] 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 b6adb8ce..d481bacd 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 249/440] 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 bc2c9066..50b47417 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 250/440] 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 1a867be3..c154cc27 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 251/440] 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 50b47417..8c445dda 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 252/440] 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 2f92f9db..479830ac 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 2ab5d75f..22914742 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 17657888..640ac996 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_tiny_skia]
+version = "0.1"
+path = "../tiny_skia"
+
 [dependencies.iced_wgpu]
 version = "0.10"
 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 c1bec6af..c9d79851 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 48ed4b1f..a353b8e4 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 21ef2c06..a20e9d35 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 ba737b11..22ec7bd1 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 46fc5a7992001ca8de6966d182ab9dba33d6742e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Wed, 10 May 2023 17:48:21 -0400
Subject: [PATCH 253/440] fix: quad rendering including border only inside of
 the bounds

---
 tiny_skia/src/backend.rs | 46 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d481bacd..58721a80 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -157,6 +157,7 @@ impl Backend {
                 border_width,
                 border_color,
             } => {
+                // XXX border seems to be contained by the bounds of the primitive in wgpu and for damage regions, so we do the same here
                 let physical_bounds = (*bounds + translation) * scale_factor;
 
                 if !clip_bounds.intersects(&physical_bounds) {
@@ -172,7 +173,26 @@ impl Backend {
                 )
                 .post_scale(scale_factor, scale_factor);
 
-                let path = rounded_rectangle(*bounds, *border_radius);
+                // Make sure the border radius is not larger than the bounds
+                let border_width = border_width
+                    .min(bounds.width / 2.0)
+                    .min(bounds.height / 2.0);
+
+                // Offset the fill by the border width
+                let path_bounds = Rectangle {
+                    x: bounds.x + border_width,
+                    y: bounds.y + border_width,
+                    width: bounds.width - 2.0 * border_width,
+                    height: bounds.height - 2.0 * border_width,
+                };
+                // fill border radius is the border radius minus the border width
+                let mut fill_border_radius = *border_radius;
+                for radius in &mut fill_border_radius {
+                    *radius = (*radius - border_width / 2.0)
+                        .min(path_bounds.width / 2.0)
+                        .min(path_bounds.height / 2.0);
+                }
+                let path = rounded_rectangle(path_bounds, fill_border_radius);
 
                 pixels.fill_path(
                     &path,
@@ -192,9 +212,27 @@ impl Backend {
                     clip_mask,
                 );
 
-                if *border_width > 0.0 {
+                // border path is offset by half the border width
+                let path_bounds = Rectangle {
+                    x: bounds.x + border_width / 2.0,
+                    y: bounds.y + border_width / 2.0,
+                    width: bounds.width - border_width,
+                    height: bounds.height - border_width,
+                };
+
+                let mut border_radius = *border_radius;
+                for radius in &mut border_radius {
+                    *radius = radius
+                        .min(path_bounds.width / 2.0)
+                        .min(path_bounds.height / 2.0);
+                }
+
+                let border_radius_path =
+                    rounded_rectangle(path_bounds, border_radius);
+
+                if border_width > 0.0 {
                     pixels.stroke_path(
-                        &path,
+                        &border_radius_path,
                         &tiny_skia::Paint {
                             shader: tiny_skia::Shader::SolidColor(into_color(
                                 *border_color,
@@ -203,7 +241,7 @@ impl Backend {
                             ..tiny_skia::Paint::default()
                         },
                         &tiny_skia::Stroke {
-                            width: *border_width,
+                            width: border_width,
                             ..tiny_skia::Stroke::default()
                         },
                         transform,

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 254/440] 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 5aab06b1..c6b0f759 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 8db1594a..1f3d2c01 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 c3127bdf..3d8fc6fa 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 2f634252..6b43f4a8 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 e3de4025..91f50282 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 d814c757..d4446c87 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 aaf1737a..de905503 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 efb33c56..ad0fbb83 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 255/440] 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 1f3d2c01..88997288 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 a20e9d35..26e2fed0 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 8a277e47..d3b84c7d 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 a445b561..a1fd7b60 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 8cfed1e5..7e17a7ad 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 0b169140..4a92c345 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 256/440] 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 b08ed8cb..0ad46865 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 be60bb78..8ca9cb86 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 904f62ad..ab1ab95b 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 b9a0e3e0..bc0ed744 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 04c31edc..ce4f44bd 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 257/440] 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 fe2a4a64..c72fd770 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 74cf145b..111e8910 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 c29de7db..d9206134 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>,

From 3220d472ac7ab2d11d6fc61d50bcbf9de91e1def 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 17:17:35 +0200
Subject: [PATCH 258/440] Fix `document` workflow for GitHub CI

---
 .github/workflows/document.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/document.yml b/.github/workflows/document.yml
index e69f4d63..09a7a4d5 100644
--- a/.github/workflows/document.yml
+++ b/.github/workflows/document.yml
@@ -20,13 +20,13 @@ jobs:
           -p iced_core \
           -p iced_style \
           -p iced_futures \
-          -p iced_native \
-          -p iced_lazy \
+          -p iced_runtime \
           -p iced_graphics \
           -p iced_wgpu \
-          -p iced_glow \
+          -p iced_tiny_skia \
+          -p iced_renderer \
+          -p iced_widget \
           -p iced_winit \
-          -p iced_glutin \
           -p iced
     - name: Write CNAME file
       run: echo 'docs.iced.rs' > ./target/doc/CNAME

From cf434236e7e15e0fa05e5915b8d4d78dcaf1b7e8 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 17:28:51 +0200
Subject: [PATCH 259/440] Enable `doc_auto_cfg` when generating documentation

---
 futures/src/backend/native.rs             | 4 ----
 futures/src/backend/native/smol.rs        | 2 --
 futures/src/backend/native/thread_pool.rs | 1 -
 futures/src/lib.rs                        | 2 +-
 graphics/src/lib.rs                       | 2 +-
 runtime/src/lib.rs                        | 2 +-
 src/lib.rs                                | 2 +-
 src/window/icon.rs                        | 3 ---
 wgpu/src/lib.rs                           | 2 +-
 widget/src/helpers.rs                     | 3 ---
 widget/src/lib.rs                         | 1 +
 winit/src/lib.rs                          | 2 +-
 12 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/futures/src/backend/native.rs b/futures/src/backend/native.rs
index 4199ad16..85af2c88 100644
--- a/futures/src/backend/native.rs
+++ b/futures/src/backend/native.rs
@@ -1,16 +1,12 @@
 //! Backends that are only available in native platforms: Windows, macOS, or Linux.
-#[cfg_attr(docsrs, doc(cfg(feature = "tokio",)))]
 #[cfg(feature = "tokio")]
 pub mod tokio;
 
-#[cfg_attr(docsrs, doc(cfg(feature = "async-std",)))]
 #[cfg(feature = "async-std")]
 pub mod async_std;
 
-#[cfg_attr(docsrs, doc(cfg(feature = "smol",)))]
 #[cfg(feature = "smol")]
 pub mod smol;
 
-#[cfg_attr(docsrs, doc(cfg(feature = "thread-pool",)))]
 #[cfg(feature = "thread-pool")]
 pub mod thread_pool;
diff --git a/futures/src/backend/native/smol.rs b/futures/src/backend/native/smol.rs
index 30bc8291..00d13d35 100644
--- a/futures/src/backend/native/smol.rs
+++ b/futures/src/backend/native/smol.rs
@@ -1,9 +1,7 @@
 //! A `smol` backend.
-
 use futures::Future;
 
 /// A `smol` executor.
-#[cfg_attr(docsrs, doc(cfg(feature = "smol")))]
 #[derive(Debug)]
 pub struct Executor;
 
diff --git a/futures/src/backend/native/thread_pool.rs b/futures/src/backend/native/thread_pool.rs
index da5d4b9b..c96f2682 100644
--- a/futures/src/backend/native/thread_pool.rs
+++ b/futures/src/backend/native/thread_pool.rs
@@ -2,7 +2,6 @@
 use futures::Future;
 
 /// A thread pool executor for futures.
-#[cfg_attr(docsrs, doc(cfg(feature = "thread-pool")))]
 pub type Executor = futures::executor::ThreadPool;
 
 impl crate::Executor for Executor {
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
index 397fc2d2..34d81e1e 100644
--- a/futures/src/lib.rs
+++ b/futures/src/lib.rs
@@ -16,7 +16,7 @@
 )]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub use futures;
 pub use iced_core as core;
 
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 91f50282..12fc54f6 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -20,7 +20,7 @@
 )]
 #![forbid(rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 mod antialiasing;
 mod error;
 mod transformation;
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index d3b84c7d..50abf7b2 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -42,7 +42,7 @@
     clippy::useless_conversion
 )]
 #![forbid(unsafe_code, rust_2018_idioms)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub mod clipboard;
 pub mod command;
 pub mod font;
diff --git a/src/lib.rs b/src/lib.rs
index c73cc48d..b9e8c8c4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -163,7 +163,7 @@
 )]
 #![forbid(rust_2018_idioms, unsafe_code)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 use iced_widget::graphics;
 use iced_widget::renderer;
 use iced_widget::style;
diff --git a/src/window/icon.rs b/src/window/icon.rs
index b67b2ea3..0fe010ca 100644
--- a/src/window/icon.rs
+++ b/src/window/icon.rs
@@ -12,7 +12,6 @@ use std::path::Path;
 ///
 /// This will return an error in case the file is missing at run-time. You may prefer [`Self::from_file_data`] instead.
 #[cfg(feature = "image")]
-#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
 pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Icon, Error> {
     let icon = image_rs::io::Reader::open(icon_path)?.decode()?.to_rgba8();
 
@@ -24,7 +23,6 @@ pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Icon, Error> {
 /// This content can be included in your application at compile-time, e.g. using the `include_bytes!` macro.
 /// You can pass an explicit file format. Otherwise, the file format will be guessed at runtime.
 #[cfg(feature = "image")]
-#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
 pub fn from_file_data(
     data: &[u8],
     explicit_format: Option<image_rs::ImageFormat>,
@@ -60,7 +58,6 @@ pub enum Error {
 
     /// The `image` crate reported an error.
     #[cfg(feature = "image")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
     #[error("Unable to create icon from a file: {0}")]
     ImageError(#[from] image_rs::error::ImageError),
 }
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 4a92c345..7004416f 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -36,7 +36,7 @@
 )]
 #![forbid(rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub mod layer;
 pub mod settings;
 pub mod window;
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 336ac4ee..3f5136f8 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -310,7 +310,6 @@ where
 ///
 /// [`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())
 }
@@ -320,7 +319,6 @@ pub fn image<Handle>(handle: impl Into<Handle>) -> crate::Image<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>
@@ -333,7 +331,6 @@ where
 
 /// 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>
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index ab1ab95b..9da13f9b 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -14,6 +14,7 @@
 )]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub use iced_renderer as renderer;
 pub use iced_renderer::graphics;
 pub use iced_runtime as runtime;
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 9f6bcebb..62d66d5e 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -29,7 +29,7 @@
 )]
 #![forbid(rust_2018_idioms, unsafe_code)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub use iced_graphics as graphics;
 pub use iced_runtime as runtime;
 pub use iced_runtime::core;

From a5fbfe7ea5e73218af1befe02eb364afad2d6c55 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Mon, 27 Feb 2023 23:44:31 +0000
Subject: [PATCH 260/440] Update to winit 0.28

---
 winit/Cargo.toml         | 8 ++++----
 winit/src/application.rs | 7 ++++++-
 winit/src/settings.rs    | 8 ++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 58e13b3e..56efbe77 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -23,14 +23,14 @@ wayland-dlopen = ["winit/wayland-dlopen"]
 wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
 
 [dependencies]
-window_clipboard = "0.2"
+window_clipboard = { git = "https://github.com/TobTobXX/window_clipboard", rev = "1392da8339c8aebb9849d00eb7383a73ed076f1d" }
 log = "0.4"
 thiserror = "1.0"
 
 [dependencies.winit]
-version = "0.27"
-git = "https://github.com/iced-rs/winit.git"
-rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
+version = "0.28"
+git = "https://github.com/nicoburns/winit.git"
+rev = "f160dc321eaa2e30f770f0b61f7ffc74541cafe0"
 default-features = false
 
 [dependencies.iced_runtime]
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 3d7c6e5d..1141ba27 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -26,6 +26,7 @@ use crate::{Clipboard, Error, Proxy, Settings};
 use futures::channel::mpsc;
 
 use std::mem::ManuallyDrop;
+use winit::window::WindowLevel;
 
 #[cfg(feature = "trace")]
 pub use profiler::Profiler;
@@ -795,7 +796,11 @@ pub fn run_command<A, E>(
                     window.focus_window();
                 }
                 window::Action::ChangeAlwaysOnTop(on_top) => {
-                    window.set_always_on_top(on_top);
+                    let level = match on_top {
+                        true => WindowLevel::AlwaysOnTop,
+                        false => WindowLevel::Normal,
+                    };
+                    window.set_window_level(level);
                 }
                 window::Action::FetchId(tag) => {
                     proxy
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index be0ab329..413ae64a 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -26,7 +26,7 @@ use crate::core::window::Icon;
 use crate::Position;
 
 use winit::monitor::MonitorHandle;
-use winit::window::WindowBuilder;
+use winit::window::{WindowBuilder, WindowLevel};
 
 use std::fmt;
 
@@ -121,6 +121,10 @@ impl Window {
 
         let (width, height) = self.size;
 
+        let window_level = match self.always_on_top {
+            true => WindowLevel::AlwaysOnTop,
+            false => WindowLevel::Normal,
+        };
         window_builder = window_builder
             .with_title(title)
             .with_inner_size(winit::dpi::LogicalSize { width, height })
@@ -128,7 +132,7 @@ impl Window {
             .with_decorations(self.decorations)
             .with_transparent(self.transparent)
             .with_window_icon(self.icon.and_then(conversion::icon))
-            .with_always_on_top(self.always_on_top)
+            .with_window_level(window_level)
             .with_visible(self.visible);
 
         if let Some(position) = conversion::position(

From 42671e2855a7e54c1785f75833da062e07362b87 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Tue, 28 Feb 2023 12:11:04 +0000
Subject: [PATCH 261/440] Fix build on linux

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

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 413ae64a..a807cdba 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -161,7 +161,9 @@ impl Window {
             target_os = "openbsd"
         ))]
         {
-            use ::winit::platform::unix::WindowBuilderExtUnix;
+            // `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
+            // exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
+            use ::winit::platform::x11::WindowBuilderExtWayland;
 
             if let Some(id) = _id {
                 window_builder = window_builder.with_name(id.clone(), id);

From 09a2a061303e954dbae7dab6f9bf092c121900f8 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Tue, 28 Feb 2023 12:15:04 +0000
Subject: [PATCH 262/440] Fix import path

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

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index a807cdba..22033113 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -163,7 +163,7 @@ impl Window {
         {
             // `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
             // exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
-            use ::winit::platform::x11::WindowBuilderExtWayland;
+            use ::winit::platform::wayland::WindowBuilderExtWayland;
 
             if let Some(id) = _id {
                 window_builder = window_builder.with_name(id.clone(), id);

From 5ee26cc8ec1a49c78d1f3f99ebf6696f827ea5d1 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 11 May 2023 12:25:43 -0400
Subject: [PATCH 263/440] fix: don't offset fill of quad

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

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 58721a80..583b8dac 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -178,21 +178,13 @@ impl Backend {
                     .min(bounds.width / 2.0)
                     .min(bounds.height / 2.0);
 
-                // Offset the fill by the border width
-                let path_bounds = Rectangle {
-                    x: bounds.x + border_width,
-                    y: bounds.y + border_width,
-                    width: bounds.width - 2.0 * border_width,
-                    height: bounds.height - 2.0 * border_width,
-                };
-                // fill border radius is the border radius minus the border width
                 let mut fill_border_radius = *border_radius;
                 for radius in &mut fill_border_radius {
-                    *radius = (*radius - border_width / 2.0)
-                        .min(path_bounds.width / 2.0)
-                        .min(path_bounds.height / 2.0);
+                    *radius = (*radius)
+                        .min(bounds.width / 2.0)
+                        .min(bounds.height / 2.0);
                 }
-                let path = rounded_rectangle(path_bounds, fill_border_radius);
+                let path = rounded_rectangle(*bounds, fill_border_radius);
 
                 pixels.fill_path(
                     &path,

From d6027d7da64c090e8735e755dc5095d77c38b721 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 11 May 2023 17:40:09 +0100
Subject: [PATCH 264/440] Use raw-window-handle instead of HWND

---
 winit/Cargo.toml              | 1 +
 winit/src/settings/windows.rs | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 56efbe77..a1f3233b 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -26,6 +26,7 @@ wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
 window_clipboard = { git = "https://github.com/TobTobXX/window_clipboard", rev = "1392da8339c8aebb9849d00eb7383a73ed076f1d" }
 log = "0.4"
 thiserror = "1.0"
+raw-window-handle = "0.5"
 
 [dependencies.winit]
 version = "0.28"
diff --git a/winit/src/settings/windows.rs b/winit/src/settings/windows.rs
index ff03a9c5..ce18da75 100644
--- a/winit/src/settings/windows.rs
+++ b/winit/src/settings/windows.rs
@@ -1,10 +1,12 @@
 //! Platform specific settings for Windows.
 
+use raw_window_handle::RawWindowHandle;
+
 /// The platform specific window settings of an application.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct PlatformSpecific {
     /// Parent window
-    pub parent: Option<winit::platform::windows::HWND>,
+    pub parent: Option<RawWindowHandle>,
 
     /// Drag and drop support
     pub drag_and_drop: bool,

From 861a24745a9dfb99feaa3c5a4299af58a0054ed7 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 11 May 2023 17:51:03 +0100
Subject: [PATCH 265/440] Fixup option

---
 winit/src/settings.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 22033113..efee5c68 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -173,12 +173,8 @@ impl Window {
         #[cfg(target_os = "windows")]
         {
             use winit::platform::windows::WindowBuilderExtWindows;
-
-            if let Some(parent) = self.platform_specific.parent {
-                window_builder = window_builder.with_parent_window(parent);
-            }
-
             window_builder = window_builder
+                .with_parent_window(self.platform_specific.parent)
                 .with_drag_and_drop(self.platform_specific.drag_and_drop);
         }
 

From 6551a0b2ab6c831dd1d3646ecf55180339275e22 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 11 May 2023 09:12:06 -0700
Subject: [PATCH 266/440] Added support for gradients as background variants +
 other optimizations.

---
 core/Cargo.toml                   |   1 +
 core/src/angle.rs                 |  33 ++
 core/src/background.rs            |  14 +-
 core/src/gradient.rs              | 176 +++++-----
 core/src/gradient/linear.rs       | 112 ------
 core/src/lib.rs                   |   2 +
 core/src/renderer.rs              |   2 +-
 examples/modern_art/Cargo.toml    |  11 -
 examples/modern_art/src/main.rs   | 143 --------
 examples/solar_system/Cargo.toml  |   1 +
 examples/solar_system/src/main.rs |  21 +-
 examples/tour/Cargo.toml          |   2 +-
 examples/tour/src/main.rs         |  58 +++-
 graphics/src/geometry/fill.rs     |   3 +-
 graphics/src/geometry/style.rs    |   3 +-
 graphics/src/gradient.rs          | 119 +++++++
 graphics/src/lib.rs               |   2 +
 graphics/src/primitive.rs         |  34 +-
 graphics/src/triangle.rs          |   1 -
 src/lib.rs                        |   4 +-
 style/src/button.rs               |   3 +
 style/src/theme.rs                |   3 +
 tiny_skia/src/backend.rs          |  45 +++
 tiny_skia/src/geometry.rs         |  44 ++-
 wgpu/Cargo.toml                   |   4 -
 wgpu/src/buffer.rs                |  43 ++-
 wgpu/src/buffer/dynamic.rs        | 202 -----------
 wgpu/src/buffer/static.rs         | 107 ------
 wgpu/src/geometry.rs              | 111 ++++--
 wgpu/src/image.rs                 |  46 +--
 wgpu/src/layer.rs                 |  94 ++++-
 wgpu/src/layer/mesh.rs            |  15 +-
 wgpu/src/layer/quad.rs            |  43 ++-
 wgpu/src/lib.rs                   |   2 -
 wgpu/src/quad.rs                  | 485 +++++++++++++++++++-------
 wgpu/src/shader/gradient.wgsl     |  88 -----
 wgpu/src/shader/quad.wgsl         | 320 ++++++++++++++---
 wgpu/src/shader/solid.wgsl        |  30 --
 wgpu/src/shader/triangle.wgsl     | 168 +++++++++
 wgpu/src/triangle.rs              | 551 +++++++++++-------------------
 widget/src/canvas.rs              |   1 +
 41 files changed, 1658 insertions(+), 1489 deletions(-)
 create mode 100644 core/src/angle.rs
 delete mode 100644 core/src/gradient/linear.rs
 delete mode 100644 examples/modern_art/Cargo.toml
 delete mode 100644 examples/modern_art/src/main.rs
 create mode 100644 graphics/src/gradient.rs
 delete mode 100644 graphics/src/triangle.rs
 delete mode 100644 wgpu/src/buffer/dynamic.rs
 delete mode 100644 wgpu/src/buffer/static.rs
 delete mode 100644 wgpu/src/shader/gradient.wgsl
 delete mode 100644 wgpu/src/shader/solid.wgsl
 create mode 100644 wgpu/src/shader/triangle.wgsl

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 92d9773f..41b0640a 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"
+log = "0.4.17"
 twox-hash = { version = "1.5", default-features = false }
 
 [dependencies.palette]
diff --git a/core/src/angle.rs b/core/src/angle.rs
new file mode 100644
index 00000000..75a57c76
--- /dev/null
+++ b/core/src/angle.rs
@@ -0,0 +1,33 @@
+use crate::{Point, Rectangle, Vector};
+use std::f32::consts::PI;
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+/// Degrees
+pub struct Degrees(pub f32);
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+/// Radians
+pub struct Radians(pub f32);
+
+impl From<Degrees> for Radians {
+    fn from(degrees: Degrees) -> Self {
+        Radians(degrees.0 * PI / 180.0)
+    }
+}
+
+impl Radians {
+    /// Calculates the line in which the [`Angle`] intercepts the `bounds`.
+    pub fn to_distance(&self, bounds: &Rectangle) -> (Point, Point) {
+        let v1 = Vector::new(f32::cos(self.0), f32::sin(self.0));
+
+        let distance_to_rect = f32::min(
+            f32::abs((bounds.y - bounds.center().y) / v1.y),
+            f32::abs(((bounds.x + bounds.width) - bounds.center().x) / v1.x),
+        );
+
+        let start = bounds.center() + v1 * distance_to_rect;
+        let end = bounds.center() - v1 * distance_to_rect;
+
+        (start, end)
+    }
+}
diff --git a/core/src/background.rs b/core/src/background.rs
index cfb95867..6af33c3e 100644
--- a/core/src/background.rs
+++ b/core/src/background.rs
@@ -1,11 +1,13 @@
-use crate::Color;
+use crate::{Color, Gradient};
 
 /// The background of some element.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Background {
-    /// A solid color
+    /// A solid color.
     Color(Color),
-    // TODO: Add gradient and image variants
+    /// Linearly interpolate between several colors.
+    Gradient(Gradient),
+    // TODO: Add image variant
 }
 
 impl From<Color> for Background {
@@ -19,3 +21,9 @@ impl From<Color> for Option<Background> {
         Some(Background::from(color))
     }
 }
+
+impl From<Gradient> for Option<Background> {
+    fn from(gradient: Gradient) -> Self {
+        Some(Background::Gradient(gradient))
+    }
+}
diff --git a/core/src/gradient.rs b/core/src/gradient.rs
index 61e919d6..54bb86a4 100644
--- a/core/src/gradient.rs
+++ b/core/src/gradient.rs
@@ -1,27 +1,42 @@
 //! For creating a Gradient.
-pub mod linear;
-
 pub use linear::Linear;
 
-use crate::{Color, Point, Size};
+use crate::{Color, Radians};
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 /// A fill which transitions colors progressively along a direction, either linearly, radially (TBD),
 /// or conically (TBD).
+///
+/// For a gradient which can be used as a fill on a canvas, see [`iced_graphics::Gradient`].
 pub enum Gradient {
-    /// A linear gradient interpolates colors along a direction from its `start` to its `end`
-    /// point.
+    /// A linear gradient interpolates colors along a direction at a specific [`Angle`].
     Linear(Linear),
 }
 
 impl Gradient {
     /// Creates a new linear [`linear::Builder`].
-    pub fn linear(position: impl Into<Position>) -> linear::Builder {
-        linear::Builder::new(position.into())
+    ///
+    /// This must be defined by an angle (in [`Degrees`] or [`Radians`])
+    /// which will use the bounds of the widget as a guide.
+    pub fn linear(angle: impl Into<Radians>) -> linear::Builder {
+        linear::Builder::new(angle.into())
+    }
+
+    /// Adjust the opacity of the gradient by a multiplier applied to each color stop.
+    pub fn mul_alpha(mut self, alpha_multiplier: f32) -> Self {
+        match &mut self {
+            Gradient::Linear(linear) => {
+                for stop in linear.color_stops.iter_mut().flatten() {
+                    stop.color.a *= alpha_multiplier;
+                }
+            }
+        }
+
+        self
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq)]
 /// A point along the gradient vector where the specified [`color`] is unmixed.
 ///
 /// [`color`]: Self::color
@@ -35,83 +50,84 @@ pub struct ColorStop {
     pub color: Color,
 }
 
-#[derive(Debug)]
-/// The position of the gradient within its bounds.
-pub enum Position {
-    /// The gradient will be positioned with respect to two points.
-    Absolute {
-        /// The starting point of the gradient.
-        start: Point,
-        /// The ending point of the gradient.
-        end: Point,
-    },
-    /// The gradient will be positioned relative to the provided bounds.
-    Relative {
-        /// The top left position of the bounds.
-        top_left: Point,
-        /// The width & height of the bounds.
-        size: Size,
-        /// The start [Location] of the gradient.
-        start: Location,
-        /// The end [Location] of the gradient.
-        end: Location,
-    },
-}
+pub mod linear {
+    //! Linear gradient builder & definition.
+    use crate::gradient::{ColorStop, Gradient};
+    use crate::{Color, Radians};
+    use std::cmp::Ordering;
 
-impl From<(Point, Point)> for Position {
-    fn from((start, end): (Point, Point)) -> Self {
-        Self::Absolute { start, end }
+    /// A linear gradient that can be used as a [`Background`].
+    #[derive(Debug, Clone, Copy, PartialEq)]
+    pub struct Linear {
+        /// How the [`Gradient`] is angled within its bounds.
+        pub angle: Radians,
+        /// [`ColorStop`]s along the linear gradient path.
+        pub color_stops: [Option<ColorStop>; 8],
     }
-}
 
-#[derive(Debug, Clone, Copy)]
-/// The location of a relatively-positioned gradient.
-pub enum Location {
-    /// Top left.
-    TopLeft,
-    /// Top.
-    Top,
-    /// Top right.
-    TopRight,
-    /// Right.
-    Right,
-    /// Bottom right.
-    BottomRight,
-    /// Bottom.
-    Bottom,
-    /// Bottom left.
-    BottomLeft,
-    /// Left.
-    Left,
-}
+    /// A [`Linear`] builder.
+    #[derive(Debug)]
+    pub struct Builder {
+        angle: Radians,
+        stops: [Option<ColorStop>; 8],
+    }
 
-impl Location {
-    fn to_absolute(self, top_left: Point, size: Size) -> Point {
-        match self {
-            Location::TopLeft => top_left,
-            Location::Top => {
-                Point::new(top_left.x + size.width / 2.0, top_left.y)
+    impl Builder {
+        /// Creates a new [`Builder`].
+        pub fn new(angle: Radians) -> Self {
+            Self {
+                angle,
+                stops: [None; 8],
             }
-            Location::TopRight => {
-                Point::new(top_left.x + size.width, top_left.y)
-            }
-            Location::Right => Point::new(
-                top_left.x + size.width,
-                top_left.y + size.height / 2.0,
-            ),
-            Location::BottomRight => {
-                Point::new(top_left.x + size.width, top_left.y + size.height)
-            }
-            Location::Bottom => Point::new(
-                top_left.x + size.width / 2.0,
-                top_left.y + size.height,
-            ),
-            Location::BottomLeft => {
-                Point::new(top_left.x, top_left.y + size.height)
-            }
-            Location::Left => {
-                Point::new(top_left.x, top_left.y + size.height / 2.0)
+        }
+
+        /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
+        ///
+        /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
+        ///
+        /// Any stop added after the 8th will be silently ignored.
+        pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
+            if offset.is_finite() && (0.0..=1.0).contains(&offset) {
+                let (Ok(index) | Err(index)) =
+                    self.stops.binary_search_by(|stop| match stop {
+                        None => Ordering::Greater,
+                        Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
+                    });
+
+                if index < 8 {
+                    self.stops[index] = Some(ColorStop { offset, color });
+                }
+            } else {
+                log::warn!(
+                    "Gradient color stop must be within 0.0..=1.0 range."
+                );
+            };
+
+            self
+        }
+
+        /// Adds multiple [`ColorStop`]s to the gradient.
+        ///
+        /// Any stop added after the 8th will be silently ignored.
+        pub fn add_stops(
+            mut self,
+            stops: impl IntoIterator<Item = ColorStop>,
+        ) -> Self {
+            for stop in stops.into_iter() {
+                self = self.add_stop(stop.offset, stop.color)
             }
+
+            self
+        }
+
+        /// Builds the linear [`Gradient`] of this [`Builder`].
+        ///
+        /// Returns `BuilderError` if gradient in invalid.
+        pub fn build(self) -> Gradient {
+            Gradient::Linear(Linear {
+                angle: self.angle,
+                color_stops: self.stops,
+            })
         }
     }
 }
diff --git a/core/src/gradient/linear.rs b/core/src/gradient/linear.rs
deleted file mode 100644
index c886db47..00000000
--- a/core/src/gradient/linear.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-//! Linear gradient builder & definition.
-use crate::gradient::{ColorStop, Gradient, Position};
-use crate::{Color, Point};
-
-/// A linear gradient that can be used in the style of [`Fill`] or [`Stroke`].
-///
-/// [`Fill`]: crate::widget::canvas::Fill
-/// [`Stroke`]: crate::widget::canvas::Stroke
-#[derive(Debug, Clone, PartialEq)]
-pub struct Linear {
-    /// The point where the linear gradient begins.
-    pub start: Point,
-    /// The point where the linear gradient ends.
-    pub end: Point,
-    /// [`ColorStop`]s along the linear gradient path.
-    pub color_stops: Vec<ColorStop>,
-}
-
-/// A [`Linear`] builder.
-#[derive(Debug)]
-pub struct Builder {
-    start: Point,
-    end: Point,
-    stops: Vec<ColorStop>,
-    error: Option<BuilderError>,
-}
-
-impl Builder {
-    /// Creates a new [`Builder`].
-    pub fn new(position: Position) -> Self {
-        let (start, end) = match position {
-            Position::Absolute { start, end } => (start, end),
-            Position::Relative {
-                top_left,
-                size,
-                start,
-                end,
-            } => (
-                start.to_absolute(top_left, size),
-                end.to_absolute(top_left, size),
-            ),
-        };
-
-        Self {
-            start,
-            end,
-            stops: vec![],
-            error: None,
-        }
-    }
-
-    /// Adds a new stop, defined by an offset and a color, to the gradient.
-    ///
-    /// `offset` must be between `0.0` and `1.0` or the gradient cannot be built.
-    ///
-    /// Note: when using the [`glow`] backend, any color stop added after the 16th
-    /// will not be displayed.
-    ///
-    /// On the [`wgpu`] backend this limitation does not exist (technical limit is 524,288 stops).
-    ///
-    /// [`glow`]: https://docs.rs/iced_glow
-    /// [`wgpu`]: https://docs.rs/iced_wgpu
-    pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
-        if offset.is_finite() && (0.0..=1.0).contains(&offset) {
-            match self.stops.binary_search_by(|stop| {
-                stop.offset.partial_cmp(&offset).unwrap()
-            }) {
-                Ok(_) => {
-                    self.error = Some(BuilderError::DuplicateOffset(offset))
-                }
-                Err(index) => {
-                    self.stops.insert(index, ColorStop { offset, color });
-                }
-            }
-        } else {
-            self.error = Some(BuilderError::InvalidOffset(offset))
-        };
-
-        self
-    }
-
-    /// Builds the linear [`Gradient`] of this [`Builder`].
-    ///
-    /// Returns `BuilderError` if gradient in invalid.
-    pub fn build(self) -> Result<Gradient, BuilderError> {
-        if self.stops.is_empty() {
-            Err(BuilderError::MissingColorStop)
-        } else if let Some(error) = self.error {
-            Err(error)
-        } else {
-            Ok(Gradient::Linear(Linear {
-                start: self.start,
-                end: self.end,
-                color_stops: self.stops,
-            }))
-        }
-    }
-}
-
-/// An error that happened when building a [`Linear`] gradient.
-#[derive(Debug, thiserror::Error)]
-pub enum BuilderError {
-    #[error("Gradients must contain at least one color stop.")]
-    /// Gradients must contain at least one color stop.
-    MissingColorStop,
-    #[error("Offset {0} must be a unique, finite number.")]
-    /// Offsets in a gradient must all be unique & finite.
-    DuplicateOffset(f32),
-    #[error("Offset {0} must be between 0.0..=1.0.")]
-    /// Offsets in a gradient must be between 0.0..=1.0.
-    InvalidOffset(f32),
-}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 89dfb828..6de5ada4 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -42,6 +42,7 @@ pub mod touch;
 pub mod widget;
 pub mod window;
 
+mod angle;
 mod background;
 mod color;
 mod content_fit;
@@ -57,6 +58,7 @@ mod size;
 mod vector;
 
 pub use alignment::Alignment;
+pub use angle::{Degrees, Radians};
 pub use background::Background;
 pub use clipboard::Clipboard;
 pub use color::Color;
diff --git a/core/src/renderer.rs b/core/src/renderer.rs
index d6247e39..007a0370 100644
--- a/core/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -60,7 +60,7 @@ pub struct Quad {
     pub border_color: Color,
 }
 
-/// The border radi for the corners of a graphics primitive in the order:
+/// The border radii for the corners of a graphics primitive in the order:
 /// top-left, top-right, bottom-right, bottom-left.
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub struct BorderRadius([f32; 4]);
diff --git a/examples/modern_art/Cargo.toml b/examples/modern_art/Cargo.toml
deleted file mode 100644
index 4242d209..00000000
--- a/examples/modern_art/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "modern_art"
-version = "0.1.0"
-authors = ["Bingus <shankern@protonmail.com>"]
-edition = "2021"
-publish = false
-
-[dependencies]
-iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
-rand = "0.8.5"
-env_logger = "0.9"
diff --git a/examples/modern_art/src/main.rs b/examples/modern_art/src/main.rs
deleted file mode 100644
index a43a2b2b..00000000
--- a/examples/modern_art/src/main.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use iced::widget::canvas::{
-    self, gradient::Location, gradient::Position, Cache, Canvas, Cursor, Frame,
-    Geometry, Gradient,
-};
-use iced::{
-    executor, Application, Color, Command, Element, Length, Point, Rectangle,
-    Renderer, Settings, Size, Theme,
-};
-use rand::{thread_rng, Rng};
-
-fn main() -> iced::Result {
-    env_logger::builder().format_timestamp(None).init();
-
-    ModernArt::run(Settings {
-        antialiasing: true,
-        ..Settings::default()
-    })
-}
-
-#[derive(Debug, Clone, Copy)]
-enum Message {}
-
-struct ModernArt {
-    cache: Cache,
-}
-
-impl Application for ModernArt {
-    type Executor = executor::Default;
-    type Message = Message;
-    type Theme = Theme;
-    type Flags = ();
-
-    fn new(_flags: Self::Flags) -> (Self, Command<Self::Message>) {
-        (
-            ModernArt {
-                cache: Default::default(),
-            },
-            Command::none(),
-        )
-    }
-
-    fn title(&self) -> String {
-        String::from("Modern Art")
-    }
-
-    fn update(&mut self, _message: Message) -> Command<Message> {
-        Command::none()
-    }
-
-    fn view(&self) -> Element<'_, Self::Message, Renderer<Self::Theme>> {
-        Canvas::new(self)
-            .width(Length::Fill)
-            .height(Length::Fill)
-            .into()
-    }
-}
-
-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(renderer, bounds.size(), |frame| {
-            let num_squares = thread_rng().gen_range(0..1200);
-
-            let mut i = 0;
-            while i <= num_squares {
-                generate_box(frame, bounds.size());
-                i += 1;
-            }
-        });
-
-        vec![geometry]
-    }
-}
-
-fn random_direction() -> Location {
-    match thread_rng().gen_range(0..8) {
-        0 => Location::TopLeft,
-        1 => Location::Top,
-        2 => Location::TopRight,
-        3 => Location::Right,
-        4 => Location::BottomRight,
-        5 => Location::Bottom,
-        6 => Location::BottomLeft,
-        7 => Location::Left,
-        _ => Location::TopLeft,
-    }
-}
-
-fn generate_box(frame: &mut Frame, bounds: Size) -> bool {
-    let solid = rand::random::<bool>();
-
-    let random_color = || -> Color {
-        Color::from_rgb(
-            thread_rng().gen_range(0.0..1.0),
-            thread_rng().gen_range(0.0..1.0),
-            thread_rng().gen_range(0.0..1.0),
-        )
-    };
-
-    let gradient = |top_left: Point, size: Size| -> Gradient {
-        let mut builder = Gradient::linear(Position::Relative {
-            top_left,
-            size,
-            start: random_direction(),
-            end: random_direction(),
-        });
-        let stops = thread_rng().gen_range(1..15u32);
-
-        let mut i = 0;
-        while i <= stops {
-            builder = builder.add_stop(i as f32 / stops as f32, random_color());
-            i += 1;
-        }
-
-        builder.build().unwrap()
-    };
-
-    let top_left = Point::new(
-        thread_rng().gen_range(0.0..bounds.width),
-        thread_rng().gen_range(0.0..bounds.height),
-    );
-
-    let size = Size::new(
-        thread_rng().gen_range(50.0..200.0),
-        thread_rng().gen_range(50.0..200.0),
-    );
-
-    if solid {
-        frame.fill_rectangle(top_left, size, random_color());
-    } else {
-        frame.fill_rectangle(top_left, size, gradient(top_left, size));
-    };
-
-    solid
-}
diff --git a/examples/solar_system/Cargo.toml b/examples/solar_system/Cargo.toml
index 835396b0..1a98a87e 100644
--- a/examples/solar_system/Cargo.toml
+++ b/examples/solar_system/Cargo.toml
@@ -7,4 +7,5 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
+env_logger = "0.10.0"
 rand = "0.8.3"
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index f2606feb..42606e3f 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -10,9 +10,8 @@ use iced::application;
 use iced::executor;
 use iced::theme::{self, Theme};
 use iced::widget::canvas;
-use iced::widget::canvas::gradient::{self, Gradient};
 use iced::widget::canvas::stroke::{self, Stroke};
-use iced::widget::canvas::{Cursor, Path};
+use iced::widget::canvas::{Cursor, Gradient, Path};
 use iced::window;
 use iced::{
     Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
@@ -22,6 +21,8 @@ use iced::{
 use std::time::Instant;
 
 pub fn main() -> iced::Result {
+    env_logger::builder().format_timestamp(None).init();
+
     SolarSystem::run(Settings {
         antialiasing: true,
         ..Settings::default()
@@ -208,15 +209,13 @@ impl<Message> canvas::Program<Message> for State {
 
                 let earth = Path::circle(Point::ORIGIN, Self::EARTH_RADIUS);
 
-                let earth_fill =
-                    Gradient::linear(gradient::Position::Absolute {
-                        start: Point::new(-Self::EARTH_RADIUS, 0.0),
-                        end: Point::new(Self::EARTH_RADIUS, 0.0),
-                    })
-                    .add_stop(0.2, Color::from_rgb(0.15, 0.50, 1.0))
-                    .add_stop(0.8, Color::from_rgb(0.0, 0.20, 0.47))
-                    .build()
-                    .expect("Build Earth fill gradient");
+                let earth_fill = Gradient::linear(
+                    Point::new(-Self::EARTH_RADIUS, 0.0),
+                    Point::new(Self::EARTH_RADIUS, 0.0),
+                )
+                .add_stop(0.2, Color::from_rgb(0.15, 0.50, 1.0))
+                .add_stop(0.8, Color::from_rgb(0.0, 0.20, 0.47))
+                .build();
 
                 frame.fill(&earth, earth_fill);
 
diff --git a/examples/tour/Cargo.toml b/examples/tour/Cargo.toml
index 39e83671..48471f2d 100644
--- a/examples/tour/Cargo.toml
+++ b/examples/tour/Cargo.toml
@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["image", "debug"] }
-env_logger = "0.8"
+env_logger = "0.10.0"
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 9c38ad0e..630b6359 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -1,11 +1,15 @@
-use iced::alignment;
 use iced::theme;
+use iced::theme::Palette;
 use iced::widget::{
     checkbox, column, container, horizontal_space, image, radio, row,
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
-use iced::{Color, Element, Font, Length, Renderer, Sandbox, Settings};
+use iced::{alignment, widget, Theme};
+use iced::{
+    Color, Degrees, Element, Font, Gradient, Length, Radians, Renderer,
+    Sandbox, Settings,
+};
 
 pub fn main() -> iced::Result {
     env_logger::init();
@@ -53,9 +57,11 @@ impl Sandbox for Tour {
 
         if steps.has_previous() {
             controls = controls.push(
-                button("Back")
-                    .on_press(Message::BackPressed)
-                    .style(theme::Button::Secondary),
+                button("Back").on_press(Message::BackPressed).style(
+                    theme::Button::Custom(Box::new(
+                        CustomButtonStyle::Secondary,
+                    )),
+                ),
             );
         }
 
@@ -63,9 +69,9 @@ impl Sandbox for Tour {
 
         if steps.can_continue() {
             controls = controls.push(
-                button("Next")
-                    .on_press(Message::NextPressed)
-                    .style(theme::Button::Primary),
+                button("Next").on_press(Message::NextPressed).style(
+                    theme::Button::Custom(Box::new(CustomButtonStyle::Primary)),
+                ),
             );
         }
 
@@ -716,3 +722,39 @@ pub enum Layout {
     Row,
     Column,
 }
+
+enum CustomButtonStyle {
+    Primary,
+    Secondary,
+}
+
+impl widget::button::StyleSheet for CustomButtonStyle {
+    type Style = Theme;
+
+    fn active(&self, _style: &Self::Style) -> widget::button::Appearance {
+        match self {
+            CustomButtonStyle::Primary => widget::button::Appearance {
+                background: Gradient::linear(Degrees(270.0))
+                    .add_stop(0.0, Palette::LIGHT.primary)
+                    .add_stop(1.0, Color::from_rgb8(54, 80, 168))
+                    .build()
+                    .into(),
+                text_color: Color::WHITE,
+                border_radius: 5.0,
+                ..Default::default()
+            },
+            CustomButtonStyle::Secondary => widget::button::Appearance {
+                background: Gradient::linear(Radians(
+                    3.0 * std::f32::consts::PI / 2.0,
+                ))
+                .add_stop(0.0, Color::from_rgb8(194, 194, 194))
+                .add_stop(1.0, Color::from_rgb8(126, 126, 126))
+                .build()
+                .into(),
+                text_color: Color::WHITE,
+                border_radius: 5.0,
+                ..Default::default()
+            },
+        }
+    }
+}
diff --git a/graphics/src/geometry/fill.rs b/graphics/src/geometry/fill.rs
index 2e8c1669..6aa1f28b 100644
--- a/graphics/src/geometry/fill.rs
+++ b/graphics/src/geometry/fill.rs
@@ -1,7 +1,8 @@
 //! Fill [crate::widget::canvas::Geometry] with a certain style.
-use iced_core::{Color, Gradient};
+use iced_core::Color;
 
 pub use crate::geometry::Style;
+use crate::Gradient;
 
 /// The style used to fill geometry.
 #[derive(Debug, Clone)]
diff --git a/graphics/src/geometry/style.rs b/graphics/src/geometry/style.rs
index be9ee376..ece6b32a 100644
--- a/graphics/src/geometry/style.rs
+++ b/graphics/src/geometry/style.rs
@@ -1,4 +1,5 @@
-use iced_core::{Color, Gradient};
+use crate::Gradient;
+use iced_core::Color;
 
 /// The coloring style of some drawing.
 #[derive(Debug, Clone, PartialEq)]
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
new file mode 100644
index 00000000..21bcd2c6
--- /dev/null
+++ b/graphics/src/gradient.rs
@@ -0,0 +1,119 @@
+//! A gradient that can be used as a [`Fill`] for a mesh.
+//!
+//! For a gradient that you can use as a background variant for a widget, see [`Gradient`].
+//!
+//! [`Gradient`]: crate::core::Gradient;
+use crate::core::Point;
+pub use linear::Linear;
+
+#[derive(Debug, Clone, PartialEq)]
+/// A fill which linearly interpolates colors along a direction.
+///
+/// For a gradient which can be used as a fill for a background of a widget, see [`crate::core::Gradient`].
+pub enum Gradient {
+    /// A linear gradient interpolates colors along a direction from its `start` to its `end`
+    /// point.
+    Linear(Linear),
+}
+
+impl Gradient {
+    /// Creates a new linear [`linear::Builder`].
+    ///
+    /// The `start` and `end` [`Point`]s define the absolute position of the [`Gradient`].
+    pub fn linear(start: Point, end: Point) -> linear::Builder {
+        linear::Builder::new(start, end)
+    }
+}
+
+pub mod linear {
+    //! Linear gradient builder & definition.
+    use crate::Gradient;
+    use iced_core::gradient::ColorStop;
+    use iced_core::{Color, Point};
+    use std::cmp::Ordering;
+
+    /// A linear gradient that can be used in the style of [`Fill`] or [`Stroke`].
+    ///
+    /// [`Fill`]: crate::geometry::Fill;
+    /// [`Stroke`]: crate::geometry::Stroke;
+    #[derive(Debug, Clone, Copy, PartialEq)]
+    pub struct Linear {
+        /// The absolute starting position of the gradient.
+        pub start: Point,
+
+        /// The absolute ending position of the gradient.
+        pub end: Point,
+
+        /// [`ColorStop`]s along the linear gradient direction.
+        pub color_stops: [Option<ColorStop>; 8],
+    }
+
+    /// A [`Linear`] builder.
+    #[derive(Debug)]
+    pub struct Builder {
+        start: Point,
+        end: Point,
+        stops: [Option<ColorStop>; 8],
+    }
+
+    impl Builder {
+        /// Creates a new [`Builder`].
+        pub fn new(start: Point, end: Point) -> Self {
+            Self {
+                start,
+                end,
+                stops: [None; 8],
+            }
+        }
+
+        /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
+        ///
+        /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
+        ///
+        /// Any stop added after the 8th will be silently ignored.
+        pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
+            if offset.is_finite() && (0.0..=1.0).contains(&offset) {
+                let (Ok(index) | Err(index)) =
+                    self.stops.binary_search_by(|stop| match stop {
+                        None => Ordering::Greater,
+                        Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
+                    });
+
+                if index < 8 {
+                    self.stops[index] = Some(ColorStop { offset, color });
+                }
+            } else {
+                log::warn!(
+                    "Gradient: ColorStop must be within 0.0..=1.0 range."
+                );
+            };
+
+            self
+        }
+
+        /// Adds multiple [`ColorStop`]s to the gradient.
+        ///
+        /// Any stop added after the 8th will be silently ignored.
+        pub fn add_stops(
+            mut self,
+            stops: impl IntoIterator<Item = ColorStop>,
+        ) -> Self {
+            for stop in stops.into_iter() {
+                self = self.add_stop(stop.offset, stop.color)
+            }
+
+            self
+        }
+
+        /// Builds the linear [`Gradient`] of this [`Builder`].
+        ///
+        /// Returns `BuilderError` if gradient in invalid.
+        pub fn build(self) -> Gradient {
+            Gradient::Linear(Linear {
+                start: self.start,
+                end: self.end,
+                color_stops: self.stops,
+            })
+        }
+    }
+}
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 91f50282..ae338936 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -23,6 +23,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 mod antialiasing;
 mod error;
+mod gradient;
 mod transformation;
 mod viewport;
 
@@ -42,6 +43,7 @@ pub use antialiasing::Antialiasing;
 pub use backend::Backend;
 pub use compositor::Compositor;
 pub use error::Error;
+pub use gradient::Gradient;
 pub use primitive::Primitive;
 pub use renderer::Renderer;
 pub use transformation::Transformation;
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index d4446c87..9728db39 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -3,7 +3,7 @@ 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 crate::core::{Background, Color, Font, Rectangle, Size, Vector};
 
 use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
@@ -39,7 +39,7 @@ pub enum Primitive {
         bounds: Rectangle,
         /// The background of the quad
         background: Background,
-        /// The border radius of the quad
+        /// The border radii of the quad
         border_radius: [f32; 4],
         /// The border width of the quad
         border_width: f32,
@@ -81,15 +81,12 @@ pub enum Primitive {
     /// It can be used to render many kinds of geometry freely.
     GradientMesh {
         /// The vertices and indices of the mesh.
-        buffers: Mesh2D<Vertex2D>,
+        buffers: Mesh2D<GradientVertex2D>,
 
         /// The size of the drawable region of the mesh.
         ///
         /// Any geometry that falls out of this region will be clipped.
         size: Size,
-
-        /// The [`Gradient`] to apply to the mesh.
-        gradient: Gradient,
     },
     /// A [`tiny_skia`] path filled with some paint.
     #[cfg(feature = "tiny-skia")]
@@ -242,14 +239,6 @@ pub struct Mesh2D<T> {
     pub indices: Vec<u32>,
 }
 
-/// A two-dimensional vertex.
-#[derive(Copy, Clone, Debug, PartialEq, 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, PartialEq, Zeroable, Pod)]
 #[repr(C)]
@@ -261,6 +250,23 @@ pub struct ColoredVertex2D {
     pub color: [f32; 4],
 }
 
+/// A vertex which contains 2D position & packed gradient data.
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C)]
+pub struct GradientVertex2D {
+    /// The vertex position in 2D space.
+    pub position: [f32; 2],
+
+    /// The packed vertex data of the gradient.
+    pub gradient: [f32; 44],
+}
+
+#[allow(unsafe_code)]
+unsafe impl Zeroable for GradientVertex2D {}
+
+#[allow(unsafe_code)]
+unsafe impl Pod for GradientVertex2D {}
+
 impl From<()> for Primitive {
     fn from(_: ()) -> Self {
         Self::Group { primitives: vec![] }
diff --git a/graphics/src/triangle.rs b/graphics/src/triangle.rs
deleted file mode 100644
index 09b61767..00000000
--- a/graphics/src/triangle.rs
+++ /dev/null
@@ -1 +0,0 @@
-//! Draw geometry using meshes of triangles.
diff --git a/src/lib.rs b/src/lib.rs
index c73cc48d..b81da394 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, Pixels,
-    Point, Rectangle, Size, Vector,
+    color, Alignment, Background, Color, ContentFit, Degrees, Gradient, Length,
+    Padding, Pixels, Point, Radians, Rectangle, Size, Vector,
 };
 pub use crate::runtime::Command;
 
diff --git a/style/src/button.rs b/style/src/button.rs
index a564a2b7..32ec28b7 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -68,6 +68,9 @@ pub trait StyleSheet {
                     a: color.a * 0.5,
                     ..color
                 }),
+                Background::Gradient(gradient) => {
+                    Background::Gradient(gradient.mul_alpha(0.5))
+                }
             }),
             text_color: Color {
                 a: active.text_color.a * 0.5,
diff --git a/style/src/theme.rs b/style/src/theme.rs
index d9893bcf..1b47e2f9 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -217,6 +217,9 @@ impl button::StyleSheet for Theme {
                     a: color.a * 0.5,
                     ..color
                 }),
+                Background::Gradient(gradient) => {
+                    Background::Gradient(gradient.mul_alpha(0.5))
+                }
             }),
             text_color: Color {
                 a: active.text_color.a * 0.5,
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d481bacd..dd1adbd8 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,4 +1,5 @@
 use crate::core::text;
+use crate::core::Gradient;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::backend;
 use crate::graphics::{Primitive, Viewport};
@@ -183,6 +184,9 @@ impl Backend {
                                     *color,
                                 ))
                             }
+                            Background::Gradient(gradient) => {
+                                into_gradient(*gradient, *bounds)
+                            }
                         },
                         anti_alias: true,
                         ..tiny_skia::Paint::default()
@@ -452,6 +456,47 @@ fn into_color(color: Color) -> tiny_skia::Color {
         .expect("Convert color from iced to tiny_skia")
 }
 
+fn into_gradient<'a>(
+    gradient: Gradient,
+    bounds: Rectangle,
+) -> tiny_skia::Shader<'a> {
+    let Gradient::Linear(linear) = gradient;
+    let (start, end) = linear.angle.to_distance(&bounds);
+    let stops: Vec<tiny_skia::GradientStop> = linear
+        .color_stops
+        .into_iter()
+        .flatten()
+        .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::LinearGradient::new(
+        tiny_skia::Point {
+            x: start.x,
+            y: start.y,
+        },
+        tiny_skia::Point { x: end.x, y: end.y },
+        if stops.is_empty() {
+            vec![tiny_skia::GradientStop::new(0.0, tiny_skia::Color::BLACK)]
+        } else {
+            stops
+        },
+        tiny_skia::SpreadMode::Pad,
+        tiny_skia::Transform::identity(),
+    )
+    .expect("Create linear gradient")
+}
+
 fn rounded_rectangle(
     bounds: Rectangle,
     border_radius: [f32; 4],
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index a1fd7b60..100db0b0 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -1,8 +1,8 @@
-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::Gradient;
 use crate::graphics::Primitive;
 
 pub struct Frame {
@@ -231,18 +231,11 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
                     .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
+                Gradient::Linear(linear) => {
+                    let stops: Vec<tiny_skia::GradientStop> = linear
                         .color_stops
                         .into_iter()
+                        .flatten()
                         .map(|stop| {
                             tiny_skia::GradientStop::new(
                                 stop.offset,
@@ -255,11 +248,30 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
                                 .expect("Create color"),
                             )
                         })
-                        .collect(),
-                    tiny_skia::SpreadMode::Pad,
-                    tiny_skia::Transform::identity(),
-                )
-                .expect("Create linear gradient"),
+                        .collect();
+
+                    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,
+                        },
+                        if stops.is_empty() {
+                            vec![tiny_skia::GradientStop::new(
+                                0.0,
+                                tiny_skia::Color::BLACK,
+                            )]
+                        } else {
+                            stops
+                        },
+                        tiny_skia::SpreadMode::Pad,
+                        tiny_skia::Transform::identity(),
+                    )
+                    .expect("Create linear gradient")
+                }
             },
         },
         anti_alias: true,
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 41eb4c23..1b71d6ec 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -46,10 +46,6 @@ version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
 rev = "f145067d292082abdd1f2b2481812d4a52c394ec"
 
-[dependencies.encase]
-version = "0.3.0"
-features = ["glam"]
-
 [dependencies.glam]
 version = "0.21.3"
 
diff --git a/wgpu/src/buffer.rs b/wgpu/src/buffer.rs
index c210dd4e..94122187 100644
--- a/wgpu/src/buffer.rs
+++ b/wgpu/src/buffer.rs
@@ -1,7 +1,3 @@
-//! Utilities for buffer operations.
-pub mod dynamic;
-pub mod r#static;
-
 use std::marker::PhantomData;
 use std::ops::RangeBounds;
 
@@ -10,7 +6,8 @@ pub struct Buffer<T> {
     label: &'static str,
     size: u64,
     usage: wgpu::BufferUsages,
-    raw: wgpu::Buffer,
+    pub(crate) raw: wgpu::Buffer,
+    offsets: Vec<wgpu::BufferAddress>,
     type_: PhantomData<T>,
 }
 
@@ -35,6 +32,7 @@ impl<T: bytemuck::Pod> Buffer<T> {
             size,
             usage,
             raw,
+            offsets: Vec::new(),
             type_: PhantomData,
         }
     }
@@ -43,6 +41,8 @@ impl<T: bytemuck::Pod> Buffer<T> {
         let new_size = (std::mem::size_of::<T>() * new_count) as u64;
 
         if self.size < new_size {
+            self.offsets.clear();
+
             self.raw = device.create_buffer(&wgpu::BufferDescriptor {
                 label: Some(self.label),
                 size: new_size,
@@ -58,17 +58,19 @@ impl<T: bytemuck::Pod> Buffer<T> {
         }
     }
 
+    /// Returns the size of the written bytes.
     pub fn write(
-        &self,
+        &mut self,
         queue: &wgpu::Queue,
-        offset_count: usize,
+        offset: usize,
         contents: &[T],
-    ) {
-        queue.write_buffer(
-            &self.raw,
-            (std::mem::size_of::<T>() * offset_count) as u64,
-            bytemuck::cast_slice(contents),
-        );
+    ) -> usize {
+        let bytes: &[u8] = bytemuck::cast_slice(contents);
+        queue.write_buffer(&self.raw, offset as u64, bytes);
+
+        self.offsets.push(offset as u64);
+
+        bytes.len()
     }
 
     pub fn slice(
@@ -77,6 +79,21 @@ impl<T: bytemuck::Pod> Buffer<T> {
     ) -> wgpu::BufferSlice<'_> {
         self.raw.slice(bounds)
     }
+
+    /// Returns the slice calculated from the offset stored at the given index.
+    pub fn slice_from_index(&self, index: usize) -> wgpu::BufferSlice<'_> {
+        self.raw.slice(self.offset_at(index)..)
+    }
+
+    /// Clears any temporary data (i.e. offsets) from the buffer.
+    pub fn clear(&mut self) {
+        self.offsets.clear()
+    }
+
+    /// Returns the offset at `index`, if it exists.
+    fn offset_at(&self, index: usize) -> &wgpu::BufferAddress {
+        self.offsets.get(index).expect("No offset at index.")
+    }
 }
 
 fn next_copy_size<T>(amount: usize) -> u64 {
diff --git a/wgpu/src/buffer/dynamic.rs b/wgpu/src/buffer/dynamic.rs
deleted file mode 100644
index 43fc47ac..00000000
--- a/wgpu/src/buffer/dynamic.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-//! Utilities for uniform buffer operations.
-use encase::private::WriteInto;
-use encase::ShaderType;
-
-use std::fmt;
-use std::marker::PhantomData;
-
-/// A dynamic buffer is any type of buffer which does not have a static offset.
-#[derive(Debug)]
-pub struct Buffer<T: ShaderType> {
-    offsets: Vec<wgpu::DynamicOffset>,
-    cpu: Internal,
-    gpu: wgpu::Buffer,
-    label: &'static str,
-    size: u64,
-    _data: PhantomData<T>,
-}
-
-impl<T: ShaderType + WriteInto> Buffer<T> {
-    /// Creates a new dynamic uniform buffer.
-    pub fn uniform(device: &wgpu::Device, label: &'static str) -> Self {
-        Buffer::new(
-            device,
-            Internal::Uniform(encase::DynamicUniformBuffer::new(Vec::new())),
-            label,
-            wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
-        )
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    /// Creates a new dynamic storage buffer.
-    pub fn storage(device: &wgpu::Device, label: &'static str) -> Self {
-        Buffer::new(
-            device,
-            Internal::Storage(encase::DynamicStorageBuffer::new(Vec::new())),
-            label,
-            wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST,
-        )
-    }
-
-    fn new(
-        device: &wgpu::Device,
-        dynamic_buffer_type: Internal,
-        label: &'static str,
-        usage: wgpu::BufferUsages,
-    ) -> Self {
-        let initial_size = u64::from(T::min_size());
-
-        Self {
-            offsets: Vec::new(),
-            cpu: dynamic_buffer_type,
-            gpu: Buffer::<T>::create_gpu_buffer(
-                device,
-                label,
-                usage,
-                initial_size,
-            ),
-            label,
-            size: initial_size,
-            _data: Default::default(),
-        }
-    }
-
-    fn create_gpu_buffer(
-        device: &wgpu::Device,
-        label: &'static str,
-        usage: wgpu::BufferUsages,
-        size: u64,
-    ) -> wgpu::Buffer {
-        device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some(label),
-            size,
-            usage,
-            mapped_at_creation: false,
-        })
-    }
-
-    /// Write a new value to the CPU buffer with proper alignment. Stores the returned offset value
-    /// in the buffer for future use.
-    pub fn push(&mut self, value: &T) {
-        //this write operation on the cpu buffer will adjust for uniform alignment requirements
-        let offset = self.cpu.write(value);
-        self.offsets.push(offset);
-    }
-
-    /// Resize buffer contents if necessary. This will re-create the GPU buffer if current size is
-    /// less than the newly computed size from the CPU buffer.
-    ///
-    /// If the gpu buffer is resized, its bind group will need to be recreated!
-    pub fn resize(&mut self, device: &wgpu::Device) -> bool {
-        let new_size = self.cpu.get_ref().len() as u64;
-
-        if self.size < new_size {
-            let usages = match self.cpu {
-                Internal::Uniform(_) => {
-                    wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST
-                }
-                #[cfg(not(target_arch = "wasm32"))]
-                Internal::Storage(_) => {
-                    wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_DST
-                }
-            };
-
-            self.gpu = Buffer::<T>::create_gpu_buffer(
-                device, self.label, usages, new_size,
-            );
-            self.size = new_size;
-            true
-        } else {
-            false
-        }
-    }
-
-    /// Write the contents of this dynamic buffer to the GPU via staging belt command.
-    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.
-    pub fn offset_at_index(&self, index: usize) -> wgpu::DynamicOffset {
-        let offset = self
-            .offsets
-            .get(index)
-            .copied()
-            .expect("Index not found in offsets.");
-
-        offset
-    }
-
-    /// Returns a reference to the GPU buffer.
-    pub fn raw(&self) -> &wgpu::Buffer {
-        &self.gpu
-    }
-
-    /// Reset the buffer.
-    pub fn clear(&mut self) {
-        self.offsets.clear();
-        self.cpu.clear();
-    }
-}
-
-// Currently supported dynamic buffers.
-enum Internal {
-    Uniform(encase::DynamicUniformBuffer<Vec<u8>>),
-    #[cfg(not(target_arch = "wasm32"))]
-    //storage buffers are not supported on wgpu wasm target (yet)
-    Storage(encase::DynamicStorageBuffer<Vec<u8>>),
-}
-
-impl Internal {
-    /// Writes the current value to its CPU buffer with proper alignment.
-    pub(super) fn write<T: ShaderType + WriteInto>(
-        &mut self,
-        value: &T,
-    ) -> wgpu::DynamicOffset {
-        match self {
-            Internal::Uniform(buf) => buf
-                .write(value)
-                .expect("Error when writing to dynamic uniform buffer.")
-                as u32,
-            #[cfg(not(target_arch = "wasm32"))]
-            Internal::Storage(buf) => buf
-                .write(value)
-                .expect("Error when writing to dynamic storage buffer.")
-                as u32,
-        }
-    }
-
-    /// Returns bytearray of aligned CPU buffer.
-    pub(super) fn get_ref(&self) -> &[u8] {
-        match self {
-            Internal::Uniform(buf) => buf.as_ref(),
-            #[cfg(not(target_arch = "wasm32"))]
-            Internal::Storage(buf) => buf.as_ref(),
-        }
-    }
-
-    /// Resets the CPU buffer.
-    pub(super) fn clear(&mut self) {
-        match self {
-            Internal::Uniform(buf) => {
-                buf.as_mut().clear();
-                buf.set_offset(0);
-            }
-            #[cfg(not(target_arch = "wasm32"))]
-            Internal::Storage(buf) => {
-                buf.as_mut().clear();
-                buf.set_offset(0);
-            }
-        }
-    }
-}
-
-impl fmt::Debug for Internal {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Uniform(_) => write!(f, "Internal::Uniform(_)"),
-            #[cfg(not(target_arch = "wasm32"))]
-            Self::Storage(_) => write!(f, "Internal::Storage(_)"),
-        }
-    }
-}
diff --git a/wgpu/src/buffer/static.rs b/wgpu/src/buffer/static.rs
deleted file mode 100644
index d8ae116e..00000000
--- a/wgpu/src/buffer/static.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use bytemuck::{Pod, Zeroable};
-use std::marker::PhantomData;
-use std::mem;
-
-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.
-#[derive(Debug)]
-pub struct Buffer<T> {
-    //stored sequentially per mesh iteration; refers to the offset index in the GPU buffer
-    offsets: Vec<wgpu::BufferAddress>,
-    label: &'static str,
-    usages: wgpu::BufferUsages,
-    gpu: wgpu::Buffer,
-    size: wgpu::BufferAddress,
-    _data: PhantomData<T>,
-}
-
-impl<T: Pod + Zeroable> Buffer<T> {
-    /// Initialize a new static buffer.
-    pub fn new(
-        device: &wgpu::Device,
-        label: &'static str,
-        usages: wgpu::BufferUsages,
-    ) -> Self {
-        let size = (mem::size_of::<T>() as u64) * DEFAULT_COUNT;
-
-        Self {
-            offsets: Vec::new(),
-            label,
-            usages,
-            gpu: Self::gpu_buffer(device, label, size, usages),
-            size,
-            _data: PhantomData,
-        }
-    }
-
-    fn gpu_buffer(
-        device: &wgpu::Device,
-        label: &'static str,
-        size: wgpu::BufferAddress,
-        usage: wgpu::BufferUsages,
-    ) -> wgpu::Buffer {
-        device.create_buffer(&wgpu::BufferDescriptor {
-            label: Some(label),
-            size,
-            usage,
-            mapped_at_creation: false,
-        })
-    }
-
-    /// Returns whether or not the buffer needs to be recreated. This can happen whenever mesh data
-    /// changes & a redraw is requested.
-    pub fn resize(&mut self, device: &wgpu::Device, new_count: usize) -> bool {
-        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();
-            true
-        } else {
-            false
-        }
-    }
-
-    /// Writes the current vertex data to the gpu buffer with a memcpy & stores its offset.
-    ///
-    /// Returns the size of the written bytes.
-    pub fn write(
-        &mut self,
-        queue: &wgpu::Queue,
-        offset: u64,
-        content: &[T],
-    ) -> u64 {
-        let bytes = bytemuck::cast_slice(content);
-        let bytes_size = bytes.len() as u64;
-
-        queue.write_buffer(&self.gpu, offset, bytes);
-        self.offsets.push(offset);
-
-        bytes_size
-    }
-
-    fn offset_at(&self, index: usize) -> &wgpu::BufferAddress {
-        self.offsets
-            .get(index)
-            .expect("Offset at index does not exist.")
-    }
-
-    /// Returns the slice calculated from the offset stored at the given index.
-    /// e.g. to calculate the slice for the 2nd mesh in the layer, this would be the offset at index
-    /// 1 that we stored earlier when writing.
-    pub fn slice_from_index(&self, index: usize) -> wgpu::BufferSlice<'_> {
-        self.gpu.slice(self.offset_at(index)..)
-    }
-
-    /// Clears any temporary data from the buffer.
-    pub fn clear(&mut self) {
-        self.offsets.clear()
-    }
-}
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 7e17a7ad..e26d9278 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -1,10 +1,11 @@
 //! Build and draw geometry.
-use crate::core::{Gradient, Point, Rectangle, Size, Vector};
+use crate::core::{Point, Rectangle, Size, Vector};
 use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
 use crate::graphics::primitive::{self, Primitive};
+use crate::graphics::Gradient;
 
 use lyon::geom::euclid;
 use lyon::tessellation;
@@ -23,10 +24,7 @@ pub struct Frame {
 
 enum Buffer {
     Solid(tessellation::VertexBuffers<primitive::ColoredVertex2D, u32>),
-    Gradient(
-        tessellation::VertexBuffers<primitive::Vertex2D, u32>,
-        Gradient,
-    ),
+    Gradient(tessellation::VertexBuffers<primitive::GradientVertex2D, u32>),
 }
 
 struct BufferStack {
@@ -48,12 +46,11 @@ impl BufferStack {
                     ));
                 }
             },
-            Style::Gradient(gradient) => match self.stack.last() {
-                Some(Buffer::Gradient(_, last)) if gradient == last => {}
+            Style::Gradient(_) => match self.stack.last() {
+                Some(Buffer::Gradient(_)) => {}
                 _ => {
                     self.stack.push(Buffer::Gradient(
                         tessellation::VertexBuffers::new(),
-                        gradient.clone(),
                     ));
                 }
             },
@@ -73,9 +70,14 @@ impl BufferStack {
                     TriangleVertex2DBuilder(color.into_linear()),
                 ))
             }
-            (Style::Gradient(_), Buffer::Gradient(buffer, _)) => Box::new(
-                tessellation::BuffersBuilder::new(buffer, Vertex2DBuilder),
-            ),
+            (Style::Gradient(gradient), Buffer::Gradient(buffer)) => {
+                Box::new(tessellation::BuffersBuilder::new(
+                    buffer,
+                    GradientVertex2DBuilder {
+                        gradient: gradient.clone(),
+                    },
+                ))
+            }
             _ => unreachable!(),
         }
     }
@@ -91,9 +93,14 @@ impl BufferStack {
                     TriangleVertex2DBuilder(color.into_linear()),
                 ))
             }
-            (Style::Gradient(_), Buffer::Gradient(buffer, _)) => Box::new(
-                tessellation::BuffersBuilder::new(buffer, Vertex2DBuilder),
-            ),
+            (Style::Gradient(gradient), Buffer::Gradient(buffer)) => {
+                Box::new(tessellation::BuffersBuilder::new(
+                    buffer,
+                    GradientVertex2DBuilder {
+                        gradient: gradient.clone(),
+                    },
+                ))
+            }
             _ => unreachable!(),
         }
     }
@@ -131,11 +138,13 @@ impl Transform {
     }
 
     fn transform_gradient(&self, mut gradient: Gradient) -> Gradient {
-        let (start, end) = match &mut gradient {
-            Gradient::Linear(linear) => (&mut linear.start, &mut linear.end),
-        };
-        self.transform_point(start);
-        self.transform_point(end);
+        match &mut gradient {
+            Gradient::Linear(linear) => {
+                self.transform_point(&mut linear.start);
+                self.transform_point(&mut linear.end);
+            }
+        }
+
         gradient
     }
 }
@@ -462,7 +471,7 @@ impl Frame {
                         })
                     }
                 }
-                Buffer::Gradient(buffer, gradient) => {
+                Buffer::Gradient(buffer) => {
                     if !buffer.indices.is_empty() {
                         self.primitives.push(Primitive::GradientMesh {
                             buffers: primitive::Mesh2D {
@@ -470,7 +479,6 @@ impl Frame {
                                 indices: buffer.indices,
                             },
                             size: self.size,
-                            gradient,
                         })
                     }
                 }
@@ -481,34 +489,38 @@ impl Frame {
     }
 }
 
-struct Vertex2DBuilder;
+struct GradientVertex2DBuilder {
+    gradient: Gradient,
+}
 
-impl tessellation::FillVertexConstructor<primitive::Vertex2D>
-    for Vertex2DBuilder
+impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
+    for GradientVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::FillVertex<'_>,
-    ) -> primitive::Vertex2D {
+    ) -> primitive::GradientVertex2D {
         let position = vertex.position();
 
-        primitive::Vertex2D {
+        primitive::GradientVertex2D {
             position: [position.x, position.y],
+            gradient: pack_gradient(&self.gradient),
         }
     }
 }
 
-impl tessellation::StrokeVertexConstructor<primitive::Vertex2D>
-    for Vertex2DBuilder
+impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
+    for GradientVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::StrokeVertex<'_, '_>,
-    ) -> primitive::Vertex2D {
+    ) -> primitive::GradientVertex2D {
         let position = vertex.position();
 
-        primitive::Vertex2D {
+        primitive::GradientVertex2D {
             position: [position.x, position.y],
+            gradient: pack_gradient(&self.gradient),
         }
     }
 }
@@ -611,3 +623,42 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
         );
     })
 }
+
+/// Packs the [`Gradient`] for use in shader code.
+fn pack_gradient(gradient: &Gradient) -> [f32; 44] {
+    match gradient {
+        Gradient::Linear(linear) => {
+            let mut pack: [f32; 44] = [0.0; 44];
+            let mut offsets: [f32; 8] = [2.0; 8];
+
+            for (index, stop) in linear.color_stops.iter().enumerate() {
+                let [r, g, b, a] = stop
+                    .map_or(crate::core::Color::default(), |s| s.color)
+                    .into_linear();
+
+                pack[index * 4] = r;
+                pack[(index * 4) + 1] = g;
+                pack[(index * 4) + 2] = b;
+                pack[(index * 4) + 3] = a;
+
+                offsets[index] = stop.map_or(2.0, |s| s.offset);
+            }
+
+            pack[32] = offsets[0];
+            pack[33] = offsets[1];
+            pack[34] = offsets[2];
+            pack[35] = offsets[3];
+            pack[36] = offsets[4];
+            pack[37] = offsets[5];
+            pack[38] = offsets[6];
+            pack[39] = offsets[7];
+
+            pack[40] = linear.start.x;
+            pack[41] = linear.start.y;
+            pack[42] = linear.end.x;
+            pack[43] = linear.end.y;
+
+            pack
+        }
+    }
+}
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 263bcfa2..6fe02b91 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -8,10 +8,10 @@ mod vector;
 
 use atlas::Atlas;
 
+use crate::buffer::Buffer;
 use crate::core::{Rectangle, Size};
 use crate::graphics::Transformation;
-use crate::layer;
-use crate::Buffer;
+use crate::{layer, quad};
 
 use std::cell::RefCell;
 use std::mem;
@@ -121,7 +121,7 @@ impl Layer {
         );
 
         let _ = self.instances.resize(device, instances.len());
-        self.instances.write(queue, 0, instances);
+        let _ = self.instances.write(queue, 0, instances);
 
         self.instance_count = instances.len();
     }
@@ -131,7 +131,7 @@ impl Layer {
         render_pass.set_vertex_buffer(1, self.instances.slice(..));
 
         render_pass.draw_indexed(
-            0..QUAD_INDICES.len() as u32,
+            0..quad::INDICES.len() as u32,
             0,
             0..self.instance_count as u32,
         );
@@ -244,22 +244,7 @@ impl Pipeline {
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
                     entry_point: "fs_main",
-                    targets: &[Some(wgpu::ColorTargetState {
-                        format,
-                        blend: Some(wgpu::BlendState {
-                            color: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::SrcAlpha,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                            alpha: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::One,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                        }),
-                        write_mask: wgpu::ColorWrites::ALL,
-                    })],
+                    targets: &quad::color_target_state(format),
                 }),
                 primitive: wgpu::PrimitiveState {
                     topology: wgpu::PrimitiveTopology::TriangleList,
@@ -278,14 +263,14 @@ impl Pipeline {
         let vertices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::image vertex buffer"),
-                contents: bytemuck::cast_slice(&QUAD_VERTS),
+                contents: bytemuck::cast_slice(&quad::VERTICES),
                 usage: wgpu::BufferUsages::VERTEX,
             });
 
         let indices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::image index buffer"),
-                contents: bytemuck::cast_slice(&QUAD_INDICES),
+                contents: bytemuck::cast_slice(&quad::INDICES),
                 usage: wgpu::BufferUsages::INDEX,
             });
 
@@ -498,23 +483,6 @@ pub struct Vertex {
     _position: [f32; 2],
 }
 
-const QUAD_INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
-
-const QUAD_VERTS: [Vertex; 4] = [
-    Vertex {
-        _position: [0.0, 0.0],
-    },
-    Vertex {
-        _position: [1.0, 0.0],
-    },
-    Vertex {
-        _position: [1.0, 1.0],
-    },
-    Vertex {
-        _position: [0.0, 1.0],
-    },
-];
-
 #[repr(C)]
 #[derive(Debug, Clone, Copy, Zeroable, Pod)]
 struct Instance {
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 8af72b9d..b3ee4739 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -1,13 +1,13 @@
 //! Organize rendering primitives into a flattened list of layers.
 mod image;
-mod quad;
 mod text;
 
 pub mod mesh;
+pub mod quad;
 
 pub use image::Image;
 pub use mesh::Mesh;
-pub use quad::Quad;
+use quad::Quad;
 pub use text::Text;
 
 use crate::core;
@@ -22,7 +22,7 @@ pub struct Layer<'a> {
     pub bounds: Rectangle,
 
     /// The quads of the [`Layer`].
-    pub quads: Vec<Quad>,
+    pub quads: Quads,
 
     /// The triangle meshes of the [`Layer`].
     pub meshes: Vec<Mesh<'a>>,
@@ -34,12 +34,29 @@ pub struct Layer<'a> {
     pub images: Vec<Image>,
 }
 
+/// The quads of the [`Layer`].
+#[derive(Default, Debug)]
+pub struct Quads {
+    /// The solid quads of the [`Layer`].
+    pub solids: Vec<quad::Solid>,
+
+    /// The gradient quads of the [`Layer`].
+    pub gradients: Vec<quad::Gradient>,
+}
+
+impl Quads {
+    /// Returns true if there are no quads of any type in [`Quads`].
+    pub fn is_empty(&self) -> bool {
+        self.solids.is_empty() && self.gradients.is_empty()
+    }
+}
+
 impl<'a> Layer<'a> {
     /// Creates a new [`Layer`] with the given clipping bounds.
     pub fn new(bounds: Rectangle) -> Self {
         Self {
             bounds,
-            quads: Vec::new(),
+            quads: Quads::default(),
             meshes: Vec::new(),
             text: Vec::new(),
             images: Vec::new(),
@@ -145,20 +162,39 @@ impl<'a> Layer<'a> {
             } => {
                 let layer = &mut layers[current_layer];
 
-                // TODO: Move some of these computations to the GPU (?)
-                layer.quads.push(Quad {
+                let quad = Quad {
                     position: [
                         bounds.x + translation.x,
                         bounds.y + translation.y,
                     ],
                     size: [bounds.width, bounds.height],
-                    color: match background {
-                        Background::Color(color) => color.into_linear(),
-                    },
+                    border_color: border_color.into_linear(),
                     border_radius: *border_radius,
                     border_width: *border_width,
-                    border_color: border_color.into_linear(),
-                });
+                };
+
+                match background {
+                    Background::Color(color) => {
+                        layer.quads.solids.push(quad::Solid {
+                            color: color.into_linear(),
+                            quad,
+                        });
+                    }
+                    Background::Gradient(gradient) => {
+                        let quad = quad::Gradient {
+                            gradient: pack_gradient(
+                                gradient,
+                                Rectangle::new(
+                                    quad.position.into(),
+                                    quad.size.into(),
+                                ),
+                            ),
+                            quad,
+                        };
+
+                        layer.quads.gradients.push(quad);
+                    }
+                };
             }
             Primitive::Image { handle, bounds } => {
                 let layer = &mut layers[current_layer];
@@ -198,11 +234,7 @@ impl<'a> Layer<'a> {
                     });
                 }
             }
-            Primitive::GradientMesh {
-                buffers,
-                size,
-                gradient,
-            } => {
+            Primitive::GradientMesh { buffers, size } => {
                 let layer = &mut layers[current_layer];
 
                 let bounds = Rectangle::new(
@@ -216,7 +248,6 @@ impl<'a> Layer<'a> {
                         origin: Point::new(translation.x, translation.y),
                         buffers,
                         clip_bounds,
-                        gradient,
                     });
                 }
             }
@@ -279,3 +310,32 @@ impl<'a> Layer<'a> {
         }
     }
 }
+
+/// Packs the [`Gradient`] for use in shader code.
+fn pack_gradient(gradient: &core::Gradient, bounds: Rectangle) -> [f32; 44] {
+    match gradient {
+        core::Gradient::Linear(linear) => {
+            let mut pack: [f32; 44] = [0.0; 44];
+
+            for (index, stop) in linear.color_stops.iter().enumerate() {
+                let [r, g, b, a] =
+                    stop.map_or(Color::default(), |s| s.color).into_linear();
+
+                pack[index * 4] = r;
+                pack[(index * 4) + 1] = g;
+                pack[(index * 4) + 2] = b;
+                pack[(index * 4) + 3] = a;
+                pack[32 + index] = stop.map_or(2.0, |s| s.offset);
+            }
+
+            let (start, end) = linear.angle.to_distance(&bounds);
+
+            pack[40] = start.x;
+            pack[41] = start.y;
+            pack[42] = end.x;
+            pack[43] = end.y;
+
+            pack
+        }
+    }
+}
diff --git a/wgpu/src/layer/mesh.rs b/wgpu/src/layer/mesh.rs
index 9dd14391..b7dd9a0b 100644
--- a/wgpu/src/layer/mesh.rs
+++ b/wgpu/src/layer/mesh.rs
@@ -1,5 +1,5 @@
 //! A collection of triangle primitives.
-use crate::core::{Gradient, Point, Rectangle};
+use crate::core::{Point, Rectangle};
 use crate::graphics::primitive;
 
 /// A mesh of triangles.
@@ -22,13 +22,10 @@ pub enum Mesh<'a> {
         origin: Point,
 
         /// The vertex and index buffers of the [`Mesh`].
-        buffers: &'a primitive::Mesh2D<primitive::Vertex2D>,
+        buffers: &'a primitive::Mesh2D<primitive::GradientVertex2D>,
 
         /// The clipping bounds of the [`Mesh`].
         clip_bounds: Rectangle<f32>,
-
-        /// The gradient to apply to the [`Mesh`].
-        gradient: &'a Gradient,
     },
 }
 
@@ -65,9 +62,15 @@ pub struct AttributeCount {
     /// The total amount of solid vertices.
     pub solid_vertices: usize,
 
+    /// The total amount of solid meshes.
+    pub solids: usize,
+
     /// The total amount of gradient vertices.
     pub gradient_vertices: usize,
 
+    /// The total amount of gradient meshes.
+    pub gradients: usize,
+
     /// The total amount of indices.
     pub indices: usize,
 }
@@ -79,10 +82,12 @@ pub fn attribute_count_of<'a>(meshes: &'a [Mesh<'a>]) -> AttributeCount {
         .fold(AttributeCount::default(), |mut count, mesh| {
             match mesh {
                 Mesh::Solid { buffers, .. } => {
+                    count.solids += 1;
                     count.solid_vertices += buffers.vertices.len();
                     count.indices += buffers.indices.len();
                 }
                 Mesh::Gradient { buffers, .. } => {
+                    count.gradients += 1;
                     count.gradient_vertices += buffers.vertices.len();
                     count.indices += buffers.indices.len();
                 }
diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs
index 0d8bde9d..9913cfe0 100644
--- a/wgpu/src/layer/quad.rs
+++ b/wgpu/src/layer/quad.rs
@@ -1,7 +1,9 @@
-/// A colored rectangle with a border.
-///
-/// This type can be directly uploaded to GPU memory.
-#[derive(Debug, Clone, Copy)]
+//! A rectangle with certain styled properties.
+
+use bytemuck::{Pod, Zeroable};
+
+/// The properties of a quad.
+#[derive(Clone, Copy, Debug, Pod, Zeroable)]
 #[repr(C)]
 pub struct Quad {
     /// The position of the [`Quad`].
@@ -10,21 +12,40 @@ pub struct Quad {
     /// The size of the [`Quad`].
     pub size: [f32; 2],
 
-    /// The color of the [`Quad`], in __linear RGB__.
-    pub color: [f32; 4],
-
     /// The border color of the [`Quad`], in __linear RGB__.
     pub border_color: [f32; 4],
 
-    /// The border radius of the [`Quad`].
+    /// The border radii of the [`Quad`].
     pub border_radius: [f32; 4],
 
     /// The border width of the [`Quad`].
     pub border_width: f32,
 }
 
-#[allow(unsafe_code)]
-unsafe impl bytemuck::Zeroable for Quad {}
+/// A quad filled with a solid color.
+#[derive(Clone, Copy, Debug, Pod, Zeroable)]
+#[repr(C)]
+pub struct Solid {
+    /// The background color data of the quad.
+    pub color: [f32; 4],
+
+    /// The [`Quad`] data of the [`Solid`].
+    pub quad: Quad,
+}
+
+/// A quad filled with interpolated colors.
+#[derive(Clone, Copy, Debug)]
+#[repr(C)]
+pub struct Gradient {
+    /// The background gradient data of the quad.
+    pub gradient: [f32; 44],
+
+    /// The [`Quad`] data of the [`Gradient`].
+    pub quad: Quad,
+}
 
 #[allow(unsafe_code)]
-unsafe impl bytemuck::Pod for Quad {}
+unsafe impl Pod for Gradient {}
+
+#[allow(unsafe_code)]
+unsafe impl Zeroable for Gradient {}
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 4a92c345..c05280a6 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -59,8 +59,6 @@ pub use backend::Backend;
 pub use layer::Layer;
 pub use settings::Settings;
 
-use buffer::Buffer;
-
 #[cfg(any(feature = "image", feature = "svg"))]
 mod image;
 
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 8fa7359e..31bf2b85 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,18 +1,19 @@
 use crate::core::Rectangle;
 use crate::graphics::Transformation;
 use crate::layer;
-use crate::Buffer;
 
-use bytemuck::{Pod, Zeroable};
 use std::mem;
 use wgpu::util::DeviceExt;
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
 
+const INITIAL_INSTANCES: usize = 10_000;
+
 #[derive(Debug)]
 pub struct Pipeline {
-    pipeline: wgpu::RenderPipeline,
+    solid: solid::Pipeline,
+    gradient: gradient::Pipeline,
     constant_layout: wgpu::BindGroupLayout,
     vertices: wgpu::Buffer,
     indices: wgpu::Buffer,
@@ -39,107 +40,28 @@ impl Pipeline {
                 }],
             });
 
-        let layout =
-            device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                label: Some("iced_wgpu::quad pipeline layout"),
-                push_constant_ranges: &[],
-                bind_group_layouts: &[&constant_layout],
-            });
-
-        let shader =
-            device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu quad shader"),
-                source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
-                    include_str!("shader/quad.wgsl"),
-                )),
-            });
-
-        let pipeline =
-            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
-                label: Some("iced_wgpu::quad pipeline"),
-                layout: Some(&layout),
-                vertex: wgpu::VertexState {
-                    module: &shader,
-                    entry_point: "vs_main",
-                    buffers: &[
-                        wgpu::VertexBufferLayout {
-                            array_stride: mem::size_of::<Vertex>() as u64,
-                            step_mode: wgpu::VertexStepMode::Vertex,
-                            attributes: &[wgpu::VertexAttribute {
-                                shader_location: 0,
-                                format: wgpu::VertexFormat::Float32x2,
-                                offset: 0,
-                            }],
-                        },
-                        wgpu::VertexBufferLayout {
-                            array_stride: mem::size_of::<layer::Quad>() as u64,
-                            step_mode: wgpu::VertexStepMode::Instance,
-                            attributes: &wgpu::vertex_attr_array!(
-                                1 => Float32x2,
-                                2 => Float32x2,
-                                3 => Float32x4,
-                                4 => Float32x4,
-                                5 => Float32x4,
-                                6 => Float32,
-                            ),
-                        },
-                    ],
-                },
-                fragment: Some(wgpu::FragmentState {
-                    module: &shader,
-                    entry_point: "fs_main",
-                    targets: &[Some(wgpu::ColorTargetState {
-                        format,
-                        blend: Some(wgpu::BlendState {
-                            color: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::SrcAlpha,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                            alpha: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::One,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                        }),
-                        write_mask: wgpu::ColorWrites::ALL,
-                    })],
-                }),
-                primitive: wgpu::PrimitiveState {
-                    topology: wgpu::PrimitiveTopology::TriangleList,
-                    front_face: wgpu::FrontFace::Cw,
-                    ..Default::default()
-                },
-                depth_stencil: None,
-                multisample: wgpu::MultisampleState {
-                    count: 1,
-                    mask: !0,
-                    alpha_to_coverage_enabled: false,
-                },
-                multiview: None,
-            });
-
         let vertices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::quad vertex buffer"),
-                contents: bytemuck::cast_slice(&QUAD_VERTS),
+                contents: bytemuck::cast_slice(&VERTICES),
                 usage: wgpu::BufferUsages::VERTEX,
             });
 
         let indices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::quad index buffer"),
-                contents: bytemuck::cast_slice(&QUAD_INDICES),
+                contents: bytemuck::cast_slice(&INDICES),
                 usage: wgpu::BufferUsages::INDEX,
             });
 
-        Pipeline {
-            pipeline,
-            constant_layout,
+        Self {
             vertices,
             indices,
+            solid: solid::Pipeline::new(device, format, &constant_layout),
+            gradient: gradient::Pipeline::new(device, format, &constant_layout),
             layers: Vec::new(),
             prepare_layer: 0,
+            constant_layout,
         }
     }
 
@@ -147,7 +69,7 @@ impl Pipeline {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        instances: &[layer::Quad],
+        instances: &layer::Quads,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -168,22 +90,27 @@ impl Pipeline {
         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(..));
 
-            layer.draw(render_pass);
+            if layer.solid.instance_count > 0 {
+                render_pass.set_pipeline(&self.solid.pipeline);
+                layer.solid.draw(&layer.constants, render_pass);
+            }
+
+            if layer.gradient.instance_count > 0 {
+                render_pass.set_pipeline(&self.gradient.pipeline);
+                layer.gradient.draw(&layer.constants, render_pass);
+            }
         }
     }
 
@@ -196,8 +123,8 @@ impl Pipeline {
 struct Layer {
     constants: wgpu::BindGroup,
     constants_buffer: wgpu::Buffer,
-    instances: Buffer<layer::Quad>,
-    instance_count: usize,
+    solid: solid::Layer,
+    gradient: gradient::Layer,
 }
 
 impl Layer {
@@ -221,18 +148,11 @@ impl Layer {
             }],
         });
 
-        let instances = Buffer::new(
-            device,
-            "iced_wgpu::quad instance buffer",
-            INITIAL_INSTANCES,
-            wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-        );
-
         Self {
             constants,
             constants_buffer,
-            instances,
-            instance_count: 0,
+            solid: solid::Layer::new(device),
+            gradient: gradient::Layer::new(device),
         }
     }
 
@@ -240,7 +160,7 @@ impl Layer {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        instances: &[layer::Quad],
+        instances: &layer::Quads,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -255,35 +175,350 @@ impl Layer {
             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,
+        let _ = self.solid.instances.resize(device, instances.solids.len());
+        let _ = self
+            .gradient
+            .instances
+            .resize(device, instances.gradients.len());
+        let _ =
+            self.solid
+                .instances
+                .write(queue, 0, instances.solids.as_slice());
+        self.solid.instance_count = instances.solids.len();
+        let _ = self.gradient.instances.write(
+            queue,
             0,
-            0..self.instance_count as u32,
+            instances.gradients.as_slice(),
         );
+        self.gradient.instance_count = instances.gradients.len();
     }
 }
 
+mod solid {
+    use crate::buffer::Buffer;
+    use crate::layer::quad;
+    use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
+
+    #[derive(Debug)]
+    pub struct Pipeline {
+        pub pipeline: wgpu::RenderPipeline,
+    }
+
+    #[derive(Debug)]
+    pub struct Layer {
+        pub instances: Buffer<quad::Solid>,
+        pub instance_count: usize,
+    }
+
+    impl Layer {
+        pub fn new(device: &wgpu::Device) -> Self {
+            let instances = Buffer::new(
+                device,
+                "iced_wgpu.quad.solid.buffer",
+                INITIAL_INSTANCES,
+                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+            );
+
+            Self {
+                instances,
+                instance_count: 0,
+            }
+        }
+
+        pub fn draw<'a>(
+            &'a self,
+            constants: &'a wgpu::BindGroup,
+            render_pass: &mut wgpu::RenderPass<'a>,
+        ) {
+            #[cfg(feature = "tracing")]
+            let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
+
+            render_pass.set_bind_group(0, constants, &[]);
+            render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+            render_pass.draw_indexed(
+                0..INDICES.len() as u32,
+                0,
+                0..self.instance_count as u32,
+            );
+        }
+    }
+
+    impl Pipeline {
+        pub fn new(
+            device: &wgpu::Device,
+            format: wgpu::TextureFormat,
+            constants_layout: &wgpu::BindGroupLayout,
+        ) -> Self {
+            let layout = device.create_pipeline_layout(
+                &wgpu::PipelineLayoutDescriptor {
+                    label: Some("iced_wgpu.quad.solid.pipeline"),
+                    push_constant_ranges: &[],
+                    bind_group_layouts: &[constants_layout],
+                },
+            );
+
+            let shader =
+                device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                    label: Some("iced_wgpu.quad.solid.shader"),
+                    source: wgpu::ShaderSource::Wgsl(
+                        std::borrow::Cow::Borrowed(include_str!(
+                            "shader/quad.wgsl"
+                        )),
+                    ),
+                });
+
+            let pipeline = device.create_render_pipeline(
+                &wgpu::RenderPipelineDescriptor {
+                    label: Some("iced_wgpu.quad.solid.pipeline"),
+                    layout: Some(&layout),
+                    vertex: wgpu::VertexState {
+                        module: &shader,
+                        entry_point: "solid_vs_main",
+                        buffers: &[
+                            Vertex::buffer_layout(),
+                            wgpu::VertexBufferLayout {
+                                array_stride: std::mem::size_of::<quad::Solid>()
+                                    as u64,
+                                step_mode: wgpu::VertexStepMode::Instance,
+                                attributes: &wgpu::vertex_attr_array!(
+                                    // Color
+                                    1 => Float32x4,
+                                    // Position
+                                    2 => Float32x2,
+                                    // Size
+                                    3 => Float32x2,
+                                    // Border color
+                                    4 => Float32x4,
+                                    // Border radius
+                                    5 => Float32x4,
+                                    // Border width
+                                    6 => Float32,
+                                ),
+                            },
+                        ],
+                    },
+                    fragment: Some(wgpu::FragmentState {
+                        module: &shader,
+                        entry_point: "solid_fs_main",
+                        targets: &color_target_state(format),
+                    }),
+                    primitive: wgpu::PrimitiveState {
+                        topology: wgpu::PrimitiveTopology::TriangleList,
+                        front_face: wgpu::FrontFace::Cw,
+                        ..Default::default()
+                    },
+                    depth_stencil: None,
+                    multisample: wgpu::MultisampleState {
+                        count: 1,
+                        mask: !0,
+                        alpha_to_coverage_enabled: false,
+                    },
+                    multiview: None,
+                },
+            );
+
+            Self { pipeline }
+        }
+    }
+}
+
+mod gradient {
+    use crate::buffer::Buffer;
+    use crate::layer::quad;
+    use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
+
+    #[derive(Debug)]
+    pub struct Pipeline {
+        pub pipeline: wgpu::RenderPipeline,
+    }
+
+    #[derive(Debug)]
+    pub struct Layer {
+        pub instances: Buffer<quad::Gradient>,
+        pub instance_count: usize,
+    }
+
+    impl Layer {
+        pub fn new(device: &wgpu::Device) -> Self {
+            let instances = Buffer::new(
+                device,
+                "iced_wgpu.quad.gradient.buffer",
+                INITIAL_INSTANCES,
+                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+            );
+
+            Self {
+                instances,
+                instance_count: 0,
+            }
+        }
+
+        pub fn draw<'a>(
+            &'a self,
+            constants: &'a wgpu::BindGroup,
+            render_pass: &mut wgpu::RenderPass<'a>,
+        ) {
+            #[cfg(feature = "tracing")]
+            let _ =
+                tracing::info_span!("Wgpu::Quad::Gradient", "DRAW").entered();
+
+            render_pass.set_bind_group(0, constants, &[]);
+            render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+            render_pass.draw_indexed(
+                0..INDICES.len() as u32,
+                0,
+                0..self.instance_count as u32,
+            );
+        }
+    }
+
+    impl Pipeline {
+        pub fn new(
+            device: &wgpu::Device,
+            format: wgpu::TextureFormat,
+            constants_layout: &wgpu::BindGroupLayout,
+        ) -> Self {
+            let layout = device.create_pipeline_layout(
+                &wgpu::PipelineLayoutDescriptor {
+                    label: Some("iced_wgpu.quad.gradient.pipeline"),
+                    push_constant_ranges: &[],
+                    bind_group_layouts: &[constants_layout],
+                },
+            );
+
+            let shader =
+                device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                    label: Some("iced_wgpu.quad.gradient.shader"),
+                    source: wgpu::ShaderSource::Wgsl(
+                        std::borrow::Cow::Borrowed(include_str!(
+                            "shader/quad.wgsl"
+                        )),
+                    ),
+                });
+
+            let pipeline =
+                device.create_render_pipeline(
+                    &wgpu::RenderPipelineDescriptor {
+                        label: Some("iced_wgpu.quad.gradient.pipeline"),
+                        layout: Some(&layout),
+                        vertex: wgpu::VertexState {
+                            module: &shader,
+                            entry_point: "gradient_vs_main",
+                            buffers: &[
+                                Vertex::buffer_layout(),
+                                wgpu::VertexBufferLayout {
+                                    array_stride: std::mem::size_of::<
+                                        quad::Gradient,
+                                    >(
+                                    )
+                                        as u64,
+                                    step_mode: wgpu::VertexStepMode::Instance,
+                                    attributes: &wgpu::vertex_attr_array!(
+                                        // Color 1
+                                        1 => Float32x4,
+                                        // Color 2
+                                        2 => Float32x4,
+                                        // Color 3
+                                        3 => Float32x4,
+                                        // Color 4
+                                        4 => Float32x4,
+                                        // Color 5
+                                        5 => Float32x4,
+                                        // Color 6
+                                        6 => Float32x4,
+                                        // Color 7
+                                        7 => Float32x4,
+                                        // Color 8
+                                        8 => Float32x4,
+                                        // Offsets 1-4
+                                        9 => Float32x4,
+                                        // Offsets 5-8
+                                        10 => Float32x4,
+                                        // Direction
+                                        11 => Float32x4,
+                                        // Position & Scale
+                                        12 => Float32x4,
+                                        // Border color
+                                        13 => Float32x4,
+                                        // Border radius
+                                        14 => Float32x4,
+                                        // Border width
+                                        15 => Float32
+                                    ),
+                                },
+                            ],
+                        },
+                        fragment: Some(wgpu::FragmentState {
+                            module: &shader,
+                            entry_point: "gradient_fs_main",
+                            targets: &color_target_state(format),
+                        }),
+                        primitive: wgpu::PrimitiveState {
+                            topology: wgpu::PrimitiveTopology::TriangleList,
+                            front_face: wgpu::FrontFace::Cw,
+                            ..Default::default()
+                        },
+                        depth_stencil: None,
+                        multisample: wgpu::MultisampleState {
+                            count: 1,
+                            mask: !0,
+                            alpha_to_coverage_enabled: false,
+                        },
+                        multiview: None,
+                    },
+                );
+
+            Self { pipeline }
+        }
+    }
+}
+
+pub(crate) fn color_target_state(
+    format: wgpu::TextureFormat,
+) -> [Option<wgpu::ColorTargetState>; 1] {
+    [Some(wgpu::ColorTargetState {
+        format,
+        blend: Some(wgpu::BlendState {
+            color: wgpu::BlendComponent {
+                src_factor: wgpu::BlendFactor::SrcAlpha,
+                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                operation: wgpu::BlendOperation::Add,
+            },
+            alpha: wgpu::BlendComponent {
+                src_factor: wgpu::BlendFactor::One,
+                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                operation: wgpu::BlendOperation::Add,
+            },
+        }),
+        write_mask: wgpu::ColorWrites::ALL,
+    })]
+}
+
 #[repr(C)]
-#[derive(Clone, Copy, Zeroable, Pod)]
+#[derive(Clone, Copy, bytemuck::Zeroable, bytemuck::Pod)]
 pub struct Vertex {
     _position: [f32; 2],
 }
 
-const QUAD_INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
+impl Vertex {
+    fn buffer_layout<'a>() -> wgpu::VertexBufferLayout<'a> {
+        wgpu::VertexBufferLayout {
+            array_stride: mem::size_of::<Self>() as u64,
+            step_mode: wgpu::VertexStepMode::Vertex,
+            attributes: &[wgpu::VertexAttribute {
+                shader_location: 0,
+                format: wgpu::VertexFormat::Float32x2,
+                offset: 0,
+            }],
+        }
+    }
+}
 
-const QUAD_VERTS: [Vertex; 4] = [
+pub(crate) const INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
+
+pub(crate) const VERTICES: [Vertex; 4] = [
     Vertex {
         _position: [0.0, 0.0],
     },
@@ -298,10 +533,8 @@ const QUAD_VERTS: [Vertex; 4] = [
     },
 ];
 
-const INITIAL_INSTANCES: usize = 10_000;
-
 #[repr(C)]
-#[derive(Debug, Clone, Copy, Zeroable, Pod)]
+#[derive(Debug, Clone, Copy, bytemuck::Zeroable, bytemuck::Pod)]
 struct Uniforms {
     transform: [f32; 16],
     scale: f32,
diff --git a/wgpu/src/shader/gradient.wgsl b/wgpu/src/shader/gradient.wgsl
deleted file mode 100644
index 63825aec..00000000
--- a/wgpu/src/shader/gradient.wgsl
+++ /dev/null
@@ -1,88 +0,0 @@
-struct Uniforms {
-    transform: mat4x4<f32>,
-    //xy = start, wz = end
-    position: vec4<f32>,
-    //x = start stop, y = end stop, zw = padding
-    stop_range: vec4<i32>,
-}
-
-struct Stop {
-    color: vec4<f32>,
-    offset: f32,
-};
-
-@group(0) @binding(0)
-var<uniform> uniforms: Uniforms;
-
-@group(0) @binding(1)
-var<storage, read> color_stops: array<Stop>;
-
-struct VertexOutput {
-    @builtin(position) position: vec4<f32>,
-    @location(0) raw_position: vec2<f32>
-}
-
-@vertex
-fn vs_main(@location(0) input: vec2<f32>) -> VertexOutput {
-    var output: VertexOutput;
-    output.position = uniforms.transform * vec4<f32>(input.xy, 0.0, 1.0);
-    output.raw_position = input;
-
-    return output;
-}
-
-//TODO: rewrite without branching
-@fragment
-fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
-    let start = uniforms.position.xy;
-    let end = uniforms.position.zw;
-    let start_stop = uniforms.stop_range.x;
-    let end_stop = uniforms.stop_range.y;
-
-    let v1 = end - start;
-    let v2 = input.raw_position.xy - start;
-    let unit = normalize(v1);
-    let offset = dot(unit, v2) / length(v1);
-
-    let min_stop = color_stops[start_stop];
-    let max_stop = color_stops[end_stop];
-
-    var color: vec4<f32>;
-
-    if (offset <= min_stop.offset) {
-        color = min_stop.color;
-    } else if (offset >= max_stop.offset) {
-        color = max_stop.color;
-    } else {
-        var min = min_stop;
-        var max = max_stop;
-        var min_index = start_stop;
-        var max_index = end_stop;
-
-        loop {
-            if (min_index >= max_index - 1) {
-                break;
-            }
-
-            let index = min_index + (max_index - min_index) / 2;
-
-            let stop = color_stops[index];
-
-            if (offset <= stop.offset) {
-                max = stop;
-                max_index = index;
-            } else {
-                min = stop;
-                min_index = index;
-            }
-        }
-
-        color = mix(min.color, max.color, smoothstep(
-            min.offset,
-            max.offset,
-            offset
-        ));
-    }
-
-    return color;
-}
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index cf4f7e4d..3232bdbe 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -5,59 +5,6 @@ struct Globals {
 
 @group(0) @binding(0) var<uniform> globals: Globals;
 
-struct VertexInput {
-    @location(0) v_pos: vec2<f32>,
-    @location(1) pos: vec2<f32>,
-    @location(2) scale: vec2<f32>,
-    @location(3) color: vec4<f32>,
-    @location(4) border_color: vec4<f32>,
-    @location(5) border_radius: vec4<f32>,
-    @location(6) border_width: f32,
-}
-
-struct VertexOutput {
-    @builtin(position) position: vec4<f32>,
-    @location(0) color: vec4<f32>,
-    @location(1) border_color: vec4<f32>,
-    @location(2) pos: vec2<f32>,
-    @location(3) scale: vec2<f32>,
-    @location(4) border_radius: vec4<f32>,
-    @location(5) border_width: f32,
-}
-
-@vertex
-fn vs_main(input: VertexInput) -> VertexOutput {
-    var out: VertexOutput;
-
-    var pos: vec2<f32> = input.pos * globals.scale;
-    var scale: vec2<f32> = input.scale * globals.scale;
-
-    var min_border_radius = min(input.scale.x, input.scale.y) * 0.5;
-    var border_radius: vec4<f32> = vec4<f32>(
-        min(input.border_radius.x, min_border_radius),
-        min(input.border_radius.y, min_border_radius),
-        min(input.border_radius.z, min_border_radius),
-        min(input.border_radius.w, min_border_radius)
-    );
-
-    var transform: mat4x4<f32> = mat4x4<f32>(
-        vec4<f32>(scale.x + 1.0, 0.0, 0.0, 0.0),
-        vec4<f32>(0.0, scale.y + 1.0, 0.0, 0.0),
-        vec4<f32>(0.0, 0.0, 1.0, 0.0),
-        vec4<f32>(pos - vec2<f32>(0.5, 0.5), 0.0, 1.0)
-    );
-
-    out.color = input.color;
-    out.border_color = input.border_color;
-    out.pos = pos;
-    out.scale = scale;
-    out.border_radius = border_radius * globals.scale;
-    out.border_width = input.border_width * globals.scale;
-    out.position = globals.transform * transform * vec4<f32>(input.v_pos, 0.0, 1.0);
-
-    return out;
-}
-
 fn distance_alg(
     frag_coord: vec2<f32>,
     position: vec2<f32>,
@@ -91,10 +38,62 @@ fn select_border_radius(radi: vec4<f32>, position: vec2<f32>, center: vec2<f32>)
     return rx;
 }
 
+struct SolidVertexInput {
+    @location(0) v_pos: vec2<f32>,
+    @location(1) color: vec4<f32>,
+    @location(2) pos: vec2<f32>,
+    @location(3) scale: vec2<f32>,
+    @location(4) border_color: vec4<f32>,
+    @location(5) border_radius: vec4<f32>,
+    @location(6) border_width: f32,
+}
+
+struct SolidVertexOutput {
+    @builtin(position) position: vec4<f32>,
+    @location(0) color: vec4<f32>,
+    @location(1) border_color: vec4<f32>,
+    @location(2) pos: vec2<f32>,
+    @location(3) scale: vec2<f32>,
+    @location(4) border_radius: vec4<f32>,
+    @location(5) border_width: f32,
+}
+
+@vertex
+fn solid_vs_main(input: SolidVertexInput) -> SolidVertexOutput {
+    var out: SolidVertexOutput;
+
+    var pos: vec2<f32> = input.pos * globals.scale;
+    var scale: vec2<f32> = input.scale * globals.scale;
+
+    var min_border_radius = min(input.scale.x, input.scale.y) * 0.5;
+    var border_radius: vec4<f32> = vec4<f32>(
+        min(input.border_radius.x, min_border_radius),
+        min(input.border_radius.y, min_border_radius),
+        min(input.border_radius.z, min_border_radius),
+        min(input.border_radius.w, min_border_radius)
+    );
+
+    var transform: mat4x4<f32> = mat4x4<f32>(
+        vec4<f32>(scale.x + 1.0, 0.0, 0.0, 0.0),
+        vec4<f32>(0.0, scale.y + 1.0, 0.0, 0.0),
+        vec4<f32>(0.0, 0.0, 1.0, 0.0),
+        vec4<f32>(pos - vec2<f32>(0.5, 0.5), 0.0, 1.0)
+    );
+
+    out.position = globals.transform * transform * vec4<f32>(input.v_pos, 0.0, 1.0);
+    out.color = input.color;
+    out.border_color = input.border_color;
+    out.pos = pos;
+    out.scale = scale;
+    out.border_radius = border_radius * globals.scale;
+    out.border_width = input.border_width * globals.scale;
+
+    return out;
+}
 
 @fragment
-fn fs_main(
-    input: VertexOutput
+fn solid_fs_main(
+    input: SolidVertexOutput
 ) -> @location(0) vec4<f32> {
     var mixed_color: vec4<f32> = input.color;
 
@@ -138,3 +137,214 @@ fn fs_main(
 
     return vec4<f32>(mixed_color.x, mixed_color.y, mixed_color.z, mixed_color.w * radius_alpha);
 }
+
+struct GradientVertexInput {
+    @location(0) v_pos: vec2<f32>,
+    @location(1) color_1: vec4<f32>,
+    @location(2) color_2: vec4<f32>,
+    @location(3) color_3: vec4<f32>,
+    @location(4) color_4: vec4<f32>,
+    @location(5) color_5: vec4<f32>,
+    @location(6) color_6: vec4<f32>,
+    @location(7) color_7: vec4<f32>,
+    @location(8) color_8: vec4<f32>,
+    @location(9) offsets_1: vec4<f32>,
+    @location(10) offsets_2: vec4<f32>,
+    @location(11) direction: vec4<f32>,
+    @location(12) position_and_scale: vec4<f32>,
+    @location(13) border_color: vec4<f32>,
+    @location(14) border_radius: vec4<f32>,
+    @location(15) border_width: f32
+}
+
+struct GradientVertexOutput {
+    @builtin(position) position: vec4<f32>,
+    @location(1) color_1: vec4<f32>,
+    @location(2) color_2: vec4<f32>,
+    @location(3) color_3: vec4<f32>,
+    @location(4) color_4: vec4<f32>,
+    @location(5) color_5: vec4<f32>,
+    @location(6) color_6: vec4<f32>,
+    @location(7) color_7: vec4<f32>,
+    @location(8) color_8: vec4<f32>,
+    @location(9) offsets_1: vec4<f32>,
+    @location(10) offsets_2: vec4<f32>,
+    @location(11) direction: vec4<f32>,
+    @location(12) position_and_scale: vec4<f32>,
+    @location(13) border_color: vec4<f32>,
+    @location(14) border_radius: vec4<f32>,
+    @location(15) border_width: f32
+}
+
+@vertex
+fn gradient_vs_main(input: GradientVertexInput) -> GradientVertexOutput {
+    var out: GradientVertexOutput;
+
+    var pos: vec2<f32> = input.position_and_scale.xy * globals.scale;
+    var scale: vec2<f32> = input.position_and_scale.zw * globals.scale;
+
+    var min_border_radius = min(input.position_and_scale.z, input.position_and_scale.w) * 0.5;
+    var border_radius: vec4<f32> = vec4<f32>(
+        min(input.border_radius.x, min_border_radius),
+        min(input.border_radius.y, min_border_radius),
+        min(input.border_radius.z, min_border_radius),
+        min(input.border_radius.w, min_border_radius)
+    );
+
+    var transform: mat4x4<f32> = mat4x4<f32>(
+        vec4<f32>(scale.x + 1.0, 0.0, 0.0, 0.0),
+        vec4<f32>(0.0, scale.y + 1.0, 0.0, 0.0),
+        vec4<f32>(0.0, 0.0, 1.0, 0.0),
+        vec4<f32>(pos - vec2<f32>(0.5, 0.5), 0.0, 1.0)
+    );
+
+    out.position = globals.transform * transform * vec4<f32>(input.v_pos, 0.0, 1.0);
+    out.color_1 = input.color_1;
+    out.color_2 = input.color_2;
+    out.color_3 = input.color_3;
+    out.color_4 = input.color_4;
+    out.color_5 = input.color_5;
+    out.color_6 = input.color_6;
+    out.color_7 = input.color_7;
+    out.color_8 = input.color_8;
+    out.offsets_1 = input.offsets_1;
+    out.offsets_2 = input.offsets_2;
+    out.direction = input.direction * globals.scale;
+    out.position_and_scale = vec4<f32>(pos, scale);
+    out.border_color = input.border_color;
+    out.border_radius = border_radius * globals.scale;
+    out.border_width = input.border_width * globals.scale;
+
+    return out;
+}
+
+fn random(coords: vec2<f32>) -> f32 {
+    return fract(sin(dot(coords, vec2(12.9898,78.233))) * 43758.5453);
+}
+
+/// Returns the current interpolated color with a max 8-stop gradient
+fn gradient(
+    raw_position: vec2<f32>,
+    direction: vec4<f32>,
+    colors: array<vec4<f32>, 8>,
+    offsets: array<f32, 8>,
+    last_index: i32
+) -> vec4<f32> {
+    let start = direction.xy;
+    let end = direction.zw;
+
+    let v1 = end - start;
+    let v2 = raw_position - start;
+    let unit = normalize(v1);
+    let coord_offset = dot(unit, v2) / length(v1);
+
+    //need to store these as a var to use dynamic indexing in a loop
+    //this is already added to wgsl spec but not in wgpu yet
+    var colors_arr = colors;
+    var offsets_arr = offsets;
+
+    var color: vec4<f32>;
+
+    let noise_granularity: f32 = 0.3/255.0;
+
+    for (var i: i32 = 0; i < last_index; i++) {
+        let curr_offset = offsets_arr[i];
+        let next_offset = offsets_arr[i+1];
+
+        if (coord_offset <= offsets_arr[0]) {
+            color = colors_arr[0];
+        }
+
+        if (curr_offset <= coord_offset && coord_offset <= next_offset) {
+            color = mix(colors_arr[i], colors_arr[i+1], smoothstep(
+                curr_offset,
+                next_offset,
+                coord_offset,
+            ));
+        }
+
+        if (coord_offset >= offsets_arr[last_index]) {
+            color = colors_arr[last_index];
+        }
+    }
+
+    return color + mix(-noise_granularity, noise_granularity, random(raw_position));
+}
+
+@fragment
+fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
+    let colors = array<vec4<f32>, 8>(
+        input.color_1,
+        input.color_2,
+        input.color_3,
+        input.color_4,
+        input.color_5,
+        input.color_6,
+        input.color_7,
+        input.color_8,
+    );
+
+    var offsets = array<f32, 8>(
+        input.offsets_1.x,
+        input.offsets_1.y,
+        input.offsets_1.z,
+        input.offsets_1.w,
+        input.offsets_2.x,
+        input.offsets_2.y,
+        input.offsets_2.z,
+        input.offsets_2.w,
+    );
+
+    //TODO could just pass this in to the shader but is probably more performant to just check it here
+    var last_index = 7;
+    for (var i: i32 = 0; i <= 7; i++) {
+        if (offsets[i] > 1.0) {
+            last_index = i - 1;
+            break;
+        }
+    }
+
+    var mixed_color: vec4<f32> = gradient(input.position.xy, input.direction, colors, offsets, last_index);
+
+    let pos = input.position_and_scale.xy;
+    let scale = input.position_and_scale.zw;
+
+    var border_radius = select_border_radius(
+        input.border_radius,
+        input.position.xy,
+        (pos + scale * 0.5).xy
+    );
+
+    if (input.border_width > 0.0) {
+        var internal_border: f32 = max(border_radius - input.border_width, 0.0);
+
+        var internal_distance: f32 = distance_alg(
+            input.position.xy,
+            pos + vec2<f32>(input.border_width, input.border_width),
+            scale - vec2<f32>(input.border_width * 2.0, input.border_width * 2.0),
+            internal_border
+        );
+
+        var border_mix: f32 = smoothstep(
+            max(internal_border - 0.5, 0.0),
+            internal_border + 0.5,
+            internal_distance
+        );
+
+        mixed_color = mix(mixed_color, input.border_color, vec4<f32>(border_mix, border_mix, border_mix, border_mix));
+    }
+
+    var dist: f32 = distance_alg(
+        input.position.xy,
+        pos,
+        scale,
+        border_radius
+    );
+
+    var radius_alpha: f32 = 1.0 - smoothstep(
+        max(border_radius - 0.5, 0.0),
+        border_radius + 0.5,
+        dist);
+
+    return vec4<f32>(mixed_color.x, mixed_color.y, mixed_color.z, mixed_color.w * radius_alpha);
+}
diff --git a/wgpu/src/shader/solid.wgsl b/wgpu/src/shader/solid.wgsl
deleted file mode 100644
index b24402f8..00000000
--- a/wgpu/src/shader/solid.wgsl
+++ /dev/null
@@ -1,30 +0,0 @@
-struct Globals {
-    transform: mat4x4<f32>,
-}
-
-@group(0) @binding(0) var<uniform> globals: Globals;
-
-struct VertexInput {
-    @location(0) position: vec2<f32>,
-    @location(1) color: vec4<f32>,
-}
-
-struct VertexOutput {
-    @builtin(position) position: vec4<f32>,
-    @location(0) color: vec4<f32>,
-}
-
-@vertex
-fn vs_main(input: VertexInput) -> VertexOutput {
-    var out: VertexOutput;
-
-    out.color = input.color;
-    out.position = globals.transform * vec4<f32>(input.position, 0.0, 1.0);
-
-    return out;
-}
-
-@fragment
-fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
-    return input.color;
-}
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
new file mode 100644
index 00000000..625fa46e
--- /dev/null
+++ b/wgpu/src/shader/triangle.wgsl
@@ -0,0 +1,168 @@
+struct Globals {
+    transform: mat4x4<f32>,
+}
+
+@group(0) @binding(0) var<uniform> globals: Globals;
+
+struct SolidVertexInput {
+    @location(0) position: vec2<f32>,
+    @location(1) color: vec4<f32>,
+}
+
+struct SolidVertexOutput {
+    @builtin(position) position: vec4<f32>,
+    @location(0) color: vec4<f32>,
+}
+
+@vertex
+fn solid_vs_main(input: SolidVertexInput) -> SolidVertexOutput {
+    var out: SolidVertexOutput;
+
+    out.color = input.color;
+    out.position = globals.transform * vec4<f32>(input.position, 0.0, 1.0);
+
+    return out;
+}
+
+@fragment
+fn solid_fs_main(input: SolidVertexOutput) -> @location(0) vec4<f32> {
+    return input.color;
+}
+
+struct GradientVertexOutput {
+    @builtin(position) position: vec4<f32>,
+    @location(0) raw_position: vec2<f32>,
+    @location(1) color_1: vec4<f32>,
+    @location(2) color_2: vec4<f32>,
+    @location(3) color_3: vec4<f32>,
+    @location(4) color_4: vec4<f32>,
+    @location(5) color_5: vec4<f32>,
+    @location(6) color_6: vec4<f32>,
+    @location(7) color_7: vec4<f32>,
+    @location(8) color_8: vec4<f32>,
+    @location(9) offsets_1: vec4<f32>,
+    @location(10) offsets_2: vec4<f32>,
+    @location(11) direction: vec4<f32>,
+}
+
+@vertex
+fn gradient_vs_main(
+    @location(0) input: vec2<f32>,
+    @location(1) color_1: vec4<f32>,
+    @location(2) color_2: vec4<f32>,
+    @location(3) color_3: vec4<f32>,
+    @location(4) color_4: vec4<f32>,
+    @location(5) color_5: vec4<f32>,
+    @location(6) color_6: vec4<f32>,
+    @location(7) color_7: vec4<f32>,
+    @location(8) color_8: vec4<f32>,
+    @location(9) offsets_1: vec4<f32>,
+    @location(10) offsets_2: vec4<f32>,
+    @location(11) direction: vec4<f32>,
+) -> GradientVertexOutput {
+    var output: GradientVertexOutput;
+
+    output.position = globals.transform * vec4<f32>(input.xy, 0.0, 1.0);
+    output.raw_position = input;
+    output.color_1 = color_1;
+    output.color_2 = color_2;
+    output.color_3 = color_3;
+    output.color_4 = color_4;
+    output.color_5 = color_5;
+    output.color_6 = color_6;
+    output.color_7 = color_7;
+    output.color_8 = color_8;
+    output.offsets_1 = offsets_1;
+    output.offsets_2 = offsets_2;
+    output.direction = direction;
+
+    return output;
+}
+
+fn random(coords: vec2<f32>) -> f32 {
+    return fract(sin(dot(coords, vec2(12.9898,78.233))) * 43758.5453);
+}
+
+/// Returns the current interpolated color with a max 8-stop gradient
+fn gradient(
+    raw_position: vec2<f32>,
+    direction: vec4<f32>,
+    colors: array<vec4<f32>, 8>,
+    offsets: array<f32, 8>,
+    last_index: i32
+) -> vec4<f32> {
+    let start = direction.xy;
+    let end = direction.zw;
+
+    let v1 = end - start;
+    let v2 = raw_position - start;
+    let unit = normalize(v1);
+    let coord_offset = dot(unit, v2) / length(v1);
+
+    //need to store these as a var to use dynamic indexing in a loop
+    //this is already added to wgsl spec but not in wgpu yet
+    var colors_arr = colors;
+    var offsets_arr = offsets;
+
+    var color: vec4<f32>;
+
+    let noise_granularity: f32 = 0.3/255.0;
+
+    for (var i: i32 = 0; i < last_index; i++) {
+        let curr_offset = offsets_arr[i];
+        let next_offset = offsets_arr[i+1];
+
+        if (coord_offset <= offsets_arr[0]) {
+            color = colors_arr[0];
+        }
+
+        if (curr_offset <= coord_offset && coord_offset <= next_offset) {
+            color = mix(colors_arr[i], colors_arr[i+1], smoothstep(
+                curr_offset,
+                next_offset,
+                coord_offset,
+            ));
+        }
+
+        if (coord_offset >= offsets_arr[last_index]) {
+            color = colors_arr[last_index];
+        }
+    }
+
+    return color + mix(-noise_granularity, noise_granularity, random(raw_position));
+}
+
+@fragment
+fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
+    let colors = array<vec4<f32>, 8>(
+        input.color_1,
+        input.color_2,
+        input.color_3,
+        input.color_4,
+        input.color_5,
+        input.color_6,
+        input.color_7,
+        input.color_8,
+    );
+
+    var offsets = array<f32, 8>(
+        input.offsets_1.x,
+        input.offsets_1.y,
+        input.offsets_1.z,
+        input.offsets_1.w,
+        input.offsets_2.x,
+        input.offsets_2.y,
+        input.offsets_2.z,
+        input.offsets_2.w,
+    );
+
+    var last_index = 7;
+    for (var i: i32 = 0; i <= 7; i++) {
+        if (offsets[i] >= 1.0) {
+            last_index = i;
+            break;
+        }
+    }
+
+    return gradient(input.raw_position, input.direction, colors, offsets, last_index);
+}
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index eb15a458..0d1fead1 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,26 +1,19 @@
 //! Draw meshes of triangles.
 mod msaa;
 
-use crate::buffer::r#static::Buffer;
+use crate::buffer::Buffer;
 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;
+const INITIAL_INDEX_COUNT: usize = 1_000;
+const INITIAL_VERTEX_COUNT: usize = 1_000;
 
 #[derive(Debug)]
 pub struct Pipeline {
     blit: Option<msaa::Blit>,
     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,
 }
@@ -30,8 +23,6 @@ struct Layer {
     index_buffer: Buffer<u32>,
     index_strides: Vec<u32>,
     solid: solid::Layer,
-
-    #[cfg(not(target_arch = "wasm32"))]
     gradient: gradient::Layer,
 }
 
@@ -39,18 +30,17 @@ impl Layer {
     fn new(
         device: &wgpu::Device,
         solid: &solid::Pipeline,
-        #[cfg(not(target_arch = "wasm32"))] gradient: &gradient::Pipeline,
+        gradient: &gradient::Pipeline,
     ) -> Self {
         Self {
             index_buffer: Buffer::new(
                 device,
-                "iced_wgpu::triangle index buffer",
+                "iced_wgpu.triangle.index_buffer",
+                INITIAL_INDEX_COUNT,
                 wgpu::BufferUsages::INDEX | wgpu::BufferUsages::COPY_DST,
             ),
             index_strides: Vec::new(),
             solid: solid::Layer::new(device, &solid.constants_layout),
-
-            #[cfg(not(target_arch = "wasm32"))]
             gradient: gradient::Layer::new(device, &gradient.constants_layout),
         }
     }
@@ -60,7 +50,7 @@ impl Layer {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         solid: &solid::Pipeline,
-        #[cfg(not(target_arch = "wasm32"))] gradient: &gradient::Pipeline,
+        gradient: &gradient::Pipeline,
         meshes: &[Mesh<'_>],
         transformation: Transformation,
     ) {
@@ -73,177 +63,92 @@ impl Layer {
         // the majority of use cases. Therefore we will write GPU data every frame (for now).
         let _ = self.index_buffer.resize(device, count.indices);
         let _ = self.solid.vertices.resize(device, count.solid_vertices);
-
-        #[cfg(not(target_arch = "wasm32"))]
         let _ = self
             .gradient
             .vertices
             .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();
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            self.gradient.uniforms.clear();
-            self.gradient.vertices.clear();
-            self.gradient.storage.clear();
+        if self.solid.uniforms.resize(device, count.solids) {
+            self.solid.constants = solid::Layer::bind_group(
+                device,
+                &self.solid.uniforms.raw,
+                &solid.constants_layout,
+            );
         }
 
-        let mut solid_vertex_offset = 0;
-        let mut index_offset = 0;
+        if self.gradient.uniforms.resize(device, count.gradients) {
+            self.gradient.constants = gradient::Layer::bind_group(
+                device,
+                &self.gradient.uniforms.raw,
+                &gradient.constants_layout,
+            );
+        }
 
-        #[cfg(not(target_arch = "wasm32"))]
+        self.index_strides.clear();
+        self.index_buffer.clear();
+        self.solid.vertices.clear();
+        self.solid.uniforms.clear();
+        self.gradient.vertices.clear();
+        self.gradient.uniforms.clear();
+
+        let mut solid_vertex_offset = 0;
+        let mut solid_uniform_offset = 0;
         let mut gradient_vertex_offset = 0;
+        let mut gradient_uniform_offset = 0;
+        let mut index_offset = 0;
 
         for mesh in meshes {
             let origin = mesh.origin();
             let indices = mesh.indices();
 
-            let transform =
-                transformation * Transformation::translate(origin.x, origin.y);
+            let uniforms = Uniforms::new(
+                transformation * Transformation::translate(origin.x, origin.y),
+            );
 
-            let new_index_offset =
+            index_offset +=
                 self.index_buffer.write(queue, index_offset, indices);
-
-            index_offset += new_index_offset;
             self.index_strides.push(indices.len() as u32);
 
-            //push uniform data to CPU buffers
             match mesh {
                 Mesh::Solid { buffers, .. } => {
-                    self.solid.uniforms.push(&solid::Uniforms::new(transform));
-
-                    let written_bytes = self.solid.vertices.write(
+                    solid_vertex_offset += self.solid.vertices.write(
                         queue,
                         solid_vertex_offset,
                         &buffers.vertices,
                     );
 
-                    solid_vertex_offset += written_bytes;
+                    solid_uniform_offset += self.solid.uniforms.write(
+                        queue,
+                        solid_uniform_offset,
+                        &[uniforms],
+                    );
                 }
-                #[cfg(not(target_arch = "wasm32"))]
-                Mesh::Gradient {
-                    buffers, gradient, ..
-                } => {
-                    let written_bytes = self.gradient.vertices.write(
+                Mesh::Gradient { buffers, .. } => {
+                    gradient_vertex_offset += self.gradient.vertices.write(
                         queue,
                         gradient_vertex_offset,
                         &buffers.vertices,
                     );
 
-                    gradient_vertex_offset += written_bytes;
-
-                    match gradient {
-                        Gradient::Linear(linear) => {
-                            use glam::{IVec4, Vec4};
-
-                            let start_offset = self.gradient.color_stop_offset;
-                            let end_offset = (linear.color_stops.len() as i32)
-                                + start_offset
-                                - 1;
-
-                            self.gradient.uniforms.push(&gradient::Uniforms {
-                                transform: transform.into(),
-                                direction: Vec4::new(
-                                    linear.start.x,
-                                    linear.start.y,
-                                    linear.end.x,
-                                    linear.end.y,
-                                ),
-                                stop_range: IVec4::new(
-                                    start_offset,
-                                    end_offset,
-                                    0,
-                                    0,
-                                ),
-                            });
-
-                            self.gradient.color_stop_offset = end_offset + 1;
-
-                            let stops: Vec<gradient::ColorStop> = linear
-                                .color_stops
-                                .iter()
-                                .map(|stop| {
-                                    let [r, g, b, a] = stop.color.into_linear();
-
-                                    gradient::ColorStop {
-                                        offset: stop.offset,
-                                        color: Vec4::new(r, g, b, a),
-                                    }
-                                })
-                                .collect();
-
-                            self.gradient
-                                .color_stops_pending_write
-                                .color_stops
-                                .extend(stops);
-                        }
-                    }
+                    gradient_uniform_offset += self.gradient.uniforms.write(
+                        queue,
+                        gradient_uniform_offset,
+                        &[uniforms],
+                    );
                 }
-                #[cfg(target_arch = "wasm32")]
-                Mesh::Gradient { .. } => {}
             }
         }
-
-        // Write uniform data to GPU
-        if count.solid_vertices > 0 {
-            let uniforms_resized = self.solid.uniforms.resize(device);
-
-            if uniforms_resized {
-                self.solid.constants = solid::Layer::bind_group(
-                    device,
-                    self.solid.uniforms.raw(),
-                    &solid.constants_layout,
-                )
-            }
-
-            self.solid.uniforms.write(queue);
-        }
-
-        #[cfg(not(target_arch = "wasm32"))]
-        if count.gradient_vertices > 0 {
-            // First write the pending color stops to the CPU buffer
-            self.gradient
-                .storage
-                .push(&self.gradient.color_stops_pending_write);
-
-            // Resize buffers if needed
-            let uniforms_resized = self.gradient.uniforms.resize(device);
-            let storage_resized = self.gradient.storage.resize(device);
-
-            if uniforms_resized || storage_resized {
-                self.gradient.constants = gradient::Layer::bind_group(
-                    device,
-                    self.gradient.uniforms.raw(),
-                    self.gradient.storage.raw(),
-                    &gradient.constants_layout,
-                );
-            }
-
-            // Write to GPU
-            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 self,
         solid: &'a solid::Pipeline,
-        #[cfg(not(target_arch = "wasm32"))] gradient: &'a gradient::Pipeline,
+        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;
 
@@ -268,7 +173,8 @@ impl Layer {
                     render_pass.set_bind_group(
                         0,
                         &self.solid.constants,
-                        &[self.solid.uniforms.offset_at_index(num_solids)],
+                        &[(num_solids * std::mem::size_of::<Uniforms>())
+                            as u32],
                     );
 
                     render_pass.set_vertex_buffer(
@@ -278,7 +184,6 @@ impl Layer {
 
                     num_solids += 1;
                 }
-                #[cfg(not(target_arch = "wasm32"))]
                 Mesh::Gradient { .. } => {
                     if last_is_solid.unwrap_or(true) {
                         render_pass.set_pipeline(&gradient.pipeline);
@@ -289,10 +194,8 @@ impl Layer {
                     render_pass.set_bind_group(
                         0,
                         &self.gradient.constants,
-                        &[self
-                            .gradient
-                            .uniforms
-                            .offset_at_index(num_gradients)],
+                        &[(num_gradients * std::mem::size_of::<Uniforms>())
+                            as u32],
                     );
 
                     render_pass.set_vertex_buffer(
@@ -302,8 +205,6 @@ impl Layer {
 
                     num_gradients += 1;
                 }
-                #[cfg(target_arch = "wasm32")]
-                Mesh::Gradient { .. } => {}
             };
 
             render_pass.set_index_buffer(
@@ -325,10 +226,7 @@ impl 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,
         }
@@ -342,15 +240,11 @@ impl Pipeline {
         transformation: Transformation,
     ) {
         #[cfg(feature = "tracing")]
-        let _ = info_span!("Wgpu::Triangle", "PREPARE").entered();
+        let _ = tracing::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,
-            ));
+            self.layers
+                .push(Layer::new(device, &self.solid, &self.gradient));
         }
 
         let layer = &mut self.layers[self.prepare_layer];
@@ -358,7 +252,6 @@ impl Pipeline {
             device,
             queue,
             &self.solid,
-            #[cfg(not(target_arch = "wasm32"))]
             &self.gradient,
             meshes,
             transformation,
@@ -378,9 +271,8 @@ impl Pipeline {
         scale_factor: f32,
     ) {
         #[cfg(feature = "tracing")]
-        let _ = info_span!("Wgpu::Triangle", "DRAW").entered();
+        let _ = tracing::info_span!("Wgpu::Triangle", "DRAW").entered();
 
-        // Configure render pass
         {
             let (attachment, resolve_target, load) = if let Some(blit) =
                 &mut self.blit
@@ -397,12 +289,9 @@ impl Pipeline {
                 (target, None, wgpu::LoadOp::Load)
             };
 
-            #[cfg(feature = "tracing")]
-            let _ = info_span!("Wgpu::Triangle", "BEGIN_RENDER_PASS").enter();
-
             let mut render_pass =
                 encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                    label: Some("iced_wgpu::triangle render pass"),
+                    label: Some("iced_wgpu.triangle.render_pass"),
                     color_attachments: &[Some(
                         wgpu::RenderPassColorAttachment {
                             view: attachment,
@@ -417,7 +306,6 @@ impl Pipeline {
 
             layer.render(
                 &self.solid,
-                #[cfg(not(target_arch = "wasm32"))]
                 &self.gradient,
                 meshes,
                 scale_factor,
@@ -463,14 +351,48 @@ fn multisample_state(
     }
 }
 
-mod solid {
-    use crate::buffer::dynamic;
-    use crate::buffer::r#static::Buffer;
-    use crate::graphics::primitive;
-    use crate::graphics::{Antialiasing, Transformation};
-    use crate::triangle;
+#[derive(Debug, Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
+#[repr(C)]
+pub struct Uniforms {
+    transform: [f32; 16],
+    /// Uniform values must be 256-aligned;
+    /// see: [`wgpu::Limits`] `min_uniform_buffer_offset_alignment`.
+    _padding: [f32; 48],
+}
 
-    use encase::ShaderType;
+impl Uniforms {
+    pub fn new(transform: Transformation) -> Self {
+        Self {
+            transform: transform.into(),
+            _padding: [0.0; 48],
+        }
+    }
+
+    pub fn entry() -> wgpu::BindGroupLayoutEntry {
+        wgpu::BindGroupLayoutEntry {
+            binding: 0,
+            visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+            ty: wgpu::BindingType::Buffer {
+                ty: wgpu::BufferBindingType::Uniform,
+                has_dynamic_offset: true,
+                min_binding_size: wgpu::BufferSize::new(
+                    std::mem::size_of::<Self>() as u64,
+                ),
+            },
+            count: None,
+        }
+    }
+
+    pub fn min_size() -> Option<wgpu::BufferSize> {
+        wgpu::BufferSize::new(std::mem::size_of::<Self>() as u64)
+    }
+}
+
+mod solid {
+    use crate::buffer::Buffer;
+    use crate::graphics::primitive;
+    use crate::graphics::Antialiasing;
+    use crate::triangle;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -481,7 +403,7 @@ mod solid {
     #[derive(Debug)]
     pub struct Layer {
         pub vertices: Buffer<primitive::ColoredVertex2D>,
-        pub uniforms: dynamic::Buffer<Uniforms>,
+        pub uniforms: Buffer<triangle::Uniforms>,
         pub constants: wgpu::BindGroup,
     }
 
@@ -492,17 +414,20 @@ mod solid {
         ) -> Self {
             let vertices = Buffer::new(
                 device,
-                "iced_wgpu::triangle::solid vertex buffer",
+                "iced_wgpu.triangle.solid.vertex_buffer",
+                triangle::INITIAL_VERTEX_COUNT,
                 wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
             );
 
-            let uniforms = dynamic::Buffer::uniform(
+            let uniforms = Buffer::new(
                 device,
-                "iced_wgpu::triangle::solid uniforms",
+                "iced_wgpu.triangle.solid.uniforms",
+                1,
+                wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
             );
 
             let constants =
-                Self::bind_group(device, uniforms.raw(), constants_layout);
+                Self::bind_group(device, &uniforms.raw, constants_layout);
 
             Self {
                 vertices,
@@ -517,7 +442,7 @@ mod solid {
             layout: &wgpu::BindGroupLayout,
         ) -> wgpu::BindGroup {
             device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu::triangle::solid bind group"),
+                label: Some("iced_wgpu.triangle.solid.bind_group"),
                 layout,
                 entries: &[wgpu::BindGroupEntry {
                     binding: 0,
@@ -525,7 +450,7 @@ mod solid {
                         wgpu::BufferBinding {
                             buffer,
                             offset: 0,
-                            size: Some(Uniforms::min_size()),
+                            size: triangle::Uniforms::min_size(),
                         },
                     ),
                 }],
@@ -533,21 +458,7 @@ mod solid {
         }
     }
 
-    #[derive(Debug, Clone, Copy, ShaderType)]
-    pub struct Uniforms {
-        transform: glam::Mat4,
-    }
-
-    impl Uniforms {
-        pub fn new(transform: Transformation) -> Self {
-            Self {
-                transform: transform.into(),
-            }
-        }
-    }
-
     impl Pipeline {
-        /// Creates a new [SolidPipeline] using `solid.wgsl` shader.
         pub fn new(
             device: &wgpu::Device,
             format: wgpu::TextureFormat,
@@ -555,23 +466,14 @@ mod solid {
         ) -> Self {
             let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
-                    label: Some("iced_wgpu::triangle::solid bind group layout"),
-                    entries: &[wgpu::BindGroupLayoutEntry {
-                        binding: 0,
-                        visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
-                        ty: wgpu::BindingType::Buffer {
-                            ty: wgpu::BufferBindingType::Uniform,
-                            has_dynamic_offset: true,
-                            min_binding_size: Some(Uniforms::min_size()),
-                        },
-                        count: None,
-                    }],
+                    label: Some("iced_wgpu.triangle.solid.bind_group_layout"),
+                    entries: &[triangle::Uniforms::entry()],
                 },
             );
 
             let layout = device.create_pipeline_layout(
                 &wgpu::PipelineLayoutDescriptor {
-                    label: Some("iced_wgpu::triangle::solid pipeline layout"),
+                    label: Some("iced_wgpu.triangle.solid.pipeline_layout"),
                     bind_group_layouts: &[&constants_layout],
                     push_constant_ranges: &[],
                 },
@@ -579,12 +481,10 @@ mod solid {
 
             let shader =
                 device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some(
-                        "iced_wgpu triangle solid create shader module",
-                    ),
+                    label: Some("iced_wgpu.triangle.solid.shader"),
                     source: wgpu::ShaderSource::Wgsl(
                         std::borrow::Cow::Borrowed(include_str!(
-                            "shader/solid.wgsl"
+                            "shader/triangle.wgsl"
                         )),
                     ),
                 });
@@ -595,7 +495,7 @@ mod solid {
                     layout: Some(&layout),
                     vertex: wgpu::VertexState {
                         module: &shader,
-                        entry_point: "vs_main",
+                        entry_point: "solid_vs_main",
                         buffers: &[wgpu::VertexBufferLayout {
                             array_stride: std::mem::size_of::<
                                 primitive::ColoredVertex2D,
@@ -612,7 +512,7 @@ mod solid {
                     },
                     fragment: Some(wgpu::FragmentState {
                         module: &shader,
-                        entry_point: "fs_main",
+                        entry_point: "solid_fs_main",
                         targets: &[triangle::fragment_target(format)],
                     }),
                     primitive: triangle::primitive_state(),
@@ -630,16 +530,11 @@ mod solid {
     }
 }
 
-#[cfg(not(target_arch = "wasm32"))]
 mod gradient {
-    use crate::buffer::dynamic;
-    use crate::buffer::r#static::Buffer;
-    use crate::graphics::Antialiasing;
+    use crate::graphics::{primitive, Antialiasing};
     use crate::triangle;
 
-    use encase::ShaderType;
-    use glam::{IVec4, Vec4};
-    use iced_graphics::primitive;
+    use crate::buffer::Buffer;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -649,14 +544,9 @@ mod gradient {
 
     #[derive(Debug)]
     pub struct Layer {
-        pub vertices: Buffer<primitive::Vertex2D>,
-        pub uniforms: dynamic::Buffer<Uniforms>,
-        pub storage: dynamic::Buffer<Storage>,
+        pub vertices: Buffer<primitive::GradientVertex2D>,
+        pub uniforms: Buffer<triangle::Uniforms>,
         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,
     }
 
     impl Layer {
@@ -666,94 +556,52 @@ mod gradient {
         ) -> Self {
             let vertices = Buffer::new(
                 device,
-                "iced_wgpu::triangle::gradient vertex buffer",
+                "iced_wgpu.triangle.gradient.vertex_buffer",
+                triangle::INITIAL_VERTEX_COUNT,
                 wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
             );
 
-            let uniforms = dynamic::Buffer::uniform(
+            let uniforms = Buffer::new(
                 device,
-                "iced_wgpu::triangle::gradient uniforms",
+                "iced_wgpu.triangle.gradient.uniforms",
+                1,
+                wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
             );
 
-            // 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,
-            );
+            let constants =
+                Self::bind_group(device, &uniforms.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"),
+                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(),
-                    },
-                ],
+                entries: &[wgpu::BindGroupEntry {
+                    binding: 0,
+                    resource: wgpu::BindingResource::Buffer(
+                        wgpu::BufferBinding {
+                            buffer: uniform_buffer,
+                            offset: 0,
+                            size: triangle::Uniforms::min_size(),
+                        },
+                    ),
+                }],
             })
         }
     }
 
-    #[derive(Debug, ShaderType)]
-    pub struct Uniforms {
-        pub transform: glam::Mat4,
-        //xy = start, zw = end
-        pub direction: Vec4,
-        //x = start stop, y = end stop, zw = padding
-        pub stop_range: IVec4,
-    }
-
-    #[derive(Debug, ShaderType)]
-    pub struct ColorStop {
-        pub color: Vec4,
-        pub offset: f32,
-    }
-
-    #[derive(Debug, ShaderType)]
-    pub struct Storage {
-        #[size(runtime)]
-        pub color_stops: Vec<ColorStop>,
-    }
-
     impl Pipeline {
-        /// Creates a new [GradientPipeline] using `gradient.wgsl` shader.
-        pub(super) fn new(
+        pub fn new(
             device: &wgpu::Device,
             format: wgpu::TextureFormat,
             antialiasing: Option<Antialiasing>,
@@ -761,40 +609,15 @@ mod gradient {
             let constants_layout = device.create_bind_group_layout(
                 &wgpu::BindGroupLayoutDescriptor {
                     label: Some(
-                        "iced_wgpu::triangle::gradient bind group layout",
+                        "iced_wgpu.triangle.gradient.bind_group_layout",
                     ),
-                    entries: &[
-                        wgpu::BindGroupLayoutEntry {
-                            binding: 0,
-                            visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
-                            ty: wgpu::BindingType::Buffer {
-                                ty: wgpu::BufferBindingType::Uniform,
-                                has_dynamic_offset: true,
-                                min_binding_size: Some(Uniforms::min_size()),
-                            },
-                            count: None,
-                        },
-                        wgpu::BindGroupLayoutEntry {
-                            binding: 1,
-                            visibility: wgpu::ShaderStages::FRAGMENT,
-                            ty: wgpu::BindingType::Buffer {
-                                ty: wgpu::BufferBindingType::Storage {
-                                    read_only: true,
-                                },
-                                has_dynamic_offset: false,
-                                min_binding_size: Some(Storage::min_size()),
-                            },
-                            count: None,
-                        },
-                    ],
+                    entries: &[triangle::Uniforms::entry()],
                 },
             );
 
             let layout = device.create_pipeline_layout(
                 &wgpu::PipelineLayoutDescriptor {
-                    label: Some(
-                        "iced_wgpu::triangle::gradient pipeline layout",
-                    ),
+                    label: Some("iced_wgpu.triangle.gradient.pipeline_layout"),
                     bind_group_layouts: &[&constants_layout],
                     push_constant_ranges: &[],
                 },
@@ -802,48 +625,66 @@ mod gradient {
 
             let shader =
                 device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some(
-                        "iced_wgpu::triangle::gradient create shader module",
-                    ),
+                    label: Some("iced_wgpu.triangle.gradient.shader"),
                     source: wgpu::ShaderSource::Wgsl(
                         std::borrow::Cow::Borrowed(include_str!(
-                            "shader/gradient.wgsl"
+                            "shader/triangle.wgsl"
                         )),
                     ),
                 });
 
-            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,
+            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: "gradient_vs_main",
+                        buffers: &[wgpu::VertexBufferLayout {
+                            array_stride: std::mem::size_of::<
+                                primitive::GradientVertex2D,
+                            >()
+                                as u64,
+                            step_mode: wgpu::VertexStepMode::Vertex,
+                            attributes: &wgpu::vertex_attr_array!(
+                                // Position
+                                0 => Float32x2,
+                                // Color 1
+                                1 => Float32x4,
+                                // Color 2
+                                2 => Float32x4,
+                                // Color 3
+                                3 => Float32x4,
+                                // Color 4
+                                4 => Float32x4,
+                                // Color 5
+                                5 => Float32x4,
+                                // Color 6
+                                6 => Float32x4,
+                                // Color 7
+                                7 => Float32x4,
+                                // Color 8
+                                8 => Float32x4,
+                                // Offsets 1-4
+                                9 => Float32x4,
+                                // Offsets 5-8
+                                10 => Float32x4,
+                                // Direction
+                                11 => Float32x4
+                            ),
+                        }],
                     },
-                );
+                    fragment: Some(wgpu::FragmentState {
+                        module: &shader,
+                        entry_point: "gradient_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/widget/src/canvas.rs b/widget/src/canvas.rs
index 171c4534..bc969dae 100644
--- a/widget/src/canvas.rs
+++ b/widget/src/canvas.rs
@@ -4,6 +4,7 @@ pub mod event;
 mod cursor;
 mod program;
 
+pub use crate::graphics::Gradient;
 pub use cursor::Cursor;
 pub use event::Event;
 pub use program::Program;

From f02f0c01ea9b46b3b303c805b4e001a3f10be748 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 20:18:36 +0200
Subject: [PATCH 267/440] Fix race condition when growing an `image::Atlas`

---
 wgpu/src/image.rs        |  2 --
 wgpu/src/image/atlas.rs  | 38 +++++++++++++++++++++++++++-----------
 wgpu/src/image/raster.rs |  4 +---
 wgpu/src/image/vector.rs |  5 ++---
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 263bcfa2..dd297a79 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -369,7 +369,6 @@ impl Pipeline {
                 layer::Image::Raster { handle, bounds } => {
                     if let Some(atlas_entry) = raster_cache.upload(
                         device,
-                        queue,
                         encoder,
                         handle,
                         &mut self.texture_atlas,
@@ -395,7 +394,6 @@ impl Pipeline {
 
                     if let Some(atlas_entry) = vector_cache.upload(
                         device,
-                        queue,
                         encoder,
                         handle,
                         *color,
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 366fe623..2296710b 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -65,7 +65,6 @@ impl Atlas {
     pub fn upload(
         &mut self,
         device: &wgpu::Device,
-        queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
         width: u32,
         height: u32,
@@ -75,6 +74,9 @@ impl Atlas {
             let current_size = self.layers.len();
             let entry = self.allocate(width, height)?;
 
+            dbg!(&entry);
+            dbg!(&self.layers);
+
             // We grow the internal texture after allocating if necessary
             let new_layers = self.layers.len() - current_size;
             self.grow(new_layers, device, encoder);
@@ -112,7 +114,8 @@ impl Atlas {
                     padding,
                     0,
                     allocation,
-                    queue,
+                    device,
+                    encoder,
                 );
             }
             Entry::Fragmented { fragments, .. } => {
@@ -127,7 +130,8 @@ impl Atlas {
                         padding,
                         offset,
                         &fragment.allocation,
-                        queue,
+                        device,
+                        encoder,
                     );
                 }
             }
@@ -280,8 +284,11 @@ impl Atlas {
         padding: u32,
         offset: usize,
         allocation: &Allocation,
-        queue: &wgpu::Queue,
+        device: &wgpu::Device,
+        encoder: &mut wgpu::CommandEncoder,
     ) {
+        use wgpu::util::DeviceExt;
+
         let (x, y) = allocation.position();
         let Size { width, height } = allocation.size();
         let layer = allocation.layer();
@@ -292,7 +299,22 @@ impl Atlas {
             depth_or_array_layers: 1,
         };
 
-        queue.write_texture(
+        let buffer =
+            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+                label: Some("image upload buffer"),
+                contents: data,
+                usage: wgpu::BufferUsages::COPY_SRC,
+            });
+
+        encoder.copy_buffer_to_texture(
+            wgpu::ImageCopyBuffer {
+                buffer: &buffer,
+                layout: wgpu::ImageDataLayout {
+                    offset: offset as u64,
+                    bytes_per_row: Some(4 * image_width + padding),
+                    rows_per_image: Some(image_height),
+                },
+            },
             wgpu::ImageCopyTexture {
                 texture: &self.texture,
                 mip_level: 0,
@@ -303,12 +325,6 @@ impl Atlas {
                 },
                 aspect: wgpu::TextureAspect::default(),
             },
-            data,
-            wgpu::ImageDataLayout {
-                offset: offset as u64,
-                bytes_per_row: Some(4 * image_width + padding),
-                rows_per_image: Some(image_height),
-            },
             extent,
         );
     }
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index 9b38dce4..a6cba76a 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -63,7 +63,6 @@ impl Cache {
     pub fn upload(
         &mut self,
         device: &wgpu::Device,
-        queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
         handle: &image::Handle,
         atlas: &mut Atlas,
@@ -73,8 +72,7 @@ impl Cache {
         if let Memory::Host(image) = memory {
             let (width, height) = image.dimensions();
 
-            let entry =
-                atlas.upload(device, queue, encoder, width, height, image)?;
+            let entry = atlas.upload(device, encoder, width, height, image)?;
 
             *memory = Memory::Device(entry);
         }
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 58bdf64a..6b9be651 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -74,7 +74,6 @@ impl Cache {
     pub fn upload(
         &mut self,
         device: &wgpu::Device,
-        queue: &wgpu::Queue,
         encoder: &mut wgpu::CommandEncoder,
         handle: &svg::Handle,
         color: Option<Color>,
@@ -138,8 +137,8 @@ impl Cache {
                     });
                 }
 
-                let allocation = atlas
-                    .upload(device, queue, encoder, width, height, &rgba)?;
+                let allocation =
+                    atlas.upload(device, encoder, width, height, &rgba)?;
 
                 log::debug!("allocating {} {}x{}", id, width, height);
 

From 0ef5ab6c84643784d37801598c68a259f0ca64ff 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 20:19:37 +0200
Subject: [PATCH 268/440] Remove `dbg!` leftovers in `image::atlas`

---
 wgpu/src/image/atlas.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 2296710b..9b6dcc46 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -74,9 +74,6 @@ impl Atlas {
             let current_size = self.layers.len();
             let entry = self.allocate(width, height)?;
 
-            dbg!(&entry);
-            dbg!(&self.layers);
-
             // We grow the internal texture after allocating if necessary
             let new_layers = self.layers.len() - current_size;
             self.grow(new_layers, device, encoder);

From e82ce8d93c2c36057b85b7cfe76c871e7c720f17 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 11 May 2023 19:27:27 +0100
Subject: [PATCH 269/440] Add unsafe block

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

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index efee5c68..1f3389ef 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -173,8 +173,11 @@ impl Window {
         #[cfg(target_os = "windows")]
         {
             use winit::platform::windows::WindowBuilderExtWindows;
+            unsafe {
+                window_builder = window_builder
+                    .with_parent_window(self.platform_specific.parent);
+            }
             window_builder = window_builder
-                .with_parent_window(self.platform_specific.parent)
                 .with_drag_and_drop(self.platform_specific.drag_and_drop);
         }
 

From 096bcd898838a4980ebecbc658d7851af226eae6 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 11 May 2023 19:36:22 +0100
Subject: [PATCH 270/440] Allow unsafe code

---
 winit/src/lib.rs      | 5 +++--
 winit/src/settings.rs | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 62d66d5e..4776ea2c 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -25,9 +25,10 @@
     clippy::from_over_into,
     clippy::needless_borrow,
     clippy::new_without_default,
-    clippy::useless_conversion
+    clippy::useless_conversion,
+    unsafe_code
 )]
-#![forbid(rust_2018_idioms, unsafe_code)]
+#![forbid(rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub use iced_graphics as graphics;
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 1f3389ef..13be3932 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -173,6 +173,7 @@ impl Window {
         #[cfg(target_os = "windows")]
         {
             use winit::platform::windows::WindowBuilderExtWindows;
+            #[allow(unsafe_code)]
             unsafe {
                 window_builder = window_builder
                     .with_parent_window(self.platform_specific.parent);

From ece04c1a8de8fc4f943061d38d31e6e9eb07740d Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 11 May 2023 20:35:11 +0100
Subject: [PATCH 271/440] Bump winit rev

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

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index a1f3233b..342cbc5d 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -31,7 +31,7 @@ raw-window-handle = "0.5"
 [dependencies.winit]
 version = "0.28"
 git = "https://github.com/nicoburns/winit.git"
-rev = "f160dc321eaa2e30f770f0b61f7ffc74541cafe0"
+rev = "dd5fcaf30114baf876677d997e362c23d7d134c8"
 default-features = false
 
 [dependencies.iced_runtime]

From 102c78abd8085d06b72da8edfa83a15ff9df89f2 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 11 May 2023 19:21:36 -0400
Subject: [PATCH 272/440] fix: tiny-skia quad handle case where border_radius <
 border_width / 2.0

---
 tiny_skia/src/backend.rs | 90 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 83 insertions(+), 7 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 583b8dac..d0d24b23 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,3 +1,5 @@
+use tiny_skia::{Mask, Pixmap, PixmapPaint};
+
 use crate::core::text;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::backend;
@@ -212,17 +214,29 @@ impl Backend {
                     height: bounds.height - border_width,
                 };
 
+                // Make sure the border radius is correct
                 let mut border_radius = *border_radius;
-                for radius in &mut border_radius {
-                    *radius = radius
-                        .min(path_bounds.width / 2.0)
-                        .min(path_bounds.height / 2.0);
+                let mut border_radius_gt_half_border_width =
+                    [true, true, true, true];
+                for (i, radius) in &mut border_radius.iter_mut().enumerate() {
+                    *radius = if *radius == 0.0 {
+                        // Path should handle this fine
+                        0.0
+                    } else if *radius > border_width / 2.0 {
+                        *radius - border_width / 2.0
+                    } else {
+                        border_radius_gt_half_border_width[i] = false;
+                        0.0
+                    }
+                    .min(path_bounds.width / 2.0)
+                    .min(path_bounds.height / 2.0);
                 }
 
-                let border_radius_path =
-                    rounded_rectangle(path_bounds, border_radius);
+                // Stroking a path works well in this case.
+                if border_radius_gt_half_border_width.iter().all(|b| *b) {
+                    let border_radius_path =
+                        rounded_rectangle(path_bounds, border_radius);
 
-                if border_width > 0.0 {
                     pixels.stroke_path(
                         &border_radius_path,
                         &tiny_skia::Paint {
@@ -239,6 +253,68 @@ impl Backend {
                         transform,
                         clip_mask,
                     );
+                } else {
+                    // Draw corners that have to small border radii as having no border radius,
+                    // but mask them with the rounded rectangle with the correct border radius.
+
+                    let mut temp_pixmap =
+                        Pixmap::new(bounds.width as u32, bounds.height as u32)
+                            .unwrap();
+
+                    let mut quad_mask =
+                        Mask::new(bounds.width as u32, bounds.height as u32)
+                            .unwrap();
+
+                    let zero_bounds = Rectangle {
+                        x: 0.0,
+                        y: 0.0,
+                        width: bounds.width,
+                        height: bounds.height,
+                    };
+                    let path =
+                        rounded_rectangle(zero_bounds, fill_border_radius);
+
+                    quad_mask.fill_path(
+                        &path,
+                        tiny_skia::FillRule::EvenOdd,
+                        true,
+                        transform,
+                    );
+                    let path_bounds = Rectangle {
+                        x: border_width / 2.0,
+                        y: border_width / 2.0,
+                        width: bounds.width - border_width,
+                        height: bounds.height - border_width,
+                    };
+
+                    let border_radius_path =
+                        rounded_rectangle(path_bounds, border_radius);
+
+                    temp_pixmap.stroke_path(
+                        &border_radius_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,
+                        Some(&quad_mask),
+                    );
+
+                    pixels.draw_pixmap(
+                        bounds.x as i32,
+                        bounds.y as i32,
+                        temp_pixmap.as_ref(),
+                        &PixmapPaint::default(),
+                        transform,
+                        clip_mask,
+                    );
                 }
             }
             Primitive::Text {

From a3f32ad201c8f3aaa9efd849c917e5e106d31a9b Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 15 May 2023 13:40:52 -0400
Subject: [PATCH 273/440] fix: when clearing damaged surface with background
 color blend mode should be Source only

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

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d481bacd..39bed555 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -91,6 +91,7 @@ impl Backend {
                         background_color,
                     )),
                     anti_alias: false,
+                    blend_mode: tiny_skia::BlendMode::Source,
                     ..Default::default()
                 },
                 tiny_skia::FillRule::default(),

From 99aa54cd88d7eb99149699d539ee4d59e08047b1 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Tue, 16 May 2023 16:12:29 +0100
Subject: [PATCH 274/440] Add pane_grid functionality to split a pane with
 another pane

---
 examples/pane_grid/src/main.rs |   7 ++-
 style/src/pane_grid.rs         |  18 +++++-
 style/src/theme.rs             |  19 ++++++
 widget/src/pane_grid.rs        | 110 +++++++++++++++++++++++++++++++--
 widget/src/pane_grid/state.rs  |  51 ++++++++++++++-
 5 files changed, 198 insertions(+), 7 deletions(-)

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index dfb80853..d670e1e8 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -108,8 +108,12 @@ impl Application for Example {
             Message::Dragged(pane_grid::DragEvent::Dropped {
                 pane,
                 target,
+                region,
             }) => {
-                self.panes.swap(&pane, &target);
+                if let Some(state) = self.panes.get(&pane) {
+                    let pane = (*state, &pane);
+                    self.panes.split_with(&target, pane, region);
+                }
             }
             Message::Dragged(_) => {}
             Message::TogglePin(pane) => {
@@ -255,6 +259,7 @@ fn handle_hotkey(key_code: keyboard::KeyCode) -> Option<Message> {
     }
 }
 
+#[derive(Clone, Copy)]
 struct Pane {
     id: usize,
     pub is_pinned: bool,
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index fd8fc05f..ec422e86 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,11 +1,14 @@
 //! Change the appearance of a pane grid.
-use iced_core::Color;
+use iced_core::{Background, Color};
 
 /// A set of rules that dictate the style of a container.
 pub trait StyleSheet {
     /// The supported style of the [`StyleSheet`].
     type Style: Default;
 
+    /// The [`Region`] to draw when a pane is hovered.
+    fn hovered_region(&self, style: &Self::Style) -> Region;
+
     /// The [`Line`] to draw when a split is picked.
     fn picked_split(&self, style: &Self::Style) -> Option<Line>;
 
@@ -13,6 +16,19 @@ pub trait StyleSheet {
     fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
 }
 
+/// The appearance of the hovered region of a pane grid.
+#[derive(Debug, Clone, Copy)]
+pub struct Region {
+    /// The [`Background`] of the hovered pane region.
+    pub background: Background,
+    /// The border width of the hovered pane region.
+    pub border_width: f32,
+    /// The border [`Color`] of the hovered pane region.
+    pub border_color: Color,
+    /// The border radius of the hovered pane region.
+    pub border_radius: f32,
+}
+
 /// A line.
 ///
 /// It is normally used to define the highlight of something, like a split.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index d9893bcf..c7b2bada 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -703,6 +703,25 @@ pub enum PaneGrid {
 impl pane_grid::StyleSheet for Theme {
     type Style = PaneGrid;
 
+    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Region {
+        match style {
+            PaneGrid::Default => {
+                let palette = self.extended_palette();
+
+                pane_grid::Region {
+                    background: Background::Color(Color {
+                        a: 0.5,
+                        ..palette.primary.base.color
+                    }),
+                    border_width: 2.0,
+                    border_color: palette.primary.strong.color,
+                    border_radius: 0.0,
+                }
+            }
+            PaneGrid::Custom(custom) => custom.hovered_region(self),
+        }
+    }
+
     fn picked_split(&self, style: &Self::Style) -> Option<pane_grid::Line> {
         match style {
             PaneGrid::Default => {
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 67145e8e..f7fdc072 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -594,13 +594,18 @@ pub fn update<'a, Message, T: Draggable>(
                 if let Some(on_drag) = on_drag {
                     let mut dropped_region = contents
                         .zip(layout.children())
-                        .filter(|(_, layout)| {
-                            layout.bounds().contains(cursor_position)
+                        .filter_map(|(target, layout)| {
+                            layout_region(layout, cursor_position)
+                                .map(|region| (target, region))
                         });
 
                     let event = match dropped_region.next() {
-                        Some(((target, _), _)) if pane != target => {
-                            DragEvent::Dropped { pane, target }
+                        Some(((target, _), region)) if pane != target => {
+                            DragEvent::Dropped {
+                                pane,
+                                target,
+                                region,
+                            }
                         }
                         _ => DragEvent::Canceled { pane },
                     };
@@ -657,6 +662,28 @@ pub fn update<'a, Message, T: Draggable>(
     event_status
 }
 
+fn layout_region(layout: Layout<'_>, cursor_position: Point) -> Option<Region> {
+    let bounds = layout.bounds();
+
+    if !bounds.contains(cursor_position) {
+        return None;
+    }
+
+    let region = if cursor_position.x < (bounds.x + bounds.width / 3.0) {
+        Region::Left
+    } else if cursor_position.x > (bounds.x + 2.0 * bounds.width / 3.0) {
+        Region::Right
+    } else if cursor_position.y < (bounds.y + bounds.height / 3.0) {
+        Region::Top
+    } else if cursor_position.y > (bounds.y + 2.0 * bounds.height / 3.0) {
+        Region::Bottom
+    } else {
+        Region::Center
+    };
+
+    Some(region)
+}
+
 fn click_pane<'a, Message, T>(
     action: &mut state::Action,
     layout: Layout<'_>,
@@ -810,6 +837,36 @@ pub fn draw<Renderer, T>(
             Some((dragging, origin)) if id == dragging => {
                 render_picked_pane = Some((pane, origin, layout));
             }
+            Some((dragging, _)) if id != dragging => {
+                draw_pane(
+                    pane,
+                    renderer,
+                    default_style,
+                    layout,
+                    pane_cursor_position,
+                    viewport,
+                );
+
+                if picked_pane.is_some() {
+                    if let Some(region) = layout_region(layout, cursor_position)
+                    {
+                        let bounds = layout_region_bounds(layout, region);
+                        let hovered_region_style = theme.hovered_region(style);
+
+                        renderer.fill_quad(
+                            renderer::Quad {
+                                bounds,
+                                border_radius: hovered_region_style
+                                    .border_radius
+                                    .into(),
+                                border_width: hovered_region_style.border_width,
+                                border_color: hovered_region_style.border_color,
+                            },
+                            theme.hovered_region(style).background,
+                        );
+                    }
+                }
+            }
             _ => {
                 draw_pane(
                     pane,
@@ -884,6 +941,32 @@ pub fn draw<Renderer, T>(
     }
 }
 
+fn layout_region_bounds(layout: Layout<'_>, region: Region) -> Rectangle {
+    let bounds = layout.bounds();
+
+    match region {
+        Region::Center => bounds,
+        Region::Top => Rectangle {
+            height: bounds.height / 2.0,
+            ..bounds
+        },
+        Region::Left => Rectangle {
+            width: bounds.width / 2.0,
+            ..bounds
+        },
+        Region::Right => Rectangle {
+            x: bounds.x + bounds.width / 2.0,
+            width: bounds.width / 2.0,
+            ..bounds
+        },
+        Region::Bottom => Rectangle {
+            y: bounds.y + bounds.height / 2.0,
+            height: bounds.height / 2.0,
+            ..bounds
+        },
+    }
+}
+
 /// An event produced during a drag and drop interaction of a [`PaneGrid`].
 #[derive(Debug, Clone, Copy)]
 pub enum DragEvent {
@@ -900,6 +983,9 @@ pub enum DragEvent {
 
         /// The [`Pane`] where the picked one was dropped on.
         target: Pane,
+
+        /// The [`Region`] of the target [`Pane`] where the picked one was dropped on.
+        region: Region,
     },
 
     /// A [`Pane`] was picked and then dropped outside of other [`Pane`]
@@ -910,6 +996,22 @@ pub enum DragEvent {
     },
 }
 
+/// The region of a [`Pane`].
+#[derive(Debug, Clone, Copy, Default)]
+pub enum Region {
+    /// Center region.
+    #[default]
+    Center,
+    /// Top region.
+    Top,
+    /// Left region.
+    Left,
+    /// Right region.
+    Right,
+    /// Bottom region.
+    Bottom,
+}
+
 /// An event produced during a resize interaction of a [`PaneGrid`].
 #[derive(Debug, Clone, Copy)]
 pub struct ResizeEvent {
diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index a6e2ec7f..b57cdd92 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -2,7 +2,9 @@
 //!
 //! [`PaneGrid`]: crate::widget::PaneGrid
 use crate::core::{Point, Size};
-use crate::pane_grid::{Axis, Configuration, Direction, Node, Pane, Split};
+use crate::pane_grid::{
+    Axis, Configuration, Direction, Node, Pane, Region, Split,
+};
 
 use std::collections::HashMap;
 
@@ -165,6 +167,53 @@ impl<T> State<T> {
         Some((new_pane, new_split))
     }
 
+    /// Split a target [`Pane`] with a given [`Pane`] on a given [`Region`].
+    ///
+    /// Panes will be swapped by default for [`Region::Center`].
+    pub fn split_with(
+        &mut self,
+        target: &Pane,
+        pane: (T, &Pane),
+        region: Region,
+    ) {
+        match region {
+            Region::Center => {
+                let (_, pane) = pane;
+                self.swap(pane, target);
+            }
+            Region::Top => {
+                self.split_and_swap(Axis::Horizontal, target, pane, true)
+            }
+            Region::Bottom => {
+                self.split_and_swap(Axis::Horizontal, target, pane, false)
+            }
+            Region::Left => {
+                self.split_and_swap(Axis::Vertical, target, pane, true)
+            }
+            Region::Right => {
+                self.split_and_swap(Axis::Vertical, target, pane, false)
+            }
+        }
+    }
+
+    fn split_and_swap(
+        &mut self,
+        axis: Axis,
+        target: &Pane,
+        pane: (T, &Pane),
+        invert: bool,
+    ) {
+        let (state, pane) = pane;
+
+        if let Some((new_pane, _)) = self.split(axis, target, state) {
+            if invert {
+                self.swap(target, &new_pane);
+            }
+
+            let _ = self.close(pane);
+        }
+    }
+
     /// Swaps the position of the provided panes in the [`State`].
     ///
     /// If you want to swap panes on drag and drop in your [`PaneGrid`], you

From 4c1a082f0468a59099bbf8aa8991420a41234948 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, 19 May 2023 03:32:21 +0200
Subject: [PATCH 275/440] Remove `Builder` abstractions for gradients

---
 core/src/background.rs            |  15 +--
 core/src/gradient.rs              | 140 +++++++++++----------------
 examples/solar_system/src/main.rs |   8 +-
 examples/toast/src/main.rs        |   2 +-
 examples/tour/src/main.rs         |  30 +++---
 graphics/src/geometry.rs          |   2 +-
 graphics/src/geometry/fill.rs     |  15 ++-
 graphics/src/gradient.rs          | 151 ++++++++++++------------------
 graphics/src/lib.rs               |   2 +-
 src/lib.rs                        |   1 +
 style/src/theme.rs                |   6 +-
 tiny_skia/src/backend.rs          |   2 +-
 tiny_skia/src/geometry.rs         |   2 +-
 wgpu/src/geometry.rs              |   2 +-
 wgpu/src/layer.rs                 |   2 +-
 15 files changed, 167 insertions(+), 213 deletions(-)

diff --git a/core/src/background.rs b/core/src/background.rs
index 6af33c3e..347c52c0 100644
--- a/core/src/background.rs
+++ b/core/src/background.rs
@@ -1,4 +1,5 @@
-use crate::{Color, Gradient};
+use crate::gradient::{self, Gradient};
+use crate::Color;
 
 /// The background of some element.
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -16,14 +17,14 @@ impl From<Color> for Background {
     }
 }
 
-impl From<Color> for Option<Background> {
-    fn from(color: Color) -> Self {
-        Some(Background::from(color))
+impl From<Gradient> for Background {
+    fn from(gradient: Gradient) -> Self {
+        Background::Gradient(gradient)
     }
 }
 
-impl From<Gradient> for Option<Background> {
-    fn from(gradient: Gradient) -> Self {
-        Some(Background::Gradient(gradient))
+impl From<gradient::Linear> for Background {
+    fn from(gradient: gradient::Linear) -> Self {
+        Background::Gradient(Gradient::Linear(gradient))
     }
 }
diff --git a/core/src/gradient.rs b/core/src/gradient.rs
index 54bb86a4..e19622fb 100644
--- a/core/src/gradient.rs
+++ b/core/src/gradient.rs
@@ -1,8 +1,8 @@
-//! For creating a Gradient.
-pub use linear::Linear;
-
+//! Colors that transition progressively.
 use crate::{Color, Radians};
 
+use std::cmp::Ordering;
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 /// A fill which transitions colors progressively along a direction, either linearly, radially (TBD),
 /// or conically (TBD).
@@ -14,19 +14,11 @@ pub enum Gradient {
 }
 
 impl Gradient {
-    /// Creates a new linear [`linear::Builder`].
-    ///
-    /// This must be defined by an angle (in [`Degrees`] or [`Radians`])
-    /// which will use the bounds of the widget as a guide.
-    pub fn linear(angle: impl Into<Radians>) -> linear::Builder {
-        linear::Builder::new(angle.into())
-    }
-
     /// Adjust the opacity of the gradient by a multiplier applied to each color stop.
     pub fn mul_alpha(mut self, alpha_multiplier: f32) -> Self {
         match &mut self {
             Gradient::Linear(linear) => {
-                for stop in linear.color_stops.iter_mut().flatten() {
+                for stop in linear.stops.iter_mut().flatten() {
                     stop.color.a *= alpha_multiplier;
                 }
             }
@@ -36,6 +28,12 @@ impl Gradient {
     }
 }
 
+impl From<Linear> for Gradient {
+    fn from(gradient: Linear) -> Self {
+        Self::Linear(gradient)
+    }
+}
+
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
 /// A point along the gradient vector where the specified [`color`] is unmixed.
 ///
@@ -50,84 +48,58 @@ pub struct ColorStop {
     pub color: Color,
 }
 
-pub mod linear {
-    //! Linear gradient builder & definition.
-    use crate::gradient::{ColorStop, Gradient};
-    use crate::{Color, Radians};
-    use std::cmp::Ordering;
+/// A linear gradient.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Linear {
+    /// How the [`Gradient`] is angled within its bounds.
+    pub angle: Radians,
+    /// [`ColorStop`]s along the linear gradient path.
+    pub stops: [Option<ColorStop>; 8],
+}
 
-    /// A linear gradient that can be used as a [`Background`].
-    #[derive(Debug, Clone, Copy, PartialEq)]
-    pub struct Linear {
-        /// How the [`Gradient`] is angled within its bounds.
-        pub angle: Radians,
-        /// [`ColorStop`]s along the linear gradient path.
-        pub color_stops: [Option<ColorStop>; 8],
+impl Linear {
+    /// Creates a new [`Linear`] gradient with the given angle in [`Radians`].
+    pub fn new(angle: impl Into<Radians>) -> Self {
+        Self {
+            angle: angle.into(),
+            stops: [None; 8],
+        }
     }
 
-    /// A [`Linear`] builder.
-    #[derive(Debug)]
-    pub struct Builder {
-        angle: Radians,
-        stops: [Option<ColorStop>; 8],
+    /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
+    ///
+    /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
+    ///
+    /// Any stop added after the 8th will be silently ignored.
+    pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
+        if offset.is_finite() && (0.0..=1.0).contains(&offset) {
+            let (Ok(index) | Err(index)) =
+                self.stops.binary_search_by(|stop| match stop {
+                    None => Ordering::Greater,
+                    Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
+                });
+
+            if index < 8 {
+                self.stops[index] = Some(ColorStop { offset, color });
+            }
+        } else {
+            log::warn!("Gradient color stop must be within 0.0..=1.0 range.");
+        };
+
+        self
     }
 
-    impl Builder {
-        /// Creates a new [`Builder`].
-        pub fn new(angle: Radians) -> Self {
-            Self {
-                angle,
-                stops: [None; 8],
-            }
+    /// Adds multiple [`ColorStop`]s to the gradient.
+    ///
+    /// Any stop added after the 8th will be silently ignored.
+    pub fn add_stops(
+        mut self,
+        stops: impl IntoIterator<Item = ColorStop>,
+    ) -> Self {
+        for stop in stops.into_iter() {
+            self = self.add_stop(stop.offset, stop.color)
         }
 
-        /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
-        ///
-        /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
-        ///
-        /// Any stop added after the 8th will be silently ignored.
-        pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
-            if offset.is_finite() && (0.0..=1.0).contains(&offset) {
-                let (Ok(index) | Err(index)) =
-                    self.stops.binary_search_by(|stop| match stop {
-                        None => Ordering::Greater,
-                        Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
-                    });
-
-                if index < 8 {
-                    self.stops[index] = Some(ColorStop { offset, color });
-                }
-            } else {
-                log::warn!(
-                    "Gradient color stop must be within 0.0..=1.0 range."
-                );
-            };
-
-            self
-        }
-
-        /// Adds multiple [`ColorStop`]s to the gradient.
-        ///
-        /// Any stop added after the 8th will be silently ignored.
-        pub fn add_stops(
-            mut self,
-            stops: impl IntoIterator<Item = ColorStop>,
-        ) -> Self {
-            for stop in stops.into_iter() {
-                self = self.add_stop(stop.offset, stop.color)
-            }
-
-            self
-        }
-
-        /// Builds the linear [`Gradient`] of this [`Builder`].
-        ///
-        /// Returns `BuilderError` if gradient in invalid.
-        pub fn build(self) -> Gradient {
-            Gradient::Linear(Linear {
-                angle: self.angle,
-                color_stops: self.stops,
-            })
-        }
+        self
     }
 }
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index 42606e3f..d9e660d7 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -10,8 +10,9 @@ use iced::application;
 use iced::executor;
 use iced::theme::{self, Theme};
 use iced::widget::canvas;
+use iced::widget::canvas::gradient;
 use iced::widget::canvas::stroke::{self, Stroke};
-use iced::widget::canvas::{Cursor, Gradient, Path};
+use iced::widget::canvas::{Cursor, Path};
 use iced::window;
 use iced::{
     Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
@@ -209,13 +210,12 @@ impl<Message> canvas::Program<Message> for State {
 
                 let earth = Path::circle(Point::ORIGIN, Self::EARTH_RADIUS);
 
-                let earth_fill = Gradient::linear(
+                let earth_fill = gradient::Linear::new(
                     Point::new(-Self::EARTH_RADIUS, 0.0),
                     Point::new(Self::EARTH_RADIUS, 0.0),
                 )
                 .add_stop(0.2, Color::from_rgb(0.15, 0.50, 1.0))
-                .add_stop(0.8, Color::from_rgb(0.0, 0.20, 0.47))
-                .build();
+                .add_stop(0.8, Color::from_rgb(0.0, 0.20, 0.47));
 
                 frame.fill(&earth, earth_fill);
 
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 9d859258..515218e7 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -226,7 +226,7 @@ mod toast {
             };
 
             container::Appearance {
-                background: pair.color.into(),
+                background: Some(pair.color.into()),
                 text_color: pair.text.into(),
                 ..Default::default()
             }
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 630b6359..a40f0f33 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -1,3 +1,4 @@
+use iced::gradient;
 use iced::theme;
 use iced::theme::Palette;
 use iced::widget::{
@@ -7,8 +8,7 @@ use iced::widget::{
 use iced::widget::{Button, Column, Container, Slider};
 use iced::{alignment, widget, Theme};
 use iced::{
-    Color, Degrees, Element, Font, Gradient, Length, Radians, Renderer,
-    Sandbox, Settings,
+    Color, Degrees, Element, Font, Length, Radians, Renderer, Sandbox, Settings,
 };
 
 pub fn main() -> iced::Result {
@@ -734,23 +734,25 @@ impl widget::button::StyleSheet for CustomButtonStyle {
     fn active(&self, _style: &Self::Style) -> widget::button::Appearance {
         match self {
             CustomButtonStyle::Primary => widget::button::Appearance {
-                background: Gradient::linear(Degrees(270.0))
-                    .add_stop(0.0, Palette::LIGHT.primary)
-                    .add_stop(1.0, Color::from_rgb8(54, 80, 168))
-                    .build()
-                    .into(),
+                background: Some(
+                    gradient::Linear::new(Degrees(270.0))
+                        .add_stop(0.0, Palette::LIGHT.primary)
+                        .add_stop(1.0, Color::from_rgb8(54, 80, 168))
+                        .into(),
+                ),
                 text_color: Color::WHITE,
                 border_radius: 5.0,
                 ..Default::default()
             },
             CustomButtonStyle::Secondary => widget::button::Appearance {
-                background: Gradient::linear(Radians(
-                    3.0 * std::f32::consts::PI / 2.0,
-                ))
-                .add_stop(0.0, Color::from_rgb8(194, 194, 194))
-                .add_stop(1.0, Color::from_rgb8(126, 126, 126))
-                .build()
-                .into(),
+                background: Some(
+                    gradient::Linear::new(Radians(
+                        3.0 * std::f32::consts::PI / 2.0,
+                    ))
+                    .add_stop(0.0, Color::from_rgb8(194, 194, 194))
+                    .add_stop(1.0, Color::from_rgb8(126, 126, 126))
+                    .into(),
+                ),
                 text_color: Color::WHITE,
                 border_radius: 5.0,
                 ..Default::default()
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 88997288..729c3d44 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -12,7 +12,7 @@ pub use stroke::{LineCap, LineDash, LineJoin, Stroke};
 pub use style::Style;
 pub use text::Text;
 
-pub use crate::core::gradient::{self, Gradient};
+pub use crate::gradient::{self, Gradient};
 
 use crate::Primitive;
 
diff --git a/graphics/src/geometry/fill.rs b/graphics/src/geometry/fill.rs
index 6aa1f28b..b773c99b 100644
--- a/graphics/src/geometry/fill.rs
+++ b/graphics/src/geometry/fill.rs
@@ -1,8 +1,8 @@
 //! Fill [crate::widget::canvas::Geometry] with a certain style.
-use iced_core::Color;
-
 pub use crate::geometry::Style;
-use crate::Gradient;
+
+use crate::core::Color;
+use crate::gradient::{self, Gradient};
 
 /// The style used to fill geometry.
 #[derive(Debug, Clone)]
@@ -50,6 +50,15 @@ impl From<Gradient> for Fill {
     }
 }
 
+impl From<gradient::Linear> for Fill {
+    fn from(gradient: gradient::Linear) -> Self {
+        Fill {
+            style: Style::Gradient(Gradient::Linear(gradient)),
+            ..Default::default()
+        }
+    }
+}
+
 /// The fill rule defines how to determine what is inside and what is outside of
 /// a shape.
 ///
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 21bcd2c6..3e88d9de 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -1,10 +1,11 @@
-//! A gradient that can be used as a [`Fill`] for a mesh.
+//! A gradient that can be used as a [`Fill`] for some geometry.
 //!
 //! For a gradient that you can use as a background variant for a widget, see [`Gradient`].
 //!
 //! [`Gradient`]: crate::core::Gradient;
-use crate::core::Point;
-pub use linear::Linear;
+use crate::core::gradient::ColorStop;
+use crate::core::{Color, Point};
+use std::cmp::Ordering;
 
 #[derive(Debug, Clone, PartialEq)]
 /// A fill which linearly interpolates colors along a direction.
@@ -16,104 +17,72 @@ pub enum Gradient {
     Linear(Linear),
 }
 
-impl Gradient {
-    /// Creates a new linear [`linear::Builder`].
-    ///
-    /// The `start` and `end` [`Point`]s define the absolute position of the [`Gradient`].
-    pub fn linear(start: Point, end: Point) -> linear::Builder {
-        linear::Builder::new(start, end)
+impl From<Linear> for Gradient {
+    fn from(gradient: Linear) -> Self {
+        Self::Linear(gradient)
     }
 }
 
-pub mod linear {
-    //! Linear gradient builder & definition.
-    use crate::Gradient;
-    use iced_core::gradient::ColorStop;
-    use iced_core::{Color, Point};
-    use std::cmp::Ordering;
+/// A linear gradient that can be used in the style of [`Fill`] or [`Stroke`].
+///
+/// [`Fill`]: crate::geometry::Fill;
+/// [`Stroke`]: crate::geometry::Stroke;
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Linear {
+    /// The absolute starting position of the gradient.
+    pub start: Point,
 
-    /// A linear gradient that can be used in the style of [`Fill`] or [`Stroke`].
+    /// The absolute ending position of the gradient.
+    pub end: Point,
+
+    /// [`ColorStop`]s along the linear gradient direction.
+    pub stops: [Option<ColorStop>; 8],
+}
+
+impl Linear {
+    /// Creates a new [`Builder`].
+    pub fn new(start: Point, end: Point) -> Self {
+        Self {
+            start,
+            end,
+            stops: [None; 8],
+        }
+    }
+
+    /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
     ///
-    /// [`Fill`]: crate::geometry::Fill;
-    /// [`Stroke`]: crate::geometry::Stroke;
-    #[derive(Debug, Clone, Copy, PartialEq)]
-    pub struct Linear {
-        /// The absolute starting position of the gradient.
-        pub start: Point,
+    /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
+    ///
+    /// Any stop added after the 8th will be silently ignored.
+    pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
+        if offset.is_finite() && (0.0..=1.0).contains(&offset) {
+            let (Ok(index) | Err(index)) =
+                self.stops.binary_search_by(|stop| match stop {
+                    None => Ordering::Greater,
+                    Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
+                });
 
-        /// The absolute ending position of the gradient.
-        pub end: Point,
+            if index < 8 {
+                self.stops[index] = Some(ColorStop { offset, color });
+            }
+        } else {
+            log::warn!("Gradient: ColorStop must be within 0.0..=1.0 range.");
+        };
 
-        /// [`ColorStop`]s along the linear gradient direction.
-        pub color_stops: [Option<ColorStop>; 8],
+        self
     }
 
-    /// A [`Linear`] builder.
-    #[derive(Debug)]
-    pub struct Builder {
-        start: Point,
-        end: Point,
-        stops: [Option<ColorStop>; 8],
-    }
-
-    impl Builder {
-        /// Creates a new [`Builder`].
-        pub fn new(start: Point, end: Point) -> Self {
-            Self {
-                start,
-                end,
-                stops: [None; 8],
-            }
+    /// Adds multiple [`ColorStop`]s to the gradient.
+    ///
+    /// Any stop added after the 8th will be silently ignored.
+    pub fn add_stops(
+        mut self,
+        stops: impl IntoIterator<Item = ColorStop>,
+    ) -> Self {
+        for stop in stops.into_iter() {
+            self = self.add_stop(stop.offset, stop.color)
         }
 
-        /// Adds a new [`ColorStop`], defined by an offset and a color, to the gradient.
-        ///
-        /// Any `offset` that is not within `0.0..=1.0` will be silently ignored.
-        ///
-        /// Any stop added after the 8th will be silently ignored.
-        pub fn add_stop(mut self, offset: f32, color: Color) -> Self {
-            if offset.is_finite() && (0.0..=1.0).contains(&offset) {
-                let (Ok(index) | Err(index)) =
-                    self.stops.binary_search_by(|stop| match stop {
-                        None => Ordering::Greater,
-                        Some(stop) => stop.offset.partial_cmp(&offset).unwrap(),
-                    });
-
-                if index < 8 {
-                    self.stops[index] = Some(ColorStop { offset, color });
-                }
-            } else {
-                log::warn!(
-                    "Gradient: ColorStop must be within 0.0..=1.0 range."
-                );
-            };
-
-            self
-        }
-
-        /// Adds multiple [`ColorStop`]s to the gradient.
-        ///
-        /// Any stop added after the 8th will be silently ignored.
-        pub fn add_stops(
-            mut self,
-            stops: impl IntoIterator<Item = ColorStop>,
-        ) -> Self {
-            for stop in stops.into_iter() {
-                self = self.add_stop(stop.offset, stop.color)
-            }
-
-            self
-        }
-
-        /// Builds the linear [`Gradient`] of this [`Builder`].
-        ///
-        /// Returns `BuilderError` if gradient in invalid.
-        pub fn build(self) -> Gradient {
-            Gradient::Linear(Linear {
-                start: self.start,
-                end: self.end,
-                color_stops: self.stops,
-            })
-        }
+        self
     }
 }
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index ae338936..b44fd603 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -23,13 +23,13 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 mod antialiasing;
 mod error;
-mod gradient;
 mod transformation;
 mod viewport;
 
 pub mod backend;
 pub mod compositor;
 pub mod damage;
+pub mod gradient;
 pub mod primitive;
 pub mod renderer;
 
diff --git a/src/lib.rs b/src/lib.rs
index b81da394..804be045 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -188,6 +188,7 @@ pub use style::theme;
 
 pub use crate::core::alignment;
 pub use crate::core::event;
+pub use crate::core::gradient;
 pub use crate::core::{
     color, Alignment, Background, Color, ContentFit, Degrees, Gradient, Length,
     Padding, Pixels, Point, Radians, Rectangle, Size, Vector,
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 1b47e2f9..c9835ca3 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -371,7 +371,7 @@ impl container::StyleSheet for Theme {
 
                 container::Appearance {
                     text_color: None,
-                    background: palette.background.weak.color.into(),
+                    background: Some(palette.background.weak.color.into()),
                     border_radius: 2.0,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
@@ -896,7 +896,7 @@ impl scrollable::StyleSheet for Theme {
                 let palette = self.extended_palette();
 
                 scrollable::Scrollbar {
-                    background: palette.background.weak.color.into(),
+                    background: Some(palette.background.weak.color.into()),
                     border_radius: 2.0,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
@@ -923,7 +923,7 @@ impl scrollable::StyleSheet for Theme {
                     let palette = self.extended_palette();
 
                     scrollable::Scrollbar {
-                        background: palette.background.weak.color.into(),
+                        background: Some(palette.background.weak.color.into()),
                         border_radius: 2.0,
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index dd1adbd8..9495d2fc 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -463,7 +463,7 @@ fn into_gradient<'a>(
     let Gradient::Linear(linear) = gradient;
     let (start, end) = linear.angle.to_distance(&bounds);
     let stops: Vec<tiny_skia::GradientStop> = linear
-        .color_stops
+        .stops
         .into_iter()
         .flatten()
         .map(|stop| {
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index 100db0b0..ee347c73 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -233,7 +233,7 @@ pub fn into_paint(style: Style) -> tiny_skia::Paint<'static> {
             Style::Gradient(gradient) => match gradient {
                 Gradient::Linear(linear) => {
                     let stops: Vec<tiny_skia::GradientStop> = linear
-                        .color_stops
+                        .stops
                         .into_iter()
                         .flatten()
                         .map(|stop| {
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index e26d9278..b8a75c33 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -631,7 +631,7 @@ fn pack_gradient(gradient: &Gradient) -> [f32; 44] {
             let mut pack: [f32; 44] = [0.0; 44];
             let mut offsets: [f32; 8] = [2.0; 8];
 
-            for (index, stop) in linear.color_stops.iter().enumerate() {
+            for (index, stop) in linear.stops.iter().enumerate() {
                 let [r, g, b, a] = stop
                     .map_or(crate::core::Color::default(), |s| s.color)
                     .into_linear();
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index b3ee4739..08c0004a 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -317,7 +317,7 @@ fn pack_gradient(gradient: &core::Gradient, bounds: Rectangle) -> [f32; 44] {
         core::Gradient::Linear(linear) => {
             let mut pack: [f32; 44] = [0.0; 44];
 
-            for (index, stop) in linear.color_stops.iter().enumerate() {
+            for (index, stop) in linear.stops.iter().enumerate() {
                 let [r, g, b, a] =
                     stop.map_or(Color::default(), |s| s.color).into_linear();
 

From 59663d2e45c3c4487fb64f781eb0d0f422763467 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, 19 May 2023 03:37:36 +0200
Subject: [PATCH 276/440] Avoid packing gradient data for every vertex in
 `iced_wgpu`

---
 wgpu/src/geometry.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index b8a75c33..d1d4fd3c 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -74,7 +74,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: gradient.clone(),
+                        gradient: pack_gradient(gradient),
                     },
                 ))
             }
@@ -97,7 +97,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: gradient.clone(),
+                        gradient: pack_gradient(gradient),
                     },
                 ))
             }
@@ -490,7 +490,7 @@ impl Frame {
 }
 
 struct GradientVertex2DBuilder {
-    gradient: Gradient,
+    gradient: [f32; 44],
 }
 
 impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
@@ -504,7 +504,7 @@ impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: pack_gradient(&self.gradient),
+            gradient: self.gradient,
         }
     }
 }
@@ -520,7 +520,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: pack_gradient(&self.gradient),
+            gradient: self.gradient,
         }
     }
 }

From 96aa0379d58ff799493097e3bd0572f9a87da453 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, 19 May 2023 03:43:11 +0200
Subject: [PATCH 277/440] Implement `custom` helper for `theme::Button`

---
 examples/tour/src/main.rs | 14 ++++++--------
 style/src/theme.rs        |  9 +++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index a40f0f33..257a4def 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -57,11 +57,9 @@ impl Sandbox for Tour {
 
         if steps.has_previous() {
             controls = controls.push(
-                button("Back").on_press(Message::BackPressed).style(
-                    theme::Button::Custom(Box::new(
-                        CustomButtonStyle::Secondary,
-                    )),
-                ),
+                button("Back")
+                    .on_press(Message::BackPressed)
+                    .style(theme::Button::custom(CustomButtonStyle::Secondary)),
             );
         }
 
@@ -69,9 +67,9 @@ impl Sandbox for Tour {
 
         if steps.can_continue() {
             controls = controls.push(
-                button("Next").on_press(Message::NextPressed).style(
-                    theme::Button::Custom(Box::new(CustomButtonStyle::Primary)),
-                ),
+                button("Next")
+                    .on_press(Message::NextPressed)
+                    .style(theme::Button::custom(CustomButtonStyle::Primary)),
             );
         }
 
diff --git a/style/src/theme.rs b/style/src/theme.rs
index c9835ca3..477bd27b 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -139,6 +139,15 @@ pub enum Button {
     Custom(Box<dyn button::StyleSheet<Style = Theme>>),
 }
 
+impl Button {
+    /// Creates a custom [`Button`] style variant.
+    pub fn custom(
+        style_sheet: impl button::StyleSheet<Style = Theme> + 'static,
+    ) -> Self {
+        Self::Custom(Box::new(style_sheet))
+    }
+}
+
 impl button::StyleSheet for Theme {
     type Style = Button;
 

From 10a8c599e62e46dad4da0e53e184861047ad34c0 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, 19 May 2023 03:47:00 +0200
Subject: [PATCH 278/440] Keep `tour` buttons solid

The gradients feel a bit out of place currently.
---
 examples/tour/src/main.rs | 55 ++++-----------------------------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 257a4def..13bcd5ff 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -1,15 +1,11 @@
-use iced::gradient;
+use iced::alignment;
 use iced::theme;
-use iced::theme::Palette;
 use iced::widget::{
     checkbox, column, container, horizontal_space, image, radio, row,
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
-use iced::{alignment, widget, Theme};
-use iced::{
-    Color, Degrees, Element, Font, Length, Radians, Renderer, Sandbox, Settings,
-};
+use iced::{Color, Element, Font, Length, Renderer, Sandbox, Settings};
 
 pub fn main() -> iced::Result {
     env_logger::init();
@@ -59,18 +55,15 @@ impl Sandbox for Tour {
             controls = controls.push(
                 button("Back")
                     .on_press(Message::BackPressed)
-                    .style(theme::Button::custom(CustomButtonStyle::Secondary)),
+                    .style(theme::Button::Secondary),
             );
         }
 
         controls = controls.push(horizontal_space(Length::Fill));
 
         if steps.can_continue() {
-            controls = controls.push(
-                button("Next")
-                    .on_press(Message::NextPressed)
-                    .style(theme::Button::custom(CustomButtonStyle::Primary)),
-            );
+            controls =
+                controls.push(button("Next").on_press(Message::NextPressed));
         }
 
         let content: Element<_> = column![
@@ -720,41 +713,3 @@ pub enum Layout {
     Row,
     Column,
 }
-
-enum CustomButtonStyle {
-    Primary,
-    Secondary,
-}
-
-impl widget::button::StyleSheet for CustomButtonStyle {
-    type Style = Theme;
-
-    fn active(&self, _style: &Self::Style) -> widget::button::Appearance {
-        match self {
-            CustomButtonStyle::Primary => widget::button::Appearance {
-                background: Some(
-                    gradient::Linear::new(Degrees(270.0))
-                        .add_stop(0.0, Palette::LIGHT.primary)
-                        .add_stop(1.0, Color::from_rgb8(54, 80, 168))
-                        .into(),
-                ),
-                text_color: Color::WHITE,
-                border_radius: 5.0,
-                ..Default::default()
-            },
-            CustomButtonStyle::Secondary => widget::button::Appearance {
-                background: Some(
-                    gradient::Linear::new(Radians(
-                        3.0 * std::f32::consts::PI / 2.0,
-                    ))
-                    .add_stop(0.0, Color::from_rgb8(194, 194, 194))
-                    .add_stop(1.0, Color::from_rgb8(126, 126, 126))
-                    .into(),
-                ),
-                text_color: Color::WHITE,
-                border_radius: 5.0,
-                ..Default::default()
-            },
-        }
-    }
-}

From 3d44de9547c770787edf6de3b683fe2b7e92ee09 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, 19 May 2023 03:49:42 +0200
Subject: [PATCH 279/440] Fix imports of `geometry::style` in `iced_graphics`

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

diff --git a/graphics/src/geometry/style.rs b/graphics/src/geometry/style.rs
index ece6b32a..a0f4b08a 100644
--- a/graphics/src/geometry/style.rs
+++ b/graphics/src/geometry/style.rs
@@ -1,5 +1,5 @@
-use crate::Gradient;
-use iced_core::Color;
+use crate::core::Color;
+use crate::geometry::Gradient;
 
 /// The coloring style of some drawing.
 #[derive(Debug, Clone, PartialEq)]

From 49353bc4ea2e93e5d70f026e7eda169987b7c1c7 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, 19 May 2023 03:53:23 +0200
Subject: [PATCH 280/440] Inline `into_gradient` in `tiny_skia::backend`

... since it's not really reused anywhere else.
---
 tiny_skia/src/backend.rs | 84 ++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 9495d2fc..d55b9dab 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -184,8 +184,47 @@ impl Backend {
                                     *color,
                                 ))
                             }
-                            Background::Gradient(gradient) => {
-                                into_gradient(*gradient, *bounds)
+                            Background::Gradient(Gradient::Linear(linear)) => {
+                                let (start, end) =
+                                    linear.angle.to_distance(&bounds);
+
+                                let stops: Vec<tiny_skia::GradientStop> =
+                                    linear
+                                        .stops
+                                        .into_iter()
+                                        .flatten()
+                                        .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::LinearGradient::new(
+                                    tiny_skia::Point {
+                                        x: start.x,
+                                        y: start.y,
+                                    },
+                                    tiny_skia::Point { x: end.x, y: end.y },
+                                    if stops.is_empty() {
+                                        vec![tiny_skia::GradientStop::new(
+                                            0.0,
+                                            tiny_skia::Color::BLACK,
+                                        )]
+                                    } else {
+                                        stops
+                                    },
+                                    tiny_skia::SpreadMode::Pad,
+                                    tiny_skia::Transform::identity(),
+                                )
+                                .expect("Create linear gradient")
                             }
                         },
                         anti_alias: true,
@@ -456,47 +495,6 @@ fn into_color(color: Color) -> tiny_skia::Color {
         .expect("Convert color from iced to tiny_skia")
 }
 
-fn into_gradient<'a>(
-    gradient: Gradient,
-    bounds: Rectangle,
-) -> tiny_skia::Shader<'a> {
-    let Gradient::Linear(linear) = gradient;
-    let (start, end) = linear.angle.to_distance(&bounds);
-    let stops: Vec<tiny_skia::GradientStop> = linear
-        .stops
-        .into_iter()
-        .flatten()
-        .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::LinearGradient::new(
-        tiny_skia::Point {
-            x: start.x,
-            y: start.y,
-        },
-        tiny_skia::Point { x: end.x, y: end.y },
-        if stops.is_empty() {
-            vec![tiny_skia::GradientStop::new(0.0, tiny_skia::Color::BLACK)]
-        } else {
-            stops
-        },
-        tiny_skia::SpreadMode::Pad,
-        tiny_skia::Transform::identity(),
-    )
-    .expect("Create linear gradient")
-}
-
 fn rounded_rectangle(
     bounds: Rectangle,
     border_radius: [f32; 4],

From f557b810f5931e69a9a35353b20fff1b07480715 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, 19 May 2023 03:58:25 +0200
Subject: [PATCH 281/440] Keep `image` pipeline decoupled from `quad` in
 `iced_wgpu`

---
 wgpu/src/image.rs | 42 +++++++++++++++++++++++++++++++++++++-----
 wgpu/src/quad.rs  |  6 +++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index 6fe02b91..c3479652 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -11,7 +11,7 @@ use atlas::Atlas;
 use crate::buffer::Buffer;
 use crate::core::{Rectangle, Size};
 use crate::graphics::Transformation;
-use crate::{layer, quad};
+use crate::layer;
 
 use std::cell::RefCell;
 use std::mem;
@@ -131,7 +131,7 @@ impl Layer {
         render_pass.set_vertex_buffer(1, self.instances.slice(..));
 
         render_pass.draw_indexed(
-            0..quad::INDICES.len() as u32,
+            0..QUAD_INDICES.len() as u32,
             0,
             0..self.instance_count as u32,
         );
@@ -244,7 +244,22 @@ impl Pipeline {
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
                     entry_point: "fs_main",
-                    targets: &quad::color_target_state(format),
+                    targets: &[Some(wgpu::ColorTargetState {
+                        format,
+                        blend: Some(wgpu::BlendState {
+                            color: wgpu::BlendComponent {
+                                src_factor: wgpu::BlendFactor::SrcAlpha,
+                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                                operation: wgpu::BlendOperation::Add,
+                            },
+                            alpha: wgpu::BlendComponent {
+                                src_factor: wgpu::BlendFactor::One,
+                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                                operation: wgpu::BlendOperation::Add,
+                            },
+                        }),
+                        write_mask: wgpu::ColorWrites::ALL,
+                    })],
                 }),
                 primitive: wgpu::PrimitiveState {
                     topology: wgpu::PrimitiveTopology::TriangleList,
@@ -263,14 +278,14 @@ impl Pipeline {
         let vertices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::image vertex buffer"),
-                contents: bytemuck::cast_slice(&quad::VERTICES),
+                contents: bytemuck::cast_slice(&QUAD_VERTICES),
                 usage: wgpu::BufferUsages::VERTEX,
             });
 
         let indices =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("iced_wgpu::image index buffer"),
-                contents: bytemuck::cast_slice(&quad::INDICES),
+                contents: bytemuck::cast_slice(&QUAD_INDICES),
                 usage: wgpu::BufferUsages::INDEX,
             });
 
@@ -483,6 +498,23 @@ pub struct Vertex {
     _position: [f32; 2],
 }
 
+const QUAD_INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
+
+const QUAD_VERTICES: [Vertex; 4] = [
+    Vertex {
+        _position: [0.0, 0.0],
+    },
+    Vertex {
+        _position: [1.0, 0.0],
+    },
+    Vertex {
+        _position: [1.0, 1.0],
+    },
+    Vertex {
+        _position: [0.0, 1.0],
+    },
+];
+
 #[repr(C)]
 #[derive(Debug, Clone, Copy, Zeroable, Pod)]
 struct Instance {
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 31bf2b85..83ea8e1f 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -475,7 +475,7 @@ mod gradient {
     }
 }
 
-pub(crate) fn color_target_state(
+fn color_target_state(
     format: wgpu::TextureFormat,
 ) -> [Option<wgpu::ColorTargetState>; 1] {
     [Some(wgpu::ColorTargetState {
@@ -516,9 +516,9 @@ impl Vertex {
     }
 }
 
-pub(crate) const INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
+const INDICES: [u16; 6] = [0, 1, 2, 0, 2, 3];
 
-pub(crate) const VERTICES: [Vertex; 4] = [
+const VERTICES: [Vertex; 4] = [
     Vertex {
         _position: [0.0, 0.0],
     },

From e267e075ccd35ae3ca357ae4143796e68c1ad392 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, 19 May 2023 04:02:18 +0200
Subject: [PATCH 282/440] Avoid redundant `buffer::Buffer` import

---
 wgpu/src/image.rs    | 2 +-
 wgpu/src/lib.rs      | 2 ++
 wgpu/src/quad.rs     | 4 ++--
 wgpu/src/triangle.rs | 7 +++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index c3479652..3407aa92 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -8,10 +8,10 @@ mod vector;
 
 use atlas::Atlas;
 
-use crate::buffer::Buffer;
 use crate::core::{Rectangle, Size};
 use crate::graphics::Transformation;
 use crate::layer;
+use crate::Buffer;
 
 use std::cell::RefCell;
 use std::mem;
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index c05280a6..571d2718 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -50,6 +50,8 @@ mod quad;
 mod text;
 mod triangle;
 
+use buffer::Buffer;
+
 pub use iced_graphics as graphics;
 pub use iced_graphics::core;
 
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 83ea8e1f..e35aebc9 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -195,9 +195,9 @@ impl Layer {
 }
 
 mod solid {
-    use crate::buffer::Buffer;
     use crate::layer::quad;
     use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
+    use crate::Buffer;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -324,9 +324,9 @@ mod solid {
 }
 
 mod gradient {
-    use crate::buffer::Buffer;
     use crate::layer::quad;
     use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
+    use crate::Buffer;
 
     #[derive(Debug)]
     pub struct Pipeline {
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 0d1fead1..6cd54ef7 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,10 +1,10 @@
 //! Draw meshes of triangles.
 mod msaa;
 
-use crate::buffer::Buffer;
 use crate::core::Size;
 use crate::graphics::{Antialiasing, Transformation};
 use crate::layer::mesh::{self, Mesh};
+use crate::Buffer;
 
 const INITIAL_INDEX_COUNT: usize = 1_000;
 const INITIAL_VERTEX_COUNT: usize = 1_000;
@@ -389,10 +389,10 @@ impl Uniforms {
 }
 
 mod solid {
-    use crate::buffer::Buffer;
     use crate::graphics::primitive;
     use crate::graphics::Antialiasing;
     use crate::triangle;
+    use crate::Buffer;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -533,8 +533,7 @@ mod solid {
 mod gradient {
     use crate::graphics::{primitive, Antialiasing};
     use crate::triangle;
-
-    use crate::buffer::Buffer;
+    use crate::Buffer;
 
     #[derive(Debug)]
     pub struct Pipeline {

From c888d0679bcaca13cd0dd5963e65449fef69ec01 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, 19 May 2023 04:04:16 +0200
Subject: [PATCH 283/440] Fix inconsistent `pub use` in `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 08c0004a..980d807b 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -7,7 +7,7 @@ pub mod quad;
 
 pub use image::Image;
 pub use mesh::Mesh;
-use quad::Quad;
+pub use quad::Quad;
 pub use text::Text;
 
 use crate::core;

From ccf7d1994fd1856a32fe8a9afe3a6474aa4e6dc8 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, 19 May 2023 04:05:31 +0200
Subject: [PATCH 284/440] Fix needless borrow in `tiny_skia::backend`

---
 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 d55b9dab..491e80c9 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -186,7 +186,7 @@ impl Backend {
                             }
                             Background::Gradient(Gradient::Linear(linear)) => {
                                 let (start, end) =
-                                    linear.angle.to_distance(&bounds);
+                                    linear.angle.to_distance(bounds);
 
                                 let stops: Vec<tiny_skia::GradientStop> =
                                     linear

From 9d25f98f0f658819048e2455df0d48aea79fb4cc 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, 19 May 2023 04:07:53 +0200
Subject: [PATCH 285/440] Reduce `INITIAL_INSTANCES` in `wgpu::quad` to `2_000`

---
 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 e35aebc9..0125ec0b 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -8,7 +8,7 @@ use wgpu::util::DeviceExt;
 #[cfg(feature = "tracing")]
 use tracing::info_span;
 
-const INITIAL_INSTANCES: usize = 10_000;
+const INITIAL_INSTANCES: usize = 2_000;
 
 #[derive(Debug)]
 pub struct Pipeline {

From f7ed645eddd96f7964268367e24abcb5bb78a979 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, 19 May 2023 04:15:55 +0200
Subject: [PATCH 286/440] Remove redundant re-export in `widget::canvas`

---
 widget/src/canvas.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs
index bc969dae..171c4534 100644
--- a/widget/src/canvas.rs
+++ b/widget/src/canvas.rs
@@ -4,7 +4,6 @@ pub mod event;
 mod cursor;
 mod program;
 
-pub use crate::graphics::Gradient;
 pub use cursor::Cursor;
 pub use event::Event;
 pub use program::Program;

From 0cb84c1c4cc128f8260054192b4f7798de52a82a Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Wed, 17 May 2023 15:30:35 +0100
Subject: [PATCH 287/440] Change name of hovered region style struct, reorder
 lines & export Appearance

---
 style/src/pane_grid.rs  | 32 ++++++++++++++++----------------
 style/src/theme.rs      |  4 ++--
 widget/src/pane_grid.rs |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index ec422e86..c1002725 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,24 +1,9 @@
 //! Change the appearance of a pane grid.
 use iced_core::{Background, Color};
 
-/// A set of rules that dictate the style of a container.
-pub trait StyleSheet {
-    /// The supported style of the [`StyleSheet`].
-    type Style: Default;
-
-    /// The [`Region`] to draw when a pane is hovered.
-    fn hovered_region(&self, style: &Self::Style) -> Region;
-
-    /// The [`Line`] to draw when a split is picked.
-    fn picked_split(&self, style: &Self::Style) -> Option<Line>;
-
-    /// The [`Line`] to draw when a split is hovered.
-    fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
-}
-
 /// The appearance of the hovered region of a pane grid.
 #[derive(Debug, Clone, Copy)]
-pub struct Region {
+pub struct Appearance {
     /// The [`Background`] of the hovered pane region.
     pub background: Background,
     /// The border width of the hovered pane region.
@@ -40,3 +25,18 @@ pub struct Line {
     /// The width of the [`Line`].
     pub width: f32,
 }
+
+/// A set of rules that dictate the style of a container.
+pub trait StyleSheet {
+    /// The supported style of the [`StyleSheet`].
+    type Style: Default;
+
+    /// The [`Region`] to draw when a pane is hovered.
+    fn hovered_region(&self, style: &Self::Style) -> Appearance;
+
+    /// The [`Line`] to draw when a split is picked.
+    fn picked_split(&self, style: &Self::Style) -> Option<Line>;
+
+    /// The [`Line`] to draw when a split is hovered.
+    fn hovered_split(&self, style: &Self::Style) -> Option<Line>;
+}
diff --git a/style/src/theme.rs b/style/src/theme.rs
index c7b2bada..8a7be72c 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -703,12 +703,12 @@ pub enum PaneGrid {
 impl pane_grid::StyleSheet for Theme {
     type Style = PaneGrid;
 
-    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Region {
+    fn hovered_region(&self, style: &Self::Style) -> pane_grid::Appearance {
         match style {
             PaneGrid::Default => {
                 let palette = self.extended_palette();
 
-                pane_grid::Region {
+                pane_grid::Appearance {
                     background: Background::Color(Color {
                         a: 0.5,
                         ..palette.primary.base.color
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index f7fdc072..e6ffb1d6 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -30,7 +30,7 @@ pub use split::Split;
 pub use state::State;
 pub use title_bar::TitleBar;
 
-pub use crate::style::pane_grid::{Line, StyleSheet};
+pub use crate::style::pane_grid::{Appearance, Line, StyleSheet};
 
 use crate::container;
 use crate::core::event::{self, Event};

From bc590e2d6f3a39b09b11928c829f05d7bc9f9211 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Fri, 19 May 2023 12:12:08 +0100
Subject: [PATCH 288/440] Take pane state internally

---
 examples/pane_grid/src/main.rs |  5 +----
 widget/src/pane_grid/state.rs  | 26 ++++++++------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index d670e1e8..2ffdcc69 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -110,10 +110,7 @@ impl Application for Example {
                 target,
                 region,
             }) => {
-                if let Some(state) = self.panes.get(&pane) {
-                    let pane = (*state, &pane);
-                    self.panes.split_with(&target, pane, region);
-                }
+                self.panes.split_with(&target, &pane, region);
             }
             Message::Dragged(_) => {}
             Message::TogglePin(pane) => {
diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index b57cdd92..6ab34884 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -170,17 +170,9 @@ impl<T> State<T> {
     /// Split a target [`Pane`] with a given [`Pane`] on a given [`Region`].
     ///
     /// Panes will be swapped by default for [`Region::Center`].
-    pub fn split_with(
-        &mut self,
-        target: &Pane,
-        pane: (T, &Pane),
-        region: Region,
-    ) {
+    pub fn split_with(&mut self, target: &Pane, pane: &Pane, region: Region) {
         match region {
-            Region::Center => {
-                let (_, pane) = pane;
-                self.swap(pane, target);
-            }
+            Region::Center => self.swap(pane, target),
             Region::Top => {
                 self.split_and_swap(Axis::Horizontal, target, pane, true)
             }
@@ -200,17 +192,15 @@ impl<T> State<T> {
         &mut self,
         axis: Axis,
         target: &Pane,
-        pane: (T, &Pane),
+        pane: &Pane,
         invert: bool,
     ) {
-        let (state, pane) = pane;
-
-        if let Some((new_pane, _)) = self.split(axis, target, state) {
-            if invert {
-                self.swap(target, &new_pane);
+        if let Some((state, _)) = self.close(pane) {
+            if let Some((new_pane, _)) = self.split(axis, target, state) {
+                if invert {
+                    self.swap(target, &new_pane);
+                }
             }
-
-            let _ = self.close(pane);
         }
     }
 

From 9b5f32ee403c8b0730e3bac2b48aab6b87d7b653 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Fri, 19 May 2023 12:15:44 +0100
Subject: [PATCH 289/440] Rename invert -> swap

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

diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index 6ab34884..1f034ca3 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -193,11 +193,11 @@ impl<T> State<T> {
         axis: Axis,
         target: &Pane,
         pane: &Pane,
-        invert: bool,
+        swap: bool,
     ) {
         if let Some((state, _)) = self.close(pane) {
             if let Some((new_pane, _)) = self.split(axis, target, state) {
-                if invert {
+                if swap {
                     self.swap(target, &new_pane);
                 }
             }

From 039debd251feef6225961455181db324bcc0c272 Mon Sep 17 00:00:00 2001
From: RGBCube <78925721+RGBCube@users.noreply.github.com>
Date: Sat, 20 May 2023 20:23:00 +0300
Subject: [PATCH 290/440] Add Nix instructions to README

---
 README.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/README.md b/README.md
index c72fd770..16ca9926 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,40 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
 [check out the issues]: https://github.com/iced-rs/iced/issues
 [feel free to contribute!]: #contributing--feedback
 
+## Dependencies
+
+Iced requires some system dependencies to work, and not
+all operating systems come with them installed.
+
+You can follow the provided instructions for your system to
+get them, if your system isn't here, add it!
+
+### NixOS
+
+You can add this `shell.nix` to your project and use it by running `nix-shell`:
+
+```nix
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell rec {
+  buildInputs = with pkgs; [
+    expat
+    fontconfig
+    freetype
+    freetype.dev
+    libGL
+    pkgconfig
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ];
+
+  LD_LIBRARY_PATH =
+    builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs;
+}
+```
+
 ## Installation
 
 Add `iced` as a dependency in your `Cargo.toml`:

From d20493c8a0cc6e2e250434ed4cb6f350ed39d7e8 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marienz@google.com>
Date: Sun, 21 May 2023 23:41:26 +1000
Subject: [PATCH 291/440] Support conversion from Fn trait to custom theme

...instead of just from function pointers.

I'm making this change not because I actually want to pass a closure,
but to make passing a single fixed function work. This commit also
simplifies the scrollable example slightly, and without the other half
of this change that simplified example fails to compile with:

```
error[E0277]: the trait bound `iced::theme::ProgressBar: From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}>` is not satisfied
   --> examples/scrollable/src/main.rs:292:28
    |
292 |                     .style(progress_bar_custom_style)
    |                      ----- ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}>` is not implemented for `iced::theme::ProgressBar`
    |                      |
    |                      required by a bound introduced by this call
    |
    = help: the trait `From<for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance>` is implemented for `iced::theme::ProgressBar`
    = note: required for `for<'a> fn(&'a Theme) -> iced::widget::progress_bar::Appearance {progress_bar_custom_style}` to implement `Into<iced::theme::ProgressBar>`
note: required by a bound in `iced::widget::ProgressBar::<Renderer>::style`
   --> /home/marienz/src/iced/widget/src/progress_bar.rs:77:21
    |
77  |         style: impl Into<<Renderer::Theme as StyleSheet>::Style>,
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ProgressBar::<Renderer>::style`
```

This happens because `progress_bar_custom_style` by itself is a function
item, which is typically coerced to a function pointer when one is
needed, but not in this case. It is possible to work around this on the
caller's side, but especially since the compiler diagnostic for this is
a bit rough (see https://github.com/rust-lang/rust/issues/100116) let's
try to make it work out of the box.
---
 examples/scrollable/src/main.rs | 27 ++++++++-------------------
 style/src/theme.rs              | 28 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 97344c94..9d57cb94 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -289,18 +289,13 @@ impl Application for ScrollableDemo {
             }
             Direction::Horizontal => {
                 progress_bar(0.0..=1.0, self.current_scroll_offset.x)
-                    .style(theme::ProgressBar::Custom(Box::new(
-                        ProgressBarCustomStyle,
-                    )))
+                    .style(progress_bar_custom_style)
                     .into()
             }
             Direction::Multi => column![
                 progress_bar(0.0..=1.0, self.current_scroll_offset.y),
-                progress_bar(0.0..=1.0, self.current_scroll_offset.x).style(
-                    theme::ProgressBar::Custom(Box::new(
-                        ProgressBarCustomStyle,
-                    ))
-                )
+                progress_bar(0.0..=1.0, self.current_scroll_offset.x)
+                    .style(progress_bar_custom_style)
             ]
             .spacing(10)
             .into(),
@@ -372,16 +367,10 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
     }
 }
 
-struct ProgressBarCustomStyle;
-
-impl progress_bar::StyleSheet for ProgressBarCustomStyle {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
-        progress_bar::Appearance {
-            background: style.extended_palette().background.strong.color.into(),
-            bar: Color::from_rgb8(250, 85, 134).into(),
-            border_radius: 0.0,
-        }
+fn progress_bar_custom_style(theme: &Theme) -> progress_bar::Appearance {
+    progress_bar::Appearance {
+        background: theme.extended_palette().background.strong.color.into(),
+        bar: Color::from_rgb8(250, 85, 134).into(),
+        border_radius: 0.0,
     }
 }
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 6299975d..9500fe9d 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -105,7 +105,7 @@ impl application::StyleSheet for Theme {
     }
 }
 
-impl application::StyleSheet for fn(&Theme) -> application::Appearance {
+impl<T: Fn(&Theme) -> application::Appearance> application::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> application::Appearance {
@@ -113,8 +113,10 @@ impl application::StyleSheet for fn(&Theme) -> application::Appearance {
     }
 }
 
-impl From<fn(&Theme) -> application::Appearance> for Application {
-    fn from(f: fn(&Theme) -> application::Appearance) -> Self {
+impl<T: Fn(&Theme) -> application::Appearance + 'static> From<T>
+    for Application
+{
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -363,8 +365,8 @@ pub enum Container {
     Custom(Box<dyn container::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> container::Appearance> for Container {
-    fn from(f: fn(&Theme) -> container::Appearance) -> Self {
+impl<T: Fn(&Theme) -> container::Appearance + 'static> From<T> for Container {
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -391,7 +393,7 @@ impl container::StyleSheet for Theme {
     }
 }
 
-impl container::StyleSheet for fn(&Theme) -> container::Appearance {
+impl<T: Fn(&Theme) -> container::Appearance> container::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> container::Appearance {
@@ -777,8 +779,10 @@ pub enum ProgressBar {
     Custom(Box<dyn progress_bar::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> progress_bar::Appearance> for ProgressBar {
-    fn from(f: fn(&Theme) -> progress_bar::Appearance) -> Self {
+impl<T: Fn(&Theme) -> progress_bar::Appearance + 'static> From<T>
+    for ProgressBar
+{
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -808,7 +812,7 @@ impl progress_bar::StyleSheet for Theme {
     }
 }
 
-impl progress_bar::StyleSheet for fn(&Theme) -> progress_bar::Appearance {
+impl<T: Fn(&Theme) -> progress_bar::Appearance> progress_bar::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
@@ -826,8 +830,8 @@ pub enum Rule {
     Custom(Box<dyn rule::StyleSheet<Style = Theme>>),
 }
 
-impl From<fn(&Theme) -> rule::Appearance> for Rule {
-    fn from(f: fn(&Theme) -> rule::Appearance) -> Self {
+impl<T: Fn(&Theme) -> rule::Appearance + 'static> From<T> for Rule {
+    fn from(f: T) -> Self {
         Self::Custom(Box::new(f))
     }
 }
@@ -850,7 +854,7 @@ impl rule::StyleSheet for Theme {
     }
 }
 
-impl rule::StyleSheet for fn(&Theme) -> rule::Appearance {
+impl<T: Fn(&Theme) -> rule::Appearance> rule::StyleSheet for T {
     type Style = Theme;
 
     fn appearance(&self, style: &Self::Style) -> rule::Appearance {

From dee8ede5be04d0c32d24929b255e431821b69d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20du=20Garreau?= <bdgdlm@outlook.com>
Date: Tue, 9 May 2023 14:14:29 +0200
Subject: [PATCH 292/440] Update `glam` to `0.24`

---
 graphics/Cargo.toml | 2 +-
 wgpu/Cargo.toml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 125ea17d..903a2069 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -16,7 +16,7 @@ opengl = []
 image = ["dep:image", "kamadak-exif"]
 
 [dependencies]
-glam = "0.21.3"
+glam = "0.24"
 log = "0.4"
 raw-window-handle = "0.5"
 thiserror = "1.0"
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 1b71d6ec..f21bf7e0 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -47,7 +47,7 @@ git = "https://github.com/hecrj/glyphon.git"
 rev = "f145067d292082abdd1f2b2481812d4a52c394ec"
 
 [dependencies.glam]
-version = "0.21.3"
+version = "0.24"
 
 [dependencies.lyon]
 version = "1.0"

From 5802c957972ab972567d7f9a2f35a49bd9fb2cc3 Mon Sep 17 00:00:00 2001
From: bbb651 <bar.ye651@gmail.com>
Date: Sat, 15 Apr 2023 00:45:30 +0300
Subject: [PATCH 293/440] Make mouse::Button::Other take u16 instead of u8

On wayland keys correspond to <input-event-codes.h>,
and they are past the limit of u8, causing the
back and forward buttons to be 20 and 19 which definitely isn't right
(they should all be around 0x110..=0x117).
---
 core/src/mouse/button.rs | 2 +-
 winit/src/conversion.rs  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/mouse/button.rs b/core/src/mouse/button.rs
index aeb8a55d..3eec7f42 100644
--- a/core/src/mouse/button.rs
+++ b/core/src/mouse/button.rs
@@ -11,5 +11,5 @@ pub enum Button {
     Middle,
 
     /// Some other button.
-    Other(u8),
+    Other(u16),
 }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index e416c073..22d8f223 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -249,9 +249,7 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
         winit::event::MouseButton::Left => mouse::Button::Left,
         winit::event::MouseButton::Right => mouse::Button::Right,
         winit::event::MouseButton::Middle => mouse::Button::Middle,
-        winit::event::MouseButton::Other(other) => {
-            mouse::Button::Other(other as u8)
-        }
+        winit::event::MouseButton::Other(other) => mouse::Button::Other(other),
     }
 }
 

From 12a57fae5c4a8cf24976c551a64753b5da32ee30 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 10 May 2023 17:09:29 -0700
Subject: [PATCH 294/440] Remove min width 1 from scrollbar & scroller

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

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index fd51a6a8..c3478493 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -128,9 +128,8 @@ impl Properties {
     }
 
     /// Sets the scrollbar width of the [`Scrollable`] .
-    /// Silently enforces a minimum width of 1.
     pub fn width(mut self, width: impl Into<Pixels>) -> Self {
-        self.width = width.into().0.max(1.0);
+        self.width = width.into().0.max(0.0);
         self
     }
 
@@ -141,9 +140,8 @@ impl Properties {
     }
 
     /// Sets the scroller width of the [`Scrollable`] .
-    /// Silently enforces a minimum width of 1.
     pub fn scroller_width(mut self, scroller_width: impl Into<Pixels>) -> Self {
-        self.scroller_width = scroller_width.into().0.max(1.0);
+        self.scroller_width = scroller_width.into().0.max(0.0);
         self
     }
 }

From 29326952b420c22c34a5a1315e8f8a1ce77311ef 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, 23 May 2023 04:39:41 +0200
Subject: [PATCH 295/440] Avoid drawing empty quads in `widget::scrollable`

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

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index c3478493..af5424c0 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -809,9 +809,11 @@ pub fn draw<Renderer>(
              style: Scrollbar,
              scrollbar: &internals::Scrollbar| {
                 //track
-                if style.background.is_some()
-                    || (style.border_color != Color::TRANSPARENT
-                        && style.border_width > 0.0)
+                if scrollbar.bounds.width > 0.0
+                    && scrollbar.bounds.height > 0.0
+                    && (style.background.is_some()
+                        || (style.border_color != Color::TRANSPARENT
+                            && style.border_width > 0.0))
                 {
                     renderer.fill_quad(
                         renderer::Quad {
@@ -827,9 +829,11 @@ pub fn draw<Renderer>(
                 }
 
                 //thumb
-                if style.scroller.color != Color::TRANSPARENT
-                    || (style.scroller.border_color != Color::TRANSPARENT
-                        && style.scroller.border_width > 0.0)
+                if scrollbar.scroller.bounds.width > 0.0
+                    && scrollbar.scroller.bounds.height > 0.0
+                    && (style.scroller.color != Color::TRANSPARENT
+                        || (style.scroller.border_color != Color::TRANSPARENT
+                            && style.scroller.border_width > 0.0))
                 {
                     renderer.fill_quad(
                         renderer::Quad {

From 1c86defab5f5491b5f6b6e45faabf1b91ed195a3 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Tue, 23 May 2023 12:26:16 +0200
Subject: [PATCH 296/440] Extend border radius on relevant widgets

---
 core/src/border_radius.rs       | 22 ++++++++++++++++++++
 core/src/lib.rs                 |  2 ++
 core/src/renderer.rs            | 25 +----------------------
 examples/modal/src/main.rs      |  2 +-
 examples/scrollable/src/main.rs | 31 +++++++++++++++++++---------
 style/src/button.rs             |  6 +++---
 style/src/checkbox.rs           |  4 ++--
 style/src/container.rs          |  6 +++---
 style/src/menu.rs               |  4 ++--
 style/src/pane_grid.rs          |  4 ++--
 style/src/pick_list.rs          |  4 ++--
 style/src/progress_bar.rs       |  4 ++--
 style/src/rule.rs               |  4 ++--
 style/src/scrollable.rs         |  6 +++---
 style/src/slider.rs             |  4 ++--
 style/src/text_input.rs         |  4 ++--
 style/src/theme.rs              | 36 ++++++++++++++++-----------------
 widget/src/slider.rs            | 20 +++++++++---------
 widget/src/vertical_slider.rs   | 22 ++++++++++----------
 19 files changed, 111 insertions(+), 99 deletions(-)
 create mode 100644 core/src/border_radius.rs

diff --git a/core/src/border_radius.rs b/core/src/border_radius.rs
new file mode 100644
index 00000000..a444dd74
--- /dev/null
+++ b/core/src/border_radius.rs
@@ -0,0 +1,22 @@
+/// The border radii for the corners of a graphics primitive in the order:
+/// top-left, top-right, bottom-right, bottom-left.
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
+pub struct BorderRadius([f32; 4]);
+
+impl From<f32> for BorderRadius {
+    fn from(w: f32) -> Self {
+        Self([w; 4])
+    }
+}
+
+impl From<[f32; 4]> for BorderRadius {
+    fn from(radi: [f32; 4]) -> Self {
+        Self(radi)
+    }
+}
+
+impl From<BorderRadius> for [f32; 4] {
+    fn from(radi: BorderRadius) -> Self {
+        radi.0
+    }
+}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 6de5ada4..76d775e7 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -44,6 +44,7 @@ pub mod window;
 
 mod angle;
 mod background;
+mod border_radius;
 mod color;
 mod content_fit;
 mod element;
@@ -60,6 +61,7 @@ mod vector;
 pub use alignment::Alignment;
 pub use angle::{Degrees, Radians};
 pub use background::Background;
+pub use border_radius::BorderRadius;
 pub use clipboard::Clipboard;
 pub use color::Color;
 pub use content_fit::ContentFit;
diff --git a/core/src/renderer.rs b/core/src/renderer.rs
index 007a0370..7c73d2e4 100644
--- a/core/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -6,7 +6,7 @@ mod null;
 pub use null::Null;
 
 use crate::layout;
-use crate::{Background, Color, Element, Rectangle, Vector};
+use crate::{Background, BorderRadius, Color, Element, Rectangle, Vector};
 
 /// A component that can be used by widgets to draw themselves on a screen.
 pub trait Renderer: Sized {
@@ -60,29 +60,6 @@ pub struct Quad {
     pub border_color: Color,
 }
 
-/// The border radii for the corners of a graphics primitive in the order:
-/// top-left, top-right, bottom-right, bottom-left.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct BorderRadius([f32; 4]);
-
-impl From<f32> for BorderRadius {
-    fn from(w: f32) -> Self {
-        Self([w; 4])
-    }
-}
-
-impl From<[f32; 4]> for BorderRadius {
-    fn from(radi: [f32; 4]) -> Self {
-        Self(radi)
-    }
-}
-
-impl From<BorderRadius> for [f32; 4] {
-    fn from(radi: BorderRadius) -> Self {
-        radi.0
-    }
-}
-
 /// The styling attributes of a [`Renderer`].
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Style {
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index f48afb69..9e1e4c2f 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -418,7 +418,7 @@ mod modal {
             renderer.fill_quad(
                 renderer::Quad {
                     bounds: layout.bounds(),
-                    border_radius: renderer::BorderRadius::from(0.0),
+                    border_radius: Default::default(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 9d57cb94..efc880e3 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -289,13 +289,18 @@ impl Application for ScrollableDemo {
             }
             Direction::Horizontal => {
                 progress_bar(0.0..=1.0, self.current_scroll_offset.x)
-                    .style(progress_bar_custom_style)
+                    .style(theme::ProgressBar::Custom(Box::new(
+                        ProgressBarCustomStyle,
+                    )))
                     .into()
             }
             Direction::Multi => column![
                 progress_bar(0.0..=1.0, self.current_scroll_offset.y),
-                progress_bar(0.0..=1.0, self.current_scroll_offset.x)
-                    .style(progress_bar_custom_style)
+                progress_bar(0.0..=1.0, self.current_scroll_offset.x).style(
+                    theme::ProgressBar::Custom(Box::new(
+                        ProgressBarCustomStyle,
+                    ))
+                )
             ]
             .spacing(10)
             .into(),
@@ -351,12 +356,12 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
                 background: style
                     .active(&theme::Scrollable::default())
                     .background,
-                border_radius: 0.0,
+                border_radius: 0.0.into(),
                 border_width: 0.0,
                 border_color: Default::default(),
                 scroller: Scroller {
                     color: Color::from_rgb8(250, 85, 134),
-                    border_radius: 0.0,
+                    border_radius: 0.0.into(),
                     border_width: 0.0,
                     border_color: Default::default(),
                 },
@@ -367,10 +372,16 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
     }
 }
 
-fn progress_bar_custom_style(theme: &Theme) -> progress_bar::Appearance {
-    progress_bar::Appearance {
-        background: theme.extended_palette().background.strong.color.into(),
-        bar: Color::from_rgb8(250, 85, 134).into(),
-        border_radius: 0.0,
+struct ProgressBarCustomStyle;
+
+impl progress_bar::StyleSheet for ProgressBarCustomStyle {
+    type Style = Theme;
+
+    fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
+        progress_bar::Appearance {
+            background: style.extended_palette().background.strong.color.into(),
+            bar: Color::from_rgb8(250, 85, 134).into(),
+            border_radius: 0.0.into(),
+        }
     }
 }
diff --git a/style/src/button.rs b/style/src/button.rs
index 32ec28b7..e49ad94a 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -1,5 +1,5 @@
 //! Change the apperance of a button.
-use iced_core::{Background, Color, Vector};
+use iced_core::{Background, BorderRadius, Color, Vector};
 
 /// The appearance of a button.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the button.
     pub background: Option<Background>,
     /// The border radius of the button.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the button.
     pub border_width: f32,
     /// The border [`Color`] of the button.
@@ -23,7 +23,7 @@ impl std::default::Default for Appearance {
         Self {
             shadow_offset: Vector::default(),
             background: None,
-            border_radius: 0.0,
+            border_radius: 0.0.into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
             text_color: Color::BLACK,
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
index 52b90ec9..cf52c05d 100644
--- a/style/src/checkbox.rs
+++ b/style/src/checkbox.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a checkbox.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a checkbox.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The icon [`Color`] of the checkbox.
     pub icon_color: Color,
     /// The border radius of the checkbox.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the checkbox.
     pub border_width: f32,
     /// The border [`Color`] of the checkbox.
diff --git a/style/src/container.rs b/style/src/container.rs
index 560b2d5b..ec543ae4 100644
--- a/style/src/container.rs
+++ b/style/src/container.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a container.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a container.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the container.
     pub background: Option<Background>,
     /// The border radius of the container.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the container.
     pub border_width: f32,
     /// The border [`Color`] of the container.
@@ -21,7 +21,7 @@ impl std::default::Default for Appearance {
         Self {
             text_color: None,
             background: None,
-            border_radius: 0.0,
+            border_radius: 0.0.into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         }
diff --git a/style/src/menu.rs b/style/src/menu.rs
index 7d878748..dbf19dae 100644
--- a/style/src/menu.rs
+++ b/style/src/menu.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of menus.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a menu.
 #[derive(Debug, Clone, Copy)]
@@ -11,7 +11,7 @@ pub struct Appearance {
     /// The border width of the menu.
     pub border_width: f32,
     /// The border radius of the menu.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border [`Color`] of the menu.
     pub border_color: Color,
     /// The text [`Color`] of a selected option in the menu.
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index c1002725..b99af955 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a pane grid.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of the hovered region of a pane grid.
 #[derive(Debug, Clone, Copy)]
@@ -11,7 +11,7 @@ pub struct Appearance {
     /// The border [`Color`] of the hovered pane region.
     pub border_color: Color,
     /// The border radius of the hovered pane region.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
 }
 
 /// A line.
diff --git a/style/src/pick_list.rs b/style/src/pick_list.rs
index 11e13b01..961c1e93 100644
--- a/style/src/pick_list.rs
+++ b/style/src/pick_list.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a pick list.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a pick list.
 #[derive(Debug, Clone, Copy)]
@@ -13,7 +13,7 @@ pub struct Appearance {
     /// The [`Background`] of the pick list.
     pub background: Background,
     /// The border radius of the pick list.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the pick list.
     pub border_width: f32,
     /// The border color of the pick list.
diff --git a/style/src/progress_bar.rs b/style/src/progress_bar.rs
index fb1819fc..c05a6ee4 100644
--- a/style/src/progress_bar.rs
+++ b/style/src/progress_bar.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a progress bar.
-use iced_core::Background;
+use iced_core::{Background, BorderRadius};
 
 /// The appearance of a progress bar.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The [`Background`] of the bar of the progress bar.
     pub bar: Background,
     /// The border radius of the progress bar.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
 }
 
 /// A set of rules that dictate the style of a progress bar.
diff --git a/style/src/rule.rs b/style/src/rule.rs
index b7380747..afae085c 100644
--- a/style/src/rule.rs
+++ b/style/src/rule.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a rule.
-use iced_core::Color;
+use iced_core::{BorderRadius, Color};
 
 /// The appearance of a rule.
 #[derive(Debug, Clone, Copy)]
@@ -9,7 +9,7 @@ pub struct Appearance {
     /// The width (thickness) of the rule line.
     pub width: u16,
     /// The radius of the line corners.
-    pub radius: f32,
+    pub radius: BorderRadius,
     /// The [`FillMode`] of the rule.
     pub fill_mode: FillMode,
 }
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index b528c444..952c11e1 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a scrollable.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a scrollable.
 #[derive(Debug, Clone, Copy)]
@@ -7,7 +7,7 @@ pub struct Scrollbar {
     /// The [`Background`] of a scrollable.
     pub background: Option<Background>,
     /// The border radius of a scrollable.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of a scrollable.
     pub border_width: f32,
     /// The border [`Color`] of a scrollable.
@@ -22,7 +22,7 @@ pub struct Scroller {
     /// The [`Color`] of the scroller.
     pub color: Color,
     /// The border radius of the scroller.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the scroller.
     pub border_width: f32,
     /// The border [`Color`] of the scroller.
diff --git a/style/src/slider.rs b/style/src/slider.rs
index 884d3871..ca115f46 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -1,5 +1,5 @@
 //! Change the apperance of a slider.
-use iced_core::Color;
+use iced_core::{BorderRadius, Color};
 
 /// The appearance of a slider.
 #[derive(Debug, Clone, Copy)]
@@ -45,7 +45,7 @@ pub enum HandleShape {
         /// The width of the rectangle.
         width: u16,
         /// The border radius of the corners of the rectangle.
-        border_radius: f32,
+        border_radius: BorderRadius,
     },
 }
 
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 2616ad5a..90251b5c 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of a text input.
-use iced_core::{Background, Color};
+use iced_core::{Background, BorderRadius, Color};
 
 /// The appearance of a text input.
 #[derive(Debug, Clone, Copy)]
@@ -7,7 +7,7 @@ pub struct Appearance {
     /// The [`Background`] of the text input.
     pub background: Background,
     /// The border radius of the text input.
-    pub border_radius: f32,
+    pub border_radius: BorderRadius,
     /// The border width of the text input.
     pub border_width: f32,
     /// The border [`Color`] of the text input.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 9500fe9d..4a8ee749 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -157,7 +157,7 @@ impl button::StyleSheet for Theme {
         let palette = self.extended_palette();
 
         let appearance = button::Appearance {
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             ..button::Appearance::default()
         };
 
@@ -346,7 +346,7 @@ fn checkbox_appearance(
             base.color
         }),
         icon_color,
-        border_radius: 2.0,
+        border_radius: 2.0.into(),
         border_width: 1.0,
         border_color: accent.color,
         text_color: None,
@@ -383,7 +383,7 @@ impl container::StyleSheet for Theme {
                 container::Appearance {
                     text_color: None,
                     background: Some(palette.background.weak.color.into()),
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 }
@@ -422,7 +422,7 @@ impl slider::StyleSheet for Theme {
                 let handle = slider::Handle {
                     shape: slider::HandleShape::Rectangle {
                         width: 8,
-                        border_radius: 4.0,
+                        border_radius: 4.0.into(),
                     },
                     color: Color::WHITE,
                     border_color: Color::WHITE,
@@ -507,7 +507,7 @@ impl menu::StyleSheet for Theme {
                     text_color: palette.background.weak.text,
                     background: palette.background.weak.color.into(),
                     border_width: 1.0,
-                    border_radius: 0.0,
+                    border_radius: 0.0.into(),
                     border_color: palette.background.strong.color,
                     selected_text_color: palette.primary.strong.text,
                     selected_background: palette.primary.strong.color.into(),
@@ -553,7 +553,7 @@ impl pick_list::StyleSheet for Theme {
                     background: palette.background.weak.color.into(),
                     placeholder_color: palette.background.strong.color,
                     handle_color: palette.background.weak.text,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 1.0,
                     border_color: palette.background.strong.color,
                 }
@@ -572,7 +572,7 @@ impl pick_list::StyleSheet for Theme {
                     background: palette.background.weak.color.into(),
                     placeholder_color: palette.background.strong.color,
                     handle_color: palette.background.weak.text,
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 1.0,
                     border_color: palette.primary.strong.color,
                 }
@@ -729,7 +729,7 @@ impl pane_grid::StyleSheet for Theme {
                     }),
                     border_width: 2.0,
                     border_color: palette.primary.strong.color,
-                    border_radius: 0.0,
+                    border_radius: 0.0.into(),
                 }
             }
             PaneGrid::Custom(custom) => custom.hovered_region(self),
@@ -800,7 +800,7 @@ impl progress_bar::StyleSheet for Theme {
         let from_palette = |bar: Color| progress_bar::Appearance {
             background: palette.background.strong.color.into(),
             bar: bar.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
         };
 
         match style {
@@ -846,7 +846,7 @@ impl rule::StyleSheet for Theme {
             Rule::Default => rule::Appearance {
                 color: palette.background.strong.color,
                 width: 1,
-                radius: 0.0,
+                radius: 0.0.into(),
                 fill_mode: rule::FillMode::Full,
             },
             Rule::Custom(custom) => custom.appearance(self),
@@ -929,12 +929,12 @@ impl scrollable::StyleSheet for Theme {
 
                 scrollable::Scrollbar {
                     background: Some(palette.background.weak.color.into()),
-                    border_radius: 2.0,
+                    border_radius: 2.0.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                     scroller: scrollable::Scroller {
                         color: palette.background.strong.color,
-                        border_radius: 2.0,
+                        border_radius: 2.0.into(),
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
                     },
@@ -956,12 +956,12 @@ impl scrollable::StyleSheet for Theme {
 
                     scrollable::Scrollbar {
                         background: Some(palette.background.weak.color.into()),
-                        border_radius: 2.0,
+                        border_radius: 2.0.into(),
                         border_width: 0.0,
                         border_color: Color::TRANSPARENT,
                         scroller: scrollable::Scroller {
                             color: palette.primary.strong.color,
-                            border_radius: 2.0,
+                            border_radius: 2.0.into(),
                             border_width: 0.0,
                             border_color: Color::TRANSPARENT,
                         },
@@ -1063,7 +1063,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.strong.color,
             icon_color: palette.background.weak.text,
@@ -1079,7 +1079,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.base.text,
             icon_color: palette.background.weak.text,
@@ -1095,7 +1095,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.base.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.primary.strong.color,
             icon_color: palette.background.weak.text,
@@ -1141,7 +1141,7 @@ impl text_input::StyleSheet for Theme {
 
         text_input::Appearance {
             background: palette.background.weak.color.into(),
-            border_radius: 2.0,
+            border_radius: 2.0.into(),
             border_width: 1.0,
             border_color: palette.background.strong.color,
             icon_color: palette.background.strong.color,
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index 18a49665..d3c4a936 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -368,16 +368,16 @@ pub fn draw<T, R>(
         style_sheet.active(style)
     };
 
-    let (handle_width, handle_height, handle_border_radius) = match style
-        .handle
-        .shape
-    {
-        HandleShape::Circle { radius } => (radius * 2.0, radius * 2.0, radius),
-        HandleShape::Rectangle {
-            width,
-            border_radius,
-        } => (f32::from(width), bounds.height, border_radius),
-    };
+    let (handle_width, handle_height, handle_border_radius) =
+        match style.handle.shape {
+            HandleShape::Circle { radius } => {
+                (radius * 2.0, radius * 2.0, radius.into())
+            }
+            HandleShape::Rectangle {
+                width,
+                border_radius,
+            } => (f32::from(width), bounds.height, border_radius),
+        };
 
     let value = value.into() as f32;
     let (range_start, range_end) = {
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 2635611d..3b2430c4 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -366,16 +366,16 @@ pub fn draw<T, R>(
         style_sheet.active(style)
     };
 
-    let (handle_width, handle_height, handle_border_radius) = match style
-        .handle
-        .shape
-    {
-        HandleShape::Circle { radius } => (radius * 2.0, radius * 2.0, radius),
-        HandleShape::Rectangle {
-            width,
-            border_radius,
-        } => (f32::from(width), bounds.width, border_radius),
-    };
+    let (handle_width, handle_height, handle_border_radius) =
+        match style.handle.shape {
+            HandleShape::Circle { radius } => {
+                (radius * 2.0, radius * 2.0, radius.into())
+            }
+            HandleShape::Rectangle {
+                width,
+                border_radius,
+            } => (f32::from(width), bounds.width, border_radius),
+        };
 
     let value = value.into() as f32;
     let (range_start, range_end) = {
@@ -431,7 +431,7 @@ pub fn draw<T, R>(
                 width: handle_height,
                 height: handle_width,
             },
-            border_radius: handle_border_radius.into(),
+            border_radius: handle_border_radius,
             border_width: style.handle.border_width,
             border_color: style.handle.border_color,
         },

From 1234d528121265698f9f426ca89fc687dc95dc01 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Tue, 23 May 2023 15:28:45 +0200
Subject: [PATCH 297/440] clippy

---
 widget/src/button.rs       | 4 ++--
 widget/src/checkbox.rs     | 2 +-
 widget/src/container.rs    | 2 +-
 widget/src/overlay/menu.rs | 4 ++--
 widget/src/pane_grid.rs    | 3 +--
 widget/src/pick_list.rs    | 2 +-
 widget/src/progress_bar.rs | 4 ++--
 widget/src/rule.rs         | 2 +-
 widget/src/scrollable.rs   | 4 ++--
 widget/src/slider.rs       | 2 +-
 widget/src/text_input.rs   | 2 +-
 11 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/widget/src/button.rs b/widget/src/button.rs
index 7eee69cb..70fed1d5 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -395,7 +395,7 @@ where
                         y: bounds.y + styling.shadow_offset.y,
                         ..bounds
                     },
-                    border_radius: styling.border_radius.into(),
+                    border_radius: styling.border_radius,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
@@ -406,7 +406,7 @@ where
         renderer.fill_quad(
             renderer::Quad {
                 bounds,
-                border_radius: styling.border_radius.into(),
+                border_radius: styling.border_radius,
                 border_width: styling.border_width,
                 border_color: styling.border_color,
             },
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 7d43bb4a..4c8a989b 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -269,7 +269,7 @@ where
             renderer.fill_quad(
                 renderer::Quad {
                     bounds,
-                    border_radius: custom_style.border_radius.into(),
+                    border_radius: custom_style.border_radius,
                     border_width: custom_style.border_width,
                     border_color: custom_style.border_color,
                 },
diff --git a/widget/src/container.rs b/widget/src/container.rs
index 9d932772..13e76551 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -332,7 +332,7 @@ pub fn draw_background<Renderer>(
         renderer.fill_quad(
             renderer::Quad {
                 bounds,
-                border_radius: appearance.border_radius.into(),
+                border_radius: appearance.border_radius,
                 border_width: appearance.border_width,
                 border_color: appearance.border_color,
             },
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index 0acc6f79..84cc800c 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -307,7 +307,7 @@ where
                 bounds,
                 border_color: appearance.border_color,
                 border_width: appearance.border_width,
-                border_radius: appearance.border_radius.into(),
+                border_radius: appearance.border_radius,
             },
             appearance.background,
         );
@@ -515,7 +515,7 @@ where
                         },
                         border_color: Color::TRANSPARENT,
                         border_width: 0.0,
-                        border_radius: appearance.border_radius.into(),
+                        border_radius: appearance.border_radius,
                     },
                     appearance.selected_background,
                 );
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index e6ffb1d6..7bddc4a6 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -857,8 +857,7 @@ pub fn draw<Renderer, T>(
                             renderer::Quad {
                                 bounds,
                                 border_radius: hovered_region_style
-                                    .border_radius
-                                    .into(),
+                                    .border_radius,
                                 border_width: hovered_region_style.border_width,
                                 border_color: hovered_region_style.border_color,
                             },
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index 8c445dda..dcd0629b 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -624,7 +624,7 @@ pub fn draw<'a, T, Renderer>(
             bounds,
             border_color: style.border_color,
             border_width: style.border_width,
-            border_radius: style.border_radius.into(),
+            border_radius: style.border_radius,
         },
         style.background,
     );
diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs
index ef0d87d5..9e1e9131 100644
--- a/widget/src/progress_bar.rs
+++ b/widget/src/progress_bar.rs
@@ -133,7 +133,7 @@ where
         renderer.fill_quad(
             renderer::Quad {
                 bounds: Rectangle { ..bounds },
-                border_radius: style.border_radius.into(),
+                border_radius: style.border_radius,
                 border_width: 0.0,
                 border_color: Color::TRANSPARENT,
             },
@@ -147,7 +147,7 @@ where
                         width: active_progress_width,
                         ..bounds
                     },
-                    border_radius: style.border_radius.into(),
+                    border_radius: style.border_radius,
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
diff --git a/widget/src/rule.rs b/widget/src/rule.rs
index 3749d7ce..272bd2b3 100644
--- a/widget/src/rule.rs
+++ b/widget/src/rule.rs
@@ -125,7 +125,7 @@ where
         renderer.fill_quad(
             renderer::Quad {
                 bounds,
-                border_radius: style.radius.into(),
+                border_radius: style.radius,
                 border_width: 0.0,
                 border_color: Color::TRANSPARENT,
             },
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index af5424c0..12e544c5 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -818,7 +818,7 @@ pub fn draw<Renderer>(
                     renderer.fill_quad(
                         renderer::Quad {
                             bounds: scrollbar.bounds,
-                            border_radius: style.border_radius.into(),
+                            border_radius: style.border_radius,
                             border_width: style.border_width,
                             border_color: style.border_color,
                         },
@@ -838,7 +838,7 @@ pub fn draw<Renderer>(
                     renderer.fill_quad(
                         renderer::Quad {
                             bounds: scrollbar.scroller.bounds,
-                            border_radius: style.scroller.border_radius.into(),
+                            border_radius: style.scroller.border_radius,
                             border_width: style.scroller.border_width,
                             border_color: style.scroller.border_color,
                         },
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index d3c4a936..2851d8c3 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -433,7 +433,7 @@ pub fn draw<T, R>(
                 width: handle_width,
                 height: handle_height,
             },
-            border_radius: handle_border_radius.into(),
+            border_radius: handle_border_radius,
             border_width: style.handle.border_width,
             border_color: style.handle.border_color,
         },
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index bbc07dac..8f243c1a 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -982,7 +982,7 @@ pub fn draw<Renderer>(
     renderer.fill_quad(
         renderer::Quad {
             bounds,
-            border_radius: appearance.border_radius.into(),
+            border_radius: appearance.border_radius,
             border_width: appearance.border_width,
             border_color: appearance.border_color,
         },

From 25804d9e5ad67d26fafb437057bc0fddde04512a Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Tue, 23 May 2023 19:42:01 +0200
Subject: [PATCH 298/440] clean up rebase mistake

---
 examples/scrollable/src/main.rs | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index efc880e3..3038661e 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -289,18 +289,13 @@ impl Application for ScrollableDemo {
             }
             Direction::Horizontal => {
                 progress_bar(0.0..=1.0, self.current_scroll_offset.x)
-                    .style(theme::ProgressBar::Custom(Box::new(
-                        ProgressBarCustomStyle,
-                    )))
+                    .style(progress_bar_custom_style)
                     .into()
             }
             Direction::Multi => column![
                 progress_bar(0.0..=1.0, self.current_scroll_offset.y),
-                progress_bar(0.0..=1.0, self.current_scroll_offset.x).style(
-                    theme::ProgressBar::Custom(Box::new(
-                        ProgressBarCustomStyle,
-                    ))
-                )
+                progress_bar(0.0..=1.0, self.current_scroll_offset.x)
+                    .style(progress_bar_custom_style)
             ]
             .spacing(10)
             .into(),
@@ -372,16 +367,10 @@ impl scrollable::StyleSheet for ScrollbarCustomStyle {
     }
 }
 
-struct ProgressBarCustomStyle;
-
-impl progress_bar::StyleSheet for ProgressBarCustomStyle {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> progress_bar::Appearance {
-        progress_bar::Appearance {
-            background: style.extended_palette().background.strong.color.into(),
-            bar: Color::from_rgb8(250, 85, 134).into(),
-            border_radius: 0.0.into(),
-        }
+fn progress_bar_custom_style(theme: &Theme) -> progress_bar::Appearance {
+    progress_bar::Appearance {
+        background: theme.extended_palette().background.strong.color.into(),
+        bar: Color::from_rgb8(250, 85, 134).into(),
+        border_radius: 0.0.into(),
     }
 }

From b74d8dafbf0ddfc355aeab636834f42f2ea16ba6 Mon Sep 17 00:00:00 2001
From: RGBCube <78925721+RGBCube@users.noreply.github.com>
Date: Tue, 23 May 2023 21:07:08 +0300
Subject: [PATCH 299/440] Create DEPENDENCIES.md

---
 DEPENDENCIES.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 DEPENDENCIES.md

diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
new file mode 100644
index 00000000..809371cb
--- /dev/null
+++ b/DEPENDENCIES.md
@@ -0,0 +1,33 @@
+# Dependencies
+
+Iced requires some system dependencies to work, and not
+all operating systems come with them installed.
+
+You can follow the provided instructions for your system to
+get them, if your system isn't here, add it!
+
+## NixOS
+
+You can add this `shell.nix` to your project and use it by running `nix-shell`:
+
+```nix
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell rec {
+  buildInputs = with pkgs; [
+    expat
+    fontconfig
+    freetype
+    freetype.dev
+    libGL
+    pkgconfig
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ];
+
+  LD_LIBRARY_PATH =
+    builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs;
+}
+```

From 490cc3d55889f3be20d94b295d4a2d593aa102ee Mon Sep 17 00:00:00 2001
From: RGBCube <78925721+RGBCube@users.noreply.github.com>
Date: Tue, 23 May 2023 21:07:29 +0300
Subject: [PATCH 300/440] Update README.md

---
 README.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/README.md b/README.md
index 16ca9926..c72fd770 100644
--- a/README.md
+++ b/README.md
@@ -63,40 +63,6 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
 [check out the issues]: https://github.com/iced-rs/iced/issues
 [feel free to contribute!]: #contributing--feedback
 
-## Dependencies
-
-Iced requires some system dependencies to work, and not
-all operating systems come with them installed.
-
-You can follow the provided instructions for your system to
-get them, if your system isn't here, add it!
-
-### NixOS
-
-You can add this `shell.nix` to your project and use it by running `nix-shell`:
-
-```nix
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.mkShell rec {
-  buildInputs = with pkgs; [
-    expat
-    fontconfig
-    freetype
-    freetype.dev
-    libGL
-    pkgconfig
-    xorg.libX11
-    xorg.libXcursor
-    xorg.libXi
-    xorg.libXrandr
-  ];
-
-  LD_LIBRARY_PATH =
-    builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs;
-}
-```
-
 ## Installation
 
 Add `iced` as a dependency in your `Cargo.toml`:

From a395e78596d0711a50108cb6654121541337ceb5 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 24 May 2023 13:08:59 -0700
Subject: [PATCH 301/440] Made gradient pack public for iced_graphics::gradient
 mod for use with GradientVertex2D.

---
 graphics/src/gradient.rs | 33 ++++++++++++++++++++++++++++++
 wgpu/src/geometry.rs     | 43 ++--------------------------------------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 3e88d9de..86d14b6c 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -23,6 +23,15 @@ impl From<Linear> for Gradient {
     }
 }
 
+impl Gradient {
+    /// Packs the [`Gradient`] for use in shader code.
+    pub fn pack(&self) -> [f32; 44] {
+        match self {
+            Gradient::Linear(linear) => linear.pack(),
+        }
+    }
+}
+
 /// A linear gradient that can be used in the style of [`Fill`] or [`Stroke`].
 ///
 /// [`Fill`]: crate::geometry::Fill;
@@ -85,4 +94,28 @@ impl Linear {
 
         self
     }
+
+    /// Packs the [`Gradient`] for use in shader code.
+    pub fn pack(&self) -> [f32; 44] {
+        let mut pack: [f32; 44] = [0.0; 44];
+
+        for (index, stop) in self.stops.iter().enumerate() {
+            let [r, g, b, a] =
+                stop.map_or(Color::default(), |s| s.color).into_linear();
+
+            pack[index * 4] = r;
+            pack[(index * 4) + 1] = g;
+            pack[(index * 4) + 2] = b;
+            pack[(index * 4) + 3] = a;
+
+            pack[32 + index] = stop.map_or(2.0, |s| s.offset);
+        }
+
+        pack[40] = self.start.x;
+        pack[41] = self.start.y;
+        pack[42] = self.end.x;
+        pack[43] = self.end.y;
+
+        pack
+    }
 }
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index d1d4fd3c..13ce2359 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -74,7 +74,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: pack_gradient(gradient),
+                        gradient: gradient.pack(),
                     },
                 ))
             }
@@ -97,7 +97,7 @@ impl BufferStack {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
                     GradientVertex2DBuilder {
-                        gradient: pack_gradient(gradient),
+                        gradient: gradient.pack(),
                     },
                 ))
             }
@@ -623,42 +623,3 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
         );
     })
 }
-
-/// Packs the [`Gradient`] for use in shader code.
-fn pack_gradient(gradient: &Gradient) -> [f32; 44] {
-    match gradient {
-        Gradient::Linear(linear) => {
-            let mut pack: [f32; 44] = [0.0; 44];
-            let mut offsets: [f32; 8] = [2.0; 8];
-
-            for (index, stop) in linear.stops.iter().enumerate() {
-                let [r, g, b, a] = stop
-                    .map_or(crate::core::Color::default(), |s| s.color)
-                    .into_linear();
-
-                pack[index * 4] = r;
-                pack[(index * 4) + 1] = g;
-                pack[(index * 4) + 2] = b;
-                pack[(index * 4) + 3] = a;
-
-                offsets[index] = stop.map_or(2.0, |s| s.offset);
-            }
-
-            pack[32] = offsets[0];
-            pack[33] = offsets[1];
-            pack[34] = offsets[2];
-            pack[35] = offsets[3];
-            pack[36] = offsets[4];
-            pack[37] = offsets[5];
-            pack[38] = offsets[6];
-            pack[39] = offsets[7];
-
-            pack[40] = linear.start.x;
-            pack[41] = linear.start.y;
-            pack[42] = linear.end.x;
-            pack[43] = linear.end.y;
-
-            pack
-        }
-    }
-}

From 413526ad09d006853eb9659efabee168f4a0e0a4 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 25 May 2023 10:49:26 -0700
Subject: [PATCH 302/440] Created "Packed" data structure for gradient data.

---
 graphics/src/gradient.rs | 33 ++++++++++++++++++++-------------
 wgpu/src/geometry.rs     |  7 ++++---
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 86d14b6c..2b6aba44 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -25,7 +25,7 @@ impl From<Linear> for Gradient {
 
 impl Gradient {
     /// Packs the [`Gradient`] for use in shader code.
-    pub fn pack(&self) -> [f32; 44] {
+    pub fn pack(&self) -> Packed {
         match self {
             Gradient::Linear(linear) => linear.pack(),
         }
@@ -96,26 +96,33 @@ impl Linear {
     }
 
     /// Packs the [`Gradient`] for use in shader code.
-    pub fn pack(&self) -> [f32; 44] {
-        let mut pack: [f32; 44] = [0.0; 44];
+    pub fn pack(&self) -> Packed {
+        let mut data: [f32; 44] = [0.0; 44];
 
         for (index, stop) in self.stops.iter().enumerate() {
             let [r, g, b, a] =
                 stop.map_or(Color::default(), |s| s.color).into_linear();
 
-            pack[index * 4] = r;
-            pack[(index * 4) + 1] = g;
-            pack[(index * 4) + 2] = b;
-            pack[(index * 4) + 3] = a;
+            data[index * 4] = r;
+            data[(index * 4) + 1] = g;
+            data[(index * 4) + 2] = b;
+            data[(index * 4) + 3] = a;
 
-            pack[32 + index] = stop.map_or(2.0, |s| s.offset);
+            data[32 + index] = stop.map_or(2.0, |s| s.offset);
         }
 
-        pack[40] = self.start.x;
-        pack[41] = self.start.y;
-        pack[42] = self.end.x;
-        pack[43] = self.end.y;
+        data[40] = self.start.x;
+        data[41] = self.start.y;
+        data[42] = self.end.x;
+        data[43] = self.end.y;
 
-        pack
+        Packed { data }
     }
 }
+
+/// Packed [`Gradient`] data for use in shader code.
+#[derive(Debug)]
+pub struct Packed {
+    /// The packed [`Gradient`] data.
+    pub data: [f32; 44],
+}
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 13ce2359..f3fed7ae 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -7,6 +7,7 @@ use crate::graphics::geometry::{
 use crate::graphics::primitive::{self, Primitive};
 use crate::graphics::Gradient;
 
+use iced_graphics::gradient;
 use lyon::geom::euclid;
 use lyon::tessellation;
 use std::borrow::Cow;
@@ -490,7 +491,7 @@ impl Frame {
 }
 
 struct GradientVertex2DBuilder {
-    gradient: [f32; 44],
+    gradient: gradient::Packed,
 }
 
 impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
@@ -504,7 +505,7 @@ impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient,
+            gradient: self.gradient.data,
         }
     }
 }
@@ -520,7 +521,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient,
+            gradient: self.gradient.data,
         }
     }
 }

From 60d17d68d665d2de5abd8c5f3c3d146f4534d365 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, 25 May 2023 23:04:29 +0200
Subject: [PATCH 303/440] Update `winit` dependency

---
 winit/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 342cbc5d..7a169fb1 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -30,8 +30,8 @@ raw-window-handle = "0.5"
 
 [dependencies.winit]
 version = "0.28"
-git = "https://github.com/nicoburns/winit.git"
-rev = "dd5fcaf30114baf876677d997e362c23d7d134c8"
+git = "https://github.com/iced-rs/winit.git"
+rev = "ac1ddfe0bd870910b3aa64a18d386fdd55b30a1d"
 default-features = false
 
 [dependencies.iced_runtime]

From b924e866308d60432729932afc4c642a00575c43 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, 25 May 2023 23:05:24 +0200
Subject: [PATCH 304/440] Update `window_clipboard` dependency

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

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 7a169fb1..b75b1929 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -23,7 +23,7 @@ wayland-dlopen = ["winit/wayland-dlopen"]
 wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
 
 [dependencies]
-window_clipboard = { git = "https://github.com/TobTobXX/window_clipboard", rev = "1392da8339c8aebb9849d00eb7383a73ed076f1d" }
+window_clipboard = "0.3"
 log = "0.4"
 thiserror = "1.0"
 raw-window-handle = "0.5"

From a7fa7e40058188c95a790712e11b863a9f84cecb 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, 25 May 2023 23:14:07 +0200
Subject: [PATCH 305/440] Introduce `window::Level` enum

... and add `level` field to `window::Settings`
---
 core/src/window.rs       |  2 ++
 core/src/window/level.rs | 19 +++++++++++++++++++
 src/window/settings.rs   | 10 +++++-----
 winit/src/conversion.rs  | 13 +++++++++++++
 winit/src/settings.rs    | 18 +++++++-----------
 5 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 core/src/window/level.rs

diff --git a/core/src/window.rs b/core/src/window.rs
index 81bd7e3d..a6dbdfb4 100644
--- a/core/src/window.rs
+++ b/core/src/window.rs
@@ -2,12 +2,14 @@
 pub mod icon;
 
 mod event;
+mod level;
 mod mode;
 mod redraw_request;
 mod user_attention;
 
 pub use event::Event;
 pub use icon::Icon;
+pub use level::Level;
 pub use mode::Mode;
 pub use redraw_request::RedrawRequest;
 pub use user_attention::UserAttention;
diff --git a/core/src/window/level.rs b/core/src/window/level.rs
new file mode 100644
index 00000000..3878ecac
--- /dev/null
+++ b/core/src/window/level.rs
@@ -0,0 +1,19 @@
+/// A window level groups windows with respect to their z-position.
+///
+/// The relative ordering between windows in different window levels is fixed.
+/// The z-order of a window within the same window level may change dynamically
+/// on user interaction.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum Level {
+    /// The default behavior.
+    #[default]
+    Normal,
+
+    /// The window will always be below normal windows.
+    ///
+    /// This is useful for a widget-based app.
+    AlwaysOnBottom,
+
+    /// The window will always be on top of normal windows.
+    AlwaysOnTop,
+}
diff --git a/src/window/settings.rs b/src/window/settings.rs
index 3c8da62f..458b9232 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,4 +1,4 @@
-use crate::window::{Icon, Position};
+use crate::window::{Icon, Level, Position};
 
 pub use iced_winit::settings::PlatformSpecific;
 
@@ -29,8 +29,8 @@ pub struct Settings {
     /// Whether the window should be transparent.
     pub transparent: bool,
 
-    /// Whether the window will always be on top of other windows.
-    pub always_on_top: bool,
+    /// The window [`Level`].
+    pub level: Level,
 
     /// The icon of the window.
     pub icon: Option<Icon>,
@@ -50,7 +50,7 @@ impl Default for Settings {
             resizable: true,
             decorations: true,
             transparent: false,
-            always_on_top: false,
+            level: Level::default(),
             icon: None,
             platform_specific: Default::default(),
         }
@@ -68,7 +68,7 @@ impl From<Settings> for iced_winit::settings::Window {
             resizable: settings.resizable,
             decorations: settings.decorations,
             transparent: settings.transparent,
-            always_on_top: settings.always_on_top,
+            level: settings.level,
             icon: settings.icon.map(Icon::into),
             platform_specific: settings.platform_specific,
         }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index a9262184..904aa184 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -140,6 +140,19 @@ pub fn window_event(
     }
 }
 
+/// Converts a [`window::Level`] to a [`winit`] window level.
+///
+/// [`winit`]: https://github.com/rust-windowing/winit
+pub fn window_level(level: window::Level) -> winit::window::WindowLevel {
+    match level {
+        window::Level::Normal => winit::window::WindowLevel::Normal,
+        window::Level::AlwaysOnBottom => {
+            winit::window::WindowLevel::AlwaysOnBottom
+        }
+        window::Level::AlwaysOnTop => winit::window::WindowLevel::AlwaysOnTop,
+    }
+}
+
 /// Converts a [`Position`] to a [`winit`] logical position for a given monitor.
 ///
 /// [`winit`]: https://github.com/rust-windowing/winit
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 13be3932..40b3d487 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -22,11 +22,11 @@ mod platform;
 pub use platform::PlatformSpecific;
 
 use crate::conversion;
-use crate::core::window::Icon;
+use crate::core::window::{Icon, Level};
 use crate::Position;
 
 use winit::monitor::MonitorHandle;
-use winit::window::{WindowBuilder, WindowLevel};
+use winit::window::WindowBuilder;
 
 use std::fmt;
 
@@ -81,8 +81,8 @@ pub struct Window {
     /// Whether the window should be transparent.
     pub transparent: bool,
 
-    /// Whether the window will always be on top of other windows.
-    pub always_on_top: bool,
+    /// The window [`Level`].
+    pub level: Level,
 
     /// The window icon, which is also usually used in the taskbar
     pub icon: Option<Icon>,
@@ -102,7 +102,7 @@ impl fmt::Debug for Window {
             .field("resizable", &self.resizable)
             .field("decorations", &self.decorations)
             .field("transparent", &self.transparent)
-            .field("always_on_top", &self.always_on_top)
+            .field("level", &self.level)
             .field("icon", &self.icon.is_some())
             .field("platform_specific", &self.platform_specific)
             .finish()
@@ -121,10 +121,6 @@ impl Window {
 
         let (width, height) = self.size;
 
-        let window_level = match self.always_on_top {
-            true => WindowLevel::AlwaysOnTop,
-            false => WindowLevel::Normal,
-        };
         window_builder = window_builder
             .with_title(title)
             .with_inner_size(winit::dpi::LogicalSize { width, height })
@@ -132,7 +128,7 @@ impl Window {
             .with_decorations(self.decorations)
             .with_transparent(self.transparent)
             .with_window_icon(self.icon.and_then(conversion::icon))
-            .with_window_level(window_level)
+            .with_window_level(conversion::window_level(self.level))
             .with_visible(self.visible);
 
         if let Some(position) = conversion::position(
@@ -211,7 +207,7 @@ impl Default for Window {
             resizable: true,
             decorations: true,
             transparent: false,
-            always_on_top: false,
+            level: Level::default(),
             icon: None,
             platform_specific: Default::default(),
         }

From f0788b9f373f44248e55b068d9d0d494d628ba93 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, 25 May 2023 23:18:50 +0200
Subject: [PATCH 306/440] Replace `change_always_on_top` action with
 `change_level`

---
 runtime/src/window.rs        | 10 +++++-----
 runtime/src/window/action.rs | 26 ++++++++++----------------
 winit/src/application.rs     |  9 ++-------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index 833a1125..d4111293 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -5,7 +5,7 @@ pub use action::Action;
 
 use crate::command::{self, Command};
 use crate::core::time::Instant;
-use crate::core::window::{Event, Icon, Mode, UserAttention};
+use crate::core::window::{Event, Icon, Level, Mode, UserAttention};
 use crate::futures::subscription::{self, Subscription};
 
 /// Subscribes to the frames of the window of the running application.
@@ -53,7 +53,7 @@ pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
     Command::single(command::Action::Window(Action::Move { x, y }))
 }
 
-/// Sets the [`Mode`] of the window.
+/// Changes the [`Mode`] of the window.
 pub fn change_mode<Message>(mode: Mode) -> Command<Message> {
     Command::single(command::Action::Window(Action::ChangeMode(mode)))
 }
@@ -99,9 +99,9 @@ pub fn gain_focus<Message>() -> Command<Message> {
     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(Action::ChangeAlwaysOnTop(on_top)))
+/// Changes the window [`Level`].
+pub fn change_level<Message>(level: Level) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ChangeLevel(level)))
 }
 
 /// Fetches an identifier unique to the window.
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index 83b71c75..a9d2a3d0 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,13 +1,13 @@
-use crate::core::window::{Icon, Mode, UserAttention};
+use crate::core::window::{Icon, Level, Mode, UserAttention};
 use crate::futures::MaybeSend;
 
 use std::fmt;
 
 /// An operation to be performed on some window.
 pub enum Action<T> {
-    /// Closes the current window and exits the application.
+    /// Close the current window and exits the application.
     Close,
-    /// Moves the window with the left mouse button until the button is
+    /// Move the window with the left mouse button until the button is
     /// released.
     ///
     /// There’s no guarantee that this will work unless the left mouse
@@ -20,7 +20,7 @@ pub enum Action<T> {
         /// The new logical height of the window
         height: u32,
     },
-    /// Sets the window to maximized or back
+    /// Set the window to maximized or back
     Maximize(bool),
     /// Set the window to minimized or back
     Minimize(bool),
@@ -70,15 +70,11 @@ pub enum Action<T> {
     ///
     /// - **Web / Wayland:** Unsupported.
     GainFocus,
-    /// Change whether or not the window will always be on top of other windows.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Web / Wayland:** Unsupported.
-    ChangeAlwaysOnTop(bool),
+    /// Change the window [`Level`].
+    ChangeLevel(Level),
     /// Fetch an identifier unique to the window.
     FetchId(Box<dyn FnOnce(u64) -> T + 'static>),
-    /// Changes the window [`Icon`].
+    /// Change the window [`Icon`].
     ///
     /// On Windows and X11, this is typically the small icon in the top-left
     /// corner of the titlebar.
@@ -119,9 +115,7 @@ impl<T> Action<T> {
                 Action::RequestUserAttention(attention_type)
             }
             Self::GainFocus => Action::GainFocus,
-            Self::ChangeAlwaysOnTop(on_top) => {
-                Action::ChangeAlwaysOnTop(on_top)
-            }
+            Self::ChangeLevel(level) => Action::ChangeLevel(level),
             Self::FetchId(o) => Action::FetchId(Box::new(move |s| f(o(s)))),
             Self::ChangeIcon(icon) => Action::ChangeIcon(icon),
         }
@@ -154,8 +148,8 @@ impl<T> fmt::Debug for Action<T> {
                 write!(f, "Action::RequestUserAttention")
             }
             Self::GainFocus => write!(f, "Action::GainFocus"),
-            Self::ChangeAlwaysOnTop(on_top) => {
-                write!(f, "Action::AlwaysOnTop({on_top})")
+            Self::ChangeLevel(level) => {
+                write!(f, "Action::ChangeLevel({level:?})")
             }
             Self::FetchId(_) => write!(f, "Action::FetchId"),
             Self::ChangeIcon(_icon) => {
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 1141ba27..4147be17 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -26,7 +26,6 @@ use crate::{Clipboard, Error, Proxy, Settings};
 use futures::channel::mpsc;
 
 use std::mem::ManuallyDrop;
-use winit::window::WindowLevel;
 
 #[cfg(feature = "trace")]
 pub use profiler::Profiler;
@@ -795,12 +794,8 @@ pub fn run_command<A, E>(
                 window::Action::GainFocus => {
                     window.focus_window();
                 }
-                window::Action::ChangeAlwaysOnTop(on_top) => {
-                    let level = match on_top {
-                        true => WindowLevel::AlwaysOnTop,
-                        false => WindowLevel::Normal,
-                    };
-                    window.set_window_level(level);
+                window::Action::ChangeLevel(level) => {
+                    window.set_window_level(conversion::window_level(level));
                 }
                 window::Action::FetchId(tag) => {
                     proxy

From 70fd296ccc69ae135bfbe693b8404d5409ae4332 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, 25 May 2023 23:20:26 +0200
Subject: [PATCH 307/440] Remove unnecessary newline

---
 winit/src/settings/windows.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/winit/src/settings/windows.rs b/winit/src/settings/windows.rs
index ce18da75..45d753bd 100644
--- a/winit/src/settings/windows.rs
+++ b/winit/src/settings/windows.rs
@@ -1,5 +1,4 @@
 //! Platform specific settings for Windows.
-
 use raw_window_handle::RawWindowHandle;
 
 /// The platform specific window settings of an application.

From 2d21d0900e9fcabfc01a7deaaab5b4fd4b8573e8 Mon Sep 17 00:00:00 2001
From: Clark Moody <clark@clarkmoody.com>
Date: Thu, 25 May 2023 13:59:58 -0500
Subject: [PATCH 308/440] Upgrade `palette` dependency

---
 core/Cargo.toml                    |  2 +-
 core/src/color.rs                  | 42 ++++++++++++-------------
 examples/color_palette/Cargo.toml  |  2 +-
 examples/color_palette/src/main.rs | 50 ++++++++++++++++--------------
 style/Cargo.toml                   |  2 +-
 style/src/theme/palette.rs         | 22 +++++++------
 6 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 41b0640a..fc5de36f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4.17"
 twox-hash = { version = "1.5", default-features = false }
 
 [dependencies.palette]
-version = "0.6"
+version = "0.7"
 optional = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/core/src/color.rs b/core/src/color.rs
index fe0a1856..f5423871 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -1,5 +1,5 @@
 #[cfg(feature = "palette")]
-use palette::rgb::{Srgb, Srgba};
+use palette::rgb::{Rgb, Rgba};
 
 /// A color in the sRGB color space.
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
@@ -183,34 +183,34 @@ macro_rules! color {
 }
 
 #[cfg(feature = "palette")]
-/// Converts from palette's `Srgba` type to a [`Color`].
-impl From<Srgba> for Color {
-    fn from(srgba: Srgba) -> Self {
-        Color::new(srgba.red, srgba.green, srgba.blue, srgba.alpha)
+/// Converts from palette's `Rgba` type to a [`Color`].
+impl From<Rgba> for Color {
+    fn from(rgba: Rgba) -> Self {
+        Color::new(rgba.red, rgba.green, rgba.blue, rgba.alpha)
     }
 }
 
 #[cfg(feature = "palette")]
-/// Converts from [`Color`] to palette's `Srgba` type.
-impl From<Color> for Srgba {
+/// Converts from [`Color`] to palette's `Rgba` type.
+impl From<Color> for Rgba {
     fn from(c: Color) -> Self {
-        Srgba::new(c.r, c.g, c.b, c.a)
+        Rgba::new(c.r, c.g, c.b, c.a)
     }
 }
 
 #[cfg(feature = "palette")]
-/// Converts from palette's `Srgb` type to a [`Color`].
-impl From<Srgb> for Color {
-    fn from(srgb: Srgb) -> Self {
-        Color::new(srgb.red, srgb.green, srgb.blue, 1.0)
+/// Converts from palette's `Rgb` type to a [`Color`].
+impl From<Rgb> for Color {
+    fn from(rgb: Rgb) -> Self {
+        Color::new(rgb.red, rgb.green, rgb.blue, 1.0)
     }
 }
 
 #[cfg(feature = "palette")]
-/// Converts from [`Color`] to palette's `Srgb` type.
-impl From<Color> for Srgb {
+/// Converts from [`Color`] to palette's `Rgb` type.
+impl From<Color> for Rgb {
     fn from(c: Color) -> Self {
-        Srgb::new(c.r, c.g, c.b)
+        Rgb::new(c.r, c.g, c.b)
     }
 }
 
@@ -218,13 +218,13 @@ impl From<Color> for Srgb {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use palette::Blend;
+    use palette::blend::Blend;
 
     #[test]
     fn srgba_traits() {
         let c = Color::from_rgb(0.5, 0.4, 0.3);
-        // Round-trip conversion to the palette:Srgba type
-        let s: Srgba = c.into();
+        // Round-trip conversion to the palette:Rgba type
+        let s: Rgba = c.into();
         let r: Color = s.into();
         assert_eq!(c, r);
     }
@@ -235,14 +235,14 @@ mod tests {
         let c2 = Color::from_rgb(0.2, 0.5, 0.3);
 
         // Convert to linear color for manipulation
-        let l1 = Srgba::from(c1).into_linear();
-        let l2 = Srgba::from(c2).into_linear();
+        let l1 = Rgba::from(c1).into_linear();
+        let l2 = Rgba::from(c2).into_linear();
 
         // Take the lighter of each of the RGB components
         let lighter = l1.lighten(l2);
 
         // Convert back to our Color
-        let r: Color = Srgba::from_linear(lighter).into();
+        let r: Color = Rgba::from_linear(lighter).into();
         assert_eq!(
             r,
             Color {
diff --git a/examples/color_palette/Cargo.toml b/examples/color_palette/Cargo.toml
index 8fd37202..3be732bb 100644
--- a/examples/color_palette/Cargo.toml
+++ b/examples/color_palette/Cargo.toml
@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["canvas", "palette"] }
-palette = "0.6.0"
+palette = "0.7.0"
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index 5c4304ee..de01099e 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -4,7 +4,9 @@ use iced::{
     alignment, Alignment, Color, Element, Length, Point, Rectangle, Renderer,
     Sandbox, Settings, Size, Vector,
 };
-use palette::{self, convert::FromColor, Hsl, Srgb};
+use palette::{
+    self, convert::FromColor, rgb::Rgb, Darken, Hsl, Lighten, ShiftHue,
+};
 use std::marker::PhantomData;
 use std::ops::RangeInclusive;
 
@@ -49,12 +51,12 @@ impl Sandbox for ColorPalette {
 
     fn update(&mut self, message: Message) {
         let srgb = match message {
-            Message::RgbColorChanged(rgb) => palette::Srgb::from(rgb),
-            Message::HslColorChanged(hsl) => palette::Srgb::from_color(hsl),
-            Message::HsvColorChanged(hsv) => palette::Srgb::from_color(hsv),
-            Message::HwbColorChanged(hwb) => palette::Srgb::from_color(hwb),
-            Message::LabColorChanged(lab) => palette::Srgb::from_color(lab),
-            Message::LchColorChanged(lch) => palette::Srgb::from_color(lch),
+            Message::RgbColorChanged(rgb) => Rgb::from(rgb),
+            Message::HslColorChanged(hsl) => Rgb::from_color(hsl),
+            Message::HsvColorChanged(hsv) => Rgb::from_color(hsv),
+            Message::HwbColorChanged(hwb) => Rgb::from_color(hwb),
+            Message::LabColorChanged(lab) => Rgb::from_color(lab),
+            Message::LchColorChanged(lch) => Rgb::from_color(lch),
         };
 
         self.theme = Theme::new(srgb);
@@ -63,7 +65,7 @@ impl Sandbox for ColorPalette {
     fn view(&self) -> Element<Message> {
         let base = self.theme.base;
 
-        let srgb = palette::Srgb::from(base);
+        let srgb = Rgb::from(base);
         let hsl = palette::Hsl::from_color(srgb);
         let hsv = palette::Hsv::from_color(srgb);
         let hwb = palette::Hwb::from_color(srgb);
@@ -95,12 +97,10 @@ struct Theme {
 
 impl Theme {
     pub fn new(base: impl Into<Color>) -> Theme {
-        use palette::{Hue, Shade};
-
         let base = base.into();
 
         // Convert to HSL color for manipulation
-        let hsl = Hsl::from_color(Srgb::from(base));
+        let hsl = Hsl::from_color(Rgb::from(base));
 
         let lower = [
             hsl.shift_hue(-135.0).lighten(0.075),
@@ -119,12 +119,12 @@ impl Theme {
         Theme {
             lower: lower
                 .iter()
-                .map(|&color| Srgb::from_color(color).into())
+                .map(|&color| Rgb::from_color(color).into())
                 .collect(),
             base,
             higher: higher
                 .iter()
-                .map(|&color| Srgb::from_color(color).into())
+                .map(|&color| Rgb::from_color(color).into())
                 .collect(),
             canvas_cache: canvas::Cache::default(),
         }
@@ -209,14 +209,14 @@ impl Theme {
 
         text.vertical_alignment = alignment::Vertical::Bottom;
 
-        let hsl = Hsl::from_color(Srgb::from(self.base));
+        let hsl = Hsl::from_color(Rgb::from(self.base));
         for i in 0..self.len() {
             let pct = (i as f32 + 1.0) / (self.len() as f32 + 1.0);
             let graded = Hsl {
                 lightness: 1.0 - pct,
                 ..hsl
             };
-            let color: Color = Srgb::from_color(graded).into();
+            let color: Color = Rgb::from_color(graded).into();
 
             let anchor = Point {
                 x: (i as f32) * box_size.width,
@@ -352,7 +352,7 @@ impl ColorSpace for palette::Hsl {
 
     fn components(&self) -> [f32; 3] {
         [
-            self.hue.to_positive_degrees(),
+            self.hue.into_positive_degrees(),
             self.saturation,
             self.lightness,
         ]
@@ -361,7 +361,7 @@ impl ColorSpace for palette::Hsl {
     fn to_string(&self) -> String {
         format!(
             "hsl({:.1}, {:.1}%, {:.1}%)",
-            self.hue.to_positive_degrees(),
+            self.hue.into_positive_degrees(),
             100.0 * self.saturation,
             100.0 * self.lightness
         )
@@ -378,13 +378,17 @@ impl ColorSpace for palette::Hsv {
     }
 
     fn components(&self) -> [f32; 3] {
-        [self.hue.to_positive_degrees(), self.saturation, self.value]
+        [
+            self.hue.into_positive_degrees(),
+            self.saturation,
+            self.value,
+        ]
     }
 
     fn to_string(&self) -> String {
         format!(
             "hsv({:.1}, {:.1}%, {:.1}%)",
-            self.hue.to_positive_degrees(),
+            self.hue.into_positive_degrees(),
             100.0 * self.saturation,
             100.0 * self.value
         )
@@ -406,7 +410,7 @@ impl ColorSpace for palette::Hwb {
 
     fn components(&self) -> [f32; 3] {
         [
-            self.hue.to_positive_degrees(),
+            self.hue.into_positive_degrees(),
             self.whiteness,
             self.blackness,
         ]
@@ -415,7 +419,7 @@ impl ColorSpace for palette::Hwb {
     fn to_string(&self) -> String {
         format!(
             "hwb({:.1}, {:.1}%, {:.1}%)",
-            self.hue.to_positive_degrees(),
+            self.hue.into_positive_degrees(),
             100.0 * self.whiteness,
             100.0 * self.blackness
         )
@@ -450,7 +454,7 @@ impl ColorSpace for palette::Lch {
     }
 
     fn components(&self) -> [f32; 3] {
-        [self.l, self.chroma, self.hue.to_positive_degrees()]
+        [self.l, self.chroma, self.hue.into_positive_degrees()]
     }
 
     fn to_string(&self) -> String {
@@ -458,7 +462,7 @@ impl ColorSpace for palette::Lch {
             "Lch({:.1}, {:.1}, {:.1})",
             self.l,
             self.chroma,
-            self.hue.to_positive_degrees()
+            self.hue.into_positive_degrees()
         )
     }
 }
diff --git a/style/Cargo.toml b/style/Cargo.toml
index 0bb354e0..8af4a9b3 100644
--- a/style/Cargo.toml
+++ b/style/Cargo.toml
@@ -16,7 +16,7 @@ path = "../core"
 features = ["palette"]
 
 [dependencies.palette]
-version = "0.6"
+version = "0.7"
 
 [dependencies.once_cell]
 version = "1.15"
diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs
index 0f15494b..aaeb799d 100644
--- a/style/src/theme/palette.rs
+++ b/style/src/theme/palette.rs
@@ -2,7 +2,9 @@
 use iced_core::Color;
 
 use once_cell::sync::Lazy;
-use palette::{FromColor, Hsl, Mix, RelativeContrast, Srgb};
+use palette::color_difference::Wcag21RelativeContrast;
+use palette::rgb::Rgb;
+use palette::{FromColor, Hsl, Mix};
 
 /// A color palette.
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -298,11 +300,11 @@ fn deviate(color: Color, amount: f32) -> Color {
 }
 
 fn mix(a: Color, b: Color, factor: f32) -> Color {
-    let a_lin = Srgb::from(a).into_linear();
-    let b_lin = Srgb::from(b).into_linear();
+    let a_lin = Rgb::from(a).into_linear();
+    let b_lin = Rgb::from(b).into_linear();
 
-    let mixed = a_lin.mix(&b_lin, factor);
-    Srgb::from_linear(mixed).into()
+    let mixed = a_lin.mix(b_lin, factor);
+    Rgb::from_linear(mixed).into()
 }
 
 fn readable(background: Color, text: Color) -> Color {
@@ -320,16 +322,16 @@ fn is_dark(color: Color) -> bool {
 }
 
 fn is_readable(a: Color, b: Color) -> bool {
-    let a_srgb = Srgb::from(a);
-    let b_srgb = Srgb::from(b);
+    let a_srgb = Rgb::from(a);
+    let b_srgb = Rgb::from(b);
 
-    a_srgb.has_enhanced_contrast_text(&b_srgb)
+    a_srgb.has_enhanced_contrast_text(b_srgb)
 }
 
 fn to_hsl(color: Color) -> Hsl {
-    Hsl::from_color(Srgb::from(color))
+    Hsl::from_color(Rgb::from(color))
 }
 
 fn from_hsl(hsl: Hsl) -> Color {
-    Srgb::from_color(hsl).into()
+    Rgb::from_color(hsl).into()
 }

From 2a00aaa7477f3f46937bb568be2796b90fa27e12 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, 25 May 2023 23:48:42 +0200
Subject: [PATCH 309/440] Use `as_slice` instead of `as_ref` in `checkbox`
 example

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

diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs
index ef61a974..ef1a054d 100644
--- a/examples/checkbox/src/main.rs
+++ b/examples/checkbox/src/main.rs
@@ -31,7 +31,7 @@ impl Application for Example {
     fn new(_flags: Self::Flags) -> (Self, Command<Message>) {
         (
             Self::default(),
-            font::load(include_bytes!("../fonts/icons.ttf").as_ref())
+            font::load(include_bytes!("../fonts/icons.ttf").as_slice())
                 .map(Message::FontLoaded),
         )
     }

From b741893013eda90045e5a3950c37ba21d073b351 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, 26 May 2023 00:03:34 +0200
Subject: [PATCH 310/440] Use `Srgb` and `Srgba` from `palette` directly

---
 core/src/color.rs | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index f5423871..88115f25 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -1,5 +1,5 @@
 #[cfg(feature = "palette")]
-use palette::rgb::{Rgb, Rgba};
+use palette::rgb::{Srgb, Srgba};
 
 /// A color in the sRGB color space.
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
@@ -184,33 +184,33 @@ macro_rules! color {
 
 #[cfg(feature = "palette")]
 /// Converts from palette's `Rgba` type to a [`Color`].
-impl From<Rgba> for Color {
-    fn from(rgba: Rgba) -> Self {
+impl From<Srgba> for Color {
+    fn from(rgba: Srgba) -> Self {
         Color::new(rgba.red, rgba.green, rgba.blue, rgba.alpha)
     }
 }
 
 #[cfg(feature = "palette")]
 /// Converts from [`Color`] to palette's `Rgba` type.
-impl From<Color> for Rgba {
+impl From<Color> for Srgba {
     fn from(c: Color) -> Self {
-        Rgba::new(c.r, c.g, c.b, c.a)
+        Srgba::new(c.r, c.g, c.b, c.a)
     }
 }
 
 #[cfg(feature = "palette")]
 /// Converts from palette's `Rgb` type to a [`Color`].
-impl From<Rgb> for Color {
-    fn from(rgb: Rgb) -> Self {
+impl From<Srgb> for Color {
+    fn from(rgb: Srgb) -> Self {
         Color::new(rgb.red, rgb.green, rgb.blue, 1.0)
     }
 }
 
 #[cfg(feature = "palette")]
 /// Converts from [`Color`] to palette's `Rgb` type.
-impl From<Color> for Rgb {
+impl From<Color> for Srgb {
     fn from(c: Color) -> Self {
-        Rgb::new(c.r, c.g, c.b)
+        Srgb::new(c.r, c.g, c.b)
     }
 }
 
@@ -223,8 +223,8 @@ mod tests {
     #[test]
     fn srgba_traits() {
         let c = Color::from_rgb(0.5, 0.4, 0.3);
-        // Round-trip conversion to the palette:Rgba type
-        let s: Rgba = c.into();
+        // Round-trip conversion to the palette::Srgba type
+        let s: Srgba = c.into();
         let r: Color = s.into();
         assert_eq!(c, r);
     }
@@ -235,14 +235,15 @@ mod tests {
         let c2 = Color::from_rgb(0.2, 0.5, 0.3);
 
         // Convert to linear color for manipulation
-        let l1 = Rgba::from(c1).into_linear();
-        let l2 = Rgba::from(c2).into_linear();
+        let l1 = Srgba::from(c1).into_linear();
+        let l2 = Srgba::from(c2).into_linear();
 
-        // Take the lighter of each of the RGB components
+        // Take the lighter of each of the sRGB components
         let lighter = l1.lighten(l2);
 
         // Convert back to our Color
-        let r: Color = Rgba::from_linear(lighter).into();
+        let r: Color = Srgba::from_linear(lighter).into();
+
         assert_eq!(
             r,
             Color {

From cf2c8f2037907d8d619348a70594bab28f166d64 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, 26 May 2023 00:04:10 +0200
Subject: [PATCH 311/440] Use approx for testing color operations

---
 core/Cargo.toml   |  3 +++
 core/src/color.rs | 17 +++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index fc5de36f..55f2e85f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -19,3 +19,6 @@ optional = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 instant = "0.1"
+
+[dev-dependencies]
+approx = "0.5"
diff --git a/core/src/color.rs b/core/src/color.rs
index 88115f25..1392f28b 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -231,6 +231,8 @@ mod tests {
 
     #[test]
     fn color_manipulation() {
+        use approx::assert_relative_eq;
+
         let c1 = Color::from_rgb(0.5, 0.4, 0.3);
         let c2 = Color::from_rgb(0.2, 0.5, 0.3);
 
@@ -242,16 +244,11 @@ mod tests {
         let lighter = l1.lighten(l2);
 
         // Convert back to our Color
-        let r: Color = Srgba::from_linear(lighter).into();
+        let result: Color = Srgba::from_linear(lighter).into();
 
-        assert_eq!(
-            r,
-            Color {
-                r: 0.5,
-                g: 0.5,
-                b: 0.3,
-                a: 1.0
-            }
-        );
+        assert_relative_eq!(result.r, 0.5);
+        assert_relative_eq!(result.g, 0.5);
+        assert_relative_eq!(result.b, 0.3);
+        assert_relative_eq!(result.a, 1.0);
     }
 }

From 902e333148a1ceed85aba36262a849aaed8d3ac9 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Fri, 26 May 2023 10:07:52 -0700
Subject: [PATCH 312/440] Changed gradient::Packed to be `repr(C)` for direct
 gpu upload.

---
 graphics/src/gradient.rs  | 14 +++++++++-----
 graphics/src/primitive.rs |  3 ++-
 wgpu/src/geometry.rs      |  4 ++--
 wgpu/src/layer.rs         | 28 ++++++++++++++++------------
 wgpu/src/layer/quad.rs    |  4 ++--
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 2b6aba44..9f1e7bbc 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -116,13 +116,17 @@ impl Linear {
         data[42] = self.end.x;
         data[43] = self.end.y;
 
-        Packed { data }
+        Packed(data)
     }
 }
 
 /// Packed [`Gradient`] data for use in shader code.
-#[derive(Debug)]
-pub struct Packed {
-    /// The packed [`Gradient`] data.
-    pub data: [f32; 44],
+#[derive(Debug, Copy, Clone, PartialEq)]
+#[repr(C)]
+pub struct Packed([f32; 44]);
+
+impl From<[f32; 44]> for Packed {
+    fn from(value: [f32; 44]) -> Self {
+        Self(value)
+    }
 }
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 9728db39..2d4f5511 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -4,6 +4,7 @@ use crate::core::image;
 use crate::core::svg;
 use crate::core::text;
 use crate::core::{Background, Color, Font, Rectangle, Size, Vector};
+use crate::gradient;
 
 use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
@@ -258,7 +259,7 @@ pub struct GradientVertex2D {
     pub position: [f32; 2],
 
     /// The packed vertex data of the gradient.
-    pub gradient: [f32; 44],
+    pub gradient: gradient::Packed,
 }
 
 #[allow(unsafe_code)]
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index f3fed7ae..740ec20c 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -505,7 +505,7 @@ impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient.data,
+            gradient: self.gradient,
         }
     }
 }
@@ -521,7 +521,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
 
         primitive::GradientVertex2D {
             position: [position.x, position.y],
-            gradient: self.gradient.data,
+            gradient: self.gradient,
         }
     }
 }
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 980d807b..9d7f9f2a 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -13,6 +13,7 @@ pub use text::Text;
 use crate::core;
 use crate::core::alignment;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
+use crate::graphics::gradient;
 use crate::graphics::{Primitive, Viewport};
 
 /// A group of primitives that should be clipped together.
@@ -312,30 +313,33 @@ impl<'a> Layer<'a> {
 }
 
 /// Packs the [`Gradient`] for use in shader code.
-fn pack_gradient(gradient: &core::Gradient, bounds: Rectangle) -> [f32; 44] {
+fn pack_gradient(
+    gradient: &core::Gradient,
+    bounds: Rectangle,
+) -> gradient::Packed {
     match gradient {
         core::Gradient::Linear(linear) => {
-            let mut pack: [f32; 44] = [0.0; 44];
+            let mut data: [f32; 44] = [0.0; 44];
 
             for (index, stop) in linear.stops.iter().enumerate() {
                 let [r, g, b, a] =
                     stop.map_or(Color::default(), |s| s.color).into_linear();
 
-                pack[index * 4] = r;
-                pack[(index * 4) + 1] = g;
-                pack[(index * 4) + 2] = b;
-                pack[(index * 4) + 3] = a;
-                pack[32 + index] = stop.map_or(2.0, |s| s.offset);
+                data[index * 4] = r;
+                data[(index * 4) + 1] = g;
+                data[(index * 4) + 2] = b;
+                data[(index * 4) + 3] = a;
+                data[32 + index] = stop.map_or(2.0, |s| s.offset);
             }
 
             let (start, end) = linear.angle.to_distance(&bounds);
 
-            pack[40] = start.x;
-            pack[41] = start.y;
-            pack[42] = end.x;
-            pack[43] = end.y;
+            data[40] = start.x;
+            data[41] = start.y;
+            data[42] = end.x;
+            data[43] = end.y;
 
-            pack
+            data.into()
         }
     }
 }
diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs
index 9913cfe0..0bf7837a 100644
--- a/wgpu/src/layer/quad.rs
+++ b/wgpu/src/layer/quad.rs
@@ -1,5 +1,5 @@
 //! A rectangle with certain styled properties.
-
+use crate::graphics::gradient;
 use bytemuck::{Pod, Zeroable};
 
 /// The properties of a quad.
@@ -38,7 +38,7 @@ pub struct Solid {
 #[repr(C)]
 pub struct Gradient {
     /// The background gradient data of the quad.
-    pub gradient: [f32; 44],
+    pub gradient: gradient::Packed,
 
     /// The [`Quad`] data of the [`Gradient`].
     pub quad: Quad,

From 556f3e89d3a0a7a6b3a2783a618c0bb5de52be4b 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, 29 May 2023 20:47:47 +0200
Subject: [PATCH 313/440] Skip missing glyphs instead of panicking in `glyphon`

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

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f21bf7e0..b5401626 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 = "f145067d292082abdd1f2b2481812d4a52c394ec"
+rev = "cf7fe9df00499b868a6a94fa5fdb0a4ca368c9f9"
 
 [dependencies.glam]
 version = "0.24"

From 8ca7b884c0695e4e7a031ea1359ee733bdcaa8a4 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, 29 May 2023 20:56:51 +0200
Subject: [PATCH 314/440] Make `Packed` fully opaque

... by only allowing direct conversion from our `Gradient` types
---
 graphics/src/gradient.rs | 31 +++++++++++++++++++++++++++----
 wgpu/src/layer.rs        | 34 +---------------------------------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 9f1e7bbc..d3eabb6f 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -4,7 +4,7 @@
 //!
 //! [`Gradient`]: crate::core::Gradient;
 use crate::core::gradient::ColorStop;
-use crate::core::{Color, Point};
+use crate::core::{self, Color, Point, Rectangle};
 use std::cmp::Ordering;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -125,8 +125,31 @@ impl Linear {
 #[repr(C)]
 pub struct Packed([f32; 44]);
 
-impl From<[f32; 44]> for Packed {
-    fn from(value: [f32; 44]) -> Self {
-        Self(value)
+/// Creates a new [`Packed`] gradient for use in shader code.
+pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
+    match gradient {
+        core::Gradient::Linear(linear) => {
+            let mut data: [f32; 44] = [0.0; 44];
+
+            for (index, stop) in linear.stops.iter().enumerate() {
+                let [r, g, b, a] =
+                    stop.map_or(Color::default(), |s| s.color).into_linear();
+
+                data[index * 4] = r;
+                data[(index * 4) + 1] = g;
+                data[(index * 4) + 2] = b;
+                data[(index * 4) + 3] = a;
+                data[32 + index] = stop.map_or(2.0, |s| s.offset);
+            }
+
+            let (start, end) = linear.angle.to_distance(&bounds);
+
+            data[40] = start.x;
+            data[41] = start.y;
+            data[42] = end.x;
+            data[43] = end.y;
+
+            Packed(data)
+        }
     }
 }
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 9d7f9f2a..bf5c4c0a 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -183,7 +183,7 @@ impl<'a> Layer<'a> {
                     }
                     Background::Gradient(gradient) => {
                         let quad = quad::Gradient {
-                            gradient: pack_gradient(
+                            gradient: gradient::pack(
                                 gradient,
                                 Rectangle::new(
                                     quad.position.into(),
@@ -311,35 +311,3 @@ impl<'a> Layer<'a> {
         }
     }
 }
-
-/// Packs the [`Gradient`] for use in shader code.
-fn pack_gradient(
-    gradient: &core::Gradient,
-    bounds: Rectangle,
-) -> gradient::Packed {
-    match gradient {
-        core::Gradient::Linear(linear) => {
-            let mut data: [f32; 44] = [0.0; 44];
-
-            for (index, stop) in linear.stops.iter().enumerate() {
-                let [r, g, b, a] =
-                    stop.map_or(Color::default(), |s| s.color).into_linear();
-
-                data[index * 4] = r;
-                data[(index * 4) + 1] = g;
-                data[(index * 4) + 2] = b;
-                data[(index * 4) + 3] = a;
-                data[32 + index] = stop.map_or(2.0, |s| s.offset);
-            }
-
-            let (start, end) = linear.angle.to_distance(&bounds);
-
-            data[40] = start.x;
-            data[41] = start.y;
-            data[42] = end.x;
-            data[43] = end.y;
-
-            data.into()
-        }
-    }
-}

From 3f141459a66fe66e6dc25d579d0cda80662f0895 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 25 May 2023 10:27:27 -0700
Subject: [PATCH 315/440] Fixed issue where quads of different types were not
 ordered.

---
 wgpu/src/backend.rs    |  8 ++++++--
 wgpu/src/layer.rs      | 42 +++++++++++++++++++++++++++++++++++++++++-
 wgpu/src/layer/quad.rs |  9 +++++++++
 wgpu/src/quad.rs       | 41 +++++++++++++++++++++++++++++++----------
 4 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index def80a81..764a033b 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -265,8 +265,12 @@ impl Backend {
             }
 
             if !layer.quads.is_empty() {
-                self.quad_pipeline
-                    .render(quad_layer, bounds, &mut render_pass);
+                self.quad_pipeline.render(
+                    quad_layer,
+                    bounds,
+                    &layer.quads.order,
+                    &mut render_pass,
+                );
 
                 quad_layer += 1;
             }
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index bf5c4c0a..f5c4b576 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -43,6 +43,12 @@ pub struct Quads {
 
     /// The gradient quads of the [`Layer`].
     pub gradients: Vec<quad::Gradient>,
+
+    /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
+    pub order: Vec<(quad::Order, usize)>,
+
+    // The last index of quad ordering.
+    index: usize,
 }
 
 impl Quads {
@@ -174,12 +180,13 @@ impl<'a> Layer<'a> {
                     border_width: *border_width,
                 };
 
-                match background {
+                let quad_order = match background {
                     Background::Color(color) => {
                         layer.quads.solids.push(quad::Solid {
                             color: color.into_linear(),
                             quad,
                         });
+                        quad::Order::Solid
                     }
                     Background::Gradient(gradient) => {
                         let quad = quad::Gradient {
@@ -194,8 +201,41 @@ impl<'a> Layer<'a> {
                         };
 
                         layer.quads.gradients.push(quad);
+                        quad::Order::Gradient
                     }
                 };
+
+                match (layer.quads.order.get_mut(layer.quads.index), quad_order)
+                {
+                    (Some((quad_order, count)), quad::Order::Solid) => {
+                        match quad_order {
+                            quad::Order::Solid => {
+                                *count += 1;
+                            }
+                            quad::Order::Gradient => {
+                                layer.quads.order.push((quad::Order::Solid, 1));
+                                layer.quads.index += 1;
+                            }
+                        }
+                    }
+                    (Some((quad_order, count)), quad::Order::Gradient) => {
+                        match quad_order {
+                            quad::Order::Solid => {
+                                layer
+                                    .quads
+                                    .order
+                                    .push((quad::Order::Gradient, 1));
+                                layer.quads.index += 1;
+                            }
+                            quad::Order::Gradient => {
+                                *count += 1;
+                            }
+                        }
+                    }
+                    (None, _) => {
+                        layer.quads.order.push((quad_order, 1));
+                    }
+                }
             }
             Primitive::Image { handle, bounds } => {
                 let layer = &mut layers[current_layer];
diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs
index 0bf7837a..aaaebd5b 100644
--- a/wgpu/src/layer/quad.rs
+++ b/wgpu/src/layer/quad.rs
@@ -49,3 +49,12 @@ unsafe impl Pod for Gradient {}
 
 #[allow(unsafe_code)]
 unsafe impl Zeroable for Gradient {}
+
+#[derive(Debug, Copy, Clone)]
+/// The identifier of a quad, used for ordering.
+pub enum Order {
+    /// A solid quad
+    Solid,
+    /// A gradient quad
+    Gradient,
+}
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 0125ec0b..a05e5468 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,6 +1,6 @@
 use crate::core::Rectangle;
 use crate::graphics::Transformation;
-use crate::layer;
+use crate::layer::{self, quad};
 
 use std::mem;
 use wgpu::util::DeviceExt;
@@ -87,6 +87,7 @@ impl Pipeline {
         &'a self,
         layer: usize,
         bounds: Rectangle<u32>,
+        ordering: &Vec<(quad::Order, usize)>,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
         if let Some(layer) = self.layers.get(layer) {
@@ -102,14 +103,30 @@ impl Pipeline {
             );
             render_pass.set_vertex_buffer(0, self.vertices.slice(..));
 
-            if layer.solid.instance_count > 0 {
-                render_pass.set_pipeline(&self.solid.pipeline);
-                layer.solid.draw(&layer.constants, render_pass);
-            }
+            let mut solid_offset = 0;
+            let mut gradient_offset = 0;
 
-            if layer.gradient.instance_count > 0 {
-                render_pass.set_pipeline(&self.gradient.pipeline);
-                layer.gradient.draw(&layer.constants, render_pass);
+            for (quad_order, count) in ordering {
+                match quad_order {
+                    quad::Order::Solid => {
+                        render_pass.set_pipeline(&self.solid.pipeline);
+                        layer.solid.draw(
+                            &layer.constants,
+                            render_pass,
+                            solid_offset..(solid_offset + count),
+                        );
+                        solid_offset += count;
+                    }
+                    quad::Order::Gradient => {
+                        render_pass.set_pipeline(&self.gradient.pipeline);
+                        layer.gradient.draw(
+                            &layer.constants,
+                            render_pass,
+                            gradient_offset..(gradient_offset + count),
+                        );
+                        gradient_offset += count;
+                    }
+                }
             }
         }
     }
@@ -198,6 +215,7 @@ mod solid {
     use crate::layer::quad;
     use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
     use crate::Buffer;
+    use std::ops::Range;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -229,6 +247,7 @@ mod solid {
             &'a self,
             constants: &'a wgpu::BindGroup,
             render_pass: &mut wgpu::RenderPass<'a>,
+            range: Range<usize>,
         ) {
             #[cfg(feature = "tracing")]
             let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
@@ -239,7 +258,7 @@ mod solid {
             render_pass.draw_indexed(
                 0..INDICES.len() as u32,
                 0,
-                0..self.instance_count as u32,
+                range.start as u32..range.end as u32,
             );
         }
     }
@@ -327,6 +346,7 @@ mod gradient {
     use crate::layer::quad;
     use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
     use crate::Buffer;
+    use std::ops::Range;
 
     #[derive(Debug)]
     pub struct Pipeline {
@@ -358,6 +378,7 @@ mod gradient {
             &'a self,
             constants: &'a wgpu::BindGroup,
             render_pass: &mut wgpu::RenderPass<'a>,
+            range: Range<usize>,
         ) {
             #[cfg(feature = "tracing")]
             let _ =
@@ -369,7 +390,7 @@ mod gradient {
             render_pass.draw_indexed(
                 0..INDICES.len() as u32,
                 0,
-                0..self.instance_count as u32,
+                range.start as u32..range.end as u32,
             );
         }
     }

From eb6c663420a28e087c91c39e376db3c294b5aea1 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Fri, 26 May 2023 09:55:49 -0700
Subject: [PATCH 316/440] Adjusted `Quads` struct to be opaque `quad::Layer`.

---
 wgpu/src/backend.rs    |  2 +-
 wgpu/src/layer.rs      | 87 ++---------------------------------------
 wgpu/src/layer/quad.rs | 89 ++++++++++++++++++++++++++++++++++++++++++
 wgpu/src/quad.rs       | 37 +++++++-----------
 4 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 764a033b..844987f2 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -268,7 +268,7 @@ impl Backend {
                 self.quad_pipeline.render(
                     quad_layer,
                     bounds,
-                    &layer.quads.order,
+                    &layer.quads,
                     &mut render_pass,
                 );
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index f5c4b576..4e028eac 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -12,8 +12,7 @@ pub use text::Text;
 
 use crate::core;
 use crate::core::alignment;
-use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
-use crate::graphics::gradient;
+use crate::core::{Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::{Primitive, Viewport};
 
 /// A group of primitives that should be clipped together.
@@ -23,7 +22,7 @@ pub struct Layer<'a> {
     pub bounds: Rectangle,
 
     /// The quads of the [`Layer`].
-    pub quads: Quads,
+    pub quads: quad::Layer,
 
     /// The triangle meshes of the [`Layer`].
     pub meshes: Vec<Mesh<'a>>,
@@ -35,35 +34,12 @@ pub struct Layer<'a> {
     pub images: Vec<Image>,
 }
 
-/// The quads of the [`Layer`].
-#[derive(Default, Debug)]
-pub struct Quads {
-    /// The solid quads of the [`Layer`].
-    pub solids: Vec<quad::Solid>,
-
-    /// The gradient quads of the [`Layer`].
-    pub gradients: Vec<quad::Gradient>,
-
-    /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
-    pub order: Vec<(quad::Order, usize)>,
-
-    // The last index of quad ordering.
-    index: usize,
-}
-
-impl Quads {
-    /// Returns true if there are no quads of any type in [`Quads`].
-    pub fn is_empty(&self) -> bool {
-        self.solids.is_empty() && self.gradients.is_empty()
-    }
-}
-
 impl<'a> Layer<'a> {
     /// Creates a new [`Layer`] with the given clipping bounds.
     pub fn new(bounds: Rectangle) -> Self {
         Self {
             bounds,
-            quads: Quads::default(),
+            quads: quad::Layer::default(),
             meshes: Vec::new(),
             text: Vec::new(),
             images: Vec::new(),
@@ -180,62 +156,7 @@ impl<'a> Layer<'a> {
                     border_width: *border_width,
                 };
 
-                let quad_order = match background {
-                    Background::Color(color) => {
-                        layer.quads.solids.push(quad::Solid {
-                            color: color.into_linear(),
-                            quad,
-                        });
-                        quad::Order::Solid
-                    }
-                    Background::Gradient(gradient) => {
-                        let quad = quad::Gradient {
-                            gradient: gradient::pack(
-                                gradient,
-                                Rectangle::new(
-                                    quad.position.into(),
-                                    quad.size.into(),
-                                ),
-                            ),
-                            quad,
-                        };
-
-                        layer.quads.gradients.push(quad);
-                        quad::Order::Gradient
-                    }
-                };
-
-                match (layer.quads.order.get_mut(layer.quads.index), quad_order)
-                {
-                    (Some((quad_order, count)), quad::Order::Solid) => {
-                        match quad_order {
-                            quad::Order::Solid => {
-                                *count += 1;
-                            }
-                            quad::Order::Gradient => {
-                                layer.quads.order.push((quad::Order::Solid, 1));
-                                layer.quads.index += 1;
-                            }
-                        }
-                    }
-                    (Some((quad_order, count)), quad::Order::Gradient) => {
-                        match quad_order {
-                            quad::Order::Solid => {
-                                layer
-                                    .quads
-                                    .order
-                                    .push((quad::Order::Gradient, 1));
-                                layer.quads.index += 1;
-                            }
-                            quad::Order::Gradient => {
-                                *count += 1;
-                            }
-                        }
-                    }
-                    (None, _) => {
-                        layer.quads.order.push((quad_order, 1));
-                    }
-                }
+                layer.quads.add(quad, background);
             }
             Primitive::Image { handle, bounds } => {
                 let layer = &mut layers[current_layer];
diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs
index aaaebd5b..284a7618 100644
--- a/wgpu/src/layer/quad.rs
+++ b/wgpu/src/layer/quad.rs
@@ -1,4 +1,5 @@
 //! A rectangle with certain styled properties.
+use crate::core::{Background, Rectangle};
 use crate::graphics::gradient;
 use bytemuck::{Pod, Zeroable};
 
@@ -58,3 +59,91 @@ pub enum Order {
     /// A gradient quad
     Gradient,
 }
+
+/// A group of [`Quad`]s rendered together.
+#[derive(Default, Debug)]
+pub struct Layer {
+    /// The solid quads of the [`Layer`].
+    solids: Vec<Solid>,
+
+    /// The gradient quads of the [`Layer`].
+    gradients: Vec<Gradient>,
+
+    /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
+    order: Vec<(Order, usize)>,
+
+    /// The last index of quad ordering.
+    index: usize,
+}
+
+impl Layer {
+    /// Returns true if there are no quads of any type in [`Quads`].
+    pub fn is_empty(&self) -> bool {
+        self.solids.is_empty() && self.gradients.is_empty()
+    }
+
+    /// The [`Solid`] quads of the [`Layer`].
+    pub fn solids(&self) -> &[Solid] {
+        &self.solids
+    }
+
+    /// The [`Gradient`] quads of the [`Layer`].
+    pub fn gradients(&self) -> &[Gradient] {
+        &self.gradients
+    }
+
+    /// The order of quads within the [`Layer`], grouped by (type, count) for rendering in batches.
+    pub fn ordering(&self) -> &[(Order, usize)] {
+        &self.order
+    }
+
+    /// Adds a [`Quad`] with the provided `Background` type to the quad [`Layer`].
+    pub fn add(&mut self, quad: Quad, background: &Background) {
+        let quad_order = match background {
+            Background::Color(color) => {
+                self.solids.push(Solid {
+                    color: color.into_linear(),
+                    quad,
+                });
+
+                Order::Solid
+            }
+            Background::Gradient(gradient) => {
+                let quad = Gradient {
+                    gradient: gradient::pack(
+                        gradient,
+                        Rectangle::new(quad.position.into(), quad.size.into()),
+                    ),
+                    quad,
+                };
+
+                self.gradients.push(quad);
+                Order::Gradient
+            }
+        };
+
+        match (self.order.get_mut(self.index), quad_order) {
+            (Some((quad_order, count)), Order::Solid) => match quad_order {
+                Order::Solid => {
+                    *count += 1;
+                }
+                Order::Gradient => {
+                    self.order.push((Order::Solid, 1));
+                    self.index += 1;
+                }
+            },
+            (Some((quad_order, count)), Order::Gradient) => match quad_order {
+                Order::Solid => {
+                    self.order.push((Order::Gradient, 1));
+                    self.index += 1;
+                }
+                Order::Gradient => {
+                    *count += 1;
+                }
+            },
+            (None, _) => {
+                self.order.push((quad_order, 1));
+            }
+        }
+    }
+}
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index a05e5468..065da153 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,6 +1,6 @@
 use crate::core::Rectangle;
 use crate::graphics::Transformation;
-use crate::layer::{self, quad};
+use crate::layer::quad;
 
 use std::mem;
 use wgpu::util::DeviceExt;
@@ -69,7 +69,7 @@ impl Pipeline {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        instances: &layer::Quads,
+        quads: &quad::Layer,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -78,7 +78,7 @@ impl Pipeline {
         }
 
         let layer = &mut self.layers[self.prepare_layer];
-        layer.prepare(device, queue, instances, transformation, scale);
+        layer.prepare(device, queue, quads, transformation, scale);
 
         self.prepare_layer += 1;
     }
@@ -87,7 +87,7 @@ impl Pipeline {
         &'a self,
         layer: usize,
         bounds: Rectangle<u32>,
-        ordering: &Vec<(quad::Order, usize)>,
+        quads: &quad::Layer,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
         if let Some(layer) = self.layers.get(layer) {
@@ -106,7 +106,7 @@ impl Pipeline {
             let mut solid_offset = 0;
             let mut gradient_offset = 0;
 
-            for (quad_order, count) in ordering {
+            for (quad_order, count) in quads.ordering() {
                 match quad_order {
                     quad::Order::Solid => {
                         render_pass.set_pipeline(&self.solid.pipeline);
@@ -177,7 +177,7 @@ impl Layer {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        instances: &layer::Quads,
+        quads: &quad::Layer,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -192,22 +192,15 @@ impl Layer {
             bytemuck::bytes_of(&uniforms),
         );
 
-        let _ = self.solid.instances.resize(device, instances.solids.len());
-        let _ = self
-            .gradient
-            .instances
-            .resize(device, instances.gradients.len());
-        let _ =
-            self.solid
-                .instances
-                .write(queue, 0, instances.solids.as_slice());
-        self.solid.instance_count = instances.solids.len();
-        let _ = self.gradient.instances.write(
-            queue,
-            0,
-            instances.gradients.as_slice(),
-        );
-        self.gradient.instance_count = instances.gradients.len();
+        let solids = quads.solids();
+        let gradients = quads.gradients();
+
+        let _ = self.solid.instances.resize(device, solids.len());
+        let _ = self.gradient.instances.resize(device, gradients.len());
+        let _ = self.solid.instances.write(queue, 0, solids);
+        self.solid.instance_count = solids.len();
+        let _ = self.gradient.instances.write(queue, 0, gradients);
+        self.gradient.instance_count = gradients.len();
     }
 }
 

From fe9da174cafffbd77eb351c51ba017cf039a4cf4 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, 30 May 2023 00:56:52 +0200
Subject: [PATCH 317/440] Move `layer::quad` types to `quad` module

Not sure why I split these to begin with!
---
 wgpu/src/layer.rs         |   7 +-
 wgpu/src/layer/quad.rs    | 149 --------------
 wgpu/src/quad.rs          | 408 +++++++++++---------------------------
 wgpu/src/quad/gradient.rs | 161 +++++++++++++++
 wgpu/src/quad/solid.rs    | 136 +++++++++++++
 5 files changed, 417 insertions(+), 444 deletions(-)
 delete mode 100644 wgpu/src/layer/quad.rs
 create mode 100644 wgpu/src/quad/gradient.rs
 create mode 100644 wgpu/src/quad/solid.rs

diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 4e028eac..1a870c15 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -3,17 +3,16 @@ mod image;
 mod text;
 
 pub mod mesh;
-pub mod quad;
 
 pub use image::Image;
 pub use mesh::Mesh;
-pub use quad::Quad;
 pub use text::Text;
 
 use crate::core;
 use crate::core::alignment;
 use crate::core::{Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::{Primitive, Viewport};
+use crate::quad::{self, Quad};
 
 /// A group of primitives that should be clipped together.
 #[derive(Debug)]
@@ -22,7 +21,7 @@ pub struct Layer<'a> {
     pub bounds: Rectangle,
 
     /// The quads of the [`Layer`].
-    pub quads: quad::Layer,
+    pub quads: quad::Batch,
 
     /// The triangle meshes of the [`Layer`].
     pub meshes: Vec<Mesh<'a>>,
@@ -39,7 +38,7 @@ impl<'a> Layer<'a> {
     pub fn new(bounds: Rectangle) -> Self {
         Self {
             bounds,
-            quads: quad::Layer::default(),
+            quads: quad::Batch::default(),
             meshes: Vec::new(),
             text: Vec::new(),
             images: Vec::new(),
diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs
deleted file mode 100644
index 284a7618..00000000
--- a/wgpu/src/layer/quad.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-//! A rectangle with certain styled properties.
-use crate::core::{Background, Rectangle};
-use crate::graphics::gradient;
-use bytemuck::{Pod, Zeroable};
-
-/// The properties of a quad.
-#[derive(Clone, Copy, Debug, Pod, Zeroable)]
-#[repr(C)]
-pub struct Quad {
-    /// The position of the [`Quad`].
-    pub position: [f32; 2],
-
-    /// The size of the [`Quad`].
-    pub size: [f32; 2],
-
-    /// The border color of the [`Quad`], in __linear RGB__.
-    pub border_color: [f32; 4],
-
-    /// The border radii of the [`Quad`].
-    pub border_radius: [f32; 4],
-
-    /// The border width of the [`Quad`].
-    pub border_width: f32,
-}
-
-/// A quad filled with a solid color.
-#[derive(Clone, Copy, Debug, Pod, Zeroable)]
-#[repr(C)]
-pub struct Solid {
-    /// The background color data of the quad.
-    pub color: [f32; 4],
-
-    /// The [`Quad`] data of the [`Solid`].
-    pub quad: Quad,
-}
-
-/// A quad filled with interpolated colors.
-#[derive(Clone, Copy, Debug)]
-#[repr(C)]
-pub struct Gradient {
-    /// The background gradient data of the quad.
-    pub gradient: gradient::Packed,
-
-    /// The [`Quad`] data of the [`Gradient`].
-    pub quad: Quad,
-}
-
-#[allow(unsafe_code)]
-unsafe impl Pod for Gradient {}
-
-#[allow(unsafe_code)]
-unsafe impl Zeroable for Gradient {}
-
-#[derive(Debug, Copy, Clone)]
-/// The identifier of a quad, used for ordering.
-pub enum Order {
-    /// A solid quad
-    Solid,
-    /// A gradient quad
-    Gradient,
-}
-
-/// A group of [`Quad`]s rendered together.
-#[derive(Default, Debug)]
-pub struct Layer {
-    /// The solid quads of the [`Layer`].
-    solids: Vec<Solid>,
-
-    /// The gradient quads of the [`Layer`].
-    gradients: Vec<Gradient>,
-
-    /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
-    order: Vec<(Order, usize)>,
-
-    /// The last index of quad ordering.
-    index: usize,
-}
-
-impl Layer {
-    /// Returns true if there are no quads of any type in [`Quads`].
-    pub fn is_empty(&self) -> bool {
-        self.solids.is_empty() && self.gradients.is_empty()
-    }
-
-    /// The [`Solid`] quads of the [`Layer`].
-    pub fn solids(&self) -> &[Solid] {
-        &self.solids
-    }
-
-    /// The [`Gradient`] quads of the [`Layer`].
-    pub fn gradients(&self) -> &[Gradient] {
-        &self.gradients
-    }
-
-    /// The order of quads within the [`Layer`], grouped by (type, count) for rendering in batches.
-    pub fn ordering(&self) -> &[(Order, usize)] {
-        &self.order
-    }
-
-    /// Adds a [`Quad`] with the provided `Background` type to the quad [`Layer`].
-    pub fn add(&mut self, quad: Quad, background: &Background) {
-        let quad_order = match background {
-            Background::Color(color) => {
-                self.solids.push(Solid {
-                    color: color.into_linear(),
-                    quad,
-                });
-
-                Order::Solid
-            }
-            Background::Gradient(gradient) => {
-                let quad = Gradient {
-                    gradient: gradient::pack(
-                        gradient,
-                        Rectangle::new(quad.position.into(), quad.size.into()),
-                    ),
-                    quad,
-                };
-
-                self.gradients.push(quad);
-                Order::Gradient
-            }
-        };
-
-        match (self.order.get_mut(self.index), quad_order) {
-            (Some((quad_order, count)), Order::Solid) => match quad_order {
-                Order::Solid => {
-                    *count += 1;
-                }
-                Order::Gradient => {
-                    self.order.push((Order::Solid, 1));
-                    self.index += 1;
-                }
-            },
-            (Some((quad_order, count)), Order::Gradient) => match quad_order {
-                Order::Solid => {
-                    self.order.push((Order::Gradient, 1));
-                    self.index += 1;
-                }
-                Order::Gradient => {
-                    *count += 1;
-                }
-            },
-            (None, _) => {
-                self.order.push((quad_order, 1));
-            }
-        }
-    }
-}
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 065da153..375b0cd7 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -1,9 +1,16 @@
-use crate::core::Rectangle;
-use crate::graphics::Transformation;
-use crate::layer::quad;
+mod gradient;
+mod solid;
+
+use gradient::Gradient;
+use solid::Solid;
+
+use crate::core::{Background, Rectangle};
+use crate::graphics::{self, Transformation};
+
+use bytemuck::{Pod, Zeroable};
+use wgpu::util::DeviceExt;
 
 use std::mem;
-use wgpu::util::DeviceExt;
 
 #[cfg(feature = "tracing")]
 use tracing::info_span;
@@ -69,7 +76,7 @@ impl Pipeline {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        quads: &quad::Layer,
+        quads: &Batch,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -87,7 +94,7 @@ impl Pipeline {
         &'a self,
         layer: usize,
         bounds: Rectangle<u32>,
-        quads: &quad::Layer,
+        quads: &Batch,
         render_pass: &mut wgpu::RenderPass<'a>,
     ) {
         if let Some(layer) = self.layers.get(layer) {
@@ -106,9 +113,9 @@ impl Pipeline {
             let mut solid_offset = 0;
             let mut gradient_offset = 0;
 
-            for (quad_order, count) in quads.ordering() {
+            for (quad_order, count) in &quads.order {
                 match quad_order {
-                    quad::Order::Solid => {
+                    Order::Solid => {
                         render_pass.set_pipeline(&self.solid.pipeline);
                         layer.solid.draw(
                             &layer.constants,
@@ -117,7 +124,7 @@ impl Pipeline {
                         );
                         solid_offset += count;
                     }
-                    quad::Order::Gradient => {
+                    Order::Gradient => {
                         render_pass.set_pipeline(&self.gradient.pipeline);
                         layer.gradient.draw(
                             &layer.constants,
@@ -177,7 +184,7 @@ impl Layer {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        quads: &quad::Layer,
+        quads: &Batch,
         transformation: Transformation,
         scale: f32,
     ) {
@@ -192,301 +199,120 @@ impl Layer {
             bytemuck::bytes_of(&uniforms),
         );
 
-        let solids = quads.solids();
-        let gradients = quads.gradients();
+        let _ = self.solid.instances.resize(device, quads.solids.len());
+        let _ = self
+            .gradient
+            .instances
+            .resize(device, quads.gradients.len());
 
-        let _ = self.solid.instances.resize(device, solids.len());
-        let _ = self.gradient.instances.resize(device, gradients.len());
-        let _ = self.solid.instances.write(queue, 0, solids);
-        self.solid.instance_count = solids.len();
-        let _ = self.gradient.instances.write(queue, 0, gradients);
-        self.gradient.instance_count = gradients.len();
+        let _ = self.solid.instances.write(queue, 0, &quads.solids);
+        let _ = self.gradient.instances.write(queue, 0, &quads.gradients);
+
+        self.solid.instance_count = quads.solids.len();
+        self.gradient.instance_count = quads.gradients.len();
     }
 }
 
-mod solid {
-    use crate::layer::quad;
-    use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
-    use crate::Buffer;
-    use std::ops::Range;
+/// The properties of a quad.
+#[derive(Clone, Copy, Debug, Pod, Zeroable)]
+#[repr(C)]
+pub struct Quad {
+    /// The position of the [`Quad`].
+    pub position: [f32; 2],
 
-    #[derive(Debug)]
-    pub struct Pipeline {
-        pub pipeline: wgpu::RenderPipeline,
+    /// The size of the [`Quad`].
+    pub size: [f32; 2],
+
+    /// The border color of the [`Quad`], in __linear RGB__.
+    pub border_color: [f32; 4],
+
+    /// The border radii of the [`Quad`].
+    pub border_radius: [f32; 4],
+
+    /// The border width of the [`Quad`].
+    pub border_width: f32,
+}
+
+/// A group of [`Quad`]s rendered together.
+#[derive(Default, Debug)]
+pub struct Batch {
+    /// The solid quads of the [`Layer`].
+    solids: Vec<Solid>,
+
+    /// The gradient quads of the [`Layer`].
+    gradients: Vec<Gradient>,
+
+    /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
+    order: Vec<(Order, usize)>,
+
+    /// The last index of quad ordering.
+    index: usize,
+}
+
+impl Batch {
+    /// Returns true if there are no quads of any type in [`Quads`].
+    pub fn is_empty(&self) -> bool {
+        self.solids.is_empty() && self.gradients.is_empty()
     }
 
-    #[derive(Debug)]
-    pub struct Layer {
-        pub instances: Buffer<quad::Solid>,
-        pub instance_count: usize,
-    }
-
-    impl Layer {
-        pub fn new(device: &wgpu::Device) -> Self {
-            let instances = Buffer::new(
-                device,
-                "iced_wgpu.quad.solid.buffer",
-                INITIAL_INSTANCES,
-                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            );
-
-            Self {
-                instances,
-                instance_count: 0,
-            }
-        }
-
-        pub fn draw<'a>(
-            &'a self,
-            constants: &'a wgpu::BindGroup,
-            render_pass: &mut wgpu::RenderPass<'a>,
-            range: Range<usize>,
-        ) {
-            #[cfg(feature = "tracing")]
-            let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
-
-            render_pass.set_bind_group(0, constants, &[]);
-            render_pass.set_vertex_buffer(1, self.instances.slice(..));
-
-            render_pass.draw_indexed(
-                0..INDICES.len() as u32,
-                0,
-                range.start as u32..range.end as u32,
-            );
-        }
-    }
-
-    impl Pipeline {
-        pub fn new(
-            device: &wgpu::Device,
-            format: wgpu::TextureFormat,
-            constants_layout: &wgpu::BindGroupLayout,
-        ) -> Self {
-            let layout = device.create_pipeline_layout(
-                &wgpu::PipelineLayoutDescriptor {
-                    label: Some("iced_wgpu.quad.solid.pipeline"),
-                    push_constant_ranges: &[],
-                    bind_group_layouts: &[constants_layout],
-                },
-            );
-
-            let shader =
-                device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("iced_wgpu.quad.solid.shader"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        std::borrow::Cow::Borrowed(include_str!(
-                            "shader/quad.wgsl"
-                        )),
-                    ),
+    /// Adds a [`Quad`] with the provided `Background` type to the quad [`Layer`].
+    pub fn add(&mut self, quad: Quad, background: &Background) {
+        let quad_order = match background {
+            Background::Color(color) => {
+                self.solids.push(Solid {
+                    color: color.into_linear(),
+                    quad,
                 });
 
-            let pipeline = device.create_render_pipeline(
-                &wgpu::RenderPipelineDescriptor {
-                    label: Some("iced_wgpu.quad.solid.pipeline"),
-                    layout: Some(&layout),
-                    vertex: wgpu::VertexState {
-                        module: &shader,
-                        entry_point: "solid_vs_main",
-                        buffers: &[
-                            Vertex::buffer_layout(),
-                            wgpu::VertexBufferLayout {
-                                array_stride: std::mem::size_of::<quad::Solid>()
-                                    as u64,
-                                step_mode: wgpu::VertexStepMode::Instance,
-                                attributes: &wgpu::vertex_attr_array!(
-                                    // Color
-                                    1 => Float32x4,
-                                    // Position
-                                    2 => Float32x2,
-                                    // Size
-                                    3 => Float32x2,
-                                    // Border color
-                                    4 => Float32x4,
-                                    // Border radius
-                                    5 => Float32x4,
-                                    // Border width
-                                    6 => Float32,
-                                ),
-                            },
-                        ],
-                    },
-                    fragment: Some(wgpu::FragmentState {
-                        module: &shader,
-                        entry_point: "solid_fs_main",
-                        targets: &color_target_state(format),
-                    }),
-                    primitive: wgpu::PrimitiveState {
-                        topology: wgpu::PrimitiveTopology::TriangleList,
-                        front_face: wgpu::FrontFace::Cw,
-                        ..Default::default()
-                    },
-                    depth_stencil: None,
-                    multisample: wgpu::MultisampleState {
-                        count: 1,
-                        mask: !0,
-                        alpha_to_coverage_enabled: false,
-                    },
-                    multiview: None,
-                },
-            );
+                Order::Solid
+            }
+            Background::Gradient(gradient) => {
+                let quad = Gradient {
+                    gradient: graphics::gradient::pack(
+                        gradient,
+                        Rectangle::new(quad.position.into(), quad.size.into()),
+                    ),
+                    quad,
+                };
 
-            Self { pipeline }
+                self.gradients.push(quad);
+                Order::Gradient
+            }
+        };
+
+        match (self.order.get_mut(self.index), quad_order) {
+            (Some((quad_order, count)), Order::Solid) => match quad_order {
+                Order::Solid => {
+                    *count += 1;
+                }
+                Order::Gradient => {
+                    self.order.push((Order::Solid, 1));
+                    self.index += 1;
+                }
+            },
+            (Some((quad_order, count)), Order::Gradient) => match quad_order {
+                Order::Solid => {
+                    self.order.push((Order::Gradient, 1));
+                    self.index += 1;
+                }
+                Order::Gradient => {
+                    *count += 1;
+                }
+            },
+            (None, _) => {
+                self.order.push((quad_order, 1));
+            }
         }
     }
 }
 
-mod gradient {
-    use crate::layer::quad;
-    use crate::quad::{color_target_state, Vertex, INDICES, INITIAL_INSTANCES};
-    use crate::Buffer;
-    use std::ops::Range;
-
-    #[derive(Debug)]
-    pub struct Pipeline {
-        pub pipeline: wgpu::RenderPipeline,
-    }
-
-    #[derive(Debug)]
-    pub struct Layer {
-        pub instances: Buffer<quad::Gradient>,
-        pub instance_count: usize,
-    }
-
-    impl Layer {
-        pub fn new(device: &wgpu::Device) -> Self {
-            let instances = Buffer::new(
-                device,
-                "iced_wgpu.quad.gradient.buffer",
-                INITIAL_INSTANCES,
-                wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
-            );
-
-            Self {
-                instances,
-                instance_count: 0,
-            }
-        }
-
-        pub fn draw<'a>(
-            &'a self,
-            constants: &'a wgpu::BindGroup,
-            render_pass: &mut wgpu::RenderPass<'a>,
-            range: Range<usize>,
-        ) {
-            #[cfg(feature = "tracing")]
-            let _ =
-                tracing::info_span!("Wgpu::Quad::Gradient", "DRAW").entered();
-
-            render_pass.set_bind_group(0, constants, &[]);
-            render_pass.set_vertex_buffer(1, self.instances.slice(..));
-
-            render_pass.draw_indexed(
-                0..INDICES.len() as u32,
-                0,
-                range.start as u32..range.end as u32,
-            );
-        }
-    }
-
-    impl Pipeline {
-        pub fn new(
-            device: &wgpu::Device,
-            format: wgpu::TextureFormat,
-            constants_layout: &wgpu::BindGroupLayout,
-        ) -> Self {
-            let layout = device.create_pipeline_layout(
-                &wgpu::PipelineLayoutDescriptor {
-                    label: Some("iced_wgpu.quad.gradient.pipeline"),
-                    push_constant_ranges: &[],
-                    bind_group_layouts: &[constants_layout],
-                },
-            );
-
-            let shader =
-                device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                    label: Some("iced_wgpu.quad.gradient.shader"),
-                    source: wgpu::ShaderSource::Wgsl(
-                        std::borrow::Cow::Borrowed(include_str!(
-                            "shader/quad.wgsl"
-                        )),
-                    ),
-                });
-
-            let pipeline =
-                device.create_render_pipeline(
-                    &wgpu::RenderPipelineDescriptor {
-                        label: Some("iced_wgpu.quad.gradient.pipeline"),
-                        layout: Some(&layout),
-                        vertex: wgpu::VertexState {
-                            module: &shader,
-                            entry_point: "gradient_vs_main",
-                            buffers: &[
-                                Vertex::buffer_layout(),
-                                wgpu::VertexBufferLayout {
-                                    array_stride: std::mem::size_of::<
-                                        quad::Gradient,
-                                    >(
-                                    )
-                                        as u64,
-                                    step_mode: wgpu::VertexStepMode::Instance,
-                                    attributes: &wgpu::vertex_attr_array!(
-                                        // Color 1
-                                        1 => Float32x4,
-                                        // Color 2
-                                        2 => Float32x4,
-                                        // Color 3
-                                        3 => Float32x4,
-                                        // Color 4
-                                        4 => Float32x4,
-                                        // Color 5
-                                        5 => Float32x4,
-                                        // Color 6
-                                        6 => Float32x4,
-                                        // Color 7
-                                        7 => Float32x4,
-                                        // Color 8
-                                        8 => Float32x4,
-                                        // Offsets 1-4
-                                        9 => Float32x4,
-                                        // Offsets 5-8
-                                        10 => Float32x4,
-                                        // Direction
-                                        11 => Float32x4,
-                                        // Position & Scale
-                                        12 => Float32x4,
-                                        // Border color
-                                        13 => Float32x4,
-                                        // Border radius
-                                        14 => Float32x4,
-                                        // Border width
-                                        15 => Float32
-                                    ),
-                                },
-                            ],
-                        },
-                        fragment: Some(wgpu::FragmentState {
-                            module: &shader,
-                            entry_point: "gradient_fs_main",
-                            targets: &color_target_state(format),
-                        }),
-                        primitive: wgpu::PrimitiveState {
-                            topology: wgpu::PrimitiveTopology::TriangleList,
-                            front_face: wgpu::FrontFace::Cw,
-                            ..Default::default()
-                        },
-                        depth_stencil: None,
-                        multisample: wgpu::MultisampleState {
-                            count: 1,
-                            mask: !0,
-                            alpha_to_coverage_enabled: false,
-                        },
-                        multiview: None,
-                    },
-                );
-
-            Self { pipeline }
-        }
-    }
+#[derive(Debug, Copy, Clone)]
+/// The identifier of a quad, used for ordering.
+enum Order {
+    /// A solid quad
+    Solid,
+    /// A gradient quad
+    Gradient,
 }
 
 fn color_target_state(
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
new file mode 100644
index 00000000..2729afdf
--- /dev/null
+++ b/wgpu/src/quad/gradient.rs
@@ -0,0 +1,161 @@
+use crate::graphics::gradient;
+use crate::quad::{self, Quad};
+use crate::Buffer;
+
+use bytemuck::{Pod, Zeroable};
+use std::ops::Range;
+
+/// A quad filled with interpolated colors.
+#[derive(Clone, Copy, Debug)]
+#[repr(C)]
+pub struct Gradient {
+    /// The background gradient data of the quad.
+    pub gradient: gradient::Packed,
+
+    /// The [`Quad`] data of the [`Gradient`].
+    pub quad: Quad,
+}
+
+#[allow(unsafe_code)]
+unsafe impl Pod for Gradient {}
+
+#[allow(unsafe_code)]
+unsafe impl Zeroable for Gradient {}
+
+#[derive(Debug)]
+pub struct Pipeline {
+    pub pipeline: wgpu::RenderPipeline,
+}
+
+#[derive(Debug)]
+pub struct Layer {
+    pub instances: Buffer<Gradient>,
+    pub instance_count: usize,
+}
+
+impl Layer {
+    pub fn new(device: &wgpu::Device) -> Self {
+        let instances = Buffer::new(
+            device,
+            "iced_wgpu.quad.gradient.buffer",
+            quad::INITIAL_INSTANCES,
+            wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+        );
+
+        Self {
+            instances,
+            instance_count: 0,
+        }
+    }
+
+    pub fn draw<'a>(
+        &'a self,
+        constants: &'a wgpu::BindGroup,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        range: Range<usize>,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = tracing::info_span!("Wgpu::Quad::Gradient", "DRAW").entered();
+
+        render_pass.set_bind_group(0, constants, &[]);
+        render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..quad::INDICES.len() as u32,
+            0,
+            range.start as u32..range.end as u32,
+        );
+    }
+}
+
+impl Pipeline {
+    pub fn new(
+        device: &wgpu::Device,
+        format: wgpu::TextureFormat,
+        constants_layout: &wgpu::BindGroupLayout,
+    ) -> Self {
+        let layout =
+            device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("iced_wgpu.quad.gradient.pipeline"),
+                push_constant_ranges: &[],
+                bind_group_layouts: &[constants_layout],
+            });
+
+        let shader =
+            device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                label: Some("iced_wgpu.quad.gradient.shader"),
+                source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
+                    include_str!("../shader/quad.wgsl"),
+                )),
+            });
+
+        let pipeline =
+            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+                label: Some("iced_wgpu.quad.gradient.pipeline"),
+                layout: Some(&layout),
+                vertex: wgpu::VertexState {
+                    module: &shader,
+                    entry_point: "gradient_vs_main",
+                    buffers: &[
+                        quad::Vertex::buffer_layout(),
+                        wgpu::VertexBufferLayout {
+                            array_stride: std::mem::size_of::<Gradient>()
+                                as u64,
+                            step_mode: wgpu::VertexStepMode::Instance,
+                            attributes: &wgpu::vertex_attr_array!(
+                                // Color 1
+                                1 => Float32x4,
+                                // Color 2
+                                2 => Float32x4,
+                                // Color 3
+                                3 => Float32x4,
+                                // Color 4
+                                4 => Float32x4,
+                                // Color 5
+                                5 => Float32x4,
+                                // Color 6
+                                6 => Float32x4,
+                                // Color 7
+                                7 => Float32x4,
+                                // Color 8
+                                8 => Float32x4,
+                                // Offsets 1-4
+                                9 => Float32x4,
+                                // Offsets 5-8
+                                10 => Float32x4,
+                                // Direction
+                                11 => Float32x4,
+                                // Position & Scale
+                                12 => Float32x4,
+                                // Border color
+                                13 => Float32x4,
+                                // Border radius
+                                14 => Float32x4,
+                                // Border width
+                                15 => Float32
+                            ),
+                        },
+                    ],
+                },
+                fragment: Some(wgpu::FragmentState {
+                    module: &shader,
+                    entry_point: "gradient_fs_main",
+                    targets: &quad::color_target_state(format),
+                }),
+                primitive: wgpu::PrimitiveState {
+                    topology: wgpu::PrimitiveTopology::TriangleList,
+                    front_face: wgpu::FrontFace::Cw,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                multisample: wgpu::MultisampleState {
+                    count: 1,
+                    mask: !0,
+                    alpha_to_coverage_enabled: false,
+                },
+                multiview: None,
+            });
+
+        Self { pipeline }
+    }
+}
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
new file mode 100644
index 00000000..3540ce3a
--- /dev/null
+++ b/wgpu/src/quad/solid.rs
@@ -0,0 +1,136 @@
+use crate::quad::{self, Quad};
+use crate::Buffer;
+
+use bytemuck::{Pod, Zeroable};
+use std::ops::Range;
+
+/// A quad filled with a solid color.
+#[derive(Clone, Copy, Debug, Pod, Zeroable)]
+#[repr(C)]
+pub struct Solid {
+    /// The background color data of the quad.
+    pub color: [f32; 4],
+
+    /// The [`Quad`] data of the [`Solid`].
+    pub quad: Quad,
+}
+
+#[derive(Debug)]
+pub struct Pipeline {
+    pub pipeline: wgpu::RenderPipeline,
+}
+
+#[derive(Debug)]
+pub struct Layer {
+    pub instances: Buffer<quad::Solid>,
+    pub instance_count: usize,
+}
+
+impl Layer {
+    pub fn new(device: &wgpu::Device) -> Self {
+        let instances = Buffer::new(
+            device,
+            "iced_wgpu.quad.solid.buffer",
+            quad::INITIAL_INSTANCES,
+            wgpu::BufferUsages::VERTEX | wgpu::BufferUsages::COPY_DST,
+        );
+
+        Self {
+            instances,
+            instance_count: 0,
+        }
+    }
+
+    pub fn draw<'a>(
+        &'a self,
+        constants: &'a wgpu::BindGroup,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        range: Range<usize>,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
+
+        render_pass.set_bind_group(0, constants, &[]);
+        render_pass.set_vertex_buffer(1, self.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..quad::INDICES.len() as u32,
+            0,
+            range.start as u32..range.end as u32,
+        );
+    }
+}
+
+impl Pipeline {
+    pub fn new(
+        device: &wgpu::Device,
+        format: wgpu::TextureFormat,
+        constants_layout: &wgpu::BindGroupLayout,
+    ) -> Self {
+        let layout =
+            device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("iced_wgpu.quad.solid.pipeline"),
+                push_constant_ranges: &[],
+                bind_group_layouts: &[constants_layout],
+            });
+
+        let shader =
+            device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                label: Some("iced_wgpu.quad.solid.shader"),
+                source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(
+                    include_str!("../shader/quad.wgsl"),
+                )),
+            });
+
+        let pipeline =
+            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+                label: Some("iced_wgpu.quad.solid.pipeline"),
+                layout: Some(&layout),
+                vertex: wgpu::VertexState {
+                    module: &shader,
+                    entry_point: "solid_vs_main",
+                    buffers: &[
+                        quad::Vertex::buffer_layout(),
+                        wgpu::VertexBufferLayout {
+                            array_stride: std::mem::size_of::<quad::Solid>()
+                                as u64,
+                            step_mode: wgpu::VertexStepMode::Instance,
+                            attributes: &wgpu::vertex_attr_array!(
+                                // Color
+                                1 => Float32x4,
+                                // Position
+                                2 => Float32x2,
+                                // Size
+                                3 => Float32x2,
+                                // Border color
+                                4 => Float32x4,
+                                // Border radius
+                                5 => Float32x4,
+                                // Border width
+                                6 => Float32,
+                            ),
+                        },
+                    ],
+                },
+                fragment: Some(wgpu::FragmentState {
+                    module: &shader,
+                    entry_point: "solid_fs_main",
+                    targets: &quad::color_target_state(format),
+                }),
+                primitive: wgpu::PrimitiveState {
+                    topology: wgpu::PrimitiveTopology::TriangleList,
+                    front_face: wgpu::FrontFace::Cw,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                multisample: wgpu::MultisampleState {
+                    count: 1,
+                    mask: !0,
+                    alpha_to_coverage_enabled: false,
+                },
+                multiview: None,
+            });
+
+        Self { pipeline }
+    }
+}

From 6d650e7f9987aa72913d20c7e538448b518a6150 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, 30 May 2023 00:59:42 +0200
Subject: [PATCH 318/440] Rename `quad::Order` to `quad::Kind`

---
 wgpu/src/quad.rs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 375b0cd7..48ef565e 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -115,7 +115,7 @@ impl Pipeline {
 
             for (quad_order, count) in &quads.order {
                 match quad_order {
-                    Order::Solid => {
+                    Kind::Solid => {
                         render_pass.set_pipeline(&self.solid.pipeline);
                         layer.solid.draw(
                             &layer.constants,
@@ -124,7 +124,7 @@ impl Pipeline {
                         );
                         solid_offset += count;
                     }
-                    Order::Gradient => {
+                    Kind::Gradient => {
                         render_pass.set_pipeline(&self.gradient.pipeline);
                         layer.gradient.draw(
                             &layer.constants,
@@ -243,7 +243,7 @@ pub struct Batch {
     gradients: Vec<Gradient>,
 
     /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
-    order: Vec<(Order, usize)>,
+    order: Vec<(Kind, usize)>,
 
     /// The last index of quad ordering.
     index: usize,
@@ -264,7 +264,7 @@ impl Batch {
                     quad,
                 });
 
-                Order::Solid
+                Kind::Solid
             }
             Background::Gradient(gradient) => {
                 let quad = Gradient {
@@ -276,26 +276,26 @@ impl Batch {
                 };
 
                 self.gradients.push(quad);
-                Order::Gradient
+                Kind::Gradient
             }
         };
 
         match (self.order.get_mut(self.index), quad_order) {
-            (Some((quad_order, count)), Order::Solid) => match quad_order {
-                Order::Solid => {
+            (Some((quad_order, count)), Kind::Solid) => match quad_order {
+                Kind::Solid => {
                     *count += 1;
                 }
-                Order::Gradient => {
-                    self.order.push((Order::Solid, 1));
+                Kind::Gradient => {
+                    self.order.push((Kind::Solid, 1));
                     self.index += 1;
                 }
             },
-            (Some((quad_order, count)), Order::Gradient) => match quad_order {
-                Order::Solid => {
-                    self.order.push((Order::Gradient, 1));
+            (Some((quad_order, count)), Kind::Gradient) => match quad_order {
+                Kind::Solid => {
+                    self.order.push((Kind::Gradient, 1));
                     self.index += 1;
                 }
-                Order::Gradient => {
+                Kind::Gradient => {
                     *count += 1;
                 }
             },
@@ -307,8 +307,8 @@ impl Batch {
 }
 
 #[derive(Debug, Copy, Clone)]
-/// The identifier of a quad, used for ordering.
-enum Order {
+/// The kind of a quad.
+enum Kind {
     /// A solid quad
     Solid,
     /// A gradient quad

From cd7d33aa8ebc6fbb6666f34aeda3ee96d0fb51e3 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, 30 May 2023 01:14:41 +0200
Subject: [PATCH 319/440] Simplify `order` match statement in
 `quad::Batch::add`

---
 wgpu/src/quad.rs | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 48ef565e..e25d02af 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -244,9 +244,6 @@ pub struct Batch {
 
     /// The quad order of the [`Layer`]; stored as a tuple of the quad type & its count.
     order: Vec<(Kind, usize)>,
-
-    /// The last index of quad ordering.
-    index: usize,
 }
 
 impl Batch {
@@ -257,7 +254,7 @@ impl Batch {
 
     /// Adds a [`Quad`] with the provided `Background` type to the quad [`Layer`].
     pub fn add(&mut self, quad: Quad, background: &Background) {
-        let quad_order = match background {
+        let kind = match background {
             Background::Color(color) => {
                 self.solids.push(Solid {
                     color: color.into_linear(),
@@ -276,37 +273,23 @@ impl Batch {
                 };
 
                 self.gradients.push(quad);
+
                 Kind::Gradient
             }
         };
 
-        match (self.order.get_mut(self.index), quad_order) {
-            (Some((quad_order, count)), Kind::Solid) => match quad_order {
-                Kind::Solid => {
-                    *count += 1;
-                }
-                Kind::Gradient => {
-                    self.order.push((Kind::Solid, 1));
-                    self.index += 1;
-                }
-            },
-            (Some((quad_order, count)), Kind::Gradient) => match quad_order {
-                Kind::Solid => {
-                    self.order.push((Kind::Gradient, 1));
-                    self.index += 1;
-                }
-                Kind::Gradient => {
-                    *count += 1;
-                }
-            },
-            (None, _) => {
-                self.order.push((quad_order, 1));
+        match self.order.last_mut() {
+            Some((last_kind, count)) if kind == *last_kind => {
+                *count += 1;
+            }
+            _ => {
+                self.order.push((kind, 1));
             }
         }
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 /// The kind of a quad.
 enum Kind {
     /// A solid quad

From 9659e6a848d76df39c1988e33d248d1c1560271f 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, 30 May 2023 01:16:30 +0200
Subject: [PATCH 320/440] Improve consistency of match branches in
 `quad::Batch::add`

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

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index e25d02af..62472126 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -264,15 +264,13 @@ impl Batch {
                 Kind::Solid
             }
             Background::Gradient(gradient) => {
-                let quad = Gradient {
+                self.gradients.push(Gradient {
                     gradient: graphics::gradient::pack(
                         gradient,
                         Rectangle::new(quad.position.into(), quad.size.into()),
                     ),
                     quad,
-                };
-
-                self.gradients.push(quad);
+                });
 
                 Kind::Gradient
             }

From 5fdc5affceca9345661ea2d213ccbce99721d09b 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, 30 May 2023 01:17:03 +0200
Subject: [PATCH 321/440] Rename `quad_order` variable to `kind` in
 `quad::Pipeline::render`

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

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 62472126..deb6d59a 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -113,8 +113,8 @@ impl Pipeline {
             let mut solid_offset = 0;
             let mut gradient_offset = 0;
 
-            for (quad_order, count) in &quads.order {
-                match quad_order {
+            for (kind, count) in &quads.order {
+                match kind {
                     Kind::Solid => {
                         render_pass.set_pipeline(&self.solid.pipeline);
                         layer.solid.draw(

From ef547469fdc8fe4faaa9902d9a8c920684f07189 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, 30 May 2023 01:33:50 +0200
Subject: [PATCH 322/440] Improve boundaries between `quad` submodules in
 `iced_wgpu`

---
 wgpu/src/quad.rs          | 27 ++++++++------------
 wgpu/src/quad/gradient.rs | 50 +++++++++++++++++++++++-------------
 wgpu/src/quad/solid.rs    | 53 ++++++++++++++++++++++++---------------
 3 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index deb6d59a..9c5ed05f 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -116,21 +116,23 @@ impl Pipeline {
             for (kind, count) in &quads.order {
                 match kind {
                     Kind::Solid => {
-                        render_pass.set_pipeline(&self.solid.pipeline);
-                        layer.solid.draw(
-                            &layer.constants,
+                        self.solid.render(
                             render_pass,
+                            &layer.constants,
+                            &layer.solid,
                             solid_offset..(solid_offset + count),
                         );
+
                         solid_offset += count;
                     }
                     Kind::Gradient => {
-                        render_pass.set_pipeline(&self.gradient.pipeline);
-                        layer.gradient.draw(
-                            &layer.constants,
+                        self.gradient.render(
                             render_pass,
+                            &layer.constants,
+                            &layer.gradient,
                             gradient_offset..(gradient_offset + count),
                         );
+
                         gradient_offset += count;
                     }
                 }
@@ -199,17 +201,8 @@ impl Layer {
             bytemuck::bytes_of(&uniforms),
         );
 
-        let _ = self.solid.instances.resize(device, quads.solids.len());
-        let _ = self
-            .gradient
-            .instances
-            .resize(device, quads.gradients.len());
-
-        let _ = self.solid.instances.write(queue, 0, &quads.solids);
-        let _ = self.gradient.instances.write(queue, 0, &quads.gradients);
-
-        self.solid.instance_count = quads.solids.len();
-        self.gradient.instance_count = quads.gradients.len();
+        self.solid.prepare(device, queue, &quads.solids);
+        self.gradient.prepare(device, queue, &quads.gradients);
     }
 }
 
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index 2729afdf..d3884ce1 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -24,13 +24,13 @@ unsafe impl Zeroable for Gradient {}
 
 #[derive(Debug)]
 pub struct Pipeline {
-    pub pipeline: wgpu::RenderPipeline,
+    pipeline: wgpu::RenderPipeline,
 }
 
 #[derive(Debug)]
 pub struct Layer {
-    pub instances: Buffer<Gradient>,
-    pub instance_count: usize,
+    instances: Buffer<Gradient>,
+    instance_count: usize,
 }
 
 impl Layer {
@@ -48,23 +48,16 @@ impl Layer {
         }
     }
 
-    pub fn draw<'a>(
-        &'a self,
-        constants: &'a wgpu::BindGroup,
-        render_pass: &mut wgpu::RenderPass<'a>,
-        range: Range<usize>,
+    pub fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        instances: &[Gradient],
     ) {
-        #[cfg(feature = "tracing")]
-        let _ = tracing::info_span!("Wgpu::Quad::Gradient", "DRAW").entered();
+        let _ = self.instances.resize(device, instances.len());
+        let _ = self.instances.write(queue, 0, instances);
 
-        render_pass.set_bind_group(0, constants, &[]);
-        render_pass.set_vertex_buffer(1, self.instances.slice(..));
-
-        render_pass.draw_indexed(
-            0..quad::INDICES.len() as u32,
-            0,
-            range.start as u32..range.end as u32,
-        );
+        self.instance_count = instances.len();
     }
 }
 
@@ -158,4 +151,25 @@ impl Pipeline {
 
         Self { pipeline }
     }
+
+    pub fn render<'a>(
+        &'a self,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        constants: &'a wgpu::BindGroup,
+        layer: &'a Layer,
+        range: Range<usize>,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = tracing::info_span!("Wgpu::Quad::Gradient", "DRAW").entered();
+
+        render_pass.set_pipeline(&self.pipeline);
+        render_pass.set_bind_group(0, constants, &[]);
+        render_pass.set_vertex_buffer(1, layer.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..quad::INDICES.len() as u32,
+            0,
+            range.start as u32..range.end as u32,
+        );
+    }
 }
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
index 3540ce3a..a3a7a0af 100644
--- a/wgpu/src/quad/solid.rs
+++ b/wgpu/src/quad/solid.rs
@@ -17,13 +17,13 @@ pub struct Solid {
 
 #[derive(Debug)]
 pub struct Pipeline {
-    pub pipeline: wgpu::RenderPipeline,
+    pipeline: wgpu::RenderPipeline,
 }
 
 #[derive(Debug)]
 pub struct Layer {
-    pub instances: Buffer<quad::Solid>,
-    pub instance_count: usize,
+    instances: Buffer<Solid>,
+    instance_count: usize,
 }
 
 impl Layer {
@@ -41,23 +41,16 @@ impl Layer {
         }
     }
 
-    pub fn draw<'a>(
-        &'a self,
-        constants: &'a wgpu::BindGroup,
-        render_pass: &mut wgpu::RenderPass<'a>,
-        range: Range<usize>,
+    pub fn prepare(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        instances: &[Solid],
     ) {
-        #[cfg(feature = "tracing")]
-        let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
+        let _ = self.instances.resize(device, instances.len());
+        let _ = self.instances.write(queue, 0, instances);
 
-        render_pass.set_bind_group(0, constants, &[]);
-        render_pass.set_vertex_buffer(1, self.instances.slice(..));
-
-        render_pass.draw_indexed(
-            0..quad::INDICES.len() as u32,
-            0,
-            range.start as u32..range.end as u32,
-        );
+        self.instance_count = instances.len();
     }
 }
 
@@ -92,8 +85,7 @@ impl Pipeline {
                     buffers: &[
                         quad::Vertex::buffer_layout(),
                         wgpu::VertexBufferLayout {
-                            array_stride: std::mem::size_of::<quad::Solid>()
-                                as u64,
+                            array_stride: std::mem::size_of::<Solid>() as u64,
                             step_mode: wgpu::VertexStepMode::Instance,
                             attributes: &wgpu::vertex_attr_array!(
                                 // Color
@@ -133,4 +125,25 @@ impl Pipeline {
 
         Self { pipeline }
     }
+
+    pub fn render<'a>(
+        &'a self,
+        render_pass: &mut wgpu::RenderPass<'a>,
+        constants: &'a wgpu::BindGroup,
+        layer: &'a Layer,
+        range: Range<usize>,
+    ) {
+        #[cfg(feature = "tracing")]
+        let _ = tracing::info_span!("Wgpu::Quad::Solid", "DRAW").entered();
+
+        render_pass.set_pipeline(&self.pipeline);
+        render_pass.set_bind_group(0, constants, &[]);
+        render_pass.set_vertex_buffer(1, layer.instances.slice(..));
+
+        render_pass.draw_indexed(
+            0..quad::INDICES.len() as u32,
+            0,
+            range.start as u32..range.end as u32,
+        );
+    }
 }

From c319f5113b274bedff0d18260eddbd6f9915efc3 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, 30 May 2023 01:35:06 +0200
Subject: [PATCH 323/440] Move `Pipeline` struct definition after `Layer` in
 `quad` submodules

---
 wgpu/src/quad/gradient.rs | 10 +++++-----
 wgpu/src/quad/solid.rs    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index d3884ce1..2b56d594 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -22,11 +22,6 @@ unsafe impl Pod for Gradient {}
 #[allow(unsafe_code)]
 unsafe impl Zeroable for Gradient {}
 
-#[derive(Debug)]
-pub struct Pipeline {
-    pipeline: wgpu::RenderPipeline,
-}
-
 #[derive(Debug)]
 pub struct Layer {
     instances: Buffer<Gradient>,
@@ -61,6 +56,11 @@ impl Layer {
     }
 }
 
+#[derive(Debug)]
+pub struct Pipeline {
+    pipeline: wgpu::RenderPipeline,
+}
+
 impl Pipeline {
     pub fn new(
         device: &wgpu::Device,
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
index a3a7a0af..f667c42c 100644
--- a/wgpu/src/quad/solid.rs
+++ b/wgpu/src/quad/solid.rs
@@ -15,11 +15,6 @@ pub struct Solid {
     pub quad: Quad,
 }
 
-#[derive(Debug)]
-pub struct Pipeline {
-    pipeline: wgpu::RenderPipeline,
-}
-
 #[derive(Debug)]
 pub struct Layer {
     instances: Buffer<Solid>,
@@ -54,6 +49,11 @@ impl Layer {
     }
 }
 
+#[derive(Debug)]
+pub struct Pipeline {
+    pipeline: wgpu::RenderPipeline,
+}
+
 impl Pipeline {
     pub fn new(
         device: &wgpu::Device,

From faa7627ea41b1ce372bae7f0d2ae36e9b15a97a3 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, 31 May 2023 21:31:58 +0200
Subject: [PATCH 324/440] Introduce `web-colors` feature flag to enable sRGB
 linear blending

This is how browsers perform color management. They treat
gamma-corrected sRGB colors as if they were linear RGB.

Correctness aside, this mode is introduced for legacy reasons. Most
UI/UX tooling uses this color management as well, and many have created
an intuition about how color should behave from interacting with a
browser.

This feature flag should facilitate application development with `iced`
in those cases.

More details: https://webcolorisstillbroken.com/
---
 Cargo.toml                    |  2 ++
 examples/geometry/src/main.rs | 19 ++++++++-------
 graphics/Cargo.toml           |  1 +
 graphics/src/color.rs         | 46 +++++++++++++++++++++++++++++++++++
 graphics/src/gradient.rs      |  8 ++++--
 graphics/src/lib.rs           |  1 +
 graphics/src/primitive.rs     |  3 ++-
 renderer/Cargo.toml           |  1 +
 wgpu/Cargo.toml               |  1 +
 wgpu/src/backend.rs           |  3 ++-
 wgpu/src/geometry.rs          |  7 +++---
 wgpu/src/layer.rs             |  3 ++-
 wgpu/src/quad.rs              |  5 ++--
 wgpu/src/quad/solid.rs        |  3 ++-
 wgpu/src/text.rs              |  4 ++-
 wgpu/src/window/compositor.rs | 22 ++++++++++-------
 16 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 graphics/src/color.rs

diff --git a/Cargo.toml b/Cargo.toml
index 479830ac..070cd0ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,8 @@ smol = ["iced_futures/smol"]
 palette = ["iced_core/palette"]
 # Enables querying system information
 system = ["iced_winit/system"]
+# Enables broken "sRGB linear" blending to reproduce color management of the Web
+web-colors = ["iced_renderer/web-colors"]
 # Enables the advanced module
 advanced = []
 
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 5cb41184..a4183db9 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -3,6 +3,7 @@
 mod rainbow {
     use iced_graphics::primitive::{ColoredVertex2D, Primitive};
 
+    use iced::advanced::graphics::color;
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
@@ -84,39 +85,39 @@ mod rainbow {
                     vertices: vec![
                         ColoredVertex2D {
                             position: posn_center,
-                            color: [1.0, 1.0, 1.0, 1.0],
+                            color: color::pack([1.0, 1.0, 1.0, 1.0]),
                         },
                         ColoredVertex2D {
                             position: posn_tl,
-                            color: color_r,
+                            color: color::pack(color_r),
                         },
                         ColoredVertex2D {
                             position: posn_t,
-                            color: color_o,
+                            color: color::pack(color_o),
                         },
                         ColoredVertex2D {
                             position: posn_tr,
-                            color: color_y,
+                            color: color::pack(color_y),
                         },
                         ColoredVertex2D {
                             position: posn_r,
-                            color: color_g,
+                            color: color::pack(color_g),
                         },
                         ColoredVertex2D {
                             position: posn_br,
-                            color: color_gb,
+                            color: color::pack(color_gb),
                         },
                         ColoredVertex2D {
                             position: posn_b,
-                            color: color_b,
+                            color: color::pack(color_b),
                         },
                         ColoredVertex2D {
                             position: posn_bl,
-                            color: color_i,
+                            color: color::pack(color_i),
                         },
                         ColoredVertex2D {
                             position: posn_l,
-                            color: color_v,
+                            color: color::pack(color_v),
                         },
                     ],
                     indices: vec![
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 903a2069..0e22227d 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -14,6 +14,7 @@ categories = ["gui"]
 geometry = ["lyon_path"]
 opengl = []
 image = ["dep:image", "kamadak-exif"]
+web-colors = []
 
 [dependencies]
 glam = "0.24"
diff --git a/graphics/src/color.rs b/graphics/src/color.rs
new file mode 100644
index 00000000..92448a68
--- /dev/null
+++ b/graphics/src/color.rs
@@ -0,0 +1,46 @@
+//! Manage colors for shaders.
+use crate::core::Color;
+
+use bytemuck::{Pod, Zeroable};
+
+/// A color packed as 4 floats representing RGBA channels.
+#[derive(Debug, Clone, Copy, PartialEq, Zeroable, Pod)]
+#[repr(C)]
+pub struct Packed([f32; 4]);
+
+impl Packed {
+    /// Returns the internal components of the [`Packed`] color.
+    pub fn components(self) -> [f32; 4] {
+        self.0
+    }
+}
+
+/// A flag that indicates whether the renderer should perform gamma correction.
+pub const GAMMA_CORRECTION: bool = internal::GAMMA_CORRECTION;
+
+/// Packs a [`Color`].
+pub fn pack(color: impl Into<Color>) -> Packed {
+    Packed(internal::pack(color.into()))
+}
+
+#[cfg(not(feature = "web-colors"))]
+mod internal {
+    use crate::core::Color;
+
+    pub const GAMMA_CORRECTION: bool = true;
+
+    pub fn pack(color: Color) -> [f32; 4] {
+        color.into_linear()
+    }
+}
+
+#[cfg(feature = "web-colors")]
+mod internal {
+    use crate::core::Color;
+
+    pub const GAMMA_CORRECTION: bool = false;
+
+    pub fn pack(color: Color) -> [f32; 4] {
+        [color.r, color.g, color.b, color.a]
+    }
+}
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index d3eabb6f..d26b5665 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -3,8 +3,10 @@
 //! For a gradient that you can use as a background variant for a widget, see [`Gradient`].
 //!
 //! [`Gradient`]: crate::core::Gradient;
+use crate::color;
 use crate::core::gradient::ColorStop;
 use crate::core::{self, Color, Point, Rectangle};
+
 use std::cmp::Ordering;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -101,7 +103,8 @@ impl Linear {
 
         for (index, stop) in self.stops.iter().enumerate() {
             let [r, g, b, a] =
-                stop.map_or(Color::default(), |s| s.color).into_linear();
+                color::pack(stop.map_or(Color::default(), |s| s.color))
+                    .components();
 
             data[index * 4] = r;
             data[(index * 4) + 1] = g;
@@ -133,7 +136,8 @@ pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
 
             for (index, stop) in linear.stops.iter().enumerate() {
                 let [r, g, b, a] =
-                    stop.map_or(Color::default(), |s| s.color).into_linear();
+                    color::pack(stop.map_or(Color::default(), |s| s.color))
+                        .components();
 
                 data[index * 4] = r;
                 data[(index * 4) + 1] = g;
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index bfaac19f..f6bc87fb 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -27,6 +27,7 @@ mod transformation;
 mod viewport;
 
 pub mod backend;
+pub mod color;
 pub mod compositor;
 pub mod damage;
 pub mod gradient;
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 2d4f5511..187c6c6c 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,4 +1,5 @@
 //! Draw using different graphical primitives.
+use crate::color;
 use crate::core::alignment;
 use crate::core::image;
 use crate::core::svg;
@@ -248,7 +249,7 @@ pub struct ColoredVertex2D {
     pub position: [f32; 2],
 
     /// The color of the vertex in __linear__ RGBA.
-    pub color: [f32; 4],
+    pub color: color::Packed,
 }
 
 /// A vertex which contains 2D position & packed gradient data.
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index 640ac996..ddfb6445 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -9,6 +9,7 @@ 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"]
+web-colors = ["iced_wgpu?/web-colors"]
 
 [dependencies]
 raw-window-handle = "0.5"
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b5401626..badd165b 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -11,6 +11,7 @@ repository = "https://github.com/iced-rs/iced"
 geometry = ["iced_graphics/geometry", "lyon"]
 image = ["iced_graphics/image"]
 svg = ["resvg"]
+web-colors = ["iced_graphics/web-colors"]
 
 [dependencies]
 wgpu = "0.16"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 844987f2..b524c615 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,6 +1,7 @@
 use crate::core;
 use crate::core::{Color, Font, Point, Size};
 use crate::graphics::backend;
+use crate::graphics::color;
 use crate::graphics::{Primitive, Transformation, Viewport};
 use crate::quad;
 use crate::text;
@@ -239,7 +240,7 @@ impl Backend {
                         load: match clear_color {
                             Some(background_color) => wgpu::LoadOp::Clear({
                                 let [r, g, b, a] =
-                                    background_color.into_linear();
+                                    color::pack(background_color).components();
 
                                 wgpu::Color {
                                     r: f64::from(r),
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 740ec20c..f81b5b2f 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -1,5 +1,6 @@
 //! Build and draw geometry.
 use crate::core::{Point, Rectangle, Size, Vector};
+use crate::graphics::color;
 use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
@@ -68,7 +69,7 @@ impl BufferStack {
             (Style::Solid(color), Buffer::Solid(buffer)) => {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
-                    TriangleVertex2DBuilder(color.into_linear()),
+                    TriangleVertex2DBuilder(color::pack(*color)),
                 ))
             }
             (Style::Gradient(gradient), Buffer::Gradient(buffer)) => {
@@ -91,7 +92,7 @@ impl BufferStack {
             (Style::Solid(color), Buffer::Solid(buffer)) => {
                 Box::new(tessellation::BuffersBuilder::new(
                     buffer,
-                    TriangleVertex2DBuilder(color.into_linear()),
+                    TriangleVertex2DBuilder(color::pack(*color)),
                 ))
             }
             (Style::Gradient(gradient), Buffer::Gradient(buffer)) => {
@@ -526,7 +527,7 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
     }
 }
 
-struct TriangleVertex2DBuilder([f32; 4]);
+struct TriangleVertex2DBuilder(color::Packed);
 
 impl tessellation::FillVertexConstructor<primitive::ColoredVertex2D>
     for TriangleVertex2DBuilder
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 1a870c15..71570e3d 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -11,6 +11,7 @@ pub use text::Text;
 use crate::core;
 use crate::core::alignment;
 use crate::core::{Color, Font, Point, Rectangle, Size, Vector};
+use crate::graphics::color;
 use crate::graphics::{Primitive, Viewport};
 use crate::quad::{self, Quad};
 
@@ -150,7 +151,7 @@ impl<'a> Layer<'a> {
                         bounds.y + translation.y,
                     ],
                     size: [bounds.width, bounds.height],
-                    border_color: border_color.into_linear(),
+                    border_color: color::pack(*border_color),
                     border_radius: *border_radius,
                     border_width: *border_width,
                 };
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 9c5ed05f..37d0c623 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -5,6 +5,7 @@ use gradient::Gradient;
 use solid::Solid;
 
 use crate::core::{Background, Rectangle};
+use crate::graphics::color;
 use crate::graphics::{self, Transformation};
 
 use bytemuck::{Pod, Zeroable};
@@ -217,7 +218,7 @@ pub struct Quad {
     pub size: [f32; 2],
 
     /// The border color of the [`Quad`], in __linear RGB__.
-    pub border_color: [f32; 4],
+    pub border_color: color::Packed,
 
     /// The border radii of the [`Quad`].
     pub border_radius: [f32; 4],
@@ -250,7 +251,7 @@ impl Batch {
         let kind = match background {
             Background::Color(color) => {
                 self.solids.push(Solid {
-                    color: color.into_linear(),
+                    color: color::pack(*color),
                     quad,
                 });
 
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
index f667c42c..f8f1e3a5 100644
--- a/wgpu/src/quad/solid.rs
+++ b/wgpu/src/quad/solid.rs
@@ -1,3 +1,4 @@
+use crate::graphics::color;
 use crate::quad::{self, Quad};
 use crate::Buffer;
 
@@ -9,7 +10,7 @@ use std::ops::Range;
 #[repr(C)]
 pub struct Solid {
     /// The background color data of the quad.
-    pub color: [f32; 4],
+    pub color: color::Packed,
 
     /// The [`Quad`] data of the [`Solid`].
     pub quad: Quad,
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 714e0400..a12bc9f7 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -2,6 +2,7 @@ use crate::core::alignment;
 use crate::core::font::{self, Font};
 use crate::core::text::{Hit, LineHeight, Shaping};
 use crate::core::{Pixels, Point, Rectangle, Size};
+use crate::graphics::color;
 use crate::layer::Text;
 
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -155,7 +156,8 @@ impl Pipeline {
                             bottom: (clip_bounds.y + clip_bounds.height) as i32,
                         },
                         default_color: {
-                            let [r, g, b, a] = section.color.into_linear();
+                            let [r, g, b, a] =
+                                color::pack(section.color).components();
 
                             glyphon::Color::rgba(
                                 (r * 255.0) as u8,
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 500458e8..2eaafde0 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -1,6 +1,7 @@
 //! Connect a window with a renderer.
 use crate::core::Color;
 use crate::graphics;
+use crate::graphics::color;
 use crate::graphics::compositor;
 use crate::graphics::{Error, Primitive, Viewport};
 use crate::{Backend, Renderer, Settings};
@@ -69,16 +70,19 @@ impl<Theme> Compositor<Theme> {
         let format = compatible_surface.as_ref().and_then(|surface| {
             let capabilities = surface.get_capabilities(&adapter);
 
-            capabilities
-                .formats
-                .iter()
-                .copied()
-                .find(wgpu::TextureFormat::is_srgb)
-                .or_else(|| {
-                    log::warn!("No sRGB format found!");
+            let mut formats = capabilities.formats.iter().copied();
 
-                    capabilities.formats.first().copied()
-                })
+            let format = if color::GAMMA_CORRECTION {
+                formats.find(wgpu::TextureFormat::is_srgb)
+            } else {
+                formats.find(|format| !wgpu::TextureFormat::is_srgb(format))
+            };
+
+            format.or_else(|| {
+                log::warn!("No format found!");
+
+                capabilities.formats.first().copied()
+            })
         })?;
 
         log::info!("Selected format: {:?}", format);

From f1b259a28fdb92ce62ceb6fcea9547b52ecc77d3 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, 31 May 2023 21:42:39 +0200
Subject: [PATCH 325/440] Avoid gamma correction when `web-colors` is enabled
 for images

---
 wgpu/src/image/atlas.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 9b6dcc46..28bc4943 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -13,6 +13,7 @@ use allocator::Allocator;
 pub const SIZE: u32 = 2048;
 
 use crate::core::Size;
+use crate::graphics::color;
 
 #[derive(Debug)]
 pub struct Atlas {
@@ -35,7 +36,11 @@ impl Atlas {
             mip_level_count: 1,
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
-            format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            format: if color::GAMMA_CORRECTION {
+                wgpu::TextureFormat::Rgba8UnormSrgb
+            } else {
+                wgpu::TextureFormat::Rgba8Unorm
+            },
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,

From c528f2129e5ce3b30e313f731588082c49beb30b 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, 31 May 2023 21:45:12 +0200
Subject: [PATCH 326/440] Use proper gamma correction mode in
 `image::Atlas::grow`

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

diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs
index 28bc4943..e3de1290 100644
--- a/wgpu/src/image/atlas.rs
+++ b/wgpu/src/image/atlas.rs
@@ -351,7 +351,11 @@ impl Atlas {
             mip_level_count: 1,
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
-            format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            format: if color::GAMMA_CORRECTION {
+                wgpu::TextureFormat::Rgba8UnormSrgb
+            } else {
+                wgpu::TextureFormat::Rgba8Unorm
+            },
             usage: wgpu::TextureUsages::COPY_DST
                 | wgpu::TextureUsages::COPY_SRC
                 | wgpu::TextureUsages::TEXTURE_BINDING,

From b5fc0f4a3aa45d33d81d5799396f0b0770c4dff3 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, 1 Jun 2023 03:10:02 +0200
Subject: [PATCH 327/440] Use consistent color strategy in `glyphon`

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

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index badd165b..7e50dff2 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -45,7 +45,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "cf7fe9df00499b868a6a94fa5fdb0a4ca368c9f9"
+rev = "26f92369da3704988e3e27f0b35e705c6b2de203"
 
 [dependencies.glam]
 version = "0.24"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index a12bc9f7..0d88865c 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -36,7 +36,16 @@ impl Pipeline {
                 .into_iter(),
             )),
             renderers: Vec::new(),
-            atlas: glyphon::TextAtlas::new(device, queue, format),
+            atlas: glyphon::TextAtlas::new(
+                device,
+                queue,
+                format,
+                if color::GAMMA_CORRECTION {
+                    glyphon::ColorMode::Accurate
+                } else {
+                    glyphon::ColorMode::Web
+                },
+            ),
             prepare_layer: 0,
             measurement_cache: RefCell::new(Cache::new()),
             render_cache: Cache::new(),

From 0b504bec8ab17b1c98f3bb957f2ec5ba80b99ec7 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, 1 Jun 2023 04:59:49 +0200
Subject: [PATCH 328/440] Invalidate `Responsive` layout when size changes
 without a `view` call

---
 widget/src/lazy/responsive.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs
index b41d978b..9b4fd9dd 100644
--- a/widget/src/lazy/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -81,6 +81,7 @@ where
 
         self.element = view(new_size);
         self.size = new_size;
+        self.layout = None;
 
         tree.diff(&self.element);
     }

From 9902e778167af8d4b108102619ee1ed8d0de0be5 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 1 Jun 2023 10:46:33 +0200
Subject: [PATCH 329/440] Add border_radius to slider rail

---
 style/src/slider.rs           | 2 ++
 style/src/theme.rs            | 3 ++-
 widget/src/slider.rs          | 4 ++--
 widget/src/vertical_slider.rs | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/style/src/slider.rs b/style/src/slider.rs
index ca115f46..f0068558 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -17,6 +17,8 @@ pub struct Rail {
     pub colors: (Color, Color),
     /// The width of the stroke of a slider rail.
     pub width: f32,
+    /// The border radius of the corners of the rail.
+    pub border_radius: BorderRadius,
 }
 
 /// The appearance of the handle of a slider.
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4a8ee749..4fef8554 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -433,9 +433,10 @@ impl slider::StyleSheet for Theme {
                     rail: slider::Rail {
                         colors: (
                             palette.primary.base.color,
-                            palette.primary.base.color,
+                            palette.secondary.base.color,
                         ),
                         width: 2.0,
+                        border_radius: Default::default(),
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index 2851d8c3..c2498b87 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -403,7 +403,7 @@ pub fn draw<T, R>(
                 width: offset + handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -418,7 +418,7 @@ pub fn draw<T, R>(
                 width: bounds.width - offset - handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 3b2430c4..b14e5401 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -401,7 +401,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: offset + handle_width / 2.0,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -416,7 +416,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: bounds.height - offset - handle_width / 2.0,
             },
-            border_radius: Default::default(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },

From 1e2965d5423fc35943388aa32a6cae2c6b0f2336 Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Thu, 1 Jun 2023 13:30:48 +0200
Subject: [PATCH 330/440] only add border radius to the visible part

---
 widget/src/slider.rs          | 7 +++++--
 widget/src/vertical_slider.rs | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index c2498b87..af6a824f 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -367,6 +367,7 @@ pub fn draw<T, R>(
     } else {
         style_sheet.active(style)
     };
+    let border_radius: [f32; 4] = style.rail.border_radius.into();
 
     let (handle_width, handle_height, handle_border_radius) =
         match style.handle.shape {
@@ -403,7 +404,8 @@ pub fn draw<T, R>(
                 width: offset + handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: style.rail.border_radius,
+            border_radius: [border_radius[0], 0.0, 0.0, border_radius[3]]
+                .into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -418,7 +420,8 @@ pub fn draw<T, R>(
                 width: bounds.width - offset - handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: style.rail.border_radius,
+            border_radius: [0.0, border_radius[1], border_radius[2], 0.0]
+                .into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index b14e5401..c6569c13 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -365,6 +365,7 @@ pub fn draw<T, R>(
     } else {
         style_sheet.active(style)
     };
+    let border_radius: [f32; 4] = style.rail.border_radius.into();
 
     let (handle_width, handle_height, handle_border_radius) =
         match style.handle.shape {
@@ -401,7 +402,8 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: offset + handle_width / 2.0,
             },
-            border_radius: style.rail.border_radius,
+            border_radius: [border_radius[0], border_radius[1], 0.0, 0.0]
+                .into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -416,7 +418,8 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: bounds.height - offset - handle_width / 2.0,
             },
-            border_radius: style.rail.border_radius,
+            border_radius: [0.0, 0.0, border_radius[2], border_radius[3]]
+                .into(),
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },

From 166d350dfc6e8397806002ae6b505e54387517d9 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, 1 Jun 2023 17:12:28 +0200
Subject: [PATCH 331/440] Fix empty scissor rectangle in `iced_wgpu::triangle`
 pipeline

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

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 6cd54ef7..6f32f182 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -155,6 +155,10 @@ impl Layer {
         for (index, mesh) in meshes.iter().enumerate() {
             let clip_bounds = (mesh.clip_bounds() * scale_factor).snap();
 
+            if clip_bounds.width < 1 || clip_bounds.height < 1 {
+                continue;
+            }
+
             render_pass.set_scissor_rect(
                 clip_bounds.x,
                 clip_bounds.y,

From ee0dd4c623f579635ae74db3d22256090c17a1eb 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, 1 Jun 2023 17:25:56 +0200
Subject: [PATCH 332/440] Change default styling of `Slider` to leverage
 rounded borders

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

diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4fef8554..64497181 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -435,8 +435,8 @@ impl slider::StyleSheet for Theme {
                             palette.primary.base.color,
                             palette.secondary.base.color,
                         ),
-                        width: 2.0,
-                        border_radius: Default::default(),
+                        width: 4.0,
+                        border_radius: 2.0.into(),
                     },
                     handle: slider::Handle {
                         color: palette.background.base.color,

From 66d4decc0c5c6ea787ec482ff6841829dfc7ffba 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, 1 Jun 2023 17:27:52 +0200
Subject: [PATCH 333/440] Fix `quad` glitch when rounding borders of a `Slider`
 rail

---
 widget/src/slider.rs          | 7 ++-----
 widget/src/vertical_slider.rs | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index af6a824f..c2498b87 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -367,7 +367,6 @@ pub fn draw<T, R>(
     } else {
         style_sheet.active(style)
     };
-    let border_radius: [f32; 4] = style.rail.border_radius.into();
 
     let (handle_width, handle_height, handle_border_radius) =
         match style.handle.shape {
@@ -404,8 +403,7 @@ pub fn draw<T, R>(
                 width: offset + handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: [border_radius[0], 0.0, 0.0, border_radius[3]]
-                .into(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -420,8 +418,7 @@ pub fn draw<T, R>(
                 width: bounds.width - offset - handle_width / 2.0,
                 height: style.rail.width,
             },
-            border_radius: [0.0, border_radius[1], border_radius[2], 0.0]
-                .into(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index c6569c13..b14e5401 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -365,7 +365,6 @@ pub fn draw<T, R>(
     } else {
         style_sheet.active(style)
     };
-    let border_radius: [f32; 4] = style.rail.border_radius.into();
 
     let (handle_width, handle_height, handle_border_radius) =
         match style.handle.shape {
@@ -402,8 +401,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: offset + handle_width / 2.0,
             },
-            border_radius: [border_radius[0], border_radius[1], 0.0, 0.0]
-                .into(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },
@@ -418,8 +416,7 @@ pub fn draw<T, R>(
                 width: style.rail.width,
                 height: bounds.height - offset - handle_width / 2.0,
             },
-            border_radius: [0.0, 0.0, border_radius[2], border_radius[3]]
-                .into(),
+            border_radius: style.rail.border_radius,
             border_width: 0.0,
             border_color: Color::TRANSPARENT,
         },

From 233196eb14b40f8bd5201ea0262571f82136ad53 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Sat, 25 Mar 2023 10:45:39 -0700
Subject: [PATCH 334/440] Added offscreen rendering support for wgpu &
 tiny-skia exposed with the window::screenshot command.

---
 examples/screenshot/Cargo.toml      |  11 +
 examples/screenshot/src/main.rs     | 305 ++++++++++++++++++++++++++++
 graphics/src/compositor.rs          |  15 +-
 renderer/src/compositor.rs          |  30 +++
 runtime/src/lib.rs                  |   2 +
 runtime/src/screenshot.rs           |  80 ++++++++
 runtime/src/window.rs               |   8 +
 runtime/src/window/action.rs        |   9 +
 tiny_skia/src/window/compositor.rs  |  76 ++++++-
 wgpu/src/backend.rs                 |  61 +++++-
 wgpu/src/lib.rs                     |   1 +
 wgpu/src/offscreen.rs               | 102 ++++++++++
 wgpu/src/shader/offscreen_blit.wgsl |  22 ++
 wgpu/src/triangle/msaa.rs           |  11 +-
 wgpu/src/window/compositor.rs       | 143 ++++++++++++-
 winit/src/application.rs            |  41 +++-
 16 files changed, 893 insertions(+), 24 deletions(-)
 create mode 100644 examples/screenshot/Cargo.toml
 create mode 100644 examples/screenshot/src/main.rs
 create mode 100644 runtime/src/screenshot.rs
 create mode 100644 wgpu/src/offscreen.rs
 create mode 100644 wgpu/src/shader/offscreen_blit.wgsl

diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml
new file mode 100644
index 00000000..b79300b7
--- /dev/null
+++ b/examples/screenshot/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "screenshot"
+version = "0.1.0"
+authors = ["Bingus <shankern@protonmail.com>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+iced = { path = "../..", features = ["debug", "image", "advanced"] }
+image = { version = "0.24.6", features = ["png"]}
+env_logger = "0.10.0"
diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
new file mode 100644
index 00000000..29d961d9
--- /dev/null
+++ b/examples/screenshot/src/main.rs
@@ -0,0 +1,305 @@
+use iced::alignment::{Horizontal, Vertical};
+use iced::keyboard::KeyCode;
+use iced::theme::{Button, Container};
+use iced::widget::runtime::{CropError, Screenshot};
+use iced::widget::{
+    button, column as col, container, image as iced_image, row, text,
+    text_input,
+};
+use iced::{
+    event, executor, keyboard, subscription, Alignment, Application, Command,
+    ContentFit, Element, Event, Length, Rectangle, Renderer, Subscription,
+    Theme,
+};
+use image as img;
+use image::ColorType;
+
+fn main() -> iced::Result {
+    env_logger::builder().format_timestamp(None).init();
+
+    Example::run(iced::Settings::default())
+}
+
+struct Example {
+    screenshot: Option<Screenshot>,
+    saved_png_path: Option<Result<String, PngError>>,
+    png_saving: bool,
+    crop_error: Option<CropError>,
+    x_input_value: u32,
+    y_input_value: u32,
+    width_input_value: u32,
+    height_input_value: u32,
+}
+
+#[derive(Clone, Debug)]
+enum Message {
+    Crop,
+    Screenshot,
+    ScreenshotData(Screenshot),
+    Png,
+    PngSaved(Result<String, PngError>),
+    XInputChanged(String),
+    YInputChanged(String),
+    WidthInputChanged(String),
+    HeightInputChanged(String),
+}
+
+impl Application for Example {
+    type Executor = executor::Default;
+    type Message = Message;
+    type Theme = Theme;
+    type Flags = ();
+
+    fn new(_flags: Self::Flags) -> (Self, Command<Self::Message>) {
+        (
+            Example {
+                screenshot: None,
+                saved_png_path: None,
+                png_saving: false,
+                crop_error: None,
+                x_input_value: 0,
+                y_input_value: 0,
+                width_input_value: 0,
+                height_input_value: 0,
+            },
+            Command::none(),
+        )
+    }
+
+    fn title(&self) -> String {
+        "Screenshot".to_string()
+    }
+
+    fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
+        match message {
+            Message::Screenshot => {
+                return iced::window::screenshot(Message::ScreenshotData);
+            }
+            Message::ScreenshotData(screenshot) => {
+                self.screenshot = Some(screenshot);
+            }
+            Message::Png => {
+                if let Some(screenshot) = &self.screenshot {
+                    return Command::perform(
+                        save_to_png(screenshot.clone()),
+                        Message::PngSaved,
+                    );
+                }
+                self.png_saving = true;
+            }
+            Message::PngSaved(res) => {
+                self.png_saving = false;
+                self.saved_png_path = Some(res);
+            }
+            Message::XInputChanged(new) => {
+                if let Ok(value) = new.parse::<u32>() {
+                    self.x_input_value = value;
+                }
+            }
+            Message::YInputChanged(new) => {
+                if let Ok(value) = new.parse::<u32>() {
+                    self.y_input_value = value;
+                }
+            }
+            Message::WidthInputChanged(new) => {
+                if let Ok(value) = new.parse::<u32>() {
+                    self.width_input_value = value;
+                }
+            }
+            Message::HeightInputChanged(new) => {
+                if let Ok(value) = new.parse::<u32>() {
+                    self.height_input_value = value;
+                }
+            }
+            Message::Crop => {
+                if let Some(screenshot) = &self.screenshot {
+                    let cropped = screenshot.crop(Rectangle::<u32> {
+                        x: self.x_input_value,
+                        y: self.y_input_value,
+                        width: self.width_input_value,
+                        height: self.height_input_value,
+                    });
+
+                    match cropped {
+                        Ok(screenshot) => {
+                            self.screenshot = Some(screenshot);
+                            self.crop_error = None;
+                        }
+                        Err(crop_error) => {
+                            self.crop_error = Some(crop_error);
+                        }
+                    }
+                }
+            }
+        }
+
+        Command::none()
+    }
+
+    fn view(&self) -> Element<'_, Self::Message, Renderer<Self::Theme>> {
+        let image: Element<Message> = if let Some(screenshot) = &self.screenshot
+        {
+            iced_image(iced_image::Handle::from_pixels(
+                screenshot.size.width,
+                screenshot.size.height,
+                screenshot.bytes.clone(),
+            ))
+            .content_fit(ContentFit::ScaleDown)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .into()
+        } else {
+            text("Press the button to take a screenshot!").into()
+        };
+
+        let image = container(image)
+            .padding(10)
+            .style(Container::Custom(Box::new(ScreenshotDisplayContainer)))
+            .width(Length::FillPortion(2))
+            .height(Length::Fill)
+            .center_x()
+            .center_y();
+
+        let crop_origin_controls = row![
+            text("X:").vertical_alignment(Vertical::Center).width(14),
+            text_input("0", &format!("{}", self.x_input_value),)
+                .on_input(Message::XInputChanged)
+                .width(40),
+            text("Y:").vertical_alignment(Vertical::Center).width(14),
+            text_input("0", &format!("{}", self.y_input_value),)
+                .on_input(Message::YInputChanged)
+                .width(40),
+        ]
+        .spacing(10)
+        .align_items(Alignment::Center);
+
+        let crop_dimension_controls = row![
+            text("W:").vertical_alignment(Vertical::Center).width(14),
+            text_input("0", &format!("{}", self.width_input_value),)
+                .on_input(Message::WidthInputChanged)
+                .width(40),
+            text("H:").vertical_alignment(Vertical::Center).width(14),
+            text_input("0", &format!("{}", self.height_input_value),)
+                .on_input(Message::HeightInputChanged)
+                .width(40),
+        ]
+        .spacing(10)
+        .align_items(Alignment::Center);
+
+        let mut crop_controls =
+            col![crop_origin_controls, crop_dimension_controls]
+                .spacing(10)
+                .align_items(Alignment::Center);
+
+        if let Some(crop_error) = &self.crop_error {
+            crop_controls = crop_controls
+                .push(text(format!("Crop error! \n{}", crop_error)));
+        }
+
+        let png_button = if !self.png_saving {
+            button("Save to png.")
+                .style(Button::Secondary)
+                .padding([10, 20, 10, 20])
+                .on_press(Message::Png)
+        } else {
+            button("Saving..")
+                .style(Button::Secondary)
+                .padding([10, 20, 10, 20])
+        };
+
+        let mut controls = col![
+            button("Screenshot!")
+                .padding([10, 20, 10, 20])
+                .on_press(Message::Screenshot),
+            button("Crop")
+                .style(Button::Destructive)
+                .padding([10, 20, 10, 20])
+                .on_press(Message::Crop),
+            crop_controls,
+            png_button,
+        ]
+        .spacing(40)
+        .align_items(Alignment::Center);
+
+        if let Some(png_result) = &self.saved_png_path {
+            let msg = match png_result {
+                Ok(path) => format!("Png saved as: {:?}!", path),
+                Err(msg) => {
+                    format!("Png could not be saved due to:\n{:?}", msg)
+                }
+            };
+
+            controls = controls.push(text(msg));
+        }
+
+        let side_content = container(controls)
+            .align_x(Horizontal::Center)
+            .width(Length::FillPortion(1))
+            .height(Length::Fill)
+            .center_y()
+            .center_x();
+
+        let content = row![side_content, image]
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .align_items(Alignment::Center);
+
+        container(content)
+            .padding(10)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .center_x()
+            .center_y()
+            .into()
+    }
+
+    fn subscription(&self) -> Subscription<Self::Message> {
+        subscription::events_with(|event, status| {
+            if let event::Status::Captured = status {
+                return None;
+            }
+
+            if let Event::Keyboard(keyboard::Event::KeyPressed {
+                key_code: KeyCode::F5,
+                ..
+            }) = event
+            {
+                Some(Message::Screenshot)
+            } else {
+                None
+            }
+        })
+    }
+}
+
+struct ScreenshotDisplayContainer;
+
+impl container::StyleSheet for ScreenshotDisplayContainer {
+    type Style = Theme;
+
+    fn appearance(&self, style: &Self::Style) -> container::Appearance {
+        container::Appearance {
+            text_color: None,
+            background: None,
+            border_radius: 5.0,
+            border_width: 4.0,
+            border_color: style.palette().primary,
+        }
+    }
+}
+
+async fn save_to_png(screenshot: Screenshot) -> Result<String, PngError> {
+    let path = "screenshot.png".to_string();
+    img::save_buffer(
+        &path,
+        &screenshot.bytes,
+        screenshot.size.width,
+        screenshot.size.height,
+        ColorType::Rgba8,
+    )
+    .map(|_| path)
+    .map_err(|err| PngError(format!("{:?}", err)))
+}
+
+#[derive(Clone, Debug)]
+struct PngError(String);
diff --git a/graphics/src/compositor.rs b/graphics/src/compositor.rs
index d55e801a..f7b86045 100644
--- a/graphics/src/compositor.rs
+++ b/graphics/src/compositor.rs
@@ -59,6 +59,19 @@ pub trait Compositor: Sized {
         background_color: Color,
         overlay: &[T],
     ) -> Result<(), SurfaceError>;
+
+    /// Screenshots the current [`Renderer`] primitives to an offscreen texture, and returns the bytes of
+    /// the texture ordered as `RGBA` in the sRGB color space.
+    ///
+    /// [`Renderer`]: Self::Renderer;
+    fn screenshot<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Vec<u8>;
 }
 
 /// Result of an unsuccessful call to [`Compositor::present`].
@@ -82,7 +95,7 @@ pub enum SurfaceError {
     OutOfMemory,
 }
 
-/// Contains informations about the graphics (e.g. graphics adapter, graphics backend).
+/// Contains information about the graphics (e.g. graphics adapter, graphics backend).
 #[derive(Debug)]
 pub struct Information {
     /// Contains the graphics adapter.
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index a353b8e4..57317b28 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -136,6 +136,36 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             }
         })
     }
+
+    fn screenshot<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Vec<u8> {
+        renderer.with_primitives(|backend, primitives| match (self, backend, surface) {
+            (Self::TinySkia(_compositor), crate::Backend::TinySkia(backend), Surface::TinySkia(surface)) => {
+                iced_tiny_skia::window::compositor::screenshot(surface, backend, primitives, viewport, background_color, overlay)
+            },
+            #[cfg(feature = "wgpu")]
+            (Self::Wgpu(compositor), crate::Backend::Wgpu(backend), Surface::Wgpu(_)) => {
+                iced_wgpu::window::compositor::screenshot(
+                    compositor,
+                    backend,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            },
+            #[allow(unreachable_patterns)]
+            _ => panic!(
+                "The provided renderer or backend are not compatible with the compositor."
+            ),
+        })
+    }
 }
 
 enum Candidate {
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 50abf7b2..32ed14d8 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -60,6 +60,7 @@ mod debug;
 #[cfg(not(feature = "debug"))]
 #[path = "debug/null.rs"]
 mod debug;
+mod screenshot;
 
 pub use iced_core as core;
 pub use iced_futures as futures;
@@ -68,4 +69,5 @@ pub use command::Command;
 pub use debug::Debug;
 pub use font::Font;
 pub use program::Program;
+pub use screenshot::{CropError, Screenshot};
 pub use user_interface::UserInterface;
diff --git a/runtime/src/screenshot.rs b/runtime/src/screenshot.rs
new file mode 100644
index 00000000..527e400f
--- /dev/null
+++ b/runtime/src/screenshot.rs
@@ -0,0 +1,80 @@
+use iced_core::{Rectangle, Size};
+use std::fmt::{Debug, Formatter};
+
+/// Data of a screenshot, captured with `window::screenshot()`.
+///
+/// The `bytes` of this screenshot will always be ordered as `RGBA` in the sRGB color space.
+#[derive(Clone)]
+pub struct Screenshot {
+    /// The bytes of the [`Screenshot`].
+    pub bytes: Vec<u8>,
+    /// The size of the [`Screenshot`].
+    pub size: Size<u32>,
+}
+
+impl Debug for Screenshot {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "Screenshot: {{ \n bytes: {}\n size: {:?} }}",
+            self.bytes.len(),
+            self.size
+        )
+    }
+}
+
+impl Screenshot {
+    /// Creates a new [`Screenshot`].
+    pub fn new(bytes: Vec<u8>, size: Size<u32>) -> Self {
+        Self { bytes, size }
+    }
+
+    /// Crops a [`Screenshot`] to the provided `region`. This will always be relative to the
+    /// top-left corner of the [`Screenshot`].
+    pub fn crop(&self, region: Rectangle<u32>) -> Result<Self, CropError> {
+        if region.width == 0 || region.height == 0 {
+            return Err(CropError::Zero);
+        }
+
+        if region.x + region.width > self.size.width
+            || region.y + region.height > self.size.height
+        {
+            return Err(CropError::OutOfBounds);
+        }
+
+        // Image is always RGBA8 = 4 bytes per pixel
+        const PIXEL_SIZE: usize = 4;
+
+        let bytes_per_row = self.size.width as usize * PIXEL_SIZE;
+        let row_range = region.y as usize..(region.y + region.height) as usize;
+        let column_range = region.x as usize * PIXEL_SIZE
+            ..(region.x + region.width) as usize * PIXEL_SIZE;
+
+        let chopped = self.bytes.chunks(bytes_per_row).enumerate().fold(
+            vec![],
+            |mut acc, (row, bytes)| {
+                if row_range.contains(&row) {
+                    acc.extend(&bytes[column_range.clone()]);
+                }
+
+                acc
+            },
+        );
+
+        Ok(Self {
+            bytes: chopped,
+            size: Size::new(region.width, region.height),
+        })
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+/// Errors that can occur when cropping a [`Screenshot`].
+pub enum CropError {
+    #[error("The cropped region is out of bounds.")]
+    /// The cropped region's size is out of bounds.
+    OutOfBounds,
+    #[error("The cropped region is not visible.")]
+    /// The cropped region's size is zero.
+    Zero,
+}
diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index d4111293..9b66cb0e 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -7,6 +7,7 @@ use crate::command::{self, Command};
 use crate::core::time::Instant;
 use crate::core::window::{Event, Icon, Level, Mode, UserAttention};
 use crate::futures::subscription::{self, Subscription};
+use crate::screenshot::Screenshot;
 
 /// Subscribes to the frames of the window of the running application.
 ///
@@ -115,3 +116,10 @@ pub fn fetch_id<Message>(
 pub fn change_icon<Message>(icon: Icon) -> Command<Message> {
     Command::single(command::Action::Window(Action::ChangeIcon(icon)))
 }
+
+/// Captures a [`Screenshot`] from the window.
+pub fn screenshot<Message>(
+    f: impl FnOnce(Screenshot) -> Message + Send + 'static,
+) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Screenshot(Box::new(f))))
+}
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index a9d2a3d0..cb430681 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,6 +1,7 @@
 use crate::core::window::{Icon, Level, Mode, UserAttention};
 use crate::futures::MaybeSend;
 
+use crate::screenshot::Screenshot;
 use std::fmt;
 
 /// An operation to be performed on some window.
@@ -89,6 +90,8 @@ pub enum Action<T> {
     /// - **X11:** Has no universal guidelines for icon sizes, so you're at the whims of the WM. That
     ///   said, it's usually in the same ballpark as on Windows.
     ChangeIcon(Icon),
+    /// Screenshot the viewport of the window.
+    Screenshot(Box<dyn FnOnce(Screenshot) -> T + 'static>),
 }
 
 impl<T> Action<T> {
@@ -118,6 +121,11 @@ impl<T> Action<T> {
             Self::ChangeLevel(level) => Action::ChangeLevel(level),
             Self::FetchId(o) => Action::FetchId(Box::new(move |s| f(o(s)))),
             Self::ChangeIcon(icon) => Action::ChangeIcon(icon),
+            Self::Screenshot(tag) => {
+                Action::Screenshot(Box::new(move |screenshot| {
+                    f(tag(screenshot))
+                }))
+            }
         }
     }
 }
@@ -155,6 +163,7 @@ impl<T> fmt::Debug for Action<T> {
             Self::ChangeIcon(_icon) => {
                 write!(f, "Action::ChangeIcon(icon)")
             }
+            Self::Screenshot(_) => write!(f, "Action::Screenshot"),
         }
     }
 }
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index 9999a188..f3be3f16 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -1,5 +1,5 @@
-use crate::core::{Color, Rectangle};
-use crate::graphics::compositor::{self, Information, SurfaceError};
+use crate::core::{Color, Rectangle, Size};
+use crate::graphics::compositor::{self, Information};
 use crate::graphics::damage;
 use crate::graphics::{Error, Primitive, Viewport};
 use crate::{Backend, Renderer, Settings};
@@ -79,7 +79,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         viewport: &Viewport,
         background_color: Color,
         overlay: &[T],
-    ) -> Result<(), SurfaceError> {
+    ) -> Result<(), compositor::SurfaceError> {
         renderer.with_primitives(|backend, primitives| {
             present(
                 backend,
@@ -91,6 +91,26 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             )
         })
     }
+
+    fn screenshot<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Vec<u8> {
+        renderer.with_primitives(|backend, primitives| {
+            screenshot(
+                surface,
+                backend,
+                primitives,
+                viewport,
+                background_color,
+                overlay,
+            )
+        })
+    }
 }
 
 pub fn new<Theme>(settings: Settings) -> (Compositor<Theme>, Backend) {
@@ -156,3 +176,53 @@ pub fn present<T: AsRef<str>>(
 
     Ok(())
 }
+
+pub fn screenshot<T: AsRef<str>>(
+    surface: &mut Surface,
+    backend: &mut Backend,
+    primitives: &[Primitive],
+    viewport: &Viewport,
+    background_color: Color,
+    overlay: &[T],
+) -> Vec<u8> {
+    let size = viewport.physical_size();
+
+    let mut offscreen_buffer: Vec<u32> =
+        vec![0; size.width as usize * size.height as usize];
+
+    backend.draw(
+        &mut tiny_skia::PixmapMut::from_bytes(
+            bytemuck::cast_slice_mut(&mut offscreen_buffer),
+            size.width,
+            size.height,
+        )
+        .expect("Create offscreen pixel map"),
+        &mut surface.clip_mask,
+        primitives,
+        viewport,
+        &[Rectangle::with_size(Size::new(
+            size.width as f32,
+            size.height as f32,
+        ))],
+        background_color,
+        overlay,
+    );
+
+    offscreen_buffer.iter().fold(
+        Vec::with_capacity(offscreen_buffer.len() * 4),
+        |mut acc, pixel| {
+            const A_MASK: u32 = 0xFF_00_00_00;
+            const R_MASK: u32 = 0x00_FF_00_00;
+            const G_MASK: u32 = 0x00_00_FF_00;
+            const B_MASK: u32 = 0x00_00_00_FF;
+
+            let a = ((A_MASK & pixel) >> 24) as u8;
+            let r = ((R_MASK & pixel) >> 16) as u8;
+            let g = ((G_MASK & pixel) >> 8) as u8;
+            let b = (B_MASK & pixel) as u8;
+
+            acc.extend([r, g, b, a]);
+            acc
+        },
+    )
+}
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index b524c615..8f37f285 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,4 +1,3 @@
-use crate::core;
 use crate::core::{Color, Font, Point, Size};
 use crate::graphics::backend;
 use crate::graphics::color;
@@ -6,6 +5,7 @@ use crate::graphics::{Primitive, Transformation, Viewport};
 use crate::quad;
 use crate::text;
 use crate::triangle;
+use crate::{core, offscreen};
 use crate::{Layer, Settings};
 
 #[cfg(feature = "tracing")]
@@ -123,6 +123,65 @@ impl Backend {
         self.image_pipeline.end_frame();
     }
 
+    /// Performs an offscreen render pass. If the `format` selected by WGPU is not
+    /// `wgpu::TextureFormat::Rgba8UnormSrgb`, a conversion compute pipeline will run.
+    ///
+    /// Returns `None` if the `frame` is `Rgba8UnormSrgb`, else returns the newly
+    /// converted texture view in `Rgba8UnormSrgb`.
+    pub fn offscreen<T: AsRef<str>>(
+        &mut self,
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        encoder: &mut wgpu::CommandEncoder,
+        clear_color: Option<Color>,
+        frame: &wgpu::TextureView,
+        format: wgpu::TextureFormat,
+        primitives: &[Primitive],
+        viewport: &Viewport,
+        overlay_text: &[T],
+        texture_extent: wgpu::Extent3d,
+    ) -> Option<wgpu::Texture> {
+        #[cfg(feature = "tracing")]
+        let _ = info_span!("iced_wgpu::offscreen", "DRAW").entered();
+
+        self.present(
+            device,
+            queue,
+            encoder,
+            clear_color,
+            frame,
+            primitives,
+            viewport,
+            overlay_text,
+        );
+
+        if format != wgpu::TextureFormat::Rgba8UnormSrgb {
+            log::info!("Texture format is {format:?}; performing conversion to rgba8..");
+            let pipeline = offscreen::Pipeline::new(device);
+
+            let texture = device.create_texture(&wgpu::TextureDescriptor {
+                label: Some("iced_wgpu.offscreen.conversion.source_texture"),
+                size: texture_extent,
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: wgpu::TextureDimension::D2,
+                format: wgpu::TextureFormat::Rgba8Unorm,
+                usage: wgpu::TextureUsages::STORAGE_BINDING
+                    | wgpu::TextureUsages::COPY_SRC,
+                view_formats: &[],
+            });
+
+            let view =
+                texture.create_view(&wgpu::TextureViewDescriptor::default());
+
+            pipeline.convert(device, texture_extent, frame, &view, encoder);
+
+            return Some(texture);
+        }
+
+        None
+    }
+
     fn prepare_text(
         &mut self,
         device: &wgpu::Device,
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 0a5726b5..827acb89 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -46,6 +46,7 @@ pub mod geometry;
 
 mod backend;
 mod buffer;
+mod offscreen;
 mod quad;
 mod text;
 mod triangle;
diff --git a/wgpu/src/offscreen.rs b/wgpu/src/offscreen.rs
new file mode 100644
index 00000000..29913d02
--- /dev/null
+++ b/wgpu/src/offscreen.rs
@@ -0,0 +1,102 @@
+use std::borrow::Cow;
+
+/// A simple compute pipeline to convert any texture to Rgba8UnormSrgb.
+#[derive(Debug)]
+pub struct Pipeline {
+    pipeline: wgpu::ComputePipeline,
+    layout: wgpu::BindGroupLayout,
+}
+
+impl Pipeline {
+    pub fn new(device: &wgpu::Device) -> Self {
+        let shader =
+            device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.shader"),
+                source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
+                    "shader/offscreen_blit.wgsl"
+                ))),
+            });
+
+        let bind_group_layout =
+            device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.bind_group_layout"),
+                entries: &[
+                    wgpu::BindGroupLayoutEntry {
+                        binding: 0,
+                        visibility: wgpu::ShaderStages::COMPUTE,
+                        ty: wgpu::BindingType::Texture {
+                            sample_type: wgpu::TextureSampleType::Float {
+                                filterable: false,
+                            },
+                            view_dimension: wgpu::TextureViewDimension::D2,
+                            multisampled: false,
+                        },
+                        count: None,
+                    },
+                    wgpu::BindGroupLayoutEntry {
+                        binding: 1,
+                        visibility: wgpu::ShaderStages::COMPUTE,
+                        ty: wgpu::BindingType::StorageTexture {
+                            access: wgpu::StorageTextureAccess::WriteOnly,
+                            format: wgpu::TextureFormat::Rgba8Unorm,
+                            view_dimension: wgpu::TextureViewDimension::D2,
+                        },
+                        count: None,
+                    },
+                ],
+            });
+
+        let pipeline_layout =
+            device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.pipeline_layout"),
+                bind_group_layouts: &[&bind_group_layout],
+                push_constant_ranges: &[],
+            });
+
+        let pipeline =
+            device.create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.pipeline"),
+                layout: Some(&pipeline_layout),
+                module: &shader,
+                entry_point: "main",
+            });
+
+        Self {
+            pipeline,
+            layout: bind_group_layout,
+        }
+    }
+
+    pub fn convert(
+        &self,
+        device: &wgpu::Device,
+        extent: wgpu::Extent3d,
+        frame: &wgpu::TextureView,
+        view: &wgpu::TextureView,
+        encoder: &mut wgpu::CommandEncoder,
+    ) {
+        let bind = device.create_bind_group(&wgpu::BindGroupDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.bind_group"),
+            layout: &self.layout,
+            entries: &[
+                wgpu::BindGroupEntry {
+                    binding: 0,
+                    resource: wgpu::BindingResource::TextureView(frame),
+                },
+                wgpu::BindGroupEntry {
+                    binding: 1,
+                    resource: wgpu::BindingResource::TextureView(view),
+                },
+            ],
+        });
+
+        let mut compute_pass =
+            encoder.begin_compute_pass(&wgpu::ComputePassDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.compute_pass"),
+            });
+
+        compute_pass.set_pipeline(&self.pipeline);
+        compute_pass.set_bind_group(0, &bind, &[]);
+        compute_pass.dispatch_workgroups(extent.width, extent.height, 1);
+    }
+}
diff --git a/wgpu/src/shader/offscreen_blit.wgsl b/wgpu/src/shader/offscreen_blit.wgsl
new file mode 100644
index 00000000..9c764c36
--- /dev/null
+++ b/wgpu/src/shader/offscreen_blit.wgsl
@@ -0,0 +1,22 @@
+@group(0) @binding(0) var u_texture: texture_2d<f32>;
+@group(0) @binding(1) var out_texture: texture_storage_2d<rgba8unorm, write>;
+
+fn srgb(color: f32) -> f32 {
+    if (color <= 0.0031308) {
+        return 12.92 * color;
+    } else {
+        return (1.055 * (pow(color, (1.0/2.4)))) - 0.055;
+    }
+}
+
+@compute @workgroup_size(1)
+fn main(@builtin(global_invocation_id) id: vec3<u32>) {
+    // texture coord must be i32 due to a naga bug:
+    // https://github.com/gfx-rs/naga/issues/1997
+    let coords = vec2(i32(id.x), i32(id.y));
+
+    let src: vec4<f32> = textureLoad(u_texture, coords, 0);
+    let srgb_color: vec4<f32> = vec4(srgb(src.x), srgb(src.y), srgb(src.z), src.w);
+
+    textureStore(out_texture, coords, srgb_color);
+}
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 4afbdb32..320b5b12 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -16,15 +16,8 @@ impl Blit {
         format: wgpu::TextureFormat,
         antialiasing: graphics::Antialiasing,
     ) -> Blit {
-        let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
-            address_mode_u: wgpu::AddressMode::ClampToEdge,
-            address_mode_v: wgpu::AddressMode::ClampToEdge,
-            address_mode_w: wgpu::AddressMode::ClampToEdge,
-            mag_filter: wgpu::FilterMode::Nearest,
-            min_filter: wgpu::FilterMode::Nearest,
-            mipmap_filter: wgpu::FilterMode::Nearest,
-            ..Default::default()
-        });
+        let sampler =
+            device.create_sampler(&wgpu::SamplerDescriptor::default());
 
         let constant_layout =
             device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 2eaafde0..43c3dce5 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -1,5 +1,5 @@
 //! Connect a window with a renderer.
-use crate::core::Color;
+use crate::core::{Color, Size};
 use crate::graphics;
 use crate::graphics::color;
 use crate::graphics::compositor;
@@ -283,4 +283,145 @@ impl<Theme> graphics::Compositor for Compositor<Theme> {
             )
         })
     }
+
+    fn screenshot<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        _surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Vec<u8> {
+        renderer.with_primitives(|backend, primitives| {
+            screenshot(
+                self,
+                backend,
+                primitives,
+                viewport,
+                background_color,
+                overlay,
+            )
+        })
+    }
+}
+
+/// Renders the current surface to an offscreen buffer.
+///
+/// Returns RGBA bytes of the texture data.
+pub fn screenshot<Theme, T: AsRef<str>>(
+    compositor: &Compositor<Theme>,
+    backend: &mut Backend,
+    primitives: &[Primitive],
+    viewport: &Viewport,
+    background_color: Color,
+    overlay: &[T],
+) -> Vec<u8> {
+    let mut encoder = compositor.device.create_command_encoder(
+        &wgpu::CommandEncoderDescriptor {
+            label: Some("iced_wgpu.offscreen.encoder"),
+        },
+    );
+
+    let dimensions = BufferDimensions::new(viewport.physical_size());
+
+    let texture_extent = wgpu::Extent3d {
+        width: dimensions.width,
+        height: dimensions.height,
+        depth_or_array_layers: 1,
+    };
+
+    let texture = compositor.device.create_texture(&wgpu::TextureDescriptor {
+        label: Some("iced_wgpu.offscreen.source_texture"),
+        size: texture_extent,
+        mip_level_count: 1,
+        sample_count: 1,
+        dimension: wgpu::TextureDimension::D2,
+        format: compositor.format,
+        usage: wgpu::TextureUsages::RENDER_ATTACHMENT
+            | wgpu::TextureUsages::COPY_SRC
+            | wgpu::TextureUsages::TEXTURE_BINDING,
+        view_formats: &[],
+    });
+
+    let view = texture.create_view(&wgpu::TextureViewDescriptor::default());
+
+    let rgba_texture = backend.offscreen(
+        &compositor.device,
+        &compositor.queue,
+        &mut encoder,
+        Some(background_color),
+        &view,
+        compositor.format,
+        primitives,
+        viewport,
+        overlay,
+        texture_extent,
+    );
+
+    let output_buffer =
+        compositor.device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("iced_wgpu.offscreen.output_texture_buffer"),
+            size: (dimensions.padded_bytes_per_row * dimensions.height as usize)
+                as u64,
+            usage: wgpu::BufferUsages::MAP_READ | wgpu::BufferUsages::COPY_DST,
+            mapped_at_creation: false,
+        });
+
+    encoder.copy_texture_to_buffer(
+        rgba_texture.unwrap_or(texture).as_image_copy(),
+        wgpu::ImageCopyBuffer {
+            buffer: &output_buffer,
+            layout: wgpu::ImageDataLayout {
+                offset: 0,
+                bytes_per_row: Some(dimensions.padded_bytes_per_row as u32),
+                rows_per_image: None,
+            },
+        },
+        texture_extent,
+    );
+
+    let index = compositor.queue.submit(Some(encoder.finish()));
+
+    let slice = output_buffer.slice(..);
+    slice.map_async(wgpu::MapMode::Read, |_| {});
+
+    let _ = compositor
+        .device
+        .poll(wgpu::Maintain::WaitForSubmissionIndex(index));
+
+    let mapped_buffer = slice.get_mapped_range();
+
+    mapped_buffer.chunks(dimensions.padded_bytes_per_row).fold(
+        vec![],
+        |mut acc, row| {
+            acc.extend(&row[..dimensions.unpadded_bytes_per_row]);
+            acc
+        },
+    )
+}
+
+#[derive(Clone, Copy, Debug)]
+struct BufferDimensions {
+    width: u32,
+    height: u32,
+    unpadded_bytes_per_row: usize,
+    padded_bytes_per_row: usize,
+}
+
+impl BufferDimensions {
+    fn new(size: Size<u32>) -> Self {
+        let unpadded_bytes_per_row = size.width as usize * 4; //slice of buffer per row; always RGBA
+        let alignment = wgpu::COPY_BYTES_PER_ROW_ALIGNMENT as usize; //256
+        let padded_bytes_per_row_padding =
+            (alignment - unpadded_bytes_per_row % alignment) % alignment;
+        let padded_bytes_per_row =
+            unpadded_bytes_per_row + padded_bytes_per_row_padding;
+
+        Self {
+            width: size.width,
+            height: size.height,
+            unpadded_bytes_per_row,
+            padded_bytes_per_row,
+        }
+    }
 }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 4147be17..5176bec6 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -19,7 +19,7 @@ use crate::graphics::compositor::{self, Compositor};
 use crate::runtime::clipboard;
 use crate::runtime::program::Program;
 use crate::runtime::user_interface::{self, UserInterface};
-use crate::runtime::{Command, Debug};
+use crate::runtime::{Command, Debug, Screenshot};
 use crate::style::application::{Appearance, StyleSheet};
 use crate::{Clipboard, Error, Proxy, Settings};
 
@@ -308,6 +308,8 @@ async fn run_instance<A, E, C>(
 
     run_command(
         &application,
+        &mut compositor,
+        &mut surface,
         &mut cache,
         &state,
         &mut renderer,
@@ -318,7 +320,6 @@ async fn run_instance<A, E, C>(
         &mut proxy,
         &mut debug,
         &window,
-        || compositor.fetch_information(),
     );
     runtime.track(application.subscription().into_recipes());
 
@@ -382,6 +383,8 @@ async fn run_instance<A, E, C>(
                     // Update application
                     update(
                         &mut application,
+                        &mut compositor,
+                        &mut surface,
                         &mut cache,
                         &state,
                         &mut renderer,
@@ -392,7 +395,6 @@ async fn run_instance<A, E, C>(
                         &mut debug,
                         &mut messages,
                         &window,
-                        || compositor.fetch_information(),
                     );
 
                     // Update window
@@ -645,8 +647,10 @@ where
 
 /// Updates an [`Application`] by feeding it the provided messages, spawning any
 /// resulting [`Command`], and tracking its [`Subscription`].
-pub fn update<A: Application, E: Executor>(
+pub fn update<A: Application, C, E: Executor>(
     application: &mut A,
+    compositor: &mut C,
+    surface: &mut C::Surface,
     cache: &mut user_interface::Cache,
     state: &State<A>,
     renderer: &mut A::Renderer,
@@ -657,8 +661,8 @@ pub fn update<A: Application, E: Executor>(
     debug: &mut Debug,
     messages: &mut Vec<A::Message>,
     window: &winit::window::Window,
-    graphics_info: impl FnOnce() -> compositor::Information + Copy,
 ) where
+    C: Compositor<Renderer = A::Renderer> + 'static,
     <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     for message in messages.drain(..) {
@@ -676,6 +680,8 @@ pub fn update<A: Application, E: Executor>(
 
         run_command(
             application,
+            compositor,
+            surface,
             cache,
             state,
             renderer,
@@ -686,7 +692,6 @@ pub fn update<A: Application, E: Executor>(
             proxy,
             debug,
             window,
-            graphics_info,
         );
     }
 
@@ -695,8 +700,10 @@ pub fn update<A: Application, E: Executor>(
 }
 
 /// Runs the actions of a [`Command`].
-pub fn run_command<A, E>(
+pub fn run_command<A, C, E>(
     application: &A,
+    compositor: &mut C,
+    surface: &mut C::Surface,
     cache: &mut user_interface::Cache,
     state: &State<A>,
     renderer: &mut A::Renderer,
@@ -707,10 +714,10 @@ pub fn run_command<A, E>(
     proxy: &mut winit::event_loop::EventLoopProxy<A::Message>,
     debug: &mut Debug,
     window: &winit::window::Window,
-    _graphics_info: impl FnOnce() -> compositor::Information + Copy,
 ) where
     A: Application,
     E: Executor,
+    C: Compositor<Renderer = A::Renderer> + 'static,
     <A::Renderer as core::Renderer>::Theme: StyleSheet,
 {
     use crate::runtime::command;
@@ -802,12 +809,28 @@ pub fn run_command<A, E>(
                         .send_event(tag(window.id().into()))
                         .expect("Send message to event loop");
                 }
+                window::Action::Screenshot(tag) => {
+                    let bytes = compositor.screenshot(
+                        renderer,
+                        surface,
+                        state.viewport(),
+                        state.background_color(),
+                        &debug.overlay(),
+                    );
+
+                    proxy
+                        .send_event(tag(Screenshot::new(
+                            bytes,
+                            state.physical_size(),
+                        )))
+                        .expect("Send message to event loop.")
+                }
             },
             command::Action::System(action) => match action {
                 system::Action::QueryInformation(_tag) => {
                     #[cfg(feature = "system")]
                     {
-                        let graphics_info = _graphics_info();
+                        let graphics_info = compositor.fetch_information();
                         let proxy = proxy.clone();
 
                         let _ = std::thread::spawn(move || {

From 5ed945287745f5c40ca5cc8013458eee89e76f35 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, 6 Jun 2023 15:39:29 +0200
Subject: [PATCH 335/440] Use `Container::Box` in `screenshot` example

---
 examples/screenshot/src/main.rs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 29d961d9..cfdddd72 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -154,7 +154,7 @@ impl Application for Example {
 
         let image = container(image)
             .padding(10)
-            .style(Container::Custom(Box::new(ScreenshotDisplayContainer)))
+            .style(Container::Box)
             .width(Length::FillPortion(2))
             .height(Length::Fill)
             .center_x()
@@ -272,22 +272,6 @@ impl Application for Example {
     }
 }
 
-struct ScreenshotDisplayContainer;
-
-impl container::StyleSheet for ScreenshotDisplayContainer {
-    type Style = Theme;
-
-    fn appearance(&self, style: &Self::Style) -> container::Appearance {
-        container::Appearance {
-            text_color: None,
-            background: None,
-            border_radius: 5.0,
-            border_width: 4.0,
-            border_color: style.palette().primary,
-        }
-    }
-}
-
 async fn save_to_png(screenshot: Screenshot) -> Result<String, PngError> {
     let path = "screenshot.png".to_string();
     img::save_buffer(

From 8820583cc04f468b403e0660118760389f9e4370 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, 6 Jun 2023 15:51:32 +0200
Subject: [PATCH 336/440] Create `numeric_input` helper in `screenshot` example

---
 examples/screenshot/src/main.rs | 98 ++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index cfdddd72..8e3bcaec 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -25,10 +25,10 @@ struct Example {
     saved_png_path: Option<Result<String, PngError>>,
     png_saving: bool,
     crop_error: Option<CropError>,
-    x_input_value: u32,
-    y_input_value: u32,
-    width_input_value: u32,
-    height_input_value: u32,
+    x_input_value: Option<u32>,
+    y_input_value: Option<u32>,
+    width_input_value: Option<u32>,
+    height_input_value: Option<u32>,
 }
 
 #[derive(Clone, Debug)]
@@ -38,10 +38,10 @@ enum Message {
     ScreenshotData(Screenshot),
     Png,
     PngSaved(Result<String, PngError>),
-    XInputChanged(String),
-    YInputChanged(String),
-    WidthInputChanged(String),
-    HeightInputChanged(String),
+    XInputChanged(Option<u32>),
+    YInputChanged(Option<u32>),
+    WidthInputChanged(Option<u32>),
+    HeightInputChanged(Option<u32>),
 }
 
 impl Application for Example {
@@ -57,10 +57,10 @@ impl Application for Example {
                 saved_png_path: None,
                 png_saving: false,
                 crop_error: None,
-                x_input_value: 0,
-                y_input_value: 0,
-                width_input_value: 0,
-                height_input_value: 0,
+                x_input_value: None,
+                y_input_value: None,
+                width_input_value: None,
+                height_input_value: None,
             },
             Command::none(),
         )
@@ -91,33 +91,25 @@ impl Application for Example {
                 self.png_saving = false;
                 self.saved_png_path = Some(res);
             }
-            Message::XInputChanged(new) => {
-                if let Ok(value) = new.parse::<u32>() {
-                    self.x_input_value = value;
-                }
+            Message::XInputChanged(new_value) => {
+                self.x_input_value = new_value;
             }
-            Message::YInputChanged(new) => {
-                if let Ok(value) = new.parse::<u32>() {
-                    self.y_input_value = value;
-                }
+            Message::YInputChanged(new_value) => {
+                self.y_input_value = new_value;
             }
-            Message::WidthInputChanged(new) => {
-                if let Ok(value) = new.parse::<u32>() {
-                    self.width_input_value = value;
-                }
+            Message::WidthInputChanged(new_value) => {
+                self.width_input_value = new_value;
             }
-            Message::HeightInputChanged(new) => {
-                if let Ok(value) = new.parse::<u32>() {
-                    self.height_input_value = value;
-                }
+            Message::HeightInputChanged(new_value) => {
+                self.height_input_value = new_value;
             }
             Message::Crop => {
                 if let Some(screenshot) = &self.screenshot {
                     let cropped = screenshot.crop(Rectangle::<u32> {
-                        x: self.x_input_value,
-                        y: self.y_input_value,
-                        width: self.width_input_value,
-                        height: self.height_input_value,
+                        x: self.x_input_value.unwrap_or(0),
+                        y: self.y_input_value.unwrap_or(0),
+                        width: self.width_input_value.unwrap_or(0),
+                        height: self.height_input_value.unwrap_or(0),
                     });
 
                     match cropped {
@@ -162,26 +154,20 @@ impl Application for Example {
 
         let crop_origin_controls = row![
             text("X:").vertical_alignment(Vertical::Center).width(14),
-            text_input("0", &format!("{}", self.x_input_value),)
-                .on_input(Message::XInputChanged)
-                .width(40),
+            numeric_input("0", self.x_input_value).map(Message::XInputChanged),
             text("Y:").vertical_alignment(Vertical::Center).width(14),
-            text_input("0", &format!("{}", self.y_input_value),)
-                .on_input(Message::YInputChanged)
-                .width(40),
+            numeric_input("0", self.y_input_value).map(Message::YInputChanged)
         ]
         .spacing(10)
         .align_items(Alignment::Center);
 
         let crop_dimension_controls = row![
             text("W:").vertical_alignment(Vertical::Center).width(14),
-            text_input("0", &format!("{}", self.width_input_value),)
-                .on_input(Message::WidthInputChanged)
-                .width(40),
+            numeric_input("0", self.width_input_value)
+                .map(Message::WidthInputChanged),
             text("H:").vertical_alignment(Vertical::Center).width(14),
-            text_input("0", &format!("{}", self.height_input_value),)
-                .on_input(Message::HeightInputChanged)
-                .width(40),
+            numeric_input("0", self.height_input_value)
+                .map(Message::HeightInputChanged)
         ]
         .spacing(10)
         .align_items(Alignment::Center);
@@ -287,3 +273,27 @@ async fn save_to_png(screenshot: Screenshot) -> Result<String, PngError> {
 
 #[derive(Clone, Debug)]
 struct PngError(String);
+
+fn numeric_input(
+    placeholder: &str,
+    value: Option<u32>,
+) -> Element<'_, Option<u32>> {
+    text_input(
+        placeholder,
+        &value
+            .as_ref()
+            .map(ToString::to_string)
+            .unwrap_or_else(String::new),
+    )
+    .on_input(move |text| {
+        if text.is_empty() {
+            None
+        } else if let Ok(new_value) = text.parse() {
+            Some(new_value)
+        } else {
+            value
+        }
+    })
+    .width(40)
+    .into()
+}

From cd15f8305ab1094ff9887f8d8822e385a381ab1c 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, 6 Jun 2023 15:59:36 +0200
Subject: [PATCH 337/440] Fix width of crop labels in `screenshot` example

---
 examples/screenshot/src/main.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 8e3bcaec..0d77d316 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -153,19 +153,19 @@ impl Application for Example {
             .center_y();
 
         let crop_origin_controls = row![
-            text("X:").vertical_alignment(Vertical::Center).width(14),
+            text("X:").vertical_alignment(Vertical::Center).width(20),
             numeric_input("0", self.x_input_value).map(Message::XInputChanged),
-            text("Y:").vertical_alignment(Vertical::Center).width(14),
+            text("Y:").vertical_alignment(Vertical::Center).width(20),
             numeric_input("0", self.y_input_value).map(Message::YInputChanged)
         ]
         .spacing(10)
         .align_items(Alignment::Center);
 
         let crop_dimension_controls = row![
-            text("W:").vertical_alignment(Vertical::Center).width(14),
+            text("W:").vertical_alignment(Vertical::Center).width(20),
             numeric_input("0", self.width_input_value)
                 .map(Message::WidthInputChanged),
-            text("H:").vertical_alignment(Vertical::Center).width(14),
+            text("H:").vertical_alignment(Vertical::Center).width(20),
             numeric_input("0", self.height_input_value)
                 .map(Message::HeightInputChanged)
         ]

From c1021c71758d0c850c7b3fea26075bb83830cb7d 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, 6 Jun 2023 15:59:56 +0200
Subject: [PATCH 338/440] Fix punctuation in `screenshot` example

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

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 0d77d316..0f1d8dce 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -183,12 +183,12 @@ impl Application for Example {
         }
 
         let png_button = if !self.png_saving {
-            button("Save to png.")
+            button("Save to png")
                 .style(Button::Secondary)
                 .padding([10, 20, 10, 20])
                 .on_press(Message::Png)
         } else {
-            button("Saving..")
+            button("Saving...")
                 .style(Button::Secondary)
                 .padding([10, 20, 10, 20])
         };

From 7adfaa88a68e1accfaddf13e82b8bd7a11ee8786 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, 6 Jun 2023 16:05:46 +0200
Subject: [PATCH 339/440] Avoid `iced_image` import in `screenshot` example

---
 examples/screenshot/src/main.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 0f1d8dce..66cbcd8c 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,18 +1,17 @@
+use ::image as img;
+use ::image::ColorType;
 use iced::alignment::{Horizontal, Vertical};
 use iced::keyboard::KeyCode;
 use iced::theme::{Button, Container};
 use iced::widget::runtime::{CropError, Screenshot};
 use iced::widget::{
-    button, column as col, container, image as iced_image, row, text,
-    text_input,
+    button, column as col, container, image, row, text, text_input,
 };
 use iced::{
     event, executor, keyboard, subscription, Alignment, Application, Command,
     ContentFit, Element, Event, Length, Rectangle, Renderer, Subscription,
     Theme,
 };
-use image as img;
-use image::ColorType;
 
 fn main() -> iced::Result {
     env_logger::builder().format_timestamp(None).init();
@@ -131,7 +130,7 @@ impl Application for Example {
     fn view(&self) -> Element<'_, Self::Message, Renderer<Self::Theme>> {
         let image: Element<Message> = if let Some(screenshot) = &self.screenshot
         {
-            iced_image(iced_image::Handle::from_pixels(
+            image(image::Handle::from_pixels(
                 screenshot.size.width,
                 screenshot.size.height,
                 screenshot.bytes.clone(),

From 5324928044cba800454b1861eb9999038bc28c2e 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, 6 Jun 2023 16:14:42 +0200
Subject: [PATCH 340/440] Wrap `Screenshot::bytes` in an `Arc` and implement
 `AsRef<[u8]>`

---
 examples/screenshot/src/main.rs |  2 +-
 runtime/src/screenshot.rs       | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 66cbcd8c..7d53b3b2 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -133,7 +133,7 @@ impl Application for Example {
             image(image::Handle::from_pixels(
                 screenshot.size.width,
                 screenshot.size.height,
-                screenshot.bytes.clone(),
+                screenshot.clone(),
             ))
             .content_fit(ContentFit::ScaleDown)
             .width(Length::Fill)
diff --git a/runtime/src/screenshot.rs b/runtime/src/screenshot.rs
index 527e400f..b88f2c20 100644
--- a/runtime/src/screenshot.rs
+++ b/runtime/src/screenshot.rs
@@ -1,5 +1,7 @@
-use iced_core::{Rectangle, Size};
+use crate::core::{Rectangle, Size};
+
 use std::fmt::{Debug, Formatter};
+use std::sync::Arc;
 
 /// Data of a screenshot, captured with `window::screenshot()`.
 ///
@@ -7,7 +9,7 @@ use std::fmt::{Debug, Formatter};
 #[derive(Clone)]
 pub struct Screenshot {
     /// The bytes of the [`Screenshot`].
-    pub bytes: Vec<u8>,
+    pub bytes: Arc<Vec<u8>>,
     /// The size of the [`Screenshot`].
     pub size: Size<u32>,
 }
@@ -26,7 +28,10 @@ impl Debug for Screenshot {
 impl Screenshot {
     /// Creates a new [`Screenshot`].
     pub fn new(bytes: Vec<u8>, size: Size<u32>) -> Self {
-        Self { bytes, size }
+        Self {
+            bytes: Arc::new(bytes),
+            size,
+        }
     }
 
     /// Crops a [`Screenshot`] to the provided `region`. This will always be relative to the
@@ -62,12 +67,18 @@ impl Screenshot {
         );
 
         Ok(Self {
-            bytes: chopped,
+            bytes: Arc::new(chopped),
             size: Size::new(region.width, region.height),
         })
     }
 }
 
+impl AsRef<[u8]> for Screenshot {
+    fn as_ref(&self) -> &[u8] {
+        &self.bytes
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 /// Errors that can occur when cropping a [`Screenshot`].
 pub enum CropError {

From 5b5000e3ae9789cf1d83cecd08f4d0cedc16d788 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, 6 Jun 2023 16:18:20 +0200
Subject: [PATCH 341/440] Introduce `on_press_maybe` helper for `Button`

---
 examples/screenshot/src/main.rs |  5 +++--
 widget/src/button.rs            | 13 +++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 7d53b3b2..be39f829 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -79,12 +79,13 @@ impl Application for Example {
             }
             Message::Png => {
                 if let Some(screenshot) = &self.screenshot {
+                    self.png_saving = true;
+
                     return Command::perform(
                         save_to_png(screenshot.clone()),
                         Message::PngSaved,
                     );
                 }
-                self.png_saving = true;
             }
             Message::PngSaved(res) => {
                 self.png_saving = false;
@@ -185,7 +186,7 @@ impl Application for Example {
             button("Save to png")
                 .style(Button::Secondary)
                 .padding([10, 20, 10, 20])
-                .on_press(Message::Png)
+                .on_press_maybe(self.screenshot.is_some().then(|| Message::Png))
         } else {
             button("Saving...")
                 .style(Button::Secondary)
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 70fed1d5..c656142c 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -102,8 +102,17 @@ where
     /// Sets the message that will be produced when the [`Button`] is pressed.
     ///
     /// Unless `on_press` is called, the [`Button`] will be disabled.
-    pub fn on_press(mut self, msg: Message) -> Self {
-        self.on_press = Some(msg);
+    pub fn on_press(mut self, on_press: Message) -> Self {
+        self.on_press = Some(on_press);
+        self
+    }
+
+    /// Sets the message that will be produced when the [`Button`] is pressed,
+    /// if `Some`.
+    ///
+    /// If `None`, the [`Button`] will be disabled.
+    pub fn on_press_maybe(mut self, on_press: Option<Message>) -> Self {
+        self.on_press = on_press;
         self
     }
 

From 38582873b7d64174f11a7c4d74ed8f654320f7f8 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, 6 Jun 2023 16:32:14 +0200
Subject: [PATCH 342/440] Rearrange controls of the `screenshot` example

---
 examples/screenshot/src/main.rs | 84 ++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 32 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index be39f829..7b9ac4e0 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,12 +1,10 @@
 use ::image as img;
 use ::image::ColorType;
-use iced::alignment::{Horizontal, Vertical};
+use iced::alignment;
 use iced::keyboard::KeyCode;
 use iced::theme::{Button, Container};
 use iced::widget::runtime::{CropError, Screenshot};
-use iced::widget::{
-    button, column as col, container, image, row, text, text_input,
-};
+use iced::widget::{button, column, container, image, row, text, text_input};
 use iced::{
     event, executor, keyboard, subscription, Alignment, Application, Command,
     ContentFit, Element, Event, Length, Rectangle, Renderer, Subscription,
@@ -153,19 +151,27 @@ impl Application for Example {
             .center_y();
 
         let crop_origin_controls = row![
-            text("X:").vertical_alignment(Vertical::Center).width(20),
+            text("X:")
+                .vertical_alignment(alignment::Vertical::Center)
+                .width(20),
             numeric_input("0", self.x_input_value).map(Message::XInputChanged),
-            text("Y:").vertical_alignment(Vertical::Center).width(20),
+            text("Y:")
+                .vertical_alignment(alignment::Vertical::Center)
+                .width(20),
             numeric_input("0", self.y_input_value).map(Message::YInputChanged)
         ]
         .spacing(10)
         .align_items(Alignment::Center);
 
         let crop_dimension_controls = row![
-            text("W:").vertical_alignment(Vertical::Center).width(20),
+            text("W:")
+                .vertical_alignment(alignment::Vertical::Center)
+                .width(20),
             numeric_input("0", self.width_input_value)
                 .map(Message::WidthInputChanged),
-            text("H:").vertical_alignment(Vertical::Center).width(20),
+            text("H:")
+                .vertical_alignment(alignment::Vertical::Center)
+                .width(20),
             numeric_input("0", self.height_input_value)
                 .map(Message::HeightInputChanged)
         ]
@@ -173,7 +179,7 @@ impl Application for Example {
         .align_items(Alignment::Center);
 
         let mut crop_controls =
-            col![crop_origin_controls, crop_dimension_controls]
+            column![crop_origin_controls, crop_dimension_controls]
                 .spacing(10)
                 .align_items(Alignment::Center);
 
@@ -182,30 +188,36 @@ impl Application for Example {
                 .push(text(format!("Crop error! \n{}", crop_error)));
         }
 
-        let png_button = if !self.png_saving {
-            button("Save to png")
+        let mut controls = column![
+            column![
+                button(centered_text("Screenshot!"))
+                    .padding([10, 20, 10, 20])
+                    .width(Length::Fill)
+                    .on_press(Message::Screenshot),
+                if !self.png_saving {
+                    button(centered_text("Save as png")).on_press_maybe(
+                        self.screenshot.is_some().then(|| Message::Png),
+                    )
+                } else {
+                    button(centered_text("Saving...")).style(Button::Secondary)
+                }
                 .style(Button::Secondary)
                 .padding([10, 20, 10, 20])
-                .on_press_maybe(self.screenshot.is_some().then(|| Message::Png))
-        } else {
-            button("Saving...")
-                .style(Button::Secondary)
-                .padding([10, 20, 10, 20])
-        };
-
-        let mut controls = col![
-            button("Screenshot!")
-                .padding([10, 20, 10, 20])
-                .on_press(Message::Screenshot),
-            button("Crop")
-                .style(Button::Destructive)
-                .padding([10, 20, 10, 20])
-                .on_press(Message::Crop),
-            crop_controls,
-            png_button,
+                .width(Length::Fill)
+            ]
+            .spacing(10),
+            column![
+                crop_controls,
+                button(centered_text("Crop"))
+                    .on_press(Message::Crop)
+                    .style(Button::Destructive)
+                    .padding([10, 20, 10, 20])
+                    .width(Length::Fill),
+            ]
+            .spacing(10)
+            .align_items(Alignment::Center),
         ]
-        .spacing(40)
-        .align_items(Alignment::Center);
+        .spacing(40);
 
         if let Some(png_result) = &self.saved_png_path {
             let msg = match png_result {
@@ -219,21 +231,22 @@ impl Application for Example {
         }
 
         let side_content = container(controls)
-            .align_x(Horizontal::Center)
+            .align_x(alignment::Horizontal::Center)
             .width(Length::FillPortion(1))
             .height(Length::Fill)
             .center_y()
             .center_x();
 
         let content = row![side_content, image]
+            .spacing(10)
             .width(Length::Fill)
             .height(Length::Fill)
             .align_items(Alignment::Center);
 
         container(content)
-            .padding(10)
             .width(Length::Fill)
             .height(Length::Fill)
+            .padding(10)
             .center_x()
             .center_y()
             .into()
@@ -297,3 +310,10 @@ fn numeric_input(
     .width(40)
     .into()
 }
+
+fn centered_text(content: &str) -> Element<'_, Message> {
+    text(content)
+        .width(Length::Fill)
+        .horizontal_alignment(alignment::Horizontal::Center)
+        .into()
+}

From 78c0189824bbae2ba679c8f8b5ae9552debcb0fd 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, 6 Jun 2023 16:36:20 +0200
Subject: [PATCH 343/440] Fix width of crop labels in `screenshot` example
 (again)

---
 examples/screenshot/src/main.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 7b9ac4e0..59dfdf14 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -153,11 +153,11 @@ impl Application for Example {
         let crop_origin_controls = row![
             text("X:")
                 .vertical_alignment(alignment::Vertical::Center)
-                .width(20),
+                .width(30),
             numeric_input("0", self.x_input_value).map(Message::XInputChanged),
             text("Y:")
                 .vertical_alignment(alignment::Vertical::Center)
-                .width(20),
+                .width(30),
             numeric_input("0", self.y_input_value).map(Message::YInputChanged)
         ]
         .spacing(10)
@@ -166,12 +166,12 @@ impl Application for Example {
         let crop_dimension_controls = row![
             text("W:")
                 .vertical_alignment(alignment::Vertical::Center)
-                .width(20),
+                .width(30),
             numeric_input("0", self.width_input_value)
                 .map(Message::WidthInputChanged),
             text("H:")
                 .vertical_alignment(alignment::Vertical::Center)
-                .width(20),
+                .width(30),
             numeric_input("0", self.height_input_value)
                 .map(Message::HeightInputChanged)
         ]

From ea7f2626b11af249510b27001fb6addd7f9210a9 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Mon, 29 May 2023 16:44:56 -0700
Subject: [PATCH 344/440] Optimized gradient data packing.

---
 core/src/color.rs             | 13 ++++++
 graphics/src/gradient.rs      | 69 ++++++++++++++-------------
 wgpu/src/quad/gradient.rs     | 34 +++++---------
 wgpu/src/shader/quad.wgsl     | 87 +++++++++++++++++------------------
 wgpu/src/shader/triangle.wgsl | 71 +++++++++++++---------------
 wgpu/src/triangle.rs          | 26 +++--------
 6 files changed, 143 insertions(+), 157 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index 1392f28b..e3bbab73 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -145,6 +145,19 @@ impl From<[f32; 4]> for Color {
     }
 }
 
+impl Into<u32> for Color {
+    fn into(self) -> u32 {
+        let [r, g, b, a] = self.into_rgba8();
+
+        let r = (r as u32) << 24;
+        let g = (g as u32) << 16;
+        let b = (b as u32) << 8;
+        let a = a as u32;
+
+        r | g | b | a
+    }
+}
+
 /// Creates a [`Color`] with shorter and cleaner syntax.
 ///
 /// # Examples
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index d26b5665..57cc007f 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -99,61 +99,68 @@ impl Linear {
 
     /// Packs the [`Gradient`] for use in shader code.
     pub fn pack(&self) -> Packed {
-        let mut data: [f32; 44] = [0.0; 44];
+        let mut colors = [0u32; 8];
+        let mut offsets = [0.0f32; 8];
 
         for (index, stop) in self.stops.iter().enumerate() {
-            let [r, g, b, a] =
-                color::pack(stop.map_or(Color::default(), |s| s.color))
-                    .components();
-
-            data[index * 4] = r;
-            data[(index * 4) + 1] = g;
-            data[(index * 4) + 2] = b;
-            data[(index * 4) + 3] = a;
-
-            data[32 + index] = stop.map_or(2.0, |s| s.offset);
+            let (color, offset) = stop
+                .map_or((Color::default().into_u32(), 2.0), |s| {
+                    (s.color.into_u32(), s.offset)
+                });
+            colors[index] = color;
+            offsets[index] = offset;
         }
 
-        data[40] = self.start.x;
-        data[41] = self.start.y;
-        data[42] = self.end.x;
-        data[43] = self.end.y;
+        let direction = [self.start.x, self.start.y, self.end.x, self.end.y];
 
-        Packed(data)
+        Packed {
+            colors,
+            offsets,
+            direction,
+        }
     }
 }
 
 /// Packed [`Gradient`] data for use in shader code.
 #[derive(Debug, Copy, Clone, PartialEq)]
 #[repr(C)]
-pub struct Packed([f32; 44]);
+pub struct Packed {
+    // 8 colors, each packed into a u32
+    colors: [u32; 8],
+    offsets: [f32; 8],
+    direction: [f32; 4],
+}
 
 /// Creates a new [`Packed`] gradient for use in shader code.
 pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
     match gradient {
         core::Gradient::Linear(linear) => {
-            let mut data: [f32; 44] = [0.0; 44];
+            let mut colors = [0u32; 8];
+            let mut offsets = [0.0f32; 8];
 
             for (index, stop) in linear.stops.iter().enumerate() {
-                let [r, g, b, a] =
-                    color::pack(stop.map_or(Color::default(), |s| s.color))
-                        .components();
+                // let [r, g, b, a] =
+                //     color::pack(stop.map_or(Color::default(), |s| s.color))
+                //         .components();
 
-                data[index * 4] = r;
-                data[(index * 4) + 1] = g;
-                data[(index * 4) + 2] = b;
-                data[(index * 4) + 3] = a;
-                data[32 + index] = stop.map_or(2.0, |s| s.offset);
+                let (color, offset) = stop
+                    .map_or((Color::default().into_u32(), 2.0), |s| {
+                        (s.color.into_u32(), s.offset)
+                    });
+
+                colors[index] = color;
+                offsets[index] = offset;
             }
 
             let (start, end) = linear.angle.to_distance(&bounds);
 
-            data[40] = start.x;
-            data[41] = start.y;
-            data[42] = end.x;
-            data[43] = end.y;
+            let direction = [start.x, start.y, end.x, end.y];
 
-            Packed(data)
+            Packed {
+                colors,
+                offsets,
+                direction,
+            }
         }
     }
 }
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index 2b56d594..1b45c9f4 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -96,36 +96,24 @@ impl Pipeline {
                                 as u64,
                             step_mode: wgpu::VertexStepMode::Instance,
                             attributes: &wgpu::vertex_attr_array!(
-                                // Color 1
-                                1 => Float32x4,
-                                // Color 2
-                                2 => Float32x4,
-                                // Color 3
-                                3 => Float32x4,
-                                // Color 4
-                                4 => Float32x4,
-                                // Color 5
-                                5 => Float32x4,
-                                // Color 6
-                                6 => Float32x4,
-                                // Color 7
-                                7 => Float32x4,
-                                // Color 8
-                                8 => Float32x4,
+                                // Colors 1-4
+                                1 => Uint32x4,
+                                // Colors 5-8
+                                2 => Uint32x4,
                                 // Offsets 1-4
-                                9 => Float32x4,
+                                3 => Float32x4,
                                 // Offsets 5-8
-                                10 => Float32x4,
+                                4 => Float32x4,
                                 // Direction
-                                11 => Float32x4,
+                                5 => Float32x4,
                                 // Position & Scale
-                                12 => Float32x4,
+                                6 => Float32x4,
                                 // Border color
-                                13 => Float32x4,
+                                7 => Float32x4,
                                 // Border radius
-                                14 => Float32x4,
+                                8 => Float32x4,
                                 // Border width
-                                15 => Float32
+                                9 => Float32
                             ),
                         },
                     ],
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index 3232bdbe..fdcc6743 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -38,6 +38,19 @@ fn select_border_radius(radi: vec4<f32>, position: vec2<f32>, center: vec2<f32>)
     return rx;
 }
 
+fn l(c: f32) -> f32 {
+    if (c < 0.04045) {
+        return c / 12.92;
+    } else {
+        return pow(((c + 0.055) / 1.055), 2.4);
+    };
+}
+
+fn to_linear(color: u32) -> vec4<f32> {
+    let c = unpack4x8unorm(color); //unpacks as a b g r
+    return vec4<f32>(l(c.w), l(c.z), l(c.y), c.x);
+}
+
 struct SolidVertexInput {
     @location(0) v_pos: vec2<f32>,
     @location(1) color: vec4<f32>,
@@ -140,40 +153,28 @@ fn solid_fs_main(
 
 struct GradientVertexInput {
     @location(0) v_pos: vec2<f32>,
-    @location(1) color_1: vec4<f32>,
-    @location(2) color_2: vec4<f32>,
-    @location(3) color_3: vec4<f32>,
-    @location(4) color_4: vec4<f32>,
-    @location(5) color_5: vec4<f32>,
-    @location(6) color_6: vec4<f32>,
-    @location(7) color_7: vec4<f32>,
-    @location(8) color_8: vec4<f32>,
-    @location(9) offsets_1: vec4<f32>,
-    @location(10) offsets_2: vec4<f32>,
-    @location(11) direction: vec4<f32>,
-    @location(12) position_and_scale: vec4<f32>,
-    @location(13) border_color: vec4<f32>,
-    @location(14) border_radius: vec4<f32>,
-    @location(15) border_width: f32
+    @location(1) colors_1: vec4<u32>,
+    @location(2) colors_2: vec4<u32>,
+    @location(3) offsets_1: vec4<f32>,
+    @location(4) offsets_2: vec4<f32>,
+    @location(5) direction: vec4<f32>,
+    @location(6) position_and_scale: vec4<f32>,
+    @location(7) border_color: vec4<f32>,
+    @location(8) border_radius: vec4<f32>,
+    @location(9) border_width: f32,
 }
 
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
-    @location(1) color_1: vec4<f32>,
-    @location(2) color_2: vec4<f32>,
-    @location(3) color_3: vec4<f32>,
-    @location(4) color_4: vec4<f32>,
-    @location(5) color_5: vec4<f32>,
-    @location(6) color_6: vec4<f32>,
-    @location(7) color_7: vec4<f32>,
-    @location(8) color_8: vec4<f32>,
-    @location(9) offsets_1: vec4<f32>,
-    @location(10) offsets_2: vec4<f32>,
-    @location(11) direction: vec4<f32>,
-    @location(12) position_and_scale: vec4<f32>,
-    @location(13) border_color: vec4<f32>,
-    @location(14) border_radius: vec4<f32>,
-    @location(15) border_width: f32
+    @location(1) colors_1: vec4<u32>,
+    @location(2) colors_2: vec4<u32>,
+    @location(3) offsets_1: vec4<f32>,
+    @location(4) offsets_2: vec4<f32>,
+    @location(5) direction: vec4<f32>,
+    @location(6) position_and_scale: vec4<f32>,
+    @location(7) border_color: vec4<f32>,
+    @location(8) border_radius: vec4<f32>,
+    @location(9) border_width: f32,
 }
 
 @vertex
@@ -199,14 +200,8 @@ fn gradient_vs_main(input: GradientVertexInput) -> GradientVertexOutput {
     );
 
     out.position = globals.transform * transform * vec4<f32>(input.v_pos, 0.0, 1.0);
-    out.color_1 = input.color_1;
-    out.color_2 = input.color_2;
-    out.color_3 = input.color_3;
-    out.color_4 = input.color_4;
-    out.color_5 = input.color_5;
-    out.color_6 = input.color_6;
-    out.color_7 = input.color_7;
-    out.color_8 = input.color_8;
+    out.colors_1 = input.colors_1;
+    out.colors_2 = input.colors_2;
     out.offsets_1 = input.offsets_1;
     out.offsets_2 = input.offsets_2;
     out.direction = input.direction * globals.scale;
@@ -274,14 +269,14 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        input.color_1,
-        input.color_2,
-        input.color_3,
-        input.color_4,
-        input.color_5,
-        input.color_6,
-        input.color_7,
-        input.color_8,
+        to_linear(input.colors_1.x),
+        to_linear(input.colors_1.y),
+        to_linear(input.colors_1.z),
+        to_linear(input.colors_1.w),
+        to_linear(input.colors_2.x),
+        to_linear(input.colors_2.y),
+        to_linear(input.colors_2.z),
+        to_linear(input.colors_2.w),
     );
 
     var offsets = array<f32, 8>(
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
index 625fa46e..5a73a77f 100644
--- a/wgpu/src/shader/triangle.wgsl
+++ b/wgpu/src/shader/triangle.wgsl
@@ -4,6 +4,19 @@ struct Globals {
 
 @group(0) @binding(0) var<uniform> globals: Globals;
 
+fn l(c: f32) -> f32 {
+    if (c < 0.04045) {
+        return c / 12.92;
+    } else {
+        return pow(((c + 0.055) / 1.055), 2.4);
+    };
+}
+
+fn to_linear(color: u32) -> vec4<f32> {
+    let c = unpack4x8unorm(color); //unpacks as a b g r
+    return vec4<f32>(l(c.w), l(c.z), l(c.y), c.x);
+}
+
 struct SolidVertexInput {
     @location(0) position: vec2<f32>,
     @location(1) color: vec4<f32>,
@@ -32,46 +45,28 @@ fn solid_fs_main(input: SolidVertexOutput) -> @location(0) vec4<f32> {
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(0) raw_position: vec2<f32>,
-    @location(1) color_1: vec4<f32>,
-    @location(2) color_2: vec4<f32>,
-    @location(3) color_3: vec4<f32>,
-    @location(4) color_4: vec4<f32>,
-    @location(5) color_5: vec4<f32>,
-    @location(6) color_6: vec4<f32>,
-    @location(7) color_7: vec4<f32>,
-    @location(8) color_8: vec4<f32>,
-    @location(9) offsets_1: vec4<f32>,
-    @location(10) offsets_2: vec4<f32>,
-    @location(11) direction: vec4<f32>,
+    @location(1) colors_1: vec4<u32>,
+    @location(2) colors_2: vec4<u32>,
+    @location(3) offsets_1: vec4<f32>,
+    @location(4) offsets_2: vec4<f32>,
+    @location(5) direction: vec4<f32>,
 }
 
 @vertex
 fn gradient_vs_main(
     @location(0) input: vec2<f32>,
-    @location(1) color_1: vec4<f32>,
-    @location(2) color_2: vec4<f32>,
-    @location(3) color_3: vec4<f32>,
-    @location(4) color_4: vec4<f32>,
-    @location(5) color_5: vec4<f32>,
-    @location(6) color_6: vec4<f32>,
-    @location(7) color_7: vec4<f32>,
-    @location(8) color_8: vec4<f32>,
-    @location(9) offsets_1: vec4<f32>,
-    @location(10) offsets_2: vec4<f32>,
-    @location(11) direction: vec4<f32>,
+    @location(1) colors_1: vec4<u32>,
+    @location(2) colors_2: vec4<u32>,
+    @location(3) offsets_1: vec4<f32>,
+    @location(4) offsets_2: vec4<f32>,
+    @location(5) direction: vec4<f32>,
 ) -> GradientVertexOutput {
     var output: GradientVertexOutput;
 
     output.position = globals.transform * vec4<f32>(input.xy, 0.0, 1.0);
     output.raw_position = input;
-    output.color_1 = color_1;
-    output.color_2 = color_2;
-    output.color_3 = color_3;
-    output.color_4 = color_4;
-    output.color_5 = color_5;
-    output.color_6 = color_6;
-    output.color_7 = color_7;
-    output.color_8 = color_8;
+    output.colors_1 = colors_1;
+    output.colors_2 = colors_2;
     output.offsets_1 = offsets_1;
     output.offsets_2 = offsets_2;
     output.direction = direction;
@@ -135,14 +130,14 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        input.color_1,
-        input.color_2,
-        input.color_3,
-        input.color_4,
-        input.color_5,
-        input.color_6,
-        input.color_7,
-        input.color_8,
+        to_linear(input.colors_1.x),
+        to_linear(input.colors_1.y),
+        to_linear(input.colors_1.z),
+        to_linear(input.colors_1.w),
+        to_linear(input.colors_2.x),
+        to_linear(input.colors_2.y),
+        to_linear(input.colors_2.z),
+        to_linear(input.colors_2.w),
     );
 
     var offsets = array<f32, 8>(
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 6f32f182..3f633e14 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -652,28 +652,16 @@ mod gradient {
                             attributes: &wgpu::vertex_attr_array!(
                                 // Position
                                 0 => Float32x2,
-                                // Color 1
-                                1 => Float32x4,
-                                // Color 2
-                                2 => Float32x4,
-                                // Color 3
-                                3 => Float32x4,
-                                // Color 4
-                                4 => Float32x4,
-                                // Color 5
-                                5 => Float32x4,
-                                // Color 6
-                                6 => Float32x4,
-                                // Color 7
-                                7 => Float32x4,
-                                // Color 8
-                                8 => Float32x4,
+                                // Colors 1-4
+                                1 => Uint32x4,
+                                // Colors 5-8,
+                                2 => Uint32x4,
                                 // Offsets 1-4
-                                9 => Float32x4,
+                                3 => Float32x4,
                                 // Offsets 5-8
-                                10 => Float32x4,
+                                4 => Float32x4,
                                 // Direction
-                                11 => Float32x4
+                                5 => Float32x4
                             ),
                         }],
                     },

From 226ce3d6c96e1ee091980c3d1ba869c01920b316 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, 6 Jun 2023 13:37:40 +0200
Subject: [PATCH 345/440] Implement explicit `Color::into_u32` instead of
 `Into` trait

---
 core/src/color.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index e3bbab73..9ea6ccbf 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -120,6 +120,18 @@ impl Color {
         ]
     }
 
+    /// Converts the [`Color`] into a `u32` value containing its RGBA8 components.
+    pub fn into_u32(self) -> u32 {
+        let [r, g, b, a] = self.into_rgba8();
+
+        let r = (r as u32) << 24;
+        let g = (g as u32) << 16;
+        let b = (b as u32) << 8;
+        let a = a as u32;
+
+        r | g | b | a
+    }
+
     /// Inverts the [`Color`] in-place.
     pub fn invert(&mut self) {
         self.r = 1.0f32 - self.r;
@@ -145,19 +157,6 @@ impl From<[f32; 4]> for Color {
     }
 }
 
-impl Into<u32> for Color {
-    fn into(self) -> u32 {
-        let [r, g, b, a] = self.into_rgba8();
-
-        let r = (r as u32) << 24;
-        let g = (g as u32) << 16;
-        let b = (b as u32) << 8;
-        let a = a as u32;
-
-        r | g | b | a
-    }
-}
-
 /// Creates a [`Color`] with shorter and cleaner syntax.
 ///
 /// # Examples

From 9554c78f3adc9846b76e9d3b96af06e98fb69aa0 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Tue, 6 Jun 2023 17:06:40 -0700
Subject: [PATCH 346/440] Updated color packing into u32 to consider incorrect
 web-colors.

---
 core/src/color.rs             | 19 +++++++++++++++++++
 graphics/src/gradient.rs      | 33 ++++++++++++++++++++-------------
 wgpu/src/shader/quad.wgsl     | 29 +++++++++++------------------
 wgpu/src/shader/triangle.wgsl | 29 +++++++++++------------------
 4 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index 9ea6ccbf..9ef66b28 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -132,6 +132,25 @@ impl Color {
         r | g | b | a
     }
 
+    /// Converts the [`Color`] into a `u32` value containing its linear RGBA8 components.
+    pub fn into_linear_u32(self) -> u32 {
+        let [r, g, b, a] = self.into_linear();
+
+        let [r, g, b, a] = [
+            (r * 255.0).round() as u8,
+            (g * 255.0).round() as u8,
+            (b * 255.0).round() as u8,
+            (a * 255.0).round() as u8,
+        ];
+
+        let r = (r as u32) << 24;
+        let g = (g as u32) << 16;
+        let b = (b as u32) << 8;
+        let a = a as u32;
+
+        r | g | b | a
+    }
+
     /// Inverts the [`Color`] in-place.
     pub fn invert(&mut self) {
         self.r = 1.0f32 - self.r;
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 57cc007f..97b0a6d7 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -103,11 +103,17 @@ impl Linear {
         let mut offsets = [0.0f32; 8];
 
         for (index, stop) in self.stops.iter().enumerate() {
-            let (color, offset) = stop
-                .map_or((Color::default().into_u32(), 2.0), |s| {
-                    (s.color.into_u32(), s.offset)
-                });
-            colors[index] = color;
+            let (color, offset) =
+                stop.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
+
+            if color::GAMMA_CORRECTION {
+                //correct colors, convert to linear before uploading to GPU
+                colors[index] = color.into_linear_u32();
+            } else {
+                //web colors, don't convert to linear before uploading to GPU
+                colors[index] = color.into_u32();
+            }
+
             offsets[index] = offset;
         }
 
@@ -139,16 +145,17 @@ pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
             let mut offsets = [0.0f32; 8];
 
             for (index, stop) in linear.stops.iter().enumerate() {
-                // let [r, g, b, a] =
-                //     color::pack(stop.map_or(Color::default(), |s| s.color))
-                //         .components();
-
                 let (color, offset) = stop
-                    .map_or((Color::default().into_u32(), 2.0), |s| {
-                        (s.color.into_u32(), s.offset)
-                    });
+                    .map_or((Color::default(), 2.0), |s| (s.color, s.offset));
+
+                if color::GAMMA_CORRECTION {
+                    //correct colors, convert to linear before uploading to GPU
+                    colors[index] = color.into_linear_u32();
+                } else {
+                    //web colors, don't convert to linear before uploading to GPU
+                    colors[index] = color.into_u32();
+                }
 
-                colors[index] = color;
                 offsets[index] = offset;
             }
 
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index fdcc6743..5a1237e6 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -38,17 +38,10 @@ fn select_border_radius(radi: vec4<f32>, position: vec2<f32>, center: vec2<f32>)
     return rx;
 }
 
-fn l(c: f32) -> f32 {
-    if (c < 0.04045) {
-        return c / 12.92;
-    } else {
-        return pow(((c + 0.055) / 1.055), 2.4);
-    };
-}
+fn unpack_u32(color: u32) -> vec4<f32> {
+    let u = unpack4x8unorm(color);
 
-fn to_linear(color: u32) -> vec4<f32> {
-    let c = unpack4x8unorm(color); //unpacks as a b g r
-    return vec4<f32>(l(c.w), l(c.z), l(c.y), c.x);
+    return vec4<f32>(u.w, u.z, u.y, u.x);
 }
 
 struct SolidVertexInput {
@@ -269,14 +262,14 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        to_linear(input.colors_1.x),
-        to_linear(input.colors_1.y),
-        to_linear(input.colors_1.z),
-        to_linear(input.colors_1.w),
-        to_linear(input.colors_2.x),
-        to_linear(input.colors_2.y),
-        to_linear(input.colors_2.z),
-        to_linear(input.colors_2.w),
+        unpack_u32(input.colors_1.x),
+        unpack_u32(input.colors_1.y),
+        unpack_u32(input.colors_1.z),
+        unpack_u32(input.colors_1.w),
+        unpack_u32(input.colors_2.x),
+        unpack_u32(input.colors_2.y),
+        unpack_u32(input.colors_2.z),
+        unpack_u32(input.colors_2.w),
     );
 
     var offsets = array<f32, 8>(
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
index 5a73a77f..f1bb2733 100644
--- a/wgpu/src/shader/triangle.wgsl
+++ b/wgpu/src/shader/triangle.wgsl
@@ -4,17 +4,10 @@ struct Globals {
 
 @group(0) @binding(0) var<uniform> globals: Globals;
 
-fn l(c: f32) -> f32 {
-    if (c < 0.04045) {
-        return c / 12.92;
-    } else {
-        return pow(((c + 0.055) / 1.055), 2.4);
-    };
-}
+fn unpack_u32(color: u32) -> vec4<f32> {
+    let u = unpack4x8unorm(color);
 
-fn to_linear(color: u32) -> vec4<f32> {
-    let c = unpack4x8unorm(color); //unpacks as a b g r
-    return vec4<f32>(l(c.w), l(c.z), l(c.y), c.x);
+    return vec4<f32>(u.w, u.z, u.y, u.x);
 }
 
 struct SolidVertexInput {
@@ -130,14 +123,14 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        to_linear(input.colors_1.x),
-        to_linear(input.colors_1.y),
-        to_linear(input.colors_1.z),
-        to_linear(input.colors_1.w),
-        to_linear(input.colors_2.x),
-        to_linear(input.colors_2.y),
-        to_linear(input.colors_2.z),
-        to_linear(input.colors_2.w),
+        unpack_u32(input.colors_1.x),
+        unpack_u32(input.colors_1.y),
+        unpack_u32(input.colors_1.z),
+        unpack_u32(input.colors_1.w),
+        unpack_u32(input.colors_2.x),
+        unpack_u32(input.colors_2.y),
+        unpack_u32(input.colors_2.z),
+        unpack_u32(input.colors_2.w),
     );
 
     var offsets = array<f32, 8>(

From 677f564f087b009842207e6df74aed343454ea17 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 7 Jun 2023 10:47:57 -0700
Subject: [PATCH 347/440] Switched to packing using f16s to maintain acceptable
 precision.

---
 core/src/color.rs             | 31 -------------
 graphics/Cargo.toml           |  1 +
 graphics/src/gradient.rs      | 76 ++++++++++++++++++++------------
 wgpu/src/quad/gradient.rs     | 24 +++++-----
 wgpu/src/shader/quad.wgsl     | 77 +++++++++++++++++---------------
 wgpu/src/shader/triangle.wgsl | 83 +++++++++++++++++++----------------
 wgpu/src/triangle.rs          | 16 ++++---
 7 files changed, 160 insertions(+), 148 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index 9ef66b28..1392f28b 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -120,37 +120,6 @@ impl Color {
         ]
     }
 
-    /// Converts the [`Color`] into a `u32` value containing its RGBA8 components.
-    pub fn into_u32(self) -> u32 {
-        let [r, g, b, a] = self.into_rgba8();
-
-        let r = (r as u32) << 24;
-        let g = (g as u32) << 16;
-        let b = (b as u32) << 8;
-        let a = a as u32;
-
-        r | g | b | a
-    }
-
-    /// Converts the [`Color`] into a `u32` value containing its linear RGBA8 components.
-    pub fn into_linear_u32(self) -> u32 {
-        let [r, g, b, a] = self.into_linear();
-
-        let [r, g, b, a] = [
-            (r * 255.0).round() as u8,
-            (g * 255.0).round() as u8,
-            (b * 255.0).round() as u8,
-            (a * 255.0).round() as u8,
-        ];
-
-        let r = (r as u32) << 24;
-        let g = (g as u32) << 16;
-        let b = (b as u32) << 8;
-        let a = a as u32;
-
-        r | g | b | a
-    }
-
     /// Inverts the [`Color`] in-place.
     pub fn invert(&mut self) {
         self.r = 1.0f32 - self.r;
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 0e22227d..02621695 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -18,6 +18,7 @@ web-colors = []
 
 [dependencies]
 glam = "0.24"
+half = "2.2.1"
 log = "0.4"
 raw-window-handle = "0.5"
 thiserror = "1.0"
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 97b0a6d7..3f5d0509 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -7,6 +7,7 @@ use crate::color;
 use crate::core::gradient::ColorStop;
 use crate::core::{self, Color, Point, Rectangle};
 
+use half::f16;
 use std::cmp::Ordering;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -99,24 +100,30 @@ impl Linear {
 
     /// Packs the [`Gradient`] for use in shader code.
     pub fn pack(&self) -> Packed {
-        let mut colors = [0u32; 8];
-        let mut offsets = [0.0f32; 8];
+        let mut colors = [[0u32; 2]; 8];
+        let mut offsets = [f16::from(0u8); 8];
 
         for (index, stop) in self.stops.iter().enumerate() {
-            let (color, offset) =
-                stop.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
+            let [r, g, b, a] =
+                color::pack(stop.map_or(Color::default(), |s| s.color))
+                    .components();
 
-            if color::GAMMA_CORRECTION {
-                //correct colors, convert to linear before uploading to GPU
-                colors[index] = color.into_linear_u32();
-            } else {
-                //web colors, don't convert to linear before uploading to GPU
-                colors[index] = color.into_u32();
-            }
+            colors[index] = [
+                pack_f16s([f16::from_f32(r), f16::from_f32(g)]),
+                pack_f16s([f16::from_f32(b), f16::from_f32(a)]),
+            ];
 
-            offsets[index] = offset;
+            offsets[index] =
+                stop.map_or(f16::from_f32(2.0), |s| f16::from_f32(s.offset));
         }
 
+        let offsets = [
+            pack_f16s([offsets[0], offsets[1]]),
+            pack_f16s([offsets[2], offsets[3]]),
+            pack_f16s([offsets[4], offsets[5]]),
+            pack_f16s([offsets[6], offsets[7]]),
+        ];
+
         let direction = [self.start.x, self.start.y, self.end.x, self.end.y];
 
         Packed {
@@ -131,9 +138,10 @@ impl Linear {
 #[derive(Debug, Copy, Clone, PartialEq)]
 #[repr(C)]
 pub struct Packed {
-    // 8 colors, each packed into a u32
-    colors: [u32; 8],
-    offsets: [f32; 8],
+    // 8 colors, each channel = 16 bit float, 2 colors packed into 1 u32
+    colors: [[u32; 2]; 8],
+    // 8 offsets, 8x 16 bit floats packed into 4 u32s
+    offsets: [u32; 4],
     direction: [f32; 4],
 }
 
@@ -141,24 +149,30 @@ pub struct Packed {
 pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
     match gradient {
         core::Gradient::Linear(linear) => {
-            let mut colors = [0u32; 8];
-            let mut offsets = [0.0f32; 8];
+            let mut colors = [[0u32; 2]; 8];
+            let mut offsets = [f16::from(0u8); 8];
 
             for (index, stop) in linear.stops.iter().enumerate() {
-                let (color, offset) = stop
-                    .map_or((Color::default(), 2.0), |s| (s.color, s.offset));
+                let [r, g, b, a] =
+                    color::pack(stop.map_or(Color::default(), |s| s.color))
+                        .components();
 
-                if color::GAMMA_CORRECTION {
-                    //correct colors, convert to linear before uploading to GPU
-                    colors[index] = color.into_linear_u32();
-                } else {
-                    //web colors, don't convert to linear before uploading to GPU
-                    colors[index] = color.into_u32();
-                }
+                colors[index] = [
+                    pack_f16s([f16::from_f32(r), f16::from_f32(g)]),
+                    pack_f16s([f16::from_f32(b), f16::from_f32(a)]),
+                ];
 
-                offsets[index] = offset;
+                offsets[index] = stop
+                    .map_or(f16::from_f32(2.0), |s| f16::from_f32(s.offset));
             }
 
+            let offsets = [
+                pack_f16s([offsets[0], offsets[1]]),
+                pack_f16s([offsets[2], offsets[3]]),
+                pack_f16s([offsets[4], offsets[5]]),
+                pack_f16s([offsets[6], offsets[7]]),
+            ];
+
             let (start, end) = linear.angle.to_distance(&bounds);
 
             let direction = [start.x, start.y, end.x, end.y];
@@ -171,3 +185,11 @@ pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
         }
     }
 }
+
+/// Packs two f16s into one u32.
+fn pack_f16s(f: [f16; 2]) -> u32 {
+    let one = (f[0].to_bits() as u32) << 16;
+    let two = f[1].to_bits() as u32;
+
+    one | two
+}
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index 1b45c9f4..6db37252 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -96,24 +96,26 @@ impl Pipeline {
                                 as u64,
                             step_mode: wgpu::VertexStepMode::Instance,
                             attributes: &wgpu::vertex_attr_array!(
-                                // Colors 1-4
+                                // Colors 1-2
                                 1 => Uint32x4,
-                                // Colors 5-8
+                                // Colors 3-4
                                 2 => Uint32x4,
-                                // Offsets 1-4
-                                3 => Float32x4,
-                                // Offsets 5-8
-                                4 => Float32x4,
+                                // Colors 5-6
+                                3 => Uint32x4,
+                                // Colors 7-8
+                                4 => Uint32x4,
+                                // Offsets 1-8
+                                5 => Uint32x4,
                                 // Direction
-                                5 => Float32x4,
-                                // Position & Scale
                                 6 => Float32x4,
-                                // Border color
+                                // Position & Scale
                                 7 => Float32x4,
-                                // Border radius
+                                // Border color
                                 8 => Float32x4,
+                                // Border radius
+                                9 => Float32x4,
                                 // Border width
-                                9 => Float32
+                                10 => Float32
                             ),
                         },
                     ],
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index 5a1237e6..fb402158 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -38,10 +38,11 @@ fn select_border_radius(radi: vec4<f32>, position: vec2<f32>, center: vec2<f32>)
     return rx;
 }
 
-fn unpack_u32(color: u32) -> vec4<f32> {
-    let u = unpack4x8unorm(color);
+fn unpack_u32(color: vec2<u32>) -> vec4<f32> {
+    let rg: vec2<f32> = unpack2x16float(color.x);
+    let ba: vec2<f32> = unpack2x16float(color.y);
 
-    return vec4<f32>(u.w, u.z, u.y, u.x);
+    return vec4<f32>(rg.y, rg.x, ba.y, ba.x);
 }
 
 struct SolidVertexInput {
@@ -148,26 +149,28 @@ struct GradientVertexInput {
     @location(0) v_pos: vec2<f32>,
     @location(1) colors_1: vec4<u32>,
     @location(2) colors_2: vec4<u32>,
-    @location(3) offsets_1: vec4<f32>,
-    @location(4) offsets_2: vec4<f32>,
-    @location(5) direction: vec4<f32>,
-    @location(6) position_and_scale: vec4<f32>,
-    @location(7) border_color: vec4<f32>,
-    @location(8) border_radius: vec4<f32>,
-    @location(9) border_width: f32,
+    @location(3) colors_3: vec4<u32>,
+    @location(4) colors_4: vec4<u32>,
+    @location(5) offsets: vec4<u32>,
+    @location(6) direction: vec4<f32>,
+    @location(7) position_and_scale: vec4<f32>,
+    @location(8) border_color: vec4<f32>,
+    @location(9) border_radius: vec4<f32>,
+    @location(10) border_width: f32,
 }
 
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(1) colors_1: vec4<u32>,
     @location(2) colors_2: vec4<u32>,
-    @location(3) offsets_1: vec4<f32>,
-    @location(4) offsets_2: vec4<f32>,
-    @location(5) direction: vec4<f32>,
-    @location(6) position_and_scale: vec4<f32>,
-    @location(7) border_color: vec4<f32>,
-    @location(8) border_radius: vec4<f32>,
-    @location(9) border_width: f32,
+    @location(3) colors_3: vec4<u32>,
+    @location(4) colors_4: vec4<u32>,
+    @location(5) offsets: vec4<u32>,
+    @location(6) direction: vec4<f32>,
+    @location(7) position_and_scale: vec4<f32>,
+    @location(8) border_color: vec4<f32>,
+    @location(9) border_radius: vec4<f32>,
+    @location(10) border_width: f32,
 }
 
 @vertex
@@ -195,8 +198,9 @@ fn gradient_vs_main(input: GradientVertexInput) -> GradientVertexOutput {
     out.position = globals.transform * transform * vec4<f32>(input.v_pos, 0.0, 1.0);
     out.colors_1 = input.colors_1;
     out.colors_2 = input.colors_2;
-    out.offsets_1 = input.offsets_1;
-    out.offsets_2 = input.offsets_2;
+    out.colors_3 = input.colors_3;
+    out.colors_4 = input.colors_4;
+    out.offsets = input.offsets;
     out.direction = input.direction * globals.scale;
     out.position_and_scale = vec4<f32>(pos, scale);
     out.border_color = input.border_color;
@@ -262,25 +266,28 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        unpack_u32(input.colors_1.x),
-        unpack_u32(input.colors_1.y),
-        unpack_u32(input.colors_1.z),
-        unpack_u32(input.colors_1.w),
-        unpack_u32(input.colors_2.x),
-        unpack_u32(input.colors_2.y),
-        unpack_u32(input.colors_2.z),
-        unpack_u32(input.colors_2.w),
+        unpack_u32(input.colors_1.xy),
+        unpack_u32(input.colors_1.zw),
+        unpack_u32(input.colors_2.xy),
+        unpack_u32(input.colors_2.zw),
+        unpack_u32(input.colors_3.xy),
+        unpack_u32(input.colors_3.zw),
+        unpack_u32(input.colors_4.xy),
+        unpack_u32(input.colors_4.zw),
     );
 
+    let offsets_1: vec4<f32> = unpack_u32(input.offsets.xy);
+    let offsets_2: vec4<f32> = unpack_u32(input.offsets.zw);
+
     var offsets = array<f32, 8>(
-        input.offsets_1.x,
-        input.offsets_1.y,
-        input.offsets_1.z,
-        input.offsets_1.w,
-        input.offsets_2.x,
-        input.offsets_2.y,
-        input.offsets_2.z,
-        input.offsets_2.w,
+        offsets_1.x,
+        offsets_1.y,
+        offsets_1.z,
+        offsets_1.w,
+        offsets_2.x,
+        offsets_2.y,
+        offsets_2.z,
+        offsets_2.w,
     );
 
     //TODO could just pass this in to the shader but is probably more performant to just check it here
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
index f1bb2733..9f512d14 100644
--- a/wgpu/src/shader/triangle.wgsl
+++ b/wgpu/src/shader/triangle.wgsl
@@ -4,10 +4,11 @@ struct Globals {
 
 @group(0) @binding(0) var<uniform> globals: Globals;
 
-fn unpack_u32(color: u32) -> vec4<f32> {
-    let u = unpack4x8unorm(color);
+fn unpack_u32(color: vec2<u32>) -> vec4<f32> {
+    let rg: vec2<f32> = unpack2x16float(color.x);
+    let ba: vec2<f32> = unpack2x16float(color.y);
 
-    return vec4<f32>(u.w, u.z, u.y, u.x);
+    return vec4<f32>(rg.y, rg.x, ba.y, ba.x);
 }
 
 struct SolidVertexInput {
@@ -35,34 +36,39 @@ fn solid_fs_main(input: SolidVertexOutput) -> @location(0) vec4<f32> {
     return input.color;
 }
 
+struct GradientVertexInput {
+    @location(0) v_pos: vec2<f32>,
+    @location(1) colors_1: vec4<u32>,
+    @location(2) colors_2: vec4<u32>,
+    @location(3) colors_3: vec4<u32>,
+    @location(4) colors_4: vec4<u32>,
+    @location(5) offsets: vec4<u32>,
+    @location(6) direction: vec4<f32>,
+}
+
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(0) raw_position: vec2<f32>,
     @location(1) colors_1: vec4<u32>,
     @location(2) colors_2: vec4<u32>,
-    @location(3) offsets_1: vec4<f32>,
-    @location(4) offsets_2: vec4<f32>,
-    @location(5) direction: vec4<f32>,
+    @location(3) colors_3: vec4<u32>,
+    @location(4) colors_4: vec4<u32>,
+    @location(5) offsets: vec4<u32>,
+    @location(6) direction: vec4<f32>,
 }
 
 @vertex
-fn gradient_vs_main(
-    @location(0) input: vec2<f32>,
-    @location(1) colors_1: vec4<u32>,
-    @location(2) colors_2: vec4<u32>,
-    @location(3) offsets_1: vec4<f32>,
-    @location(4) offsets_2: vec4<f32>,
-    @location(5) direction: vec4<f32>,
-) -> GradientVertexOutput {
+fn gradient_vs_main(input: GradientVertexInput) -> GradientVertexOutput {
     var output: GradientVertexOutput;
 
-    output.position = globals.transform * vec4<f32>(input.xy, 0.0, 1.0);
-    output.raw_position = input;
-    output.colors_1 = colors_1;
-    output.colors_2 = colors_2;
-    output.offsets_1 = offsets_1;
-    output.offsets_2 = offsets_2;
-    output.direction = direction;
+    output.position = globals.transform * vec4<f32>(input.v_pos, 0.0, 1.0);
+    output.raw_position = input.v_pos;
+    output.colors_1 = input.colors_1;
+    output.colors_2 = input.colors_2;
+    output.colors_3 = input.colors_3;
+    output.colors_4 = input.colors_4;
+    output.offsets = input.offsets;
+    output.direction = input.direction;
 
     return output;
 }
@@ -123,25 +129,28 @@ fn gradient(
 @fragment
 fn gradient_fs_main(input: GradientVertexOutput) -> @location(0) vec4<f32> {
     let colors = array<vec4<f32>, 8>(
-        unpack_u32(input.colors_1.x),
-        unpack_u32(input.colors_1.y),
-        unpack_u32(input.colors_1.z),
-        unpack_u32(input.colors_1.w),
-        unpack_u32(input.colors_2.x),
-        unpack_u32(input.colors_2.y),
-        unpack_u32(input.colors_2.z),
-        unpack_u32(input.colors_2.w),
+        unpack_u32(input.colors_1.xy),
+        unpack_u32(input.colors_1.zw),
+        unpack_u32(input.colors_2.xy),
+        unpack_u32(input.colors_2.zw),
+        unpack_u32(input.colors_3.xy),
+        unpack_u32(input.colors_3.zw),
+        unpack_u32(input.colors_4.xy),
+        unpack_u32(input.colors_4.zw),
     );
 
+    let offsets_1: vec4<f32> = unpack_u32(input.offsets.xy);
+    let offsets_2: vec4<f32> = unpack_u32(input.offsets.zw);
+
     var offsets = array<f32, 8>(
-        input.offsets_1.x,
-        input.offsets_1.y,
-        input.offsets_1.z,
-        input.offsets_1.w,
-        input.offsets_2.x,
-        input.offsets_2.y,
-        input.offsets_2.z,
-        input.offsets_2.w,
+        offsets_1.x,
+        offsets_1.y,
+        offsets_1.z,
+        offsets_1.w,
+        offsets_2.x,
+        offsets_2.y,
+        offsets_2.z,
+        offsets_2.w,
     );
 
     var last_index = 7;
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 3f633e14..3f3635cf 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -652,16 +652,18 @@ mod gradient {
                             attributes: &wgpu::vertex_attr_array!(
                                 // Position
                                 0 => Float32x2,
-                                // Colors 1-4
+                                // Colors 1-2
                                 1 => Uint32x4,
-                                // Colors 5-8,
+                                // Colors 3-4
                                 2 => Uint32x4,
-                                // Offsets 1-4
-                                3 => Float32x4,
-                                // Offsets 5-8
-                                4 => Float32x4,
+                                // Colors 5-6
+                                3 => Uint32x4,
+                                // Colors 7-8
+                                4 => Uint32x4,
+                                // Offsets
+                                5 => Uint32x4,
                                 // Direction
-                                5 => Float32x4
+                                6 => Float32x4
                             ),
                         }],
                     },

From cdfb8b30680de164280b8b90fbc08a1638e597e2 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Tue, 6 Jun 2023 21:12:41 -0700
Subject: [PATCH 348/440] feat: add progress indicators example

---
 examples/progress_indicators/Cargo.toml      |  13 +
 examples/progress_indicators/README.md       |  14 +
 examples/progress_indicators/src/circular.rs | 425 +++++++++++++++++++
 examples/progress_indicators/src/easing.rs   |  67 +++
 examples/progress_indicators/src/linear.rs   | 325 ++++++++++++++
 examples/progress_indicators/src/main.rs     | 104 +++++
 6 files changed, 948 insertions(+)
 create mode 100644 examples/progress_indicators/Cargo.toml
 create mode 100644 examples/progress_indicators/README.md
 create mode 100644 examples/progress_indicators/src/circular.rs
 create mode 100644 examples/progress_indicators/src/easing.rs
 create mode 100644 examples/progress_indicators/src/linear.rs
 create mode 100644 examples/progress_indicators/src/main.rs

diff --git a/examples/progress_indicators/Cargo.toml b/examples/progress_indicators/Cargo.toml
new file mode 100644
index 00000000..89ceb127
--- /dev/null
+++ b/examples/progress_indicators/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "progress_indicators"
+version = "0.1.0"
+authors = ["Nick Senger <dev@nsenger.com>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+flo_curves = "0.7"
+iced = { path = "../..", features = ["canvas"] }
+iced_core = { path = "../../core" }
+iced_widget = { path = "../../widget" }
+lazy_static = "1.4"
diff --git a/examples/progress_indicators/README.md b/examples/progress_indicators/README.md
new file mode 100644
index 00000000..acacca8f
--- /dev/null
+++ b/examples/progress_indicators/README.md
@@ -0,0 +1,14 @@
+## Progress indicators
+
+Example implementation of animated indeterminate progress indicators.
+
+<div align="center">
+  <a href="https://gfycat.com/importantdevotedhammerheadbird">
+    <img src="https://thumbs.gfycat.com/ImportantDevotedHammerheadbird-small.gif">
+  </a>
+</div>
+
+You can run it with `cargo run`:
+```
+cargo run --package progress_indicators
+```
diff --git a/examples/progress_indicators/src/circular.rs b/examples/progress_indicators/src/circular.rs
new file mode 100644
index 00000000..2a9f7e1e
--- /dev/null
+++ b/examples/progress_indicators/src/circular.rs
@@ -0,0 +1,425 @@
+//! Show a circular progress indicator.
+use iced::widget::canvas::{self, Cursor, Program, Renderer as CanvasRenderer};
+use iced::window;
+use iced_core::event::{self, Event};
+use iced_core::time::Instant;
+use iced_core::widget::tree::{self, Tree};
+use iced_core::window::RedrawRequest;
+use iced_core::{layout, Size};
+use iced_core::{renderer, Vector};
+use iced_core::{
+    Background, Clipboard, Color, Element, Layout, Length, Point, Rectangle,
+    Renderer, Shell, Widget,
+};
+
+use super::easing::{self, Easing};
+
+use std::borrow::Cow;
+use std::f32::consts::PI;
+use std::time::Duration;
+
+type R<Theme> = iced_widget::renderer::Renderer<Theme>;
+
+const MIN_RADIANS: f32 = PI / 8.0;
+const WRAP_RADIANS: f32 = 2.0 * PI - PI / 4.0;
+const PROCESSION_VELOCITY: u32 = u32::MAX / 120;
+
+#[allow(missing_debug_implementations)]
+pub struct Circular<'a, Theme>
+where
+    Theme: StyleSheet,
+{
+    size: f32,
+    bar_height: f32,
+    style: <Theme as StyleSheet>::Style,
+    easing: Cow<'a, Easing>,
+    cycle_duration: Duration,
+}
+
+impl<'a, Theme> Circular<'a, Theme>
+where
+    Theme: StyleSheet,
+{
+    /// Creates a new [`Circular`] with the given content.
+    pub fn new() -> Self {
+        Circular {
+            size: 40.0,
+            bar_height: 4.0,
+            style: <Theme as StyleSheet>::Style::default(),
+            easing: Cow::Borrowed(&easing::STANDARD),
+            cycle_duration: Duration::from_millis(600),
+        }
+    }
+
+    /// Sets the size of the [`Circular`].
+    pub fn size(mut self, size: f32) -> Self {
+        self.size = size;
+        self
+    }
+
+    /// Sets the bar height of the [`Circular`].
+    pub fn bar_height(mut self, bar_height: f32) -> Self {
+        self.bar_height = bar_height;
+        self
+    }
+
+    /// Sets the style variant of this [`Circular`].
+    pub fn style(mut self, style: <Theme as StyleSheet>::Style) -> Self {
+        self.style = style;
+        self
+    }
+
+    /// Sets the easing of this [`Circular`].
+    pub fn easing(mut self, easing: impl Into<Cow<'a, Easing>>) -> Self {
+        self.easing = easing.into();
+        self
+    }
+
+    /// Sets the cycle duration of this [`Circular`].
+    pub fn cycle_duration(mut self, duration: Duration) -> Self {
+        self.cycle_duration = duration / 2;
+        self
+    }
+}
+
+impl<'a, Theme> Default for Circular<'a, Theme>
+where
+    Theme: StyleSheet,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[derive(Clone, Copy)]
+enum State {
+    Expanding {
+        start: Instant,
+        progress: f32,
+        procession: u32,
+    },
+    Contracting {
+        start: Instant,
+        progress: f32,
+        procession: u32,
+    },
+}
+
+impl Default for State {
+    fn default() -> Self {
+        Self::Expanding {
+            start: Instant::now(),
+            progress: 0.0,
+            procession: 0,
+        }
+    }
+}
+
+impl State {
+    fn next(&self, now: Instant) -> Self {
+        match self {
+            Self::Expanding { procession, .. } => Self::Contracting {
+                start: now,
+                progress: 0.0,
+                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+            },
+            Self::Contracting { procession, .. } => Self::Expanding {
+                start: now,
+                progress: 0.0,
+                procession: procession.wrapping_add(
+                    PROCESSION_VELOCITY.wrapping_add(
+                        ((WRAP_RADIANS / (2.0 * PI)) * u32::MAX as f32) as u32,
+                    ),
+                ),
+            },
+        }
+    }
+
+    fn start(&self) -> Instant {
+        match self {
+            Self::Expanding { start, .. } | Self::Contracting { start, .. } => {
+                *start
+            }
+        }
+    }
+
+    fn timed_transition(&self, cycle_duration: Duration, now: Instant) -> Self {
+        let elapsed = now.duration_since(self.start());
+
+        match elapsed {
+            elapsed if elapsed > cycle_duration => self.next(now),
+            _ => self.with_elapsed(cycle_duration, elapsed),
+        }
+    }
+
+    fn with_elapsed(
+        &self,
+        cycle_duration: Duration,
+        elapsed: Duration,
+    ) -> Self {
+        let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
+        match self {
+            Self::Expanding {
+                start, procession, ..
+            } => Self::Expanding {
+                start: *start,
+                progress,
+                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+            },
+            Self::Contracting {
+                start, procession, ..
+            } => Self::Contracting {
+                start: *start,
+                progress,
+                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+            },
+        }
+    }
+
+    fn procession(&self) -> f32 {
+        match self {
+            Self::Expanding { procession, .. }
+            | Self::Contracting { procession, .. } => {
+                *procession as f32 / u32::MAX as f32
+            }
+        }
+    }
+}
+
+impl<'a, Message, Theme> Widget<Message, R<Theme>> for Circular<'a, Theme>
+where
+    Message: 'a + Clone,
+    Theme: StyleSheet,
+{
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::of::<State>()
+    }
+
+    fn state(&self) -> tree::State {
+        tree::State::new(State::default())
+    }
+
+    fn width(&self) -> Length {
+        Length::Fixed(self.size)
+    }
+
+    fn height(&self) -> Length {
+        Length::Fixed(self.size)
+    }
+
+    fn layout(
+        &self,
+        _renderer: &iced_widget::renderer::Renderer<Theme>,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        let limits = limits.width(self.size).height(self.size);
+        let size = limits.resolve(Size::ZERO);
+
+        layout::Node::new(size)
+    }
+
+    fn on_event(
+        &mut self,
+        tree: &mut Tree,
+        event: Event,
+        _layout: Layout<'_>,
+        _cursor_position: Point,
+        _renderer: &iced_widget::renderer::Renderer<Theme>,
+        _clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        let state = tree.state.downcast_mut::<State>();
+
+        if let Event::Window(window::Event::RedrawRequested(now)) = event {
+            *state = state.timed_transition(self.cycle_duration, now);
+
+            shell.request_redraw(RedrawRequest::NextFrame);
+        }
+
+        event::Status::Ignored
+    }
+
+    fn draw(
+        &self,
+        tree: &Tree,
+        renderer: &mut R<Theme>,
+        theme: &Theme,
+        _style: &renderer::Style,
+        layout: Layout<'_>,
+        _cursor_position: Point,
+        _viewport: &Rectangle,
+    ) {
+        let bounds = layout.bounds();
+        let state = tree.state.downcast_ref::<State>();
+
+        renderer.with_translation(
+            Vector::new(bounds.x, bounds.y),
+            |renderer| {
+                renderer.draw(<StateWithStyle<Theme> as Program<
+                    Message,
+                    R<Theme>,
+                >>::draw(
+                    &StateWithStyle {
+                        state,
+                        style: &self.style,
+                        bar_height: self.bar_height,
+                        easing: self.easing.as_ref(),
+                    },
+                    &(),
+                    renderer,
+                    theme,
+                    bounds,
+                    Cursor::Unavailable,
+                ));
+            },
+        );
+    }
+}
+
+impl<'a, Message, Theme> From<Circular<'a, Theme>>
+    for Element<'a, Message, R<Theme>>
+where
+    Message: Clone + 'a,
+    Theme: StyleSheet + 'a,
+{
+    fn from(circular: Circular<'a, Theme>) -> Self {
+        Self::new(circular)
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Appearance {
+    /// The [`Background`] of the progress indicator.
+    pub background: Option<Background>,
+    /// The track [`Color`] of the progress indicator.
+    pub track_color: Color,
+    /// The bar [`Color`] of the progress indicator.
+    pub bar_color: Color,
+}
+
+impl std::default::Default for Appearance {
+    fn default() -> Self {
+        Self {
+            background: None,
+            track_color: Color::TRANSPARENT,
+            bar_color: Color::BLACK,
+        }
+    }
+}
+
+/// A set of rules that dictate the style of an indicator.
+pub trait StyleSheet {
+    /// The supported style of the [`StyleSheet`].
+    type Style: Default;
+
+    /// Produces the active [`Appearance`] of a indicator.
+    fn appearance(&self, style: &Self::Style) -> Appearance;
+}
+
+impl StyleSheet for iced::Theme {
+    type Style = ();
+
+    fn appearance(&self, _style: &Self::Style) -> Appearance {
+        let palette = self.extended_palette();
+
+        Appearance {
+            background: None,
+            track_color: palette.background.weak.color,
+            bar_color: palette.primary.base.color,
+        }
+    }
+}
+
+struct StateWithStyle<'a, Theme>
+where
+    Theme: StyleSheet,
+{
+    state: &'a State,
+    style: &'a <Theme as StyleSheet>::Style,
+    easing: &'a Easing,
+    bar_height: f32,
+}
+
+impl<'a, Message, Theme>
+    canvas::Program<Message, iced_widget::renderer::Renderer<Theme>>
+    for StateWithStyle<'a, Theme>
+where
+    Theme: StyleSheet,
+{
+    type State = ();
+
+    fn update(
+        &self,
+        _state: &mut Self::State,
+        _event: canvas::Event,
+        _bounds: Rectangle,
+        _cursor: canvas::Cursor,
+    ) -> (canvas::event::Status, Option<Message>) {
+        (canvas::event::Status::Ignored, None)
+    }
+
+    fn draw(
+        &self,
+        _state: &Self::State,
+        renderer: &iced_widget::renderer::Renderer<Theme>,
+        theme: &Theme,
+        bounds: Rectangle,
+        _cursor: canvas::Cursor,
+    ) -> Vec<canvas::Geometry> {
+        let mut frame = canvas::Frame::new(renderer, bounds.size());
+        let custom_style = <Theme as StyleSheet>::appearance(theme, self.style);
+        let track_radius = frame.width() / 2.0 - self.bar_height;
+
+        if let Some(Background::Color(color)) = custom_style.background {
+            let background_path =
+                canvas::Path::circle(frame.center(), track_radius);
+            frame.fill(&background_path, color);
+        }
+
+        let track_path = canvas::Path::circle(frame.center(), track_radius);
+
+        frame.stroke(
+            &track_path,
+            canvas::Stroke::default()
+                .with_color(custom_style.track_color)
+                .with_width(self.bar_height),
+        );
+
+        let mut builder = canvas::path::Builder::new();
+
+        let start = self.state.procession() * 2.0 * PI;
+
+        match self.state {
+            State::Expanding { progress, .. } => {
+                builder.arc(canvas::path::Arc {
+                    center: frame.center(),
+                    radius: track_radius,
+                    start_angle: start,
+                    end_angle: start
+                        + MIN_RADIANS
+                        + WRAP_RADIANS * (self.easing.y_at_x(*progress)),
+                });
+            }
+            State::Contracting { progress, .. } => {
+                builder.arc(canvas::path::Arc {
+                    center: frame.center(),
+                    radius: track_radius,
+                    start_angle: start
+                        + WRAP_RADIANS * (self.easing.y_at_x(*progress)),
+                    end_angle: start + MIN_RADIANS + WRAP_RADIANS,
+                });
+            }
+        }
+
+        let bar_path = builder.build();
+
+        frame.stroke(
+            &bar_path,
+            canvas::Stroke::default()
+                .with_color(custom_style.bar_color)
+                .with_width(self.bar_height),
+        );
+
+        vec![frame.into_geometry()]
+    }
+}
diff --git a/examples/progress_indicators/src/easing.rs b/examples/progress_indicators/src/easing.rs
new file mode 100644
index 00000000..10479659
--- /dev/null
+++ b/examples/progress_indicators/src/easing.rs
@@ -0,0 +1,67 @@
+use flo_curves::bezier::Curve;
+use flo_curves::*;
+use lazy_static::lazy_static;
+
+use std::borrow::Cow;
+
+lazy_static! {
+    pub static ref EXAMPLES: [Easing; 3] = [
+        Easing::CubicBezier(Curve::from_points(
+            Coord2(0.0, 0.0),
+            (Coord2(0.05, 0.7), Coord2(0.1, 1.0)),
+            Coord2(1.0, 1.0),
+        )),
+        Easing::CubicBezier(Curve::from_points(
+            Coord2(0.0, 0.0),
+            (Coord2(0.3, 0.0), Coord2(0.8, 0.15)),
+            Coord2(1.0, 1.0),
+        )),
+        Easing::CubicBezier(Curve::from_points(
+            Coord2(0.0, 0.0),
+            (Coord2(0.2, 0.0), Coord2(0.0, 1.0)),
+            Coord2(1.0, 1.0),
+        ))
+    ];
+    pub static ref STANDARD: Easing = {
+        Easing::CubicBezier(Curve::from_points(
+            Coord2(0.0, 0.0),
+            (Coord2(0.2, 0.0), Coord2(0.0, 1.0)),
+            Coord2(1.0, 1.0),
+        ))
+    };
+}
+
+#[derive(Clone, Debug)]
+pub enum Easing {
+    BezierPath(Vec<Curve<Coord2>>),
+    CubicBezier(Curve<Coord2>),
+}
+
+impl Easing {
+    pub fn y_at_x(&self, x: f32) -> f32 {
+        let x = x as f64;
+
+        match self {
+            Self::BezierPath(curves) => curves
+                .iter()
+                .find_map(|curve| {
+                    (curve.start_point().0 <= x && curve.end_point().0 >= x)
+                        .then(|| curve.point_at_pos(x).1 as f32)
+                })
+                .unwrap_or_default(),
+            Self::CubicBezier(curve) => curve.point_at_pos(x).1 as f32,
+        }
+    }
+}
+
+impl<'a> From<Easing> for Cow<'a, Easing> {
+    fn from(easing: Easing) -> Self {
+        Cow::Owned(easing)
+    }
+}
+
+impl<'a> From<&'a Easing> for Cow<'a, Easing> {
+    fn from(easing: &'a Easing) -> Self {
+        Cow::Borrowed(easing)
+    }
+}
diff --git a/examples/progress_indicators/src/linear.rs b/examples/progress_indicators/src/linear.rs
new file mode 100644
index 00000000..735892e7
--- /dev/null
+++ b/examples/progress_indicators/src/linear.rs
@@ -0,0 +1,325 @@
+//! Show a linear progress indicator.
+use iced::window;
+use iced_core::event::{self, Event};
+use iced_core::renderer;
+use iced_core::time::Instant;
+use iced_core::widget::tree::{self, Tree};
+use iced_core::window::RedrawRequest;
+use iced_core::{layout, Size};
+use iced_core::{
+    Background, Clipboard, Color, Element, Layout, Length, Point, Rectangle,
+    Shell, Widget,
+};
+
+use super::easing::{self, Easing};
+
+use std::borrow::Cow;
+use std::time::Duration;
+
+#[allow(missing_debug_implementations)]
+pub struct Linear<'a, Renderer>
+where
+    Renderer: iced_core::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    width: Length,
+    height: Length,
+    style: <Renderer::Theme as StyleSheet>::Style,
+    easing: Cow<'a, Easing>,
+    cycle_duration: Duration,
+}
+
+impl<'a, Renderer> Linear<'a, Renderer>
+where
+    Renderer: iced_widget::core::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    /// Creates a new [`Linear`] with the given content.
+    pub fn new() -> Self {
+        Linear {
+            width: Length::Fixed(100.0),
+            height: Length::Fixed(4.0),
+            style: <Renderer::Theme as StyleSheet>::Style::default(),
+            easing: Cow::Borrowed(&easing::STANDARD),
+            cycle_duration: Duration::from_millis(600),
+        }
+    }
+
+    /// Sets the width of the [`Linear`].
+    pub fn width(mut self, width: impl Into<Length>) -> Self {
+        self.width = width.into();
+        self
+    }
+
+    /// Sets the height of the [`Linear`].
+    pub fn height(mut self, height: impl Into<Length>) -> Self {
+        self.height = height.into();
+        self
+    }
+
+    /// Sets the style variant of this [`Linear`].
+    pub fn style(
+        mut self,
+        style: <Renderer::Theme as StyleSheet>::Style,
+    ) -> Self {
+        self.style = style;
+        self
+    }
+
+    /// Sets the motion easing of this [`Linear`].
+    pub fn easing(mut self, easing: impl Into<Cow<'a, Easing>>) -> Self {
+        self.easing = easing.into();
+        self
+    }
+
+    /// Sets the cycle duration of this [`Linear`].
+    pub fn cycle_duration(mut self, duration: Duration) -> Self {
+        self.cycle_duration = duration / 2;
+        self
+    }
+}
+
+impl<'a, Renderer> Default for Linear<'a, Renderer>
+where
+    Renderer: iced_core::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[derive(Clone, Copy)]
+enum State {
+    Expanding { start: Instant, progress: f32 },
+    Contracting { start: Instant, progress: f32 },
+}
+
+impl Default for State {
+    fn default() -> Self {
+        Self::Expanding {
+            start: Instant::now(),
+            progress: 0.0,
+        }
+    }
+}
+
+impl State {
+    fn next(&self, now: Instant) -> Self {
+        match self {
+            Self::Expanding { .. } => Self::Contracting {
+                start: now,
+                progress: 0.0,
+            },
+            Self::Contracting { .. } => Self::Expanding {
+                start: now,
+                progress: 0.0,
+            },
+        }
+    }
+
+    fn start(&self) -> Instant {
+        match self {
+            Self::Expanding { start, .. } | Self::Contracting { start, .. } => {
+                *start
+            }
+        }
+    }
+
+    fn timed_transition(&self, cycle_duration: Duration, now: Instant) -> Self {
+        let elapsed = now.duration_since(self.start());
+
+        match elapsed {
+            elapsed if elapsed > cycle_duration => self.next(now),
+            _ => self.with_elapsed(cycle_duration, elapsed),
+        }
+    }
+
+    fn with_elapsed(
+        &self,
+        cycle_duration: Duration,
+        elapsed: Duration,
+    ) -> Self {
+        let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
+        match self {
+            Self::Expanding { start, .. } => Self::Expanding {
+                start: *start,
+                progress,
+            },
+            Self::Contracting { start, .. } => Self::Contracting {
+                start: *start,
+                progress,
+            },
+        }
+    }
+}
+
+impl<'a, Message, Renderer> Widget<Message, Renderer> for Linear<'a, Renderer>
+where
+    Message: 'a + Clone,
+    Renderer: 'a + iced_core::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    fn tag(&self) -> tree::Tag {
+        tree::Tag::of::<State>()
+    }
+
+    fn state(&self) -> tree::State {
+        tree::State::new(State::default())
+    }
+
+    fn width(&self) -> Length {
+        self.width
+    }
+
+    fn height(&self) -> Length {
+        self.height
+    }
+
+    fn layout(
+        &self,
+        _renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        let limits = limits.width(self.width).height(self.height);
+        let size = limits.resolve(Size::ZERO);
+
+        layout::Node::new(size)
+    }
+
+    fn on_event(
+        &mut self,
+        tree: &mut Tree,
+        event: Event,
+        _layout: Layout<'_>,
+        _cursor_position: Point,
+        _renderer: &Renderer,
+        _clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        let state = tree.state.downcast_mut::<State>();
+
+        if let Event::Window(window::Event::RedrawRequested(now)) = event {
+            *state = state.timed_transition(self.cycle_duration, now);
+
+            shell.request_redraw(RedrawRequest::NextFrame);
+        }
+
+        event::Status::Ignored
+    }
+
+    fn draw(
+        &self,
+        tree: &Tree,
+        renderer: &mut Renderer,
+        theme: &Renderer::Theme,
+        _style: &renderer::Style,
+        layout: Layout<'_>,
+        _cursor_position: Point,
+        _viewport: &Rectangle,
+    ) {
+        let bounds = layout.bounds();
+        let custom_style = theme.appearance(&self.style);
+        let state = tree.state.downcast_ref::<State>();
+
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds: Rectangle {
+                    x: bounds.x,
+                    y: bounds.y,
+                    width: bounds.width,
+                    height: bounds.height,
+                },
+                border_radius: 0.0.into(),
+                border_width: 0.0,
+                border_color: Color::TRANSPARENT,
+            },
+            Background::Color(custom_style.track_color),
+        );
+
+        match state {
+            State::Expanding { progress, .. } => renderer.fill_quad(
+                renderer::Quad {
+                    bounds: Rectangle {
+                        x: bounds.x,
+                        y: bounds.y,
+                        width: self.easing.y_at_x(*progress) * bounds.width,
+                        height: bounds.height,
+                    },
+                    border_radius: 0.0.into(),
+                    border_width: 0.0,
+                    border_color: Color::TRANSPARENT,
+                },
+                Background::Color(custom_style.bar_color),
+            ),
+
+            State::Contracting { progress, .. } => renderer.fill_quad(
+                renderer::Quad {
+                    bounds: Rectangle {
+                        x: bounds.x
+                            + self.easing.y_at_x(*progress) * bounds.width,
+                        y: bounds.y,
+                        width: (1.0 - self.easing.y_at_x(*progress))
+                            * bounds.width,
+                        height: bounds.height,
+                    },
+                    border_radius: 0.0.into(),
+                    border_width: 0.0,
+                    border_color: Color::TRANSPARENT,
+                },
+                Background::Color(custom_style.bar_color),
+            ),
+        }
+    }
+}
+
+impl<'a, Message, Renderer> From<Linear<'a, Renderer>>
+    for Element<'a, Message, Renderer>
+where
+    Message: Clone + 'a,
+    Renderer: iced_core::Renderer + 'a,
+    Renderer::Theme: StyleSheet,
+{
+    fn from(linear: Linear<'a, Renderer>) -> Self {
+        Self::new(linear)
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Appearance {
+    /// The track [`Color`] of the progress indicator.
+    pub track_color: Color,
+    /// The bar [`Color`] of the progress indicator.
+    pub bar_color: Color,
+}
+
+impl std::default::Default for Appearance {
+    fn default() -> Self {
+        Self {
+            track_color: Color::TRANSPARENT,
+            bar_color: Color::BLACK,
+        }
+    }
+}
+
+/// A set of rules that dictate the style of an indicator.
+pub trait StyleSheet {
+    /// The supported style of the [`StyleSheet`].
+    type Style: Default;
+
+    /// Produces the active [`Appearance`] of a indicator.
+    fn appearance(&self, style: &Self::Style) -> Appearance;
+}
+
+impl StyleSheet for iced::Theme {
+    type Style = ();
+
+    fn appearance(&self, _style: &Self::Style) -> Appearance {
+        let palette = self.extended_palette();
+
+        Appearance {
+            track_color: palette.background.weak.color,
+            bar_color: palette.primary.base.color,
+        }
+    }
+}
diff --git a/examples/progress_indicators/src/main.rs b/examples/progress_indicators/src/main.rs
new file mode 100644
index 00000000..136b8d8c
--- /dev/null
+++ b/examples/progress_indicators/src/main.rs
@@ -0,0 +1,104 @@
+use iced::executor;
+use iced::widget::{column, container, row, slider, text};
+use iced::{Application, Command, Element, Length, Settings, Theme};
+
+use std::time::Duration;
+
+mod circular;
+mod easing;
+mod linear;
+
+use circular::Circular;
+use linear::Linear;
+
+pub fn main() -> iced::Result {
+    ProgressIndicators::run(Settings {
+        antialiasing: true,
+        ..Default::default()
+    })
+}
+
+struct ProgressIndicators {
+    cycle_duration: f32,
+}
+
+impl Default for ProgressIndicators {
+    fn default() -> Self {
+        Self {
+            cycle_duration: 2.0,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+enum Message {
+    CycleDurationChanged(f32),
+}
+
+impl Application for ProgressIndicators {
+    type Message = Message;
+    type Flags = ();
+    type Executor = executor::Default;
+    type Theme = Theme;
+
+    fn new(_flags: Self::Flags) -> (Self, Command<Message>) {
+        (Self::default(), Command::none())
+    }
+
+    fn title(&self) -> String {
+        String::from("Progress Indicators - Iced")
+    }
+
+    fn update(&mut self, message: Message) -> Command<Message> {
+        match message {
+            Message::CycleDurationChanged(duration) => {
+                self.cycle_duration = duration;
+            }
+        }
+
+        Command::none()
+    }
+
+    fn view(&self) -> Element<Message> {
+        let column = easing::EXAMPLES
+            .iter()
+            .zip(["Decelerating:", "Accelerating:", "Standard:"])
+            .fold(column![], |column, (easing, label)| {
+                column.push(
+                    row![
+                        text(label).width(150),
+                        Linear::new().easing(easing).cycle_duration(
+                            Duration::from_secs_f32(self.cycle_duration)
+                        ),
+                        Circular::new().easing(easing).cycle_duration(
+                            Duration::from_secs_f32(self.cycle_duration)
+                        )
+                    ]
+                    .align_items(iced::Alignment::Center)
+                    .spacing(20.0),
+                )
+            })
+            .spacing(20);
+
+        container(
+            column.push(
+                row(vec![
+                    text("Cycle duration:").into(),
+                    slider(1.0..=1000.0, self.cycle_duration * 100.0, |x| {
+                        Message::CycleDurationChanged(x / 100.0)
+                    })
+                    .width(150.0)
+                    .into(),
+                    text(format!("{:.2}s", self.cycle_duration)).into(),
+                ])
+                .align_items(iced::Alignment::Center)
+                .spacing(20.0),
+            ),
+        )
+        .width(Length::Fill)
+        .height(Length::Fill)
+        .center_x()
+        .center_y()
+        .into()
+    }
+}

From 2ebc92319711e6fa0dda310939257334625b59c9 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Wed, 7 Jun 2023 15:19:11 -0700
Subject: [PATCH 349/440] feat: use lyon for easing

---
 .../Cargo.toml                                |   5 +-
 .../README.md                                 |   6 +-
 .../src/circular.rs                           |  47 +++++--
 examples/loading_spinners/src/easing.rs       | 132 ++++++++++++++++++
 .../src/linear.rs                             |   9 +-
 .../src/main.rs                               |  64 +++++----
 examples/progress_indicators/src/easing.rs    |  67 ---------
 7 files changed, 214 insertions(+), 116 deletions(-)
 rename examples/{progress_indicators => loading_spinners}/Cargo.toml (83%)
 rename examples/{progress_indicators => loading_spinners}/README.md (62%)
 rename examples/{progress_indicators => loading_spinners}/src/circular.rs (89%)
 create mode 100644 examples/loading_spinners/src/easing.rs
 rename examples/{progress_indicators => loading_spinners}/src/linear.rs (97%)
 rename examples/{progress_indicators => loading_spinners}/src/main.rs (56%)
 delete mode 100644 examples/progress_indicators/src/easing.rs

diff --git a/examples/progress_indicators/Cargo.toml b/examples/loading_spinners/Cargo.toml
similarity index 83%
rename from examples/progress_indicators/Cargo.toml
rename to examples/loading_spinners/Cargo.toml
index 89ceb127..f37017c6 100644
--- a/examples/progress_indicators/Cargo.toml
+++ b/examples/loading_spinners/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "progress_indicators"
+name = "loading_spinners"
 version = "0.1.0"
 authors = ["Nick Senger <dev@nsenger.com>"]
 edition = "2021"
@@ -10,4 +10,5 @@ flo_curves = "0.7"
 iced = { path = "../..", features = ["canvas"] }
 iced_core = { path = "../../core" }
 iced_widget = { path = "../../widget" }
-lazy_static = "1.4"
+once_cell = "1"
+lyon = "1"
diff --git a/examples/progress_indicators/README.md b/examples/loading_spinners/README.md
similarity index 62%
rename from examples/progress_indicators/README.md
rename to examples/loading_spinners/README.md
index acacca8f..3573c6f6 100644
--- a/examples/progress_indicators/README.md
+++ b/examples/loading_spinners/README.md
@@ -1,6 +1,6 @@
-## Progress indicators
+## Loading Spinners
 
-Example implementation of animated indeterminate progress indicators.
+Example implementation of animated indeterminate loading spinners.
 
 <div align="center">
   <a href="https://gfycat.com/importantdevotedhammerheadbird">
@@ -10,5 +10,5 @@ Example implementation of animated indeterminate progress indicators.
 
 You can run it with `cargo run`:
 ```
-cargo run --package progress_indicators
+cargo run --package loading_spinners
 ```
diff --git a/examples/progress_indicators/src/circular.rs b/examples/loading_spinners/src/circular.rs
similarity index 89%
rename from examples/progress_indicators/src/circular.rs
rename to examples/loading_spinners/src/circular.rs
index 2a9f7e1e..0d01e7a1 100644
--- a/examples/progress_indicators/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -14,7 +14,6 @@ use iced_core::{
 
 use super::easing::{self, Easing};
 
-use std::borrow::Cow;
 use std::f32::consts::PI;
 use std::time::Duration;
 
@@ -22,7 +21,7 @@ type R<Theme> = iced_widget::renderer::Renderer<Theme>;
 
 const MIN_RADIANS: f32 = PI / 8.0;
 const WRAP_RADIANS: f32 = 2.0 * PI - PI / 4.0;
-const PROCESSION_VELOCITY: u32 = u32::MAX / 120;
+const BASE_ROTATION_SPEED: u32 = u32::MAX / 80;
 
 #[allow(missing_debug_implementations)]
 pub struct Circular<'a, Theme>
@@ -32,8 +31,9 @@ where
     size: f32,
     bar_height: f32,
     style: <Theme as StyleSheet>::Style,
-    easing: Cow<'a, Easing>,
+    easing: &'a Easing,
     cycle_duration: Duration,
+    rotation_speed: u32,
 }
 
 impl<'a, Theme> Circular<'a, Theme>
@@ -46,8 +46,9 @@ where
             size: 40.0,
             bar_height: 4.0,
             style: <Theme as StyleSheet>::Style::default(),
-            easing: Cow::Borrowed(&easing::STANDARD),
+            easing: &easing::STANDARD,
             cycle_duration: Duration::from_millis(600),
+            rotation_speed: BASE_ROTATION_SPEED,
         }
     }
 
@@ -70,8 +71,8 @@ where
     }
 
     /// Sets the easing of this [`Circular`].
-    pub fn easing(mut self, easing: impl Into<Cow<'a, Easing>>) -> Self {
-        self.easing = easing.into();
+    pub fn easing(mut self, easing: &'a Easing) -> Self {
+        self.easing = easing;
         self
     }
 
@@ -80,6 +81,14 @@ where
         self.cycle_duration = duration / 2;
         self
     }
+
+    /// Sets the rotation speed of this [`Circular`]. Must be set to between 0.0 and 10.0.
+    /// Defaults to 1.0.
+    pub fn rotation_speed(mut self, speed: f32) -> Self {
+        let multiplier = speed.min(10.0).max(0.0);
+        self.rotation_speed = (BASE_ROTATION_SPEED as f32 * multiplier) as u32;
+        self
+    }
 }
 
 impl<'a, Theme> Default for Circular<'a, Theme>
@@ -121,13 +130,13 @@ impl State {
             Self::Expanding { procession, .. } => Self::Contracting {
                 start: now,
                 progress: 0.0,
-                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+                procession: procession.wrapping_add(BASE_ROTATION_SPEED),
             },
             Self::Contracting { procession, .. } => Self::Expanding {
                 start: now,
                 progress: 0.0,
                 procession: procession.wrapping_add(
-                    PROCESSION_VELOCITY.wrapping_add(
+                    BASE_ROTATION_SPEED.wrapping_add(
                         ((WRAP_RADIANS / (2.0 * PI)) * u32::MAX as f32) as u32,
                     ),
                 ),
@@ -143,18 +152,24 @@ impl State {
         }
     }
 
-    fn timed_transition(&self, cycle_duration: Duration, now: Instant) -> Self {
+    fn timed_transition(
+        &self,
+        cycle_duration: Duration,
+        rotation_speed: u32,
+        now: Instant,
+    ) -> Self {
         let elapsed = now.duration_since(self.start());
 
         match elapsed {
             elapsed if elapsed > cycle_duration => self.next(now),
-            _ => self.with_elapsed(cycle_duration, elapsed),
+            _ => self.with_elapsed(cycle_duration, rotation_speed, elapsed),
         }
     }
 
     fn with_elapsed(
         &self,
         cycle_duration: Duration,
+        rotation_speed: u32,
         elapsed: Duration,
     ) -> Self {
         let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
@@ -164,14 +179,14 @@ impl State {
             } => Self::Expanding {
                 start: *start,
                 progress,
-                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+                procession: procession.wrapping_add(rotation_speed),
             },
             Self::Contracting {
                 start, procession, ..
             } => Self::Contracting {
                 start: *start,
                 progress,
-                procession: procession.wrapping_add(PROCESSION_VELOCITY),
+                procession: procession.wrapping_add(rotation_speed),
             },
         }
     }
@@ -231,7 +246,11 @@ where
         let state = tree.state.downcast_mut::<State>();
 
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
-            *state = state.timed_transition(self.cycle_duration, now);
+            *state = state.timed_transition(
+                self.cycle_duration,
+                self.rotation_speed,
+                now,
+            );
 
             shell.request_redraw(RedrawRequest::NextFrame);
         }
@@ -263,7 +282,7 @@ where
                         state,
                         style: &self.style,
                         bar_height: self.bar_height,
-                        easing: self.easing.as_ref(),
+                        easing: self.easing,
                     },
                     &(),
                     renderer,
diff --git a/examples/loading_spinners/src/easing.rs b/examples/loading_spinners/src/easing.rs
new file mode 100644
index 00000000..04befa15
--- /dev/null
+++ b/examples/loading_spinners/src/easing.rs
@@ -0,0 +1,132 @@
+use iced_core::Point;
+use lyon::algorithms::measure::PathMeasurements;
+use lyon::path::builder::NoAttributes;
+use lyon::path::path::BuilderImpl;
+use lyon::path::Path;
+
+use once_cell::sync::Lazy;
+
+pub static EMPHASIZED: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.05, 0.0], [0.133333, 0.06], [0.166666, 0.4])
+        .cubic_bezier_to([0.208333, 0.82], [0.25, 1.0], [1.0, 1.0])
+        .build()
+});
+
+pub static EMPHASIZED_DECELERATE: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.05, 0.7], [0.1, 1.0], [1.0, 1.0])
+        .build()
+});
+
+pub static EMPHASIZED_ACCELERATE: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.3, 0.0], [0.8, 0.15], [1.0, 1.0])
+        .build()
+});
+
+pub static STANDARD: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.2, 0.0], [0.0, 1.0], [1.0, 1.0])
+        .build()
+});
+
+pub static STANDARD_DECELERATE: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.0, 0.0], [0.0, 1.0], [1.0, 1.0])
+        .build()
+});
+
+pub static STANDARD_ACCELERATE: Lazy<Easing> = Lazy::new(|| {
+    Easing::builder()
+        .cubic_bezier_to([0.3, 0.0], [1.0, 1.0], [1.0, 1.0])
+        .build()
+});
+
+pub struct Easing {
+    path: Path,
+    measurements: PathMeasurements,
+}
+
+impl Easing {
+    pub fn builder() -> Builder {
+        Builder::new()
+    }
+
+    pub fn y_at_x(&self, x: f32) -> f32 {
+        let mut sampler = self.measurements.create_sampler(
+            &self.path,
+            lyon::algorithms::measure::SampleType::Normalized,
+        );
+        let sample = sampler.sample(x);
+
+        sample.position().y
+    }
+}
+
+pub struct Builder(NoAttributes<BuilderImpl>);
+
+impl Builder {
+    pub fn new() -> Self {
+        let mut builder = Path::builder();
+        builder.begin(lyon::geom::point(0.0, 0.0));
+
+        Self(builder)
+    }
+
+    /// Adds a line segment. Points must be between 0,0 and 1,1
+    pub fn line_to(mut self, to: impl Into<Point>) -> Self {
+        self.0.line_to(Self::point(to));
+
+        self
+    }
+
+    /// Adds a quadratic bézier curve. Points must be between 0,0 and 1,1
+    pub fn quadratic_bezier_to(
+        mut self,
+        ctrl: impl Into<Point>,
+        to: impl Into<Point>,
+    ) -> Self {
+        self.0
+            .quadratic_bezier_to(Self::point(ctrl), Self::point(to));
+
+        self
+    }
+
+    /// Adds a cubic bézier curve. Points must be between 0,0 and 1,1
+    pub fn cubic_bezier_to(
+        mut self,
+        ctrl1: impl Into<Point>,
+        ctrl2: impl Into<Point>,
+        to: impl Into<Point>,
+    ) -> Self {
+        self.0.cubic_bezier_to(
+            Self::point(ctrl1),
+            Self::point(ctrl2),
+            Self::point(to),
+        );
+
+        self
+    }
+
+    pub fn build(mut self) -> Easing {
+        self.0.line_to(lyon::geom::point(1.0, 1.0));
+        self.0.end(false);
+
+        let path = self.0.build();
+        let measurements = PathMeasurements::from_path(&path, 0.0);
+
+        Easing { path, measurements }
+    }
+
+    fn point(p: impl Into<Point>) -> lyon::geom::Point<f32> {
+        let p: Point = p.into();
+        lyon::geom::point(p.x.min(1.0).max(0.0), p.y.min(1.0).max(0.0))
+    }
+}
+
+impl Default for Builder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/examples/progress_indicators/src/linear.rs b/examples/loading_spinners/src/linear.rs
similarity index 97%
rename from examples/progress_indicators/src/linear.rs
rename to examples/loading_spinners/src/linear.rs
index 735892e7..eb8a7408 100644
--- a/examples/progress_indicators/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -13,7 +13,6 @@ use iced_core::{
 
 use super::easing::{self, Easing};
 
-use std::borrow::Cow;
 use std::time::Duration;
 
 #[allow(missing_debug_implementations)]
@@ -25,7 +24,7 @@ where
     width: Length,
     height: Length,
     style: <Renderer::Theme as StyleSheet>::Style,
-    easing: Cow<'a, Easing>,
+    easing: &'a Easing,
     cycle_duration: Duration,
 }
 
@@ -40,7 +39,7 @@ where
             width: Length::Fixed(100.0),
             height: Length::Fixed(4.0),
             style: <Renderer::Theme as StyleSheet>::Style::default(),
-            easing: Cow::Borrowed(&easing::STANDARD),
+            easing: &easing::STANDARD,
             cycle_duration: Duration::from_millis(600),
         }
     }
@@ -67,8 +66,8 @@ where
     }
 
     /// Sets the motion easing of this [`Linear`].
-    pub fn easing(mut self, easing: impl Into<Cow<'a, Easing>>) -> Self {
-        self.easing = easing.into();
+    pub fn easing(mut self, easing: &'a Easing) -> Self {
+        self.easing = easing;
         self
     }
 
diff --git a/examples/progress_indicators/src/main.rs b/examples/loading_spinners/src/main.rs
similarity index 56%
rename from examples/progress_indicators/src/main.rs
rename to examples/loading_spinners/src/main.rs
index 136b8d8c..a78e9590 100644
--- a/examples/progress_indicators/src/main.rs
+++ b/examples/loading_spinners/src/main.rs
@@ -12,17 +12,17 @@ use circular::Circular;
 use linear::Linear;
 
 pub fn main() -> iced::Result {
-    ProgressIndicators::run(Settings {
+    LoadingSpinners::run(Settings {
         antialiasing: true,
         ..Default::default()
     })
 }
 
-struct ProgressIndicators {
+struct LoadingSpinners {
     cycle_duration: f32,
 }
 
-impl Default for ProgressIndicators {
+impl Default for LoadingSpinners {
     fn default() -> Self {
         Self {
             cycle_duration: 2.0,
@@ -35,7 +35,7 @@ enum Message {
     CycleDurationChanged(f32),
 }
 
-impl Application for ProgressIndicators {
+impl Application for LoadingSpinners {
     type Message = Message;
     type Flags = ();
     type Executor = executor::Default;
@@ -46,7 +46,7 @@ impl Application for ProgressIndicators {
     }
 
     fn title(&self) -> String {
-        String::from("Progress Indicators - Iced")
+        String::from("Loading Spinners - Iced")
     }
 
     fn update(&mut self, message: Message) -> Command<Message> {
@@ -60,25 +60,39 @@ impl Application for ProgressIndicators {
     }
 
     fn view(&self) -> Element<Message> {
-        let column = easing::EXAMPLES
-            .iter()
-            .zip(["Decelerating:", "Accelerating:", "Standard:"])
-            .fold(column![], |column, (easing, label)| {
-                column.push(
-                    row![
-                        text(label).width(150),
-                        Linear::new().easing(easing).cycle_duration(
-                            Duration::from_secs_f32(self.cycle_duration)
-                        ),
-                        Circular::new().easing(easing).cycle_duration(
-                            Duration::from_secs_f32(self.cycle_duration)
-                        )
-                    ]
-                    .align_items(iced::Alignment::Center)
-                    .spacing(20.0),
-                )
-            })
-            .spacing(20);
+        let column = [
+            &easing::EMPHASIZED,
+            &easing::EMPHASIZED_DECELERATE,
+            &easing::EMPHASIZED_ACCELERATE,
+            &easing::STANDARD,
+            &easing::STANDARD_DECELERATE,
+            &easing::STANDARD_ACCELERATE,
+        ]
+        .iter()
+        .zip([
+            "Emphasized:",
+            "Emphasized Decelerate:",
+            "Emphasized Accelerate:",
+            "Standard:",
+            "Standard Decelerate:",
+            "Standard Accelerate:",
+        ])
+        .fold(column![], |column, (easing, label)| {
+            column.push(
+                row![
+                    text(label).width(250),
+                    Linear::new().easing(easing).cycle_duration(
+                        Duration::from_secs_f32(self.cycle_duration)
+                    ),
+                    Circular::new().easing(easing).cycle_duration(
+                        Duration::from_secs_f32(self.cycle_duration)
+                    )
+                ]
+                .align_items(iced::Alignment::Center)
+                .spacing(20.0),
+            )
+        })
+        .spacing(20);
 
         container(
             column.push(
@@ -87,7 +101,7 @@ impl Application for ProgressIndicators {
                     slider(1.0..=1000.0, self.cycle_duration * 100.0, |x| {
                         Message::CycleDurationChanged(x / 100.0)
                     })
-                    .width(150.0)
+                    .width(200.0)
                     .into(),
                     text(format!("{:.2}s", self.cycle_duration)).into(),
                 ])
diff --git a/examples/progress_indicators/src/easing.rs b/examples/progress_indicators/src/easing.rs
deleted file mode 100644
index 10479659..00000000
--- a/examples/progress_indicators/src/easing.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use flo_curves::bezier::Curve;
-use flo_curves::*;
-use lazy_static::lazy_static;
-
-use std::borrow::Cow;
-
-lazy_static! {
-    pub static ref EXAMPLES: [Easing; 3] = [
-        Easing::CubicBezier(Curve::from_points(
-            Coord2(0.0, 0.0),
-            (Coord2(0.05, 0.7), Coord2(0.1, 1.0)),
-            Coord2(1.0, 1.0),
-        )),
-        Easing::CubicBezier(Curve::from_points(
-            Coord2(0.0, 0.0),
-            (Coord2(0.3, 0.0), Coord2(0.8, 0.15)),
-            Coord2(1.0, 1.0),
-        )),
-        Easing::CubicBezier(Curve::from_points(
-            Coord2(0.0, 0.0),
-            (Coord2(0.2, 0.0), Coord2(0.0, 1.0)),
-            Coord2(1.0, 1.0),
-        ))
-    ];
-    pub static ref STANDARD: Easing = {
-        Easing::CubicBezier(Curve::from_points(
-            Coord2(0.0, 0.0),
-            (Coord2(0.2, 0.0), Coord2(0.0, 1.0)),
-            Coord2(1.0, 1.0),
-        ))
-    };
-}
-
-#[derive(Clone, Debug)]
-pub enum Easing {
-    BezierPath(Vec<Curve<Coord2>>),
-    CubicBezier(Curve<Coord2>),
-}
-
-impl Easing {
-    pub fn y_at_x(&self, x: f32) -> f32 {
-        let x = x as f64;
-
-        match self {
-            Self::BezierPath(curves) => curves
-                .iter()
-                .find_map(|curve| {
-                    (curve.start_point().0 <= x && curve.end_point().0 >= x)
-                        .then(|| curve.point_at_pos(x).1 as f32)
-                })
-                .unwrap_or_default(),
-            Self::CubicBezier(curve) => curve.point_at_pos(x).1 as f32,
-        }
-    }
-}
-
-impl<'a> From<Easing> for Cow<'a, Easing> {
-    fn from(easing: Easing) -> Self {
-        Cow::Owned(easing)
-    }
-}
-
-impl<'a> From<&'a Easing> for Cow<'a, Easing> {
-    fn from(easing: &'a Easing) -> Self {
-        Cow::Borrowed(easing)
-    }
-}

From 204c9d6f52dab7b04ecec35220b15768296dfe1e Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Wed, 7 Jun 2023 16:48:11 -0700
Subject: [PATCH 350/440] fix: rotation in terms of duration

---
 examples/loading_spinners/src/circular.rs | 83 +++++++++++++++--------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 0d01e7a1..4f5b6fe4 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -33,7 +33,7 @@ where
     style: <Theme as StyleSheet>::Style,
     easing: &'a Easing,
     cycle_duration: Duration,
-    rotation_speed: u32,
+    rotaion_duration: Duration,
 }
 
 impl<'a, Theme> Circular<'a, Theme>
@@ -48,7 +48,7 @@ where
             style: <Theme as StyleSheet>::Style::default(),
             easing: &easing::STANDARD,
             cycle_duration: Duration::from_millis(600),
-            rotation_speed: BASE_ROTATION_SPEED,
+            rotaion_duration: Duration::from_secs(2),
         }
     }
 
@@ -82,11 +82,10 @@ where
         self
     }
 
-    /// Sets the rotation speed of this [`Circular`]. Must be set to between 0.0 and 10.0.
-    /// Defaults to 1.0.
-    pub fn rotation_speed(mut self, speed: f32) -> Self {
-        let multiplier = speed.min(10.0).max(0.0);
-        self.rotation_speed = (BASE_ROTATION_SPEED as f32 * multiplier) as u32;
+    /// Sets the base rotation duration of this [`Circular`]. This is the duration that a full
+    /// rotation would take if the cycle rotation were set to 0.0 (no expanding or contracting)
+    pub fn rotation_duration(mut self, duration: Duration) -> Self {
+        self.rotaion_duration = duration;
         self
     }
 }
@@ -105,12 +104,14 @@ enum State {
     Expanding {
         start: Instant,
         progress: f32,
-        procession: u32,
+        rotation: u32,
+        last: Instant,
     },
     Contracting {
         start: Instant,
         progress: f32,
-        procession: u32,
+        rotation: u32,
+        last: Instant,
     },
 }
 
@@ -119,27 +120,30 @@ impl Default for State {
         Self::Expanding {
             start: Instant::now(),
             progress: 0.0,
-            procession: 0,
+            rotation: 0,
+            last: Instant::now(),
         }
     }
 }
 
 impl State {
-    fn next(&self, now: Instant) -> Self {
+    fn next(&self, additional_rotation: u32, now: Instant) -> Self {
         match self {
-            Self::Expanding { procession, .. } => Self::Contracting {
+            Self::Expanding { rotation, .. } => Self::Contracting {
                 start: now,
                 progress: 0.0,
-                procession: procession.wrapping_add(BASE_ROTATION_SPEED),
+                rotation: rotation.wrapping_add(additional_rotation),
+                last: now,
             },
-            Self::Contracting { procession, .. } => Self::Expanding {
+            Self::Contracting { rotation, .. } => Self::Expanding {
                 start: now,
                 progress: 0.0,
-                procession: procession.wrapping_add(
+                rotation: rotation.wrapping_add(
                     BASE_ROTATION_SPEED.wrapping_add(
                         ((WRAP_RADIANS / (2.0 * PI)) * u32::MAX as f32) as u32,
                     ),
                 ),
+                last: now,
             },
         }
     }
@@ -152,50 +156,71 @@ impl State {
         }
     }
 
+    fn last(&self) -> Instant {
+        match self {
+            Self::Expanding { last, .. } | Self::Contracting { last, .. } => {
+                *last
+            }
+        }
+    }
+
     fn timed_transition(
         &self,
         cycle_duration: Duration,
-        rotation_speed: u32,
+        rotation_duration: Duration,
         now: Instant,
     ) -> Self {
         let elapsed = now.duration_since(self.start());
+        let additional_rotation = ((now - self.last()).as_secs_f32()
+            / rotation_duration.as_secs_f32()
+            * (u32::MAX) as f32) as u32;
 
         match elapsed {
-            elapsed if elapsed > cycle_duration => self.next(now),
-            _ => self.with_elapsed(cycle_duration, rotation_speed, elapsed),
+            elapsed if elapsed > cycle_duration => {
+                self.next(additional_rotation, now)
+            }
+            _ => self.with_elapsed(
+                cycle_duration,
+                additional_rotation,
+                elapsed,
+                now,
+            ),
         }
     }
 
     fn with_elapsed(
         &self,
         cycle_duration: Duration,
-        rotation_speed: u32,
+        additional_rotation: u32,
         elapsed: Duration,
+        now: Instant,
     ) -> Self {
         let progress = elapsed.as_secs_f32() / cycle_duration.as_secs_f32();
         match self {
             Self::Expanding {
-                start, procession, ..
+                start, rotation, ..
             } => Self::Expanding {
                 start: *start,
                 progress,
-                procession: procession.wrapping_add(rotation_speed),
+                rotation: rotation.wrapping_add(additional_rotation),
+                last: now,
             },
             Self::Contracting {
-                start, procession, ..
+                start, rotation, ..
             } => Self::Contracting {
                 start: *start,
                 progress,
-                procession: procession.wrapping_add(rotation_speed),
+                rotation: rotation.wrapping_add(additional_rotation),
+                last: now,
             },
         }
     }
 
-    fn procession(&self) -> f32 {
+    fn rotation(&self) -> f32 {
         match self {
-            Self::Expanding { procession, .. }
-            | Self::Contracting { procession, .. } => {
-                *procession as f32 / u32::MAX as f32
+            Self::Expanding { rotation, .. }
+            | Self::Contracting { rotation, .. } => {
+                *rotation as f32 / u32::MAX as f32
             }
         }
     }
@@ -248,7 +273,7 @@ where
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
             *state = state.timed_transition(
                 self.cycle_duration,
-                self.rotation_speed,
+                self.rotaion_duration,
                 now,
             );
 
@@ -406,7 +431,7 @@ where
 
         let mut builder = canvas::path::Builder::new();
 
-        let start = self.state.procession() * 2.0 * PI;
+        let start = self.state.rotation() * 2.0 * PI;
 
         match self.state {
             State::Expanding { progress, .. } => {

From 56eacdb3583e701cde8cca074e151b24c3fd8df3 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Thu, 8 Jun 2023 07:47:57 -0700
Subject: [PATCH 351/440] comment: cleanup imports

---
 examples/loading_spinners/Cargo.toml      |  7 +--
 examples/loading_spinners/src/circular.rs | 63 +++++++++++------------
 examples/loading_spinners/src/easing.rs   | 21 ++++----
 examples/loading_spinners/src/linear.rs   | 32 ++++++------
 4 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/examples/loading_spinners/Cargo.toml b/examples/loading_spinners/Cargo.toml
index f37017c6..ee9a48aa 100644
--- a/examples/loading_spinners/Cargo.toml
+++ b/examples/loading_spinners/Cargo.toml
@@ -6,9 +6,6 @@ edition = "2021"
 publish = false
 
 [dependencies]
-flo_curves = "0.7"
-iced = { path = "../..", features = ["canvas"] }
-iced_core = { path = "../../core" }
-iced_widget = { path = "../../widget" }
+iced = { path = "../..", features = ["advanced", "canvas"] }
+lyon_algorithms = "1"
 once_cell = "1"
-lyon = "1"
diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 4f5b6fe4..8639780a 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -1,23 +1,21 @@
 //! Show a circular progress indicator.
-use iced::widget::canvas::{self, Cursor, Program, Renderer as CanvasRenderer};
-use iced::window;
-use iced_core::event::{self, Event};
-use iced_core::time::Instant;
-use iced_core::widget::tree::{self, Tree};
-use iced_core::window::RedrawRequest;
-use iced_core::{layout, Size};
-use iced_core::{renderer, Vector};
-use iced_core::{
-    Background, Clipboard, Color, Element, Layout, Length, Point, Rectangle,
-    Renderer, Shell, Widget,
-};
+use iced::advanced::layout;
+use iced::advanced::renderer;
+use iced::advanced::widget::tree::{self, Tree};
+use iced::advanced::{Clipboard, Layout, Renderer, Shell, Widget};
+use iced::event;
+use iced::time::Instant;
+use iced::widget::canvas::{self, Cursor, Program};
+use iced::window::{self, RedrawRequest};
+use iced::{Background, Color, Element, Rectangle};
+use iced::{Event, Length, Point, Size, Vector};
 
 use super::easing::{self, Easing};
 
 use std::f32::consts::PI;
 use std::time::Duration;
 
-type R<Theme> = iced_widget::renderer::Renderer<Theme>;
+type R<Theme> = iced::Renderer<Theme>;
 
 const MIN_RADIANS: f32 = PI / 8.0;
 const WRAP_RADIANS: f32 = 2.0 * PI - PI / 4.0;
@@ -249,7 +247,7 @@ where
 
     fn layout(
         &self,
-        _renderer: &iced_widget::renderer::Renderer<Theme>,
+        _renderer: &iced::Renderer<Theme>,
         limits: &layout::Limits,
     ) -> layout::Node {
         let limits = limits.width(self.size).height(self.size);
@@ -264,7 +262,7 @@ where
         event: Event,
         _layout: Layout<'_>,
         _cursor_position: Point,
-        _renderer: &iced_widget::renderer::Renderer<Theme>,
+        _renderer: &iced::Renderer<Theme>,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
@@ -299,22 +297,22 @@ where
         renderer.with_translation(
             Vector::new(bounds.x, bounds.y),
             |renderer| {
-                renderer.draw(<StateWithStyle<Theme> as Program<
-                    Message,
-                    R<Theme>,
-                >>::draw(
-                    &StateWithStyle {
-                        state,
-                        style: &self.style,
-                        bar_height: self.bar_height,
-                        easing: self.easing,
-                    },
-                    &(),
+                canvas::Renderer::draw(
                     renderer,
-                    theme,
-                    bounds,
-                    Cursor::Unavailable,
-                ));
+                    <StateWithStyle<Theme> as Program<Message, R<Theme>>>::draw(
+                        &StateWithStyle {
+                            state,
+                            style: &self.style,
+                            bar_height: self.bar_height,
+                            easing: self.easing,
+                        },
+                        &(),
+                        renderer,
+                        theme,
+                        bounds,
+                        Cursor::Unavailable,
+                    ),
+                );
             },
         );
     }
@@ -384,8 +382,7 @@ where
     bar_height: f32,
 }
 
-impl<'a, Message, Theme>
-    canvas::Program<Message, iced_widget::renderer::Renderer<Theme>>
+impl<'a, Message, Theme> Program<Message, iced::Renderer<Theme>>
     for StateWithStyle<'a, Theme>
 where
     Theme: StyleSheet,
@@ -405,7 +402,7 @@ where
     fn draw(
         &self,
         _state: &Self::State,
-        renderer: &iced_widget::renderer::Renderer<Theme>,
+        renderer: &iced::Renderer<Theme>,
         theme: &Theme,
         bounds: Rectangle,
         _cursor: canvas::Cursor,
diff --git a/examples/loading_spinners/src/easing.rs b/examples/loading_spinners/src/easing.rs
index 04befa15..665b3329 100644
--- a/examples/loading_spinners/src/easing.rs
+++ b/examples/loading_spinners/src/easing.rs
@@ -1,9 +1,7 @@
-use iced_core::Point;
-use lyon::algorithms::measure::PathMeasurements;
-use lyon::path::builder::NoAttributes;
-use lyon::path::path::BuilderImpl;
-use lyon::path::Path;
+use iced::Point;
 
+use lyon_algorithms::measure::PathMeasurements;
+use lyon_algorithms::path::{builder::NoAttributes, path::BuilderImpl, Path};
 use once_cell::sync::Lazy;
 
 pub static EMPHASIZED: Lazy<Easing> = Lazy::new(|| {
@@ -56,7 +54,7 @@ impl Easing {
     pub fn y_at_x(&self, x: f32) -> f32 {
         let mut sampler = self.measurements.create_sampler(
             &self.path,
-            lyon::algorithms::measure::SampleType::Normalized,
+            lyon_algorithms::measure::SampleType::Normalized,
         );
         let sample = sampler.sample(x);
 
@@ -69,7 +67,7 @@ pub struct Builder(NoAttributes<BuilderImpl>);
 impl Builder {
     pub fn new() -> Self {
         let mut builder = Path::builder();
-        builder.begin(lyon::geom::point(0.0, 0.0));
+        builder.begin(lyon_algorithms::geom::point(0.0, 0.0));
 
         Self(builder)
     }
@@ -110,7 +108,7 @@ impl Builder {
     }
 
     pub fn build(mut self) -> Easing {
-        self.0.line_to(lyon::geom::point(1.0, 1.0));
+        self.0.line_to(lyon_algorithms::geom::point(1.0, 1.0));
         self.0.end(false);
 
         let path = self.0.build();
@@ -119,9 +117,12 @@ impl Builder {
         Easing { path, measurements }
     }
 
-    fn point(p: impl Into<Point>) -> lyon::geom::Point<f32> {
+    fn point(p: impl Into<Point>) -> lyon_algorithms::geom::Point<f32> {
         let p: Point = p.into();
-        lyon::geom::point(p.x.min(1.0).max(0.0), p.y.min(1.0).max(0.0))
+        lyon_algorithms::geom::point(
+            p.x.min(1.0).max(0.0),
+            p.y.min(1.0).max(0.0),
+        )
     }
 }
 
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index eb8a7408..6d151760 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -1,15 +1,13 @@
 //! Show a linear progress indicator.
-use iced::window;
-use iced_core::event::{self, Event};
-use iced_core::renderer;
-use iced_core::time::Instant;
-use iced_core::widget::tree::{self, Tree};
-use iced_core::window::RedrawRequest;
-use iced_core::{layout, Size};
-use iced_core::{
-    Background, Clipboard, Color, Element, Layout, Length, Point, Rectangle,
-    Shell, Widget,
-};
+use iced::advanced::layout;
+use iced::advanced::renderer::{self, Quad};
+use iced::advanced::widget::tree::{self, Tree};
+use iced::advanced::{Clipboard, Layout, Shell, Widget};
+use iced::event;
+use iced::time::Instant;
+use iced::window::{self, RedrawRequest};
+use iced::{Background, Color, Element, Rectangle};
+use iced::{Event, Length, Point, Size};
 
 use super::easing::{self, Easing};
 
@@ -18,7 +16,7 @@ use std::time::Duration;
 #[allow(missing_debug_implementations)]
 pub struct Linear<'a, Renderer>
 where
-    Renderer: iced_core::Renderer,
+    Renderer: iced::advanced::Renderer,
     Renderer::Theme: StyleSheet,
 {
     width: Length,
@@ -30,7 +28,7 @@ where
 
 impl<'a, Renderer> Linear<'a, Renderer>
 where
-    Renderer: iced_widget::core::Renderer,
+    Renderer: iced::advanced::Renderer,
     Renderer::Theme: StyleSheet,
 {
     /// Creates a new [`Linear`] with the given content.
@@ -80,7 +78,7 @@ where
 
 impl<'a, Renderer> Default for Linear<'a, Renderer>
 where
-    Renderer: iced_core::Renderer,
+    Renderer: iced::advanced::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn default() -> Self {
@@ -156,7 +154,7 @@ impl State {
 impl<'a, Message, Renderer> Widget<Message, Renderer> for Linear<'a, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: 'a + iced_core::Renderer,
+    Renderer: 'a + iced::advanced::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
@@ -253,7 +251,7 @@ where
             ),
 
             State::Contracting { progress, .. } => renderer.fill_quad(
-                renderer::Quad {
+                Quad {
                     bounds: Rectangle {
                         x: bounds.x
                             + self.easing.y_at_x(*progress) * bounds.width,
@@ -276,7 +274,7 @@ impl<'a, Message, Renderer> From<Linear<'a, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: Clone + 'a,
-    Renderer: iced_core::Renderer + 'a,
+    Renderer: iced::advanced::Renderer + 'a,
     Renderer::Theme: StyleSheet,
 {
     fn from(linear: Linear<'a, Renderer>) -> Self {

From 0148cfc82b0076a050e13d72a7c1b144a8c67033 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Thu, 8 Jun 2023 07:51:32 -0700
Subject: [PATCH 352/440] fix: RedrawRequest::NextFrame -> RedrawRequest::At()

---
 examples/loading_spinners/src/circular.rs | 6 +++++-
 examples/loading_spinners/src/linear.rs   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 8639780a..56ffa6f5 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -266,6 +266,8 @@ where
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
+        const FRAME_RATE: u64 = 60;
+
         let state = tree.state.downcast_mut::<State>();
 
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
@@ -275,7 +277,9 @@ where
                 now,
             );
 
-            shell.request_redraw(RedrawRequest::NextFrame);
+            shell.request_redraw(RedrawRequest::At(
+                now + Duration::from_millis(1000 / FRAME_RATE),
+            ));
         }
 
         event::Status::Ignored
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index 6d151760..ea0807c2 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -194,12 +194,16 @@ where
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
+        const FRAME_RATE: u64 = 60;
+
         let state = tree.state.downcast_mut::<State>();
 
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
             *state = state.timed_transition(self.cycle_duration, now);
 
-            shell.request_redraw(RedrawRequest::NextFrame);
+            shell.request_redraw(RedrawRequest::At(
+                now + Duration::from_millis(1000 / FRAME_RATE),
+            ));
         }
 
         event::Status::Ignored

From 05e238e9ed5f0c6cade87228f8f3044ee26df756 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 8 Jun 2023 10:10:26 -0700
Subject: [PATCH 353/440] Adjusted offscreen pass to be a render pass vs
 compute for compat with web-colors flag.

---
 examples/screenshot/src/main.rs     |   2 +-
 wgpu/src/backend.rs                 |  21 +---
 wgpu/src/offscreen.rs               | 164 ++++++++++++++++++++++++----
 wgpu/src/shader/offscreen_blit.wgsl |  41 ++++---
 4 files changed, 168 insertions(+), 60 deletions(-)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 59dfdf14..ef2be4fe 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -134,7 +134,7 @@ impl Application for Example {
                 screenshot.size.height,
                 screenshot.clone(),
             ))
-            .content_fit(ContentFit::ScaleDown)
+            .content_fit(ContentFit::Contain)
             .width(Length::Fill)
             .height(Length::Fill)
             .into()
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 8f37f285..0735f81f 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -139,7 +139,7 @@ impl Backend {
         primitives: &[Primitive],
         viewport: &Viewport,
         overlay_text: &[T],
-        texture_extent: wgpu::Extent3d,
+        size: wgpu::Extent3d,
     ) -> Option<wgpu::Texture> {
         #[cfg(feature = "tracing")]
         let _ = info_span!("iced_wgpu::offscreen", "DRAW").entered();
@@ -159,24 +159,7 @@ impl Backend {
             log::info!("Texture format is {format:?}; performing conversion to rgba8..");
             let pipeline = offscreen::Pipeline::new(device);
 
-            let texture = device.create_texture(&wgpu::TextureDescriptor {
-                label: Some("iced_wgpu.offscreen.conversion.source_texture"),
-                size: texture_extent,
-                mip_level_count: 1,
-                sample_count: 1,
-                dimension: wgpu::TextureDimension::D2,
-                format: wgpu::TextureFormat::Rgba8Unorm,
-                usage: wgpu::TextureUsages::STORAGE_BINDING
-                    | wgpu::TextureUsages::COPY_SRC,
-                view_formats: &[],
-            });
-
-            let view =
-                texture.create_view(&wgpu::TextureViewDescriptor::default());
-
-            pipeline.convert(device, texture_extent, frame, &view, encoder);
-
-            return Some(texture);
+            return Some(pipeline.convert(device, frame, size, encoder));
         }
 
         None
diff --git a/wgpu/src/offscreen.rs b/wgpu/src/offscreen.rs
index 29913d02..d0758b66 100644
--- a/wgpu/src/offscreen.rs
+++ b/wgpu/src/offscreen.rs
@@ -1,12 +1,24 @@
 use std::borrow::Cow;
+use wgpu::util::DeviceExt;
+use wgpu::vertex_attr_array;
 
 /// A simple compute pipeline to convert any texture to Rgba8UnormSrgb.
 #[derive(Debug)]
 pub struct Pipeline {
-    pipeline: wgpu::ComputePipeline,
+    pipeline: wgpu::RenderPipeline,
+    vertices: wgpu::Buffer,
+    indices: wgpu::Buffer,
+    sampler: wgpu::Sampler,
     layout: wgpu::BindGroupLayout,
 }
 
+#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+#[repr(C)]
+struct Vertex {
+    ndc: [f32; 2],
+    texel: [f32; 2],
+}
+
 impl Pipeline {
     pub fn new(device: &wgpu::Device) -> Self {
         let shader =
@@ -17,13 +29,53 @@ impl Pipeline {
                 ))),
             });
 
+        let vertices =
+            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+                label: Some("iced_wgpu.offscreen.vertex_buffer"),
+                contents: bytemuck::cast_slice(&[
+                    //bottom left
+                    Vertex {
+                        ndc: [-1.0, -1.0],
+                        texel: [0.0, 1.0],
+                    },
+                    //bottom right
+                    Vertex {
+                        ndc: [1.0, -1.0],
+                        texel: [1.0, 1.0],
+                    },
+                    //top right
+                    Vertex {
+                        ndc: [1.0, 1.0],
+                        texel: [1.0, 0.0],
+                    },
+                    //top left
+                    Vertex {
+                        ndc: [-1.0, 1.0],
+                        texel: [0.0, 0.0],
+                    },
+                ]),
+                usage: wgpu::BufferUsages::VERTEX,
+            });
+
+        let indices =
+            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+                label: Some("iced_wgpu.offscreen.index_buffer"),
+                contents: bytemuck::cast_slice(&[0u16, 1, 2, 2, 3, 0]),
+                usage: wgpu::BufferUsages::INDEX,
+            });
+
+        let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
+            label: Some("iced_wgpu.offscreen.sampler"),
+            ..Default::default()
+        });
+
         let bind_group_layout =
             device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
                 label: Some("iced_wgpu.offscreen.blit.bind_group_layout"),
                 entries: &[
                     wgpu::BindGroupLayoutEntry {
                         binding: 0,
-                        visibility: wgpu::ShaderStages::COMPUTE,
+                        visibility: wgpu::ShaderStages::FRAGMENT,
                         ty: wgpu::BindingType::Texture {
                             sample_type: wgpu::TextureSampleType::Float {
                                 filterable: false,
@@ -35,12 +87,10 @@ impl Pipeline {
                     },
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
-                        visibility: wgpu::ShaderStages::COMPUTE,
-                        ty: wgpu::BindingType::StorageTexture {
-                            access: wgpu::StorageTextureAccess::WriteOnly,
-                            format: wgpu::TextureFormat::Rgba8Unorm,
-                            view_dimension: wgpu::TextureViewDimension::D2,
-                        },
+                        visibility: wgpu::ShaderStages::FRAGMENT,
+                        ty: wgpu::BindingType::Sampler(
+                            wgpu::SamplerBindingType::NonFiltering,
+                        ),
                         count: None,
                     },
                 ],
@@ -54,15 +104,56 @@ impl Pipeline {
             });
 
         let pipeline =
-            device.create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
+            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
                 label: Some("iced_wgpu.offscreen.blit.pipeline"),
                 layout: Some(&pipeline_layout),
-                module: &shader,
-                entry_point: "main",
+                vertex: wgpu::VertexState {
+                    module: &shader,
+                    entry_point: "vs_main",
+                    buffers: &[wgpu::VertexBufferLayout {
+                        array_stride: std::mem::size_of::<Vertex>() as u64,
+                        step_mode: wgpu::VertexStepMode::Vertex,
+                        attributes: &vertex_attr_array![
+                            0 => Float32x2, // quad ndc pos
+                            1 => Float32x2, // texture uv
+                        ],
+                    }],
+                },
+                fragment: Some(wgpu::FragmentState {
+                    module: &shader,
+                    entry_point: "fs_main",
+                    targets: &[Some(wgpu::ColorTargetState {
+                        format: wgpu::TextureFormat::Rgba8UnormSrgb,
+                        blend: Some(wgpu::BlendState {
+                            color: wgpu::BlendComponent {
+                                src_factor: wgpu::BlendFactor::SrcAlpha,
+                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                                operation: wgpu::BlendOperation::Add,
+                            },
+                            alpha: wgpu::BlendComponent {
+                                src_factor: wgpu::BlendFactor::One,
+                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                                operation: wgpu::BlendOperation::Add,
+                            },
+                        }),
+                        write_mask: wgpu::ColorWrites::ALL,
+                    })],
+                }),
+                primitive: wgpu::PrimitiveState {
+                    topology: wgpu::PrimitiveTopology::TriangleList,
+                    front_face: wgpu::FrontFace::Cw,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                multisample: Default::default(),
+                multiview: None,
             });
 
         Self {
             pipeline,
+            vertices,
+            indices,
+            sampler,
             layout: bind_group_layout,
         }
     }
@@ -70,11 +161,25 @@ impl Pipeline {
     pub fn convert(
         &self,
         device: &wgpu::Device,
-        extent: wgpu::Extent3d,
         frame: &wgpu::TextureView,
-        view: &wgpu::TextureView,
+        size: wgpu::Extent3d,
         encoder: &mut wgpu::CommandEncoder,
-    ) {
+    ) -> wgpu::Texture {
+        let texture = device.create_texture(&wgpu::TextureDescriptor {
+            label: Some("iced_wgpu.offscreen.conversion.source_texture"),
+            size,
+            mip_level_count: 1,
+            sample_count: 1,
+            dimension: wgpu::TextureDimension::D2,
+            format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT
+                | wgpu::TextureUsages::COPY_SRC,
+            view_formats: &[],
+        });
+
+        let view =
+            &texture.create_view(&wgpu::TextureViewDescriptor::default());
+
         let bind = device.create_bind_group(&wgpu::BindGroupDescriptor {
             label: Some("iced_wgpu.offscreen.blit.bind_group"),
             layout: &self.layout,
@@ -85,18 +190,33 @@ impl Pipeline {
                 },
                 wgpu::BindGroupEntry {
                     binding: 1,
-                    resource: wgpu::BindingResource::TextureView(view),
+                    resource: wgpu::BindingResource::Sampler(&self.sampler),
                 },
             ],
         });
 
-        let mut compute_pass =
-            encoder.begin_compute_pass(&wgpu::ComputePassDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.compute_pass"),
-            });
+        let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.render_pass"),
+            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                view,
+                resolve_target: None,
+                ops: wgpu::Operations {
+                    load: wgpu::LoadOp::Load,
+                    store: true,
+                },
+            })],
+            depth_stencil_attachment: None,
+        });
 
-        compute_pass.set_pipeline(&self.pipeline);
-        compute_pass.set_bind_group(0, &bind, &[]);
-        compute_pass.dispatch_workgroups(extent.width, extent.height, 1);
+        pass.set_pipeline(&self.pipeline);
+        pass.set_bind_group(0, &bind, &[]);
+        pass.set_vertex_buffer(0, self.vertices.slice(..));
+        pass.set_index_buffer(
+            self.indices.slice(..),
+            wgpu::IndexFormat::Uint16,
+        );
+        pass.draw_indexed(0..6u32, 0, 0..1);
+
+        texture
     }
 }
diff --git a/wgpu/src/shader/offscreen_blit.wgsl b/wgpu/src/shader/offscreen_blit.wgsl
index 9c764c36..08952d62 100644
--- a/wgpu/src/shader/offscreen_blit.wgsl
+++ b/wgpu/src/shader/offscreen_blit.wgsl
@@ -1,22 +1,27 @@
-@group(0) @binding(0) var u_texture: texture_2d<f32>;
-@group(0) @binding(1) var out_texture: texture_storage_2d<rgba8unorm, write>;
+@group(0) @binding(0) var frame_texture: texture_2d<f32>;
+@group(0) @binding(1) var frame_sampler: sampler;
 
-fn srgb(color: f32) -> f32 {
-    if (color <= 0.0031308) {
-        return 12.92 * color;
-    } else {
-        return (1.055 * (pow(color, (1.0/2.4)))) - 0.055;
-    }
+struct VertexInput {
+    @location(0) v_pos: vec2<f32>,
+    @location(1) texel_coord: vec2<f32>,
 }
 
-@compute @workgroup_size(1)
-fn main(@builtin(global_invocation_id) id: vec3<u32>) {
-    // texture coord must be i32 due to a naga bug:
-    // https://github.com/gfx-rs/naga/issues/1997
-    let coords = vec2(i32(id.x), i32(id.y));
-
-    let src: vec4<f32> = textureLoad(u_texture, coords, 0);
-    let srgb_color: vec4<f32> = vec4(srgb(src.x), srgb(src.y), srgb(src.z), src.w);
-
-    textureStore(out_texture, coords, srgb_color);
+struct VertexOutput {
+    @builtin(position) clip_pos: vec4<f32>,
+    @location(0) uv: vec2<f32>,
 }
+
+@vertex
+fn vs_main(input: VertexInput) -> VertexOutput {
+    var output: VertexOutput;
+
+    output.clip_pos = vec4<f32>(input.v_pos, 0.0, 1.0);
+    output.uv = input.texel_coord;
+
+    return output;
+}
+
+@fragment
+fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
+    return textureSample(frame_texture, frame_sampler, input.uv);
+}
\ No newline at end of file

From af099fa6d72d9c3e23c85a36aee14904526d02f0 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 8 Jun 2023 10:17:53 -0700
Subject: [PATCH 354/440] Added in check for web-colors.

---
 wgpu/src/offscreen.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/wgpu/src/offscreen.rs b/wgpu/src/offscreen.rs
index d0758b66..baa069e8 100644
--- a/wgpu/src/offscreen.rs
+++ b/wgpu/src/offscreen.rs
@@ -1,3 +1,4 @@
+use crate::graphics::color;
 use std::borrow::Cow;
 use wgpu::util::DeviceExt;
 use wgpu::vertex_attr_array;
@@ -16,7 +17,7 @@ pub struct Pipeline {
 #[repr(C)]
 struct Vertex {
     ndc: [f32; 2],
-    texel: [f32; 2],
+    uv: [f32; 2],
 }
 
 impl Pipeline {
@@ -36,22 +37,22 @@ impl Pipeline {
                     //bottom left
                     Vertex {
                         ndc: [-1.0, -1.0],
-                        texel: [0.0, 1.0],
+                        uv: [0.0, 1.0],
                     },
                     //bottom right
                     Vertex {
                         ndc: [1.0, -1.0],
-                        texel: [1.0, 1.0],
+                        uv: [1.0, 1.0],
                     },
                     //top right
                     Vertex {
                         ndc: [1.0, 1.0],
-                        texel: [1.0, 0.0],
+                        uv: [1.0, 0.0],
                     },
                     //top left
                     Vertex {
                         ndc: [-1.0, 1.0],
-                        texel: [0.0, 0.0],
+                        uv: [0.0, 0.0],
                     },
                 ]),
                 usage: wgpu::BufferUsages::VERTEX,
@@ -123,7 +124,11 @@ impl Pipeline {
                     module: &shader,
                     entry_point: "fs_main",
                     targets: &[Some(wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Rgba8UnormSrgb,
+                        format: if color::GAMMA_CORRECTION {
+                            wgpu::TextureFormat::Rgba8UnormSrgb
+                        } else {
+                            wgpu::TextureFormat::Rgba8Unorm
+                        },
                         blend: Some(wgpu::BlendState {
                             color: wgpu::BlendComponent {
                                 src_factor: wgpu::BlendFactor::SrcAlpha,
@@ -171,7 +176,11 @@ impl Pipeline {
             mip_level_count: 1,
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
-            format: wgpu::TextureFormat::Rgba8UnormSrgb,
+            format: if color::GAMMA_CORRECTION {
+                wgpu::TextureFormat::Rgba8UnormSrgb
+            } else {
+                wgpu::TextureFormat::Rgba8Unorm
+            },
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT
                 | wgpu::TextureUsages::COPY_SRC,
             view_formats: &[],

From 34451bff185d8875f55747ee97ed746828e30f40 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, 8 Jun 2023 20:11:59 +0200
Subject: [PATCH 355/440] Implement basic cursor availability

---
 core/src/element.rs                      |  72 ++-----
 core/src/mouse.rs                        |   2 +
 core/src/mouse/cursor.rs                 |  51 +++++
 core/src/overlay.rs                      |   6 +-
 core/src/overlay/element.rs              |  46 ++---
 core/src/overlay/group.rs                |  17 +-
 core/src/widget.rs                       |   8 +-
 core/src/widget/text.rs                  |   7 +-
 examples/arc/src/main.rs                 |   5 +-
 examples/bezier_tool/src/main.rs         |  12 +-
 examples/clock/src/main.rs               |   7 +-
 examples/color_palette/src/main.rs       |  10 +-
 examples/custom_quad/src/main.rs         |   5 +-
 examples/custom_widget/src/main.rs       |   5 +-
 examples/game_of_life/src/main.rs        |  15 +-
 examples/geometry/src/main.rs            |  40 ++--
 examples/modal/src/main.rs               |  35 ++--
 examples/multitouch/src/main.rs          |   7 +-
 examples/sierpinski_triangle/src/main.rs |   5 +-
 examples/solar_system/src/main.rs        |   5 +-
 examples/toast/src/main.rs               |  42 ++--
 runtime/src/user_interface.rs            |  30 +--
 src/lib.rs                               |   4 +-
 widget/src/button.rs                     |  39 ++--
 widget/src/canvas.rs                     |  19 +-
 widget/src/canvas/cursor.rs              |  64 ------
 widget/src/canvas/program.rs             |  13 +-
 widget/src/checkbox.rs                   |  17 +-
 widget/src/column.rs                     |  30 +--
 widget/src/container.rs                  |  12 +-
 widget/src/image.rs                      |   5 +-
 widget/src/image/viewer.rs               |  25 ++-
 widget/src/lazy.rs                       |  36 ++--
 widget/src/lazy/component.rs             |  29 ++-
 widget/src/lazy/responsive.rs            |  50 ++---
 widget/src/mouse_area.rs                 |  20 +-
 widget/src/overlay/menu.rs               |  68 +++---
 widget/src/pane_grid.rs                  | 150 +++++++-------
 widget/src/pane_grid/content.rs          |  66 +++---
 widget/src/pane_grid/draggable.rs        |   6 +-
 widget/src/pane_grid/title_bar.rs        |  18 +-
 widget/src/pick_list.rs                  |  30 +--
 widget/src/progress_bar.rs               |   7 +-
 widget/src/qr_code.rs                    |   3 +-
 widget/src/radio.rs                      |  17 +-
 widget/src/row.rs                        |  30 +--
 widget/src/rule.rs                       |   5 +-
 widget/src/scrollable.rs                 | 252 +++++++++++------------
 widget/src/slider.rs                     |  36 ++--
 widget/src/space.rs                      |   5 +-
 widget/src/svg.rs                        |   5 +-
 widget/src/text_input.rs                 |  38 ++--
 widget/src/toggler.rs                    |  16 +-
 widget/src/tooltip.rs                    |  33 ++-
 widget/src/vertical_slider.rs            |  37 ++--
 55 files changed, 731 insertions(+), 886 deletions(-)
 create mode 100644 core/src/mouse/cursor.rs
 delete mode 100644 widget/src/canvas/cursor.rs

diff --git a/core/src/element.rs b/core/src/element.rs
index 98c53737..3268f14b 100644
--- a/core/src/element.rs
+++ b/core/src/element.rs
@@ -5,9 +5,7 @@ use crate::overlay;
 use crate::renderer;
 use crate::widget;
 use crate::widget::tree::{self, Tree};
-use crate::{
-    Clipboard, Color, Layout, Length, Point, Rectangle, Shell, Widget,
-};
+use crate::{Clipboard, Color, Layout, Length, Rectangle, Shell, Widget};
 
 use std::any::Any;
 use std::borrow::Borrow;
@@ -378,7 +376,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, B>,
@@ -390,7 +388,7 @@ where
             tree,
             event,
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             &mut local_shell,
@@ -408,35 +406,23 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
-        self.widget.draw(
-            tree,
-            renderer,
-            theme,
-            style,
-            layout,
-            cursor_position,
-            viewport,
-        )
+        self.widget
+            .draw(tree, renderer, theme, style, layout, cursor, viewport)
     }
 
     fn mouse_interaction(
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.widget.mouse_interaction(
-            tree,
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
+        self.widget
+            .mouse_interaction(tree, layout, cursor, viewport, renderer)
     }
 
     fn overlay<'b>(
@@ -521,20 +507,14 @@ where
         state: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
-        self.element.widget.on_event(
-            state,
-            event,
-            layout,
-            cursor_position,
-            renderer,
-            clipboard,
-            shell,
-        )
+        self.element
+            .widget
+            .on_event(state, event, layout, cursor, renderer, clipboard, shell)
     }
 
     fn draw(
@@ -544,7 +524,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         fn explain_layout<Renderer: crate::Renderer>(
@@ -567,15 +547,9 @@ where
             }
         }
 
-        self.element.widget.draw(
-            state,
-            renderer,
-            theme,
-            style,
-            layout,
-            cursor_position,
-            viewport,
-        );
+        self.element
+            .widget
+            .draw(state, renderer, theme, style, layout, cursor, viewport);
 
         explain_layout(renderer, self.color, layout);
     }
@@ -584,17 +558,13 @@ where
         &self,
         state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.element.widget.mouse_interaction(
-            state,
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
+        self.element
+            .widget
+            .mouse_interaction(state, layout, cursor, viewport, renderer)
     }
 
     fn overlay<'b>(
diff --git a/core/src/mouse.rs b/core/src/mouse.rs
index 0c405ce6..d13a60fb 100644
--- a/core/src/mouse.rs
+++ b/core/src/mouse.rs
@@ -2,10 +2,12 @@
 pub mod click;
 
 mod button;
+mod cursor;
 mod event;
 mod interaction;
 
 pub use button::Button;
 pub use click::Click;
+pub use cursor::Cursor;
 pub use event::{Event, ScrollDelta};
 pub use interaction::Interaction;
diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
new file mode 100644
index 00000000..d4cb415d
--- /dev/null
+++ b/core/src/mouse/cursor.rs
@@ -0,0 +1,51 @@
+use crate::{Point, Rectangle, Vector};
+
+/// The mouse cursor state.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Cursor {
+    /// The cursor has a defined position.
+    Available(Point),
+
+    /// The cursor is currently unavailable (i.e. out of bounds or busy).
+    Unavailable,
+}
+
+impl Cursor {
+    /// Returns the absolute position of the [`Cursor`], if available.
+    pub fn position(self) -> Option<Point> {
+        match self {
+            Cursor::Available(position) => Some(position),
+            Cursor::Unavailable => None,
+        }
+    }
+
+    /// Returns the absolute position of the [`Cursor`], if available and inside
+    /// the given bounds.
+    ///
+    /// If the [`Cursor`] is not over the provided bounds, this method will
+    /// return `None`.
+    pub fn position_over(self, bounds: &Rectangle) -> Option<Point> {
+        self.position().filter(|p| bounds.contains(*p))
+    }
+
+    /// Returns the relative position of the [`Cursor`] inside the given bounds,
+    /// if available.
+    ///
+    /// If the [`Cursor`] is not over the provided bounds, this method will
+    /// return `None`.
+    pub fn position_in(self, bounds: &Rectangle) -> Option<Point> {
+        self.position_over(bounds)
+            .map(|p| p - Vector::new(bounds.x, bounds.y))
+    }
+
+    /// Returns the relative position of the [`Cursor`] from the given origin,
+    /// if available.
+    pub fn position_from(self, origin: Point) -> Option<Point> {
+        self.position().map(|p| p - Vector::new(origin.x, origin.y))
+    }
+
+    /// Returns true if the [`Cursor`] is over the given `bounds`.
+    pub fn is_over(self, bounds: &Rectangle) -> bool {
+        self.position_over(bounds).is_some()
+    }
+}
diff --git a/core/src/overlay.rs b/core/src/overlay.rs
index b9f3c735..1fa994e4 100644
--- a/core/src/overlay.rs
+++ b/core/src/overlay.rs
@@ -38,7 +38,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     );
 
     /// Applies a [`widget::Operation`] to the [`Overlay`].
@@ -66,7 +66,7 @@ where
         &mut self,
         _event: Event,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         _shell: &mut Shell<'_, Message>,
@@ -80,7 +80,7 @@ where
     fn mouse_interaction(
         &self,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
index 237d25d1..be67fc76 100644
--- a/core/src/overlay/element.rs
+++ b/core/src/overlay/element.rs
@@ -68,35 +68,25 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
-        self.overlay.on_event(
-            event,
-            layout,
-            cursor_position,
-            renderer,
-            clipboard,
-            shell,
-        )
+        self.overlay
+            .on_event(event, layout, cursor, renderer, clipboard, shell)
     }
 
     /// Returns the current [`mouse::Interaction`] of the [`Element`].
     pub fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.overlay.mouse_interaction(
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
+        self.overlay
+            .mouse_interaction(layout, cursor, viewport, renderer)
     }
 
     /// Draws the [`Element`] and its children using the given [`Layout`].
@@ -106,10 +96,9 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
-        self.overlay
-            .draw(renderer, theme, style, layout, cursor_position)
+        self.overlay.draw(renderer, theme, style, layout, cursor)
     }
 
     /// Applies a [`widget::Operation`] to the [`Element`].
@@ -215,7 +204,7 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, B>,
@@ -226,7 +215,7 @@ where
         let event_status = self.content.on_event(
             event,
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             &mut local_shell,
@@ -240,16 +229,12 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.content.mouse_interaction(
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
+        self.content
+            .mouse_interaction(layout, cursor, viewport, renderer)
     }
 
     fn draw(
@@ -258,10 +243,9 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
-        self.content
-            .draw(renderer, theme, style, layout, cursor_position)
+        self.content.draw(renderer, theme, style, layout, cursor)
     }
 
     fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
index 0c48df34..e770abf8 100644
--- a/core/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -81,7 +81,7 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -93,7 +93,7 @@ where
                 child.on_event(
                     event.clone(),
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
@@ -108,17 +108,17 @@ where
         theme: &<Renderer as crate::Renderer>::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         for (child, layout) in self.children.iter().zip(layout.children()) {
-            child.draw(renderer, theme, style, layout, cursor_position);
+            child.draw(renderer, theme, style, layout, cursor);
         }
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -126,12 +126,7 @@ where
             .iter()
             .zip(layout.children())
             .map(|(child, layout)| {
-                child.mouse_interaction(
-                    layout,
-                    cursor_position,
-                    viewport,
-                    renderer,
-                )
+                child.mouse_interaction(layout, cursor, viewport, renderer)
             })
             .max()
             .unwrap_or_default()
diff --git a/core/src/widget.rs b/core/src/widget.rs
index 769f8659..79d86444 100644
--- a/core/src/widget.rs
+++ b/core/src/widget.rs
@@ -15,7 +15,7 @@ use crate::layout::{self, Layout};
 use crate::mouse;
 use crate::overlay;
 use crate::renderer;
-use crate::{Clipboard, Length, Point, Rectangle, Shell};
+use crate::{Clipboard, Length, Rectangle, Shell};
 
 /// A component that displays information and allows interaction.
 ///
@@ -67,7 +67,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     );
 
@@ -111,7 +111,7 @@ where
         _state: &mut Tree,
         _event: Event,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         _shell: &mut Shell<'_, Message>,
@@ -126,7 +126,7 @@ where
         &self,
         _state: &Tree,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 90af88b7..e934a2f5 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -1,12 +1,11 @@
 //! Write some text for your users to read.
 use crate::alignment;
 use crate::layout;
+use crate::mouse;
 use crate::renderer;
 use crate::text;
 use crate::widget::Tree;
-use crate::{
-    Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget,
-};
+use crate::{Color, Element, Layout, Length, Pixels, Rectangle, Size, Widget};
 
 use std::borrow::Cow;
 
@@ -163,7 +162,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor_position: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(
diff --git a/examples/arc/src/main.rs b/examples/arc/src/main.rs
index 80ad0b5b..df565859 100644
--- a/examples/arc/src/main.rs
+++ b/examples/arc/src/main.rs
@@ -1,8 +1,9 @@
 use std::{f32::consts::PI, time::Instant};
 
 use iced::executor;
+use iced::mouse;
 use iced::widget::canvas::{
-    self, stroke, Cache, Canvas, Cursor, Geometry, Path, Stroke,
+    self, stroke, Cache, Canvas, Geometry, Path, Stroke,
 };
 use iced::{
     Application, Command, Element, Length, Point, Rectangle, Renderer,
@@ -78,7 +79,7 @@ impl<Message> canvas::Program<Message> for Arc {
         renderer: &Renderer,
         theme: &Theme,
         bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<Geometry> {
         let geometry = self.cache.draw(renderer, bounds.size(), |frame| {
             let palette = theme.palette();
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index f1c83a16..b4568cbf 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -61,9 +61,7 @@ impl Sandbox for Example {
 mod bezier {
     use iced::mouse;
     use iced::widget::canvas::event::{self, Event};
-    use iced::widget::canvas::{
-        self, Canvas, Cursor, Frame, Geometry, Path, Stroke,
-    };
+    use iced::widget::canvas::{self, Canvas, Frame, Geometry, Path, Stroke};
     use iced::{Element, Length, Point, Rectangle, Renderer, Theme};
 
     #[derive(Default)]
@@ -100,7 +98,7 @@ mod bezier {
             state: &mut Self::State,
             event: Event,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> (event::Status, Option<Curve>) {
             let cursor_position =
                 if let Some(position) = cursor.position_in(&bounds) {
@@ -155,7 +153,7 @@ mod bezier {
             renderer: &Renderer,
             _theme: &Theme,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> Vec<Geometry> {
             let content = self.state.cache.draw(
                 renderer,
@@ -183,7 +181,7 @@ mod bezier {
             &self,
             _state: &Self::State,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> mouse::Interaction {
             if cursor.is_over(&bounds) {
                 mouse::Interaction::Crosshair
@@ -224,7 +222,7 @@ mod bezier {
             &self,
             renderer: &Renderer,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> Geometry {
             let mut frame = Frame::new(renderer, bounds.size());
 
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index 6425e2da..fae77bc0 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -1,7 +1,6 @@
 use iced::executor;
-use iced::widget::canvas::{
-    stroke, Cache, Cursor, Geometry, LineCap, Path, Stroke,
-};
+use iced::mouse;
+use iced::widget::canvas::{stroke, Cache, Geometry, LineCap, Path, Stroke};
 use iced::widget::{canvas, container};
 use iced::{
     Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
@@ -92,7 +91,7 @@ impl<Message> canvas::Program<Message, Renderer> for Clock {
         renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<Geometry> {
         let clock = self.clock.draw(renderer, bounds.size(), |frame| {
             let center = frame.center();
diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
index de01099e..736a9d53 100644
--- a/examples/color_palette/src/main.rs
+++ b/examples/color_palette/src/main.rs
@@ -1,8 +1,10 @@
-use iced::widget::canvas::{self, Canvas, Cursor, Frame, Geometry, Path};
+use iced::alignment::{self, Alignment};
+use iced::mouse;
+use iced::widget::canvas::{self, Canvas, Frame, Geometry, Path};
 use iced::widget::{column, row, text, Slider};
 use iced::{
-    alignment, Alignment, Color, Element, Length, Point, Rectangle, Renderer,
-    Sandbox, Settings, Size, Vector,
+    Color, Element, Length, Point, Rectangle, Renderer, Sandbox, Settings,
+    Size, Vector,
 };
 use palette::{
     self, convert::FromColor, rgb::Rgb, Darken, Hsl, Lighten, ShiftHue,
@@ -246,7 +248,7 @@ impl<Message> canvas::Program<Message> for Theme {
         renderer: &Renderer,
         _theme: &iced::Theme,
         bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<Geometry> {
         let theme = self.canvas_cache.draw(renderer, bounds.size(), |frame| {
             self.draw(frame);
diff --git a/examples/custom_quad/src/main.rs b/examples/custom_quad/src/main.rs
index b07f42ce..4b300116 100644
--- a/examples/custom_quad/src/main.rs
+++ b/examples/custom_quad/src/main.rs
@@ -3,7 +3,8 @@ mod quad {
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
-    use iced::{Color, Element, Length, Point, Rectangle, Size};
+    use iced::mouse;
+    use iced::{Color, Element, Length, Rectangle, Size};
 
     pub struct CustomQuad {
         size: f32,
@@ -48,7 +49,7 @@ mod quad {
             _theme: &Renderer::Theme,
             _style: &renderer::Style,
             layout: Layout<'_>,
-            _cursor_position: Point,
+            _cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
             renderer.fill_quad(
diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs
index 7854548c..713bc62d 100644
--- a/examples/custom_widget/src/main.rs
+++ b/examples/custom_widget/src/main.rs
@@ -12,7 +12,8 @@ mod circle {
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
-    use iced::{Color, Element, Length, Point, Rectangle, Size};
+    use iced::mouse;
+    use iced::{Color, Element, Length, Rectangle, Size};
 
     pub struct Circle {
         radius: f32,
@@ -55,7 +56,7 @@ mod circle {
             _theme: &Renderer::Theme,
             _style: &renderer::Style,
             layout: Layout<'_>,
-            _cursor_position: Point,
+            _cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
             renderer.fill_quad(
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index eab8908b..aaa8efd1 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -204,15 +204,14 @@ fn view_controls<'a>(
 
 mod grid {
     use crate::Preset;
+    use iced::alignment;
+    use iced::mouse;
     use iced::touch;
     use iced::widget::canvas;
     use iced::widget::canvas::event::{self, Event};
-    use iced::widget::canvas::{
-        Cache, Canvas, Cursor, Frame, Geometry, Path, Text,
-    };
+    use iced::widget::canvas::{Cache, Canvas, Frame, Geometry, Path, Text};
     use iced::{
-        alignment, mouse, Color, Element, Length, Point, Rectangle, Renderer,
-        Size, Theme, Vector,
+        Color, Element, Length, Point, Rectangle, Renderer, Size, Theme, Vector,
     };
     use rustc_hash::{FxHashMap, FxHashSet};
     use std::future::Future;
@@ -401,7 +400,7 @@ mod grid {
             interaction: &mut Interaction,
             event: Event,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> (event::Status, Option<Message>) {
             if let Event::Mouse(mouse::Event::ButtonReleased(_)) = event {
                 *interaction = Interaction::None;
@@ -539,7 +538,7 @@ mod grid {
             renderer: &Renderer,
             _theme: &Theme,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> Vec<Geometry> {
             let center = Vector::new(bounds.width / 2.0, bounds.height / 2.0);
 
@@ -670,7 +669,7 @@ mod grid {
             &self,
             interaction: &Interaction,
             bounds: Rectangle,
-            cursor: Cursor,
+            cursor: mouse::Cursor,
         ) -> mouse::Interaction {
             match interaction {
                 Interaction::Drawing => mouse::Interaction::Crosshair,
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index a4183db9..1f949d10 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -7,9 +7,8 @@ mod rainbow {
     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,
-    };
+    use iced::mouse;
+    use iced::{Element, Length, Rectangle, Renderer, Size, Theme, Vector};
 
     #[derive(Debug, Clone, Copy, Default)]
     pub struct Rainbow;
@@ -44,13 +43,13 @@ mod rainbow {
             _theme: &Theme,
             _style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
             use iced::advanced::Renderer as _;
             use iced_graphics::primitive::Mesh2D;
 
-            let b = layout.bounds();
+            let bounds = layout.bounds();
 
             // R O Y G B I V
             let color_r = [1.0, 0.0, 0.0, 1.0];
@@ -63,24 +62,24 @@ mod rainbow {
             let color_v = [0.75, 0.0, 0.5, 1.0];
 
             let posn_center = {
-                if b.contains(cursor_position) {
-                    [cursor_position.x - b.x, cursor_position.y - b.y]
+                if let Some(cursor_position) = cursor.position_in(&bounds) {
+                    [cursor_position.x, cursor_position.y]
                 } else {
-                    [b.width / 2.0, b.height / 2.0]
+                    [bounds.width / 2.0, bounds.height / 2.0]
                 }
             };
 
             let posn_tl = [0.0, 0.0];
-            let posn_t = [b.width / 2.0, 0.0];
-            let posn_tr = [b.width, 0.0];
-            let posn_r = [b.width, b.height / 2.0];
-            let posn_br = [b.width, b.height];
-            let posn_b = [(b.width / 2.0), b.height];
-            let posn_bl = [0.0, b.height];
-            let posn_l = [0.0, b.height / 2.0];
+            let posn_t = [bounds.width / 2.0, 0.0];
+            let posn_tr = [bounds.width, 0.0];
+            let posn_r = [bounds.width, bounds.height / 2.0];
+            let posn_br = [bounds.width, bounds.height];
+            let posn_b = [(bounds.width / 2.0), bounds.height];
+            let posn_bl = [0.0, bounds.height];
+            let posn_l = [0.0, bounds.height / 2.0];
 
             let mesh = Primitive::SolidMesh {
-                size: b.size(),
+                size: bounds.size(),
                 buffers: Mesh2D {
                     vertices: vec![
                         ColoredVertex2D {
@@ -133,9 +132,12 @@ mod rainbow {
                 },
             };
 
-            renderer.with_translation(Vector::new(b.x, b.y), |renderer| {
-                renderer.draw_primitive(mesh);
-            });
+            renderer.with_translation(
+                Vector::new(bounds.x, bounds.y),
+                |renderer| {
+                    renderer.draw_primitive(mesh);
+                },
+            );
         }
     }
 
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 9e1e4c2f..82ed05d2 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -1,10 +1,11 @@
+use iced::executor;
+use iced::keyboard;
+use iced::subscription::{self, Subscription};
+use iced::theme;
 use iced::widget::{
     self, button, column, container, horizontal_space, row, text, text_input,
 };
-use iced::{
-    executor, keyboard, subscription, theme, Alignment, Application, Command,
-    Element, Event, Length, Settings, Subscription,
-};
+use iced::{Alignment, Application, Command, Element, Event, Length, Settings};
 
 use self::modal::Modal;
 
@@ -254,7 +255,7 @@ mod modal {
             state: &mut widget::Tree,
             event: Event,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
@@ -263,7 +264,7 @@ mod modal {
                 &mut state.children[0],
                 event,
                 layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -277,7 +278,7 @@ mod modal {
             theme: &<Renderer as advanced::Renderer>::Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
         ) {
             self.base.as_widget().draw(
@@ -286,7 +287,7 @@ mod modal {
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         }
@@ -312,14 +313,14 @@ mod modal {
             &self,
             state: &widget::Tree,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
         ) -> mouse::Interaction {
             self.base.as_widget().mouse_interaction(
                 &state.children[0],
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
@@ -377,7 +378,7 @@ mod modal {
             &mut self,
             event: Event,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
@@ -389,7 +390,7 @@ mod modal {
                     mouse::Button::Left,
                 )) = &event
                 {
-                    if !content_bounds.contains(cursor_position) {
+                    if !cursor.is_over(&content_bounds) {
                         shell.publish(message.clone());
                         return event::Status::Captured;
                     }
@@ -400,7 +401,7 @@ mod modal {
                 self.tree,
                 event,
                 layout.children().next().unwrap(),
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -413,7 +414,7 @@ mod modal {
             theme: &Renderer::Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
         ) {
             renderer.fill_quad(
                 renderer::Quad {
@@ -434,7 +435,7 @@ mod modal {
                 theme,
                 style,
                 layout.children().next().unwrap(),
-                cursor_position,
+                cursor,
                 &layout.bounds(),
             );
         }
@@ -456,14 +457,14 @@ mod modal {
         fn mouse_interaction(
             &self,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
         ) -> mouse::Interaction {
             self.content.as_widget().mouse_interaction(
                 self.tree,
                 layout.children().next().unwrap(),
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
diff --git a/examples/multitouch/src/main.rs b/examples/multitouch/src/main.rs
index 7df6c929..2830b78d 100644
--- a/examples/multitouch/src/main.rs
+++ b/examples/multitouch/src/main.rs
@@ -1,9 +1,10 @@
 //! This example shows how to use touch events in `Canvas` to draw
 //! a circle around each fingertip. This only works on touch-enabled
 //! computers like Microsoft Surface.
+use iced::mouse;
 use iced::widget::canvas::event;
 use iced::widget::canvas::stroke::{self, Stroke};
-use iced::widget::canvas::{self, Canvas, Cursor, Geometry};
+use iced::widget::canvas::{self, Canvas, Geometry};
 use iced::{
     executor, touch, window, Application, Color, Command, Element, Length,
     Point, Rectangle, Renderer, Settings, Subscription, Theme,
@@ -103,7 +104,7 @@ impl canvas::Program<Message, Renderer> for State {
         _state: &mut Self::State,
         event: event::Event,
         _bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> (event::Status, Option<Message>) {
         match event {
             event::Event::Touch(touch_event) => match touch_event {
@@ -128,7 +129,7 @@ impl canvas::Program<Message, Renderer> for State {
         renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<Geometry> {
         let fingerweb = self.cache.draw(renderer, bounds.size(), |frame| {
             if self.fingers.len() < 2 {
diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
index 4faac6d6..ad681a91 100644
--- a/examples/sierpinski_triangle/src/main.rs
+++ b/examples/sierpinski_triangle/src/main.rs
@@ -1,6 +1,7 @@
 use std::fmt::Debug;
 
 use iced::executor;
+use iced::mouse;
 use iced::widget::canvas::event::{self, Event};
 use iced::widget::canvas::{self, Canvas};
 use iced::widget::{column, row, slider, text};
@@ -105,7 +106,7 @@ impl canvas::Program<Message> for SierpinskiGraph {
         _state: &mut Self::State,
         event: Event,
         bounds: Rectangle,
-        cursor: canvas::Cursor,
+        cursor: mouse::Cursor,
     ) -> (event::Status, Option<Message>) {
         let cursor_position =
             if let Some(position) = cursor.position_in(&bounds) {
@@ -137,7 +138,7 @@ impl canvas::Program<Message> for SierpinskiGraph {
         renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
-        _cursor: canvas::Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<canvas::Geometry> {
         let geom = self.cache.draw(renderer, bounds.size(), |frame| {
             frame.stroke(
diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs
index d9e660d7..58d06206 100644
--- a/examples/solar_system/src/main.rs
+++ b/examples/solar_system/src/main.rs
@@ -8,11 +8,12 @@
 //! [1]: https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API/Tutorial/Basic_animations#An_animated_solar_system
 use iced::application;
 use iced::executor;
+use iced::mouse;
 use iced::theme::{self, Theme};
 use iced::widget::canvas;
 use iced::widget::canvas::gradient;
 use iced::widget::canvas::stroke::{self, Stroke};
-use iced::widget::canvas::{Cursor, Path};
+use iced::widget::canvas::Path;
 use iced::window;
 use iced::{
     Application, Color, Command, Element, Length, Point, Rectangle, Renderer,
@@ -161,7 +162,7 @@ impl<Message> canvas::Program<Message> for State {
         renderer: &Renderer,
         _theme: &Theme,
         bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> Vec<canvas::Geometry> {
         use std::f32::consts::PI;
 
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 515218e7..395cbc10 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -1,10 +1,10 @@
+use iced::executor;
+use iced::keyboard;
+use iced::subscription::{self, Subscription};
 use iced::widget::{
     self, button, column, container, pick_list, row, slider, text, text_input,
 };
-use iced::{
-    executor, keyboard, subscription, Alignment, Application, Command, Element,
-    Event, Length, Settings, Subscription,
-};
+use iced::{Alignment, Application, Command, Element, Event, Length, Settings};
 
 use toast::{Status, Toast};
 
@@ -396,7 +396,7 @@ mod toast {
             state: &mut Tree,
             event: Event,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
@@ -405,7 +405,7 @@ mod toast {
                 &mut state.children[0],
                 event,
                 layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -419,7 +419,7 @@ mod toast {
             theme: &Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
         ) {
             self.content.as_widget().draw(
@@ -428,7 +428,7 @@ mod toast {
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         }
@@ -437,14 +437,14 @@ mod toast {
             &self,
             state: &Tree,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
         ) -> mouse::Interaction {
             self.content.as_widget().mouse_interaction(
                 &state.children[0],
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
@@ -523,7 +523,7 @@ mod toast {
             &mut self,
             event: Event,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
@@ -572,7 +572,7 @@ mod toast {
                         state,
                         event.clone(),
                         layout,
-                        cursor_position,
+                        cursor,
                         renderer,
                         clipboard,
                         &mut local_shell,
@@ -595,7 +595,7 @@ mod toast {
             theme: &<Renderer as advanced::Renderer>::Theme,
             style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
         ) {
             let viewport = layout.bounds();
 
@@ -606,13 +606,7 @@ mod toast {
                 .zip(layout.children())
             {
                 child.as_widget().draw(
-                    state,
-                    renderer,
-                    theme,
-                    style,
-                    layout,
-                    cursor_position,
-                    &viewport,
+                    state, renderer, theme, style, layout, cursor, &viewport,
                 );
             }
         }
@@ -639,7 +633,7 @@ mod toast {
         fn mouse_interaction(
             &self,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
         ) -> mouse::Interaction {
@@ -649,11 +643,7 @@ mod toast {
                 .zip(layout.children())
                 .map(|((child, state), layout)| {
                     child.as_widget().mouse_interaction(
-                        state,
-                        layout,
-                        cursor_position,
-                        viewport,
-                        renderer,
+                        state, layout, cursor, viewport, renderer,
                     )
                 })
                 .max()
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index d9206134..7dee13bc 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -203,7 +203,7 @@ where
                 let event_status = overlay.on_event(
                     event,
                     Layout::new(&layout),
-                    cursor_position,
+                    mouse::Cursor::Available(cursor_position),
                     renderer,
                     clipboard,
                     &mut shell,
@@ -257,17 +257,17 @@ where
                 .filter(|overlay| {
                     overlay.is_over(Layout::new(&layout), cursor_position)
                 })
-                .map(|_| {
-                    // TODO: Type-safe cursor availability
-                    Point::new(-1.0, -1.0)
-                })
-                .unwrap_or(cursor_position);
+                .map(|_| mouse::Cursor::Unavailable)
+                .unwrap_or(mouse::Cursor::Available(cursor_position));
 
             self.overlay = Some(layout);
 
             (base_cursor, event_statuses)
         } else {
-            (cursor_position, vec![event::Status::Ignored; events.len()])
+            (
+                mouse::Cursor::Available(cursor_position),
+                vec![event::Status::Ignored; events.len()],
+            )
         };
 
         let _ = ManuallyDrop::into_inner(manual_overlay);
@@ -427,19 +427,19 @@ where
                 overlay.layout(renderer, self.bounds, Vector::ZERO)
             });
 
-            let new_cursor_position = if overlay
+            let cursor = if overlay
                 .is_over(Layout::new(&overlay_layout), cursor_position)
             {
-                Point::new(-1.0, -1.0)
+                mouse::Cursor::Unavailable
             } else {
-                cursor_position
+                mouse::Cursor::Available(cursor_position)
             };
 
             self.overlay = Some(overlay_layout);
 
-            new_cursor_position
+            cursor
         } else {
-            cursor_position
+            mouse::Cursor::Available(cursor_position)
         };
 
         self.root.as_widget().draw(
@@ -455,7 +455,7 @@ where
         let base_interaction = self.root.as_widget().mouse_interaction(
             &self.state,
             Layout::new(&self.base),
-            cursor_position,
+            base_cursor,
             &viewport,
             renderer,
         );
@@ -480,7 +480,7 @@ where
                     .map(|overlay| {
                         let overlay_interaction = overlay.mouse_interaction(
                             Layout::new(layout),
-                            cursor_position,
+                            mouse::Cursor::Available(cursor_position),
                             &viewport,
                             renderer,
                         );
@@ -493,7 +493,7 @@ where
                                 theme,
                                 style,
                                 Layout::new(layout),
-                                cursor_position,
+                                mouse::Cursor::Available(cursor_position),
                             );
                         });
 
diff --git a/src/lib.rs b/src/lib.rs
index a0b8a956..ec1230c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -230,7 +230,9 @@ pub mod keyboard {
 
 pub mod mouse {
     //! Listen and react to mouse events.
-    pub use crate::core::mouse::{Button, Event, Interaction, ScrollDelta};
+    pub use crate::core::mouse::{
+        Button, Cursor, Event, Interaction, ScrollDelta,
+    };
 }
 
 pub mod subscription {
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 70fed1d5..89af341c 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -187,7 +187,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -196,7 +196,7 @@ where
             &mut tree.children[0],
             event.clone(),
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
@@ -204,14 +204,9 @@ where
             return event::Status::Captured;
         }
 
-        update(
-            event,
-            layout,
-            cursor_position,
-            shell,
-            &self.on_press,
-            || tree.state.downcast_mut::<State>(),
-        )
+        update(event, layout, cursor, shell, &self.on_press, || {
+            tree.state.downcast_mut::<State>()
+        })
     }
 
     fn draw(
@@ -221,7 +216,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();
@@ -230,7 +225,7 @@ where
         let styling = draw(
             renderer,
             bounds,
-            cursor_position,
+            cursor,
             self.on_press.is_some(),
             theme,
             &self.style,
@@ -245,7 +240,7 @@ where
                 text_color: styling.text_color,
             },
             content_layout,
-            cursor_position,
+            cursor,
             &bounds,
         );
     }
@@ -254,11 +249,11 @@ where
         &self,
         _tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(layout, cursor_position, self.on_press.is_some())
+        mouse_interaction(layout, cursor, self.on_press.is_some())
     }
 
     fn overlay<'b>(
@@ -305,7 +300,7 @@ impl State {
 pub fn update<'a, Message: Clone>(
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
     on_press: &Option<Message>,
     state: impl FnOnce() -> &'a mut State,
@@ -316,7 +311,7 @@ pub fn update<'a, Message: Clone>(
             if on_press.is_some() {
                 let bounds = layout.bounds();
 
-                if bounds.contains(cursor_position) {
+                if cursor.is_over(&bounds) {
                     let state = state();
 
                     state.is_pressed = true;
@@ -335,7 +330,7 @@ pub fn update<'a, Message: Clone>(
 
                     let bounds = layout.bounds();
 
-                    if bounds.contains(cursor_position) {
+                    if cursor.is_over(&bounds) {
                         shell.publish(on_press);
                     }
 
@@ -358,7 +353,7 @@ pub fn update<'a, Message: Clone>(
 pub fn draw<'a, Renderer: crate::core::Renderer>(
     renderer: &mut Renderer,
     bounds: Rectangle,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     is_enabled: bool,
     style_sheet: &dyn StyleSheet<
         Style = <Renderer::Theme as StyleSheet>::Style,
@@ -369,7 +364,7 @@ pub fn draw<'a, Renderer: crate::core::Renderer>(
 where
     Renderer::Theme: StyleSheet,
 {
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
 
     let styling = if !is_enabled {
         style_sheet.disabled(style)
@@ -442,10 +437,10 @@ pub fn layout<Renderer>(
 /// Returns the [`mouse::Interaction`] of a [`Button`].
 pub fn mouse_interaction(
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     is_enabled: bool,
 ) -> mouse::Interaction {
-    let is_mouse_over = layout.bounds().contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&layout.bounds());
 
     if is_mouse_over && is_enabled {
         mouse::Interaction::Pointer
diff --git a/widget/src/canvas.rs b/widget/src/canvas.rs
index 171c4534..96062038 100644
--- a/widget/src/canvas.rs
+++ b/widget/src/canvas.rs
@@ -1,10 +1,8 @@
 //! Draw 2D graphics for your users.
 pub mod event;
 
-mod cursor;
 mod program;
 
-pub use cursor::Cursor;
 pub use event::Event;
 pub use program::Program;
 
@@ -17,7 +15,7 @@ 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::core::{Length, Rectangle, Size, Vector};
 use crate::graphics::geometry;
 
 use std::marker::PhantomData;
@@ -28,8 +26,9 @@ 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_widget::canvas::{self, Canvas, Fill, Frame, Geometry, Path, Program};
 /// # use iced_widget::core::{Color, Rectangle};
+/// # use iced_widget::core::mouse;
 /// # use iced_widget::style::Theme;
 /// #
 /// # pub type Renderer = iced_widget::renderer::Renderer<Theme>;
@@ -43,7 +42,7 @@ use std::marker::PhantomData;
 /// impl Program<()> for Circle {
 ///     type State = ();
 ///
-///     fn draw(&self, _state: &(), renderer: &Renderer, _theme: &Theme, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry>{
+///     fn draw(&self, _state: &(), renderer: &Renderer, _theme: &Theme, bounds: Rectangle, _cursor: mouse::Cursor) -> Vec<Geometry>{
 ///         // We prepare a new `Frame`
 ///         let mut frame = Frame::new(renderer, bounds.size());
 ///
@@ -144,7 +143,7 @@ where
         tree: &mut Tree,
         event: core::Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -160,8 +159,6 @@ where
             _ => None,
         };
 
-        let cursor = Cursor::from_window_position(cursor_position);
-
         if let Some(canvas_event) = canvas_event {
             let state = tree.state.downcast_mut::<P::State>();
 
@@ -182,12 +179,11 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
         let bounds = layout.bounds();
-        let cursor = Cursor::from_window_position(cursor_position);
         let state = tree.state.downcast_ref::<P::State>();
 
         self.program.mouse_interaction(state, bounds, cursor)
@@ -200,7 +196,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();
@@ -209,7 +205,6 @@ where
             return;
         }
 
-        let cursor = Cursor::from_window_position(cursor_position);
         let state = tree.state.downcast_ref::<P::State>();
 
         renderer.with_translation(
diff --git a/widget/src/canvas/cursor.rs b/widget/src/canvas/cursor.rs
deleted file mode 100644
index 5a65e9a7..00000000
--- a/widget/src/canvas/cursor.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use crate::core::{Point, Rectangle};
-
-/// The mouse cursor state.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Cursor {
-    /// The cursor has a defined position.
-    Available(Point),
-
-    /// The cursor is currently unavailable (i.e. out of bounds or busy).
-    Unavailable,
-}
-
-impl Cursor {
-    // TODO: Remove this once this type is used in `iced_native` to encode
-    // proper cursor availability
-    pub(crate) fn from_window_position(position: Point) -> Self {
-        if position.x < 0.0 || position.y < 0.0 {
-            Cursor::Unavailable
-        } else {
-            Cursor::Available(position)
-        }
-    }
-
-    /// Returns the absolute position of the [`Cursor`], if available.
-    pub fn position(&self) -> Option<Point> {
-        match self {
-            Cursor::Available(position) => Some(*position),
-            Cursor::Unavailable => None,
-        }
-    }
-
-    /// Returns the relative position of the [`Cursor`] inside the given bounds,
-    /// if available.
-    ///
-    /// If the [`Cursor`] is not over the provided bounds, this method will
-    /// return `None`.
-    pub fn position_in(&self, bounds: &Rectangle) -> Option<Point> {
-        if self.is_over(bounds) {
-            self.position_from(bounds.position())
-        } else {
-            None
-        }
-    }
-
-    /// Returns the relative position of the [`Cursor`] from the given origin,
-    /// if available.
-    pub fn position_from(&self, origin: Point) -> Option<Point> {
-        match self {
-            Cursor::Available(position) => {
-                Some(Point::new(position.x - origin.x, position.y - origin.y))
-            }
-            Cursor::Unavailable => None,
-        }
-    }
-
-    /// Returns whether the [`Cursor`] is currently over the provided bounds
-    /// or not.
-    pub fn is_over(&self, bounds: &Rectangle) -> bool {
-        match self {
-            Cursor::Available(position) => bounds.contains(*position),
-            Cursor::Unavailable => false,
-        }
-    }
-}
diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
index ad0fbb83..929ee285 100644
--- a/widget/src/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -1,6 +1,5 @@
 use crate::canvas::event::{self, Event};
 use crate::canvas::mouse;
-use crate::canvas::Cursor;
 use crate::core::Rectangle;
 use crate::graphics::geometry::{self, Geometry};
 
@@ -33,7 +32,7 @@ where
         _state: &mut Self::State,
         _event: Event,
         _bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> (event::Status, Option<Message>) {
         (event::Status::Ignored, None)
     }
@@ -51,7 +50,7 @@ where
         renderer: &Renderer,
         theme: &Renderer::Theme,
         bounds: Rectangle,
-        cursor: Cursor,
+        cursor: mouse::Cursor,
     ) -> Vec<Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
@@ -64,7 +63,7 @@ where
         &self,
         _state: &Self::State,
         _bounds: Rectangle,
-        _cursor: Cursor,
+        _cursor: mouse::Cursor,
     ) -> mouse::Interaction {
         mouse::Interaction::default()
     }
@@ -82,7 +81,7 @@ where
         state: &mut Self::State,
         event: Event,
         bounds: Rectangle,
-        cursor: Cursor,
+        cursor: mouse::Cursor,
     ) -> (event::Status, Option<Message>) {
         T::update(self, state, event, bounds, cursor)
     }
@@ -93,7 +92,7 @@ where
         renderer: &Renderer,
         theme: &Renderer::Theme,
         bounds: Rectangle,
-        cursor: Cursor,
+        cursor: mouse::Cursor,
     ) -> Vec<Geometry> {
         T::draw(self, state, renderer, theme, bounds, cursor)
     }
@@ -102,7 +101,7 @@ where
         &self,
         state: &Self::State,
         bounds: Rectangle,
-        cursor: Cursor,
+        cursor: mouse::Cursor,
     ) -> mouse::Interaction {
         T::mouse_interaction(self, state, bounds, cursor)
     }
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 4c8a989b..86f573dd 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -8,8 +8,8 @@ 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,
+    Alignment, Clipboard, Element, Layout, Length, Pixels, Rectangle, Shell,
+    Widget,
 };
 use crate::{Row, Text};
 
@@ -204,7 +204,7 @@ where
         _tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -212,7 +212,7 @@ where
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
-                let mouse_over = layout.bounds().contains(cursor_position);
+                let mouse_over = cursor.is_over(&layout.bounds());
 
                 if mouse_over {
                     shell.publish((self.on_toggle)(!self.is_checked));
@@ -230,11 +230,11 @@ where
         &self,
         _tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if layout.bounds().contains(cursor_position) {
+        if cursor.is_over(&layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -248,11 +248,10 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
-        let bounds = layout.bounds();
-        let is_mouse_over = bounds.contains(cursor_position);
+        let is_mouse_over = cursor.is_over(&layout.bounds());
 
         let mut children = layout.children();
 
diff --git a/widget/src/column.rs b/widget/src/column.rs
index 8f363ec6..d92d794b 100644
--- a/widget/src/column.rs
+++ b/widget/src/column.rs
@@ -6,8 +6,8 @@ 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,
+    Alignment, Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle,
+    Shell, Widget,
 };
 
 /// A container that distributes its contents vertically.
@@ -166,7 +166,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -180,7 +180,7 @@ where
                     state,
                     event.clone(),
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
@@ -193,7 +193,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -203,11 +203,7 @@ where
             .zip(layout.children())
             .map(|((child, state), layout)| {
                 child.as_widget().mouse_interaction(
-                    state,
-                    layout,
-                    cursor_position,
-                    viewport,
-                    renderer,
+                    state, layout, cursor, viewport, renderer,
                 )
             })
             .max()
@@ -221,7 +217,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         for ((child, state), layout) in self
@@ -230,15 +226,9 @@ where
             .zip(&tree.children)
             .zip(layout.children())
         {
-            child.as_widget().draw(
-                state,
-                renderer,
-                theme,
-                style,
-                layout,
-                cursor_position,
-                viewport,
-            );
+            child
+                .as_widget()
+                .draw(state, renderer, theme, style, layout, cursor, viewport);
         }
     }
 
diff --git a/widget/src/container.rs b/widget/src/container.rs
index 13e76551..da9a31d6 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -196,7 +196,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -205,7 +205,7 @@ where
             &mut tree.children[0],
             event,
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
@@ -216,14 +216,14 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.content.as_widget().mouse_interaction(
             &tree.children[0],
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         )
@@ -236,7 +236,7 @@ where
         theme: &Renderer::Theme,
         renderer_style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         let style = theme.appearance(&self.style);
@@ -253,7 +253,7 @@ where
                     .unwrap_or(renderer_style.text_color),
             },
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             viewport,
         );
     }
diff --git a/widget/src/image.rs b/widget/src/image.rs
index abcb6ef2..66bf2156 100644
--- a/widget/src/image.rs
+++ b/widget/src/image.rs
@@ -4,10 +4,11 @@ pub use viewer::Viewer;
 
 use crate::core::image;
 use crate::core::layout;
+use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{
-    ContentFit, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
+    ContentFit, Element, Layout, Length, Rectangle, Size, Vector, Widget,
 };
 
 use std::hash::Hash;
@@ -186,7 +187,7 @@ where
         _theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(renderer, layout, &self.handle, self.content_fit)
diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index 0d60d818..a2ee1e5c 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -144,18 +144,19 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         _shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         let bounds = layout.bounds();
-        let is_mouse_over = bounds.contains(cursor_position);
 
         match event {
-            Event::Mouse(mouse::Event::WheelScrolled { delta })
-                if is_mouse_over =>
-            {
+            Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+                let Some(cursor_position) = cursor.position() else {
+                    return event::Status::Ignored;
+                };
+
                 match delta {
                     mouse::ScrollDelta::Lines { y, .. }
                     | mouse::ScrollDelta::Pixels { y, .. } => {
@@ -205,9 +206,11 @@ where
 
                 event::Status::Captured
             }
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
-                if is_mouse_over =>
-            {
+            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+                let Some(cursor_position) = cursor.position() else {
+                    return event::Status::Ignored;
+                };
+
                 let state = tree.state.downcast_mut::<State>();
 
                 state.cursor_grabbed_at = Some(cursor_position);
@@ -277,13 +280,13 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
         let state = tree.state.downcast_ref::<State>();
         let bounds = layout.bounds();
-        let is_mouse_over = bounds.contains(cursor_position);
+        let is_mouse_over = cursor.is_over(&bounds);
 
         if state.is_cursor_grabbed() {
             mouse::Interaction::Grabbing
@@ -301,7 +304,7 @@ where
         _theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let state = tree.state.downcast_ref::<State>();
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 0ad46865..92a611c3 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -181,7 +181,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -191,7 +191,7 @@ where
                 &mut tree.children[0],
                 event,
                 layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -203,7 +203,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -211,7 +211,7 @@ where
             element.as_widget().mouse_interaction(
                 &tree.children[0],
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
@@ -225,7 +225,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         self.with_element(|element| {
@@ -235,7 +235,7 @@ where
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             )
         })
@@ -342,27 +342,22 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         let _ = self.with_overlay_maybe(|overlay| {
-            overlay.draw(renderer, theme, style, layout, cursor_position);
+            overlay.draw(renderer, theme, style, layout, cursor);
         });
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.with_overlay_maybe(|overlay| {
-            overlay.mouse_interaction(
-                layout,
-                cursor_position,
-                viewport,
-                renderer,
-            )
+            overlay.mouse_interaction(layout, cursor, viewport, renderer)
         })
         .unwrap_or_default()
     }
@@ -371,20 +366,13 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         self.with_overlay_mut_maybe(|overlay| {
-            overlay.on_event(
-                event,
-                layout,
-                cursor_position,
-                renderer,
-                clipboard,
-                shell,
-            )
+            overlay.on_event(event, layout, cursor, renderer, clipboard, shell)
         })
         .unwrap_or(event::Status::Ignored)
     }
diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index 49ae68af..f462c8cf 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -265,7 +265,7 @@ where
         tree: &mut Tree,
         event: core::Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -279,7 +279,7 @@ where
                 &mut t.borrow_mut().as_mut().unwrap().children[0],
                 event,
                 layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 &mut local_shell,
@@ -397,7 +397,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         let tree = tree.state.downcast_ref::<Rc<RefCell<Option<Tree>>>>();
@@ -408,7 +408,7 @@ where
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         });
@@ -418,7 +418,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -427,7 +427,7 @@ where
             element.as_widget().mouse_interaction(
                 &tree.borrow().as_ref().unwrap().children[0],
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
@@ -569,27 +569,22 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         let _ = self.with_overlay_maybe(|overlay| {
-            overlay.draw(renderer, theme, style, layout, cursor_position);
+            overlay.draw(renderer, theme, style, layout, cursor);
         });
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.with_overlay_maybe(|overlay| {
-            overlay.mouse_interaction(
-                layout,
-                cursor_position,
-                viewport,
-                renderer,
-            )
+            overlay.mouse_interaction(layout, cursor, viewport, renderer)
         })
         .unwrap_or_default()
     }
@@ -598,7 +593,7 @@ where
         &mut self,
         event: core::Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -611,7 +606,7 @@ where
                 overlay.on_event(
                     event,
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     &mut local_shell,
diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs
index 9b4fd9dd..bd6385bc 100644
--- a/widget/src/lazy/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -177,7 +177,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -198,7 +198,7 @@ where
                     tree,
                     event,
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     &mut local_shell,
@@ -222,7 +222,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         let state = tree.state.downcast_ref::<State>();
@@ -235,13 +235,7 @@ where
             &self.view,
             |tree, renderer, layout, element| {
                 element.as_widget().draw(
-                    tree,
-                    renderer,
-                    theme,
-                    style,
-                    layout,
-                    cursor_position,
-                    viewport,
+                    tree, renderer, theme, style, layout, cursor, viewport,
                 )
             },
         )
@@ -251,7 +245,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -264,13 +258,9 @@ where
             layout,
             &self.view,
             |tree, renderer, layout, element| {
-                element.as_widget().mouse_interaction(
-                    tree,
-                    layout,
-                    cursor_position,
-                    viewport,
-                    renderer,
-                )
+                element
+                    .as_widget()
+                    .mouse_interaction(tree, layout, cursor, viewport, renderer)
             },
         )
     }
@@ -384,27 +374,22 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         let _ = self.with_overlay_maybe(|overlay| {
-            overlay.draw(renderer, theme, style, layout, cursor_position);
+            overlay.draw(renderer, theme, style, layout, cursor);
         });
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.with_overlay_maybe(|overlay| {
-            overlay.mouse_interaction(
-                layout,
-                cursor_position,
-                viewport,
-                renderer,
-            )
+            overlay.mouse_interaction(layout, cursor, viewport, renderer)
         })
         .unwrap_or_default()
     }
@@ -413,20 +398,13 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         self.with_overlay_mut_maybe(|overlay| {
-            overlay.on_event(
-                event,
-                layout,
-                cursor_position,
-                renderer,
-                clipboard,
-                shell,
-            )
+            overlay.on_event(event, layout, cursor, renderer, clipboard, shell)
         })
         .unwrap_or(event::Status::Ignored)
     }
diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs
index 0232c494..423f070c 100644
--- a/widget/src/mouse_area.rs
+++ b/widget/src/mouse_area.rs
@@ -8,7 +8,7 @@ use crate::core::renderer;
 use crate::core::touch;
 use crate::core::widget::{tree, Operation, Tree};
 use crate::core::{
-    Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Widget,
+    Clipboard, Element, Layout, Length, Rectangle, Shell, Widget,
 };
 
 /// Emit messages on mouse events.
@@ -146,7 +146,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -155,7 +155,7 @@ where
             &mut tree.children[0],
             event.clone(),
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
@@ -163,21 +163,21 @@ where
             return event::Status::Captured;
         }
 
-        update(self, &event, layout, cursor_position, shell)
+        update(self, &event, layout, cursor, shell)
     }
 
     fn mouse_interaction(
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.content.as_widget().mouse_interaction(
             &tree.children[0],
             layout,
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         )
@@ -190,7 +190,7 @@ where
         theme: &Renderer::Theme,
         renderer_style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         self.content.as_widget().draw(
@@ -199,7 +199,7 @@ where
             theme,
             renderer_style,
             layout,
-            cursor_position,
+            cursor,
             viewport,
         );
     }
@@ -237,10 +237,10 @@ fn update<Message: Clone, Renderer>(
     widget: &mut MouseArea<'_, Message, Renderer>,
     event: &Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
 ) -> event::Status {
-    if !layout.bounds().contains(cursor_position) {
+    if !cursor.is_over(&layout.bounds()) {
         return event::Status::Ignored;
     }
 
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index 84cc800c..fe1175ac 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -259,36 +259,25 @@ where
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         self.container.on_event(
-            self.state,
-            event,
-            layout,
-            cursor_position,
-            renderer,
-            clipboard,
-            shell,
+            self.state, event, layout, cursor, renderer, clipboard, shell,
         )
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.container.mouse_interaction(
-            self.state,
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
+        self.container
+            .mouse_interaction(self.state, layout, cursor, viewport, renderer)
     }
 
     fn draw(
@@ -297,7 +286,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         let appearance = theme.appearance(&self.style);
         let bounds = layout.bounds();
@@ -312,15 +301,8 @@ where
             appearance.background,
         );
 
-        self.container.draw(
-            self.state,
-            renderer,
-            theme,
-            style,
-            layout,
-            cursor_position,
-            &bounds,
-        );
+        self.container
+            .draw(self.state, renderer, theme, style, layout, cursor, &bounds);
     }
 }
 
@@ -387,7 +369,7 @@ where
         _state: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         _shell: &mut Shell<'_, Message>,
@@ -396,7 +378,7 @@ where
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
                 let bounds = layout.bounds();
 
-                if bounds.contains(cursor_position) {
+                if cursor.is_over(&bounds) {
                     if let Some(index) = *self.hovered_option {
                         if let Some(option) = self.options.get(index) {
                             *self.last_selection = Some(option.clone());
@@ -405,9 +387,9 @@ where
                 }
             }
             Event::Mouse(mouse::Event::CursorMoved { .. }) => {
-                let bounds = layout.bounds();
-
-                if bounds.contains(cursor_position) {
+                if let Some(cursor_position) =
+                    cursor.position_in(&layout.bounds())
+                {
                     let text_size = self
                         .text_size
                         .unwrap_or_else(|| renderer.default_size());
@@ -416,16 +398,14 @@ where
                         self.text_line_height.to_absolute(Pixels(text_size)),
                     ) + self.padding.vertical();
 
-                    *self.hovered_option = Some(
-                        ((cursor_position.y - bounds.y) / option_height)
-                            as usize,
-                    );
+                    *self.hovered_option =
+                        Some((cursor_position.y / option_height) as usize);
                 }
             }
             Event::Touch(touch::Event::FingerPressed { .. }) => {
-                let bounds = layout.bounds();
-
-                if bounds.contains(cursor_position) {
+                if let Some(cursor_position) =
+                    cursor.position_in(&layout.bounds())
+                {
                     let text_size = self
                         .text_size
                         .unwrap_or_else(|| renderer.default_size());
@@ -434,10 +414,8 @@ where
                         self.text_line_height.to_absolute(Pixels(text_size)),
                     ) + self.padding.vertical();
 
-                    *self.hovered_option = Some(
-                        ((cursor_position.y - bounds.y) / option_height)
-                            as usize,
-                    );
+                    *self.hovered_option =
+                        Some((cursor_position.y / option_height) as usize);
 
                     if let Some(index) = *self.hovered_option {
                         if let Some(option) = self.options.get(index) {
@@ -456,11 +434,11 @@ where
         &self,
         _state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        let is_mouse_over = layout.bounds().contains(cursor_position);
+        let is_mouse_over = cursor.is_over(&layout.bounds());
 
         if is_mouse_over {
             mouse::Interaction::Pointer
@@ -476,7 +454,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         let appearance = theme.appearance(&self.style);
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 7bddc4a6..7e0198fe 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -313,7 +313,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -331,7 +331,7 @@ where
             self.contents.layout(),
             &event,
             layout,
-            cursor_position,
+            cursor,
             shell,
             self.spacing,
             self.contents.iter(),
@@ -353,7 +353,7 @@ where
                     tree,
                     event.clone(),
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
@@ -367,7 +367,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -375,7 +375,7 @@ where
             tree.state.downcast_ref(),
             self.contents.layout(),
             layout,
-            cursor_position,
+            cursor,
             self.spacing,
             self.on_resize.as_ref().map(|(leeway, _)| *leeway),
         )
@@ -388,7 +388,7 @@ where
                     content.mouse_interaction(
                         tree,
                         layout,
-                        cursor_position,
+                        cursor,
                         viewport,
                         renderer,
                         self.drag_enabled(),
@@ -406,14 +406,14 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         draw(
             tree.state.downcast_ref(),
             self.contents.layout(),
             layout,
-            cursor_position,
+            cursor,
             renderer,
             theme,
             style,
@@ -425,20 +425,9 @@ where
                 .iter()
                 .zip(&tree.children)
                 .map(|((pane, content), tree)| (pane, (content, tree))),
-            |(content, tree),
-             renderer,
-             style,
-             layout,
-             cursor_position,
-             rectangle| {
+            |(content, tree), renderer, style, layout, cursor, rectangle| {
                 content.draw(
-                    tree,
-                    renderer,
-                    theme,
-                    style,
-                    layout,
-                    cursor_position,
-                    rectangle,
+                    tree, renderer, theme, style, layout, cursor, rectangle,
                 );
             },
         )
@@ -520,7 +509,7 @@ pub fn update<'a, Message, T: Draggable>(
     node: &Node,
     event: &Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
     spacing: f32,
     contents: impl Iterator<Item = (Pane, T)>,
@@ -535,7 +524,7 @@ pub fn update<'a, Message, T: Draggable>(
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let bounds = layout.bounds();
 
-            if bounds.contains(cursor_position) {
+            if let Some(cursor_position) = cursor.position_over(&bounds) {
                 event_status = event::Status::Captured;
 
                 match on_resize {
@@ -592,14 +581,18 @@ pub fn update<'a, Message, T: Draggable>(
         | Event::Touch(touch::Event::FingerLost { .. }) => {
             if let Some((pane, _)) = action.picked_pane() {
                 if let Some(on_drag) = on_drag {
-                    let mut dropped_region = contents
-                        .zip(layout.children())
-                        .filter_map(|(target, layout)| {
-                            layout_region(layout, cursor_position)
-                                .map(|region| (target, region))
+                    let dropped_region =
+                        cursor.position().and_then(|cursor_position| {
+                            contents
+                                .zip(layout.children())
+                                .filter_map(|(target, layout)| {
+                                    layout_region(layout, cursor_position)
+                                        .map(|region| (target, region))
+                                })
+                                .next()
                         });
 
-                    let event = match dropped_region.next() {
+                    let event = match dropped_region {
                         Some(((target, _), region)) if pane != target => {
                             DragEvent::Dropped {
                                 pane,
@@ -634,24 +627,32 @@ pub fn update<'a, Message, T: Draggable>(
                     );
 
                     if let Some((axis, rectangle, _)) = splits.get(&split) {
-                        let ratio = match axis {
-                            Axis::Horizontal => {
-                                let position =
-                                    cursor_position.y - bounds.y - rectangle.y;
+                        if let Some(cursor_position) = cursor.position() {
+                            let ratio = match axis {
+                                Axis::Horizontal => {
+                                    let position = cursor_position.y
+                                        - bounds.y
+                                        - rectangle.y;
 
-                                (position / rectangle.height).clamp(0.1, 0.9)
-                            }
-                            Axis::Vertical => {
-                                let position =
-                                    cursor_position.x - bounds.x - rectangle.x;
+                                    (position / rectangle.height)
+                                        .clamp(0.1, 0.9)
+                                }
+                                Axis::Vertical => {
+                                    let position = cursor_position.x
+                                        - bounds.x
+                                        - rectangle.x;
 
-                                (position / rectangle.width).clamp(0.1, 0.9)
-                            }
-                        };
+                                    (position / rectangle.width).clamp(0.1, 0.9)
+                                }
+                            };
 
-                        shell.publish(on_resize(ResizeEvent { split, ratio }));
+                            shell.publish(on_resize(ResizeEvent {
+                                split,
+                                ratio,
+                            }));
 
-                        event_status = event::Status::Captured;
+                            event_status = event::Status::Captured;
+                        }
                     }
                 }
             }
@@ -724,7 +725,7 @@ pub fn mouse_interaction(
     action: &state::Action,
     node: &Node,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     spacing: f32,
     resize_leeway: Option<f32>,
 ) -> Option<mouse::Interaction> {
@@ -735,6 +736,7 @@ pub fn mouse_interaction(
     let resize_axis =
         action.picked_split().map(|(_, axis)| axis).or_else(|| {
             resize_leeway.and_then(|leeway| {
+                let cursor_position = cursor.position()?;
                 let bounds = layout.bounds();
 
                 let splits = node.split_regions(spacing, bounds.size());
@@ -764,7 +766,7 @@ pub fn draw<Renderer, T>(
     action: &state::Action,
     node: &Node,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     renderer: &mut Renderer,
     theme: &Renderer::Theme,
     default_style: &renderer::Style,
@@ -778,7 +780,7 @@ pub fn draw<Renderer, T>(
         &mut Renderer,
         &renderer::Style,
         Layout<'_>,
-        Point,
+        mouse::Cursor,
         &Rectangle,
     ),
 ) where
@@ -802,6 +804,7 @@ pub fn draw<Renderer, T>(
         })
         .or_else(|| match resize_leeway {
             Some(leeway) => {
+                let cursor_position = cursor.position()?;
                 let bounds = layout.bounds();
 
                 let relative_cursor = Point::new(
@@ -822,12 +825,10 @@ pub fn draw<Renderer, T>(
             None => None,
         });
 
-    let pane_cursor_position = if picked_pane.is_some() {
-        // TODO: Remove once cursor availability is encoded in the type
-        // system
-        Point::new(-1.0, -1.0)
+    let pane_cursor = if picked_pane.is_some() {
+        mouse::Cursor::Unavailable
     } else {
-        cursor_position
+        cursor
     };
 
     let mut render_picked_pane = None;
@@ -843,12 +844,15 @@ pub fn draw<Renderer, T>(
                     renderer,
                     default_style,
                     layout,
-                    pane_cursor_position,
+                    pane_cursor,
                     viewport,
                 );
 
                 if picked_pane.is_some() {
-                    if let Some(region) = layout_region(layout, cursor_position)
+                    if let Some(region) =
+                        cursor.position().and_then(|cursor_position| {
+                            layout_region(layout, cursor_position)
+                        })
                     {
                         let bounds = layout_region_bounds(layout, region);
                         let hovered_region_style = theme.hovered_region(style);
@@ -872,7 +876,7 @@ pub fn draw<Renderer, T>(
                     renderer,
                     default_style,
                     layout,
-                    pane_cursor_position,
+                    pane_cursor,
                     viewport,
                 );
             }
@@ -881,25 +885,27 @@ pub fn draw<Renderer, T>(
 
     // Render picked pane last
     if let Some((pane, origin, layout)) = render_picked_pane {
-        let bounds = layout.bounds();
+        if let Some(cursor_position) = cursor.position() {
+            let bounds = layout.bounds();
 
-        renderer.with_translation(
-            cursor_position
-                - Point::new(bounds.x + origin.x, bounds.y + origin.y),
-            |renderer| {
-                renderer.with_layer(bounds, |renderer| {
-                    draw_pane(
-                        pane,
-                        renderer,
-                        default_style,
-                        layout,
-                        pane_cursor_position,
-                        viewport,
-                    );
-                });
-            },
-        );
-    };
+            renderer.with_translation(
+                cursor_position
+                    - Point::new(bounds.x + origin.x, bounds.y + origin.y),
+                |renderer| {
+                    renderer.with_layer(bounds, |renderer| {
+                        draw_pane(
+                            pane,
+                            renderer,
+                            default_style,
+                            layout,
+                            pane_cursor,
+                            viewport,
+                        );
+                    });
+                },
+            );
+        }
+    }
 
     if let Some((axis, split_region, is_picked)) = picked_split {
         let highlight = if is_picked {
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index 035ef05b..fe5c6af0 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -95,7 +95,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         use container::StyleSheet;
@@ -113,7 +113,7 @@ where
             let title_bar_layout = children.next().unwrap();
             let body_layout = children.next().unwrap();
 
-            let show_controls = bounds.contains(cursor_position);
+            let show_controls = cursor.is_over(&bounds);
 
             self.body.as_widget().draw(
                 &tree.children[0],
@@ -121,7 +121,7 @@ where
                 theme,
                 style,
                 body_layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
 
@@ -131,7 +131,7 @@ where
                 theme,
                 style,
                 title_bar_layout,
-                cursor_position,
+                cursor,
                 viewport,
                 show_controls,
             );
@@ -142,7 +142,7 @@ where
                 theme,
                 style,
                 layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         }
@@ -218,7 +218,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -233,7 +233,7 @@ where
                 &mut tree.children[1],
                 event.clone(),
                 children.next().unwrap(),
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -251,7 +251,7 @@ where
                 &mut tree.children[0],
                 event,
                 body_layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -265,42 +265,48 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
         drag_enabled: bool,
     ) -> mouse::Interaction {
-        let (body_layout, title_bar_interaction) =
-            if let Some(title_bar) = &self.title_bar {
-                let mut children = layout.children();
-                let title_bar_layout = children.next().unwrap();
+        let (body_layout, title_bar_interaction) = if let Some(title_bar) =
+            &self.title_bar
+        {
+            let mut children = layout.children();
+            let title_bar_layout = children.next().unwrap();
 
-                let is_over_pick_area = title_bar
-                    .is_over_pick_area(title_bar_layout, cursor_position);
+            let is_over_pick_area = cursor
+                .position()
+                .map(|cursor_position| {
+                    title_bar
+                        .is_over_pick_area(title_bar_layout, cursor_position)
+                })
+                .unwrap_or_default();
 
-                if is_over_pick_area && drag_enabled {
-                    return mouse::Interaction::Grab;
-                }
+            if is_over_pick_area && drag_enabled {
+                return mouse::Interaction::Grab;
+            }
 
-                let mouse_interaction = title_bar.mouse_interaction(
-                    &tree.children[1],
-                    title_bar_layout,
-                    cursor_position,
-                    viewport,
-                    renderer,
-                );
+            let mouse_interaction = title_bar.mouse_interaction(
+                &tree.children[1],
+                title_bar_layout,
+                cursor,
+                viewport,
+                renderer,
+            );
 
-                (children.next().unwrap(), mouse_interaction)
-            } else {
-                (layout, mouse::Interaction::default())
-            };
+            (children.next().unwrap(), mouse_interaction)
+        } else {
+            (layout, mouse::Interaction::default())
+        };
 
         self.body
             .as_widget()
             .mouse_interaction(
                 &tree.children[0],
                 body_layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             )
diff --git a/widget/src/pane_grid/draggable.rs b/widget/src/pane_grid/draggable.rs
index a9274dad..9d31feb5 100644
--- a/widget/src/pane_grid/draggable.rs
+++ b/widget/src/pane_grid/draggable.rs
@@ -4,9 +4,5 @@ use crate::core::{Layout, Point};
 pub trait Draggable {
     /// Returns whether the [`Draggable`] with the given [`Layout`] can be picked
     /// at the provided cursor position.
-    fn can_be_dragged_at(
-        &self,
-        layout: Layout<'_>,
-        cursor_position: Point,
-    ) -> bool;
+    fn can_be_dragged_at(&self, layout: Layout<'_>, cursor: Point) -> bool;
 }
diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index 2129937b..2fe79f80 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -122,7 +122,7 @@ where
         theme: &Renderer::Theme,
         inherited_style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         show_controls: bool,
     ) {
@@ -158,7 +158,7 @@ where
                     theme,
                     &inherited_style,
                     controls_layout,
-                    cursor_position,
+                    cursor,
                     viewport,
                 );
             }
@@ -171,7 +171,7 @@ where
                 theme,
                 &inherited_style,
                 title_layout,
-                cursor_position,
+                cursor,
                 viewport,
             );
         }
@@ -300,7 +300,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -324,7 +324,7 @@ where
                 &mut tree.children[1],
                 event.clone(),
                 controls_layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -338,7 +338,7 @@ where
                 &mut tree.children[0],
                 event,
                 title_layout,
-                cursor_position,
+                cursor,
                 renderer,
                 clipboard,
                 shell,
@@ -354,7 +354,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -367,7 +367,7 @@ where
         let title_interaction = self.content.as_widget().mouse_interaction(
             &tree.children[0],
             title_layout,
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         );
@@ -377,7 +377,7 @@ where
             let controls_interaction = controls.as_widget().mouse_interaction(
                 &tree.children[1],
                 controls_layout,
-                cursor_position,
+                cursor,
                 viewport,
                 renderer,
             );
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index dcd0629b..d1c03bcd 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -11,8 +11,8 @@ 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,
+    Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle, Shell,
+    Size, Widget,
 };
 use crate::overlay::menu::{self, Menu};
 use crate::scrollable;
@@ -196,7 +196,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -204,7 +204,7 @@ where
         update(
             event,
             layout,
-            cursor_position,
+            cursor,
             shell,
             self.on_selected.as_ref(),
             self.selected.as_ref(),
@@ -217,11 +217,11 @@ where
         &self,
         _tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(layout, cursor_position)
+        mouse_interaction(layout, cursor)
     }
 
     fn draw(
@@ -231,7 +231,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let font = self.font.unwrap_or_else(|| renderer.default_font());
@@ -239,7 +239,7 @@ where
             renderer,
             theme,
             layout,
-            cursor_position,
+            cursor,
             self.padding,
             self.text_size,
             self.text_line_height,
@@ -431,7 +431,7 @@ where
 pub fn update<'a, T, Message>(
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
     on_selected: &dyn Fn(T) -> Message,
     selected: Option<&T>,
@@ -452,7 +452,7 @@ where
                 state.is_open = false;
 
                 event::Status::Captured
-            } else if layout.bounds().contains(cursor_position) {
+            } else if cursor.is_over(&layout.bounds()) {
                 state.is_open = true;
                 state.hovered_option =
                     options.iter().position(|option| Some(option) == selected);
@@ -478,7 +478,7 @@ where
             let state = state();
 
             if state.keyboard_modifiers.command()
-                && layout.bounds().contains(cursor_position)
+                && cursor.is_over(&layout.bounds())
                 && !state.is_open
             {
                 fn find_next<'a, T: PartialEq>(
@@ -529,10 +529,10 @@ where
 /// Returns the current [`mouse::Interaction`] of a [`PickList`].
 pub fn mouse_interaction(
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
 
     if is_mouse_over {
         mouse::Interaction::Pointer
@@ -593,7 +593,7 @@ pub fn draw<'a, T, Renderer>(
     renderer: &mut Renderer,
     theme: &Renderer::Theme,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     padding: Padding,
     text_size: Option<f32>,
     text_line_height: text::LineHeight,
@@ -610,7 +610,7 @@ pub fn draw<'a, T, Renderer>(
     T: ToString + 'a,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
     let is_selected = selected.is_some();
 
     let style = if is_mouse_over {
diff --git a/widget/src/progress_bar.rs b/widget/src/progress_bar.rs
index 9e1e9131..37c6bc72 100644
--- a/widget/src/progress_bar.rs
+++ b/widget/src/progress_bar.rs
@@ -1,10 +1,9 @@
 //! Provide progress feedback to your users.
 use crate::core::layout;
+use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
-use crate::core::{
-    Color, Element, Layout, Length, Point, Rectangle, Size, Widget,
-};
+use crate::core::{Color, Element, Layout, Length, Rectangle, Size, Widget};
 
 use std::ops::RangeInclusive;
 
@@ -115,7 +114,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();
diff --git a/widget/src/qr_code.rs b/widget/src/qr_code.rs
index 7709125f..06be93c0 100644
--- a/widget/src/qr_code.rs
+++ b/widget/src/qr_code.rs
@@ -1,6 +1,7 @@
 //! Encode and display information in a QR code.
 use crate::canvas;
 use crate::core::layout;
+use crate::core::mouse;
 use crate::core::renderer::{self, Renderer as _};
 use crate::core::widget::Tree;
 use crate::core::{
@@ -74,7 +75,7 @@ impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
         _theme: &Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index 9dad1e22..9c954275 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -8,8 +8,8 @@ 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,
+    Alignment, Clipboard, Color, Element, Layout, Length, Pixels, Rectangle,
+    Shell, Widget,
 };
 use crate::{Row, Text};
 
@@ -229,7 +229,7 @@ where
         _state: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -237,7 +237,7 @@ where
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
-                if layout.bounds().contains(cursor_position) {
+                if cursor.is_over(&layout.bounds()) {
                     shell.publish(self.on_click.clone());
 
                     return event::Status::Captured;
@@ -253,11 +253,11 @@ where
         &self,
         _state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if layout.bounds().contains(cursor_position) {
+        if cursor.is_over(&layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -271,11 +271,10 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
-        let bounds = layout.bounds();
-        let is_mouse_over = bounds.contains(cursor_position);
+        let is_mouse_over = cursor.is_over(&layout.bounds());
 
         let mut children = layout.children();
 
diff --git a/widget/src/row.rs b/widget/src/row.rs
index 3ce363f8..1db22416 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -6,8 +6,8 @@ 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,
+    Alignment, Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell,
+    Widget,
 };
 
 /// A container that distributes its contents horizontally.
@@ -155,7 +155,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -169,7 +169,7 @@ where
                     state,
                     event.clone(),
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
@@ -182,7 +182,7 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -192,11 +192,7 @@ where
             .zip(layout.children())
             .map(|((child, state), layout)| {
                 child.as_widget().mouse_interaction(
-                    state,
-                    layout,
-                    cursor_position,
-                    viewport,
-                    renderer,
+                    state, layout, cursor, viewport, renderer,
                 )
             })
             .max()
@@ -210,7 +206,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         for ((child, state), layout) in self
@@ -219,15 +215,9 @@ where
             .zip(&tree.children)
             .zip(layout.children())
         {
-            child.as_widget().draw(
-                state,
-                renderer,
-                theme,
-                style,
-                layout,
-                cursor_position,
-                viewport,
-            );
+            child
+                .as_widget()
+                .draw(state, renderer, theme, style, layout, cursor, viewport);
         }
     }
 
diff --git a/widget/src/rule.rs b/widget/src/rule.rs
index 272bd2b3..d703e6ae 100644
--- a/widget/src/rule.rs
+++ b/widget/src/rule.rs
@@ -1,9 +1,10 @@
 //! Display a horizontal or vertical rule for dividing content.
 use crate::core::layout;
+use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
 use crate::core::{
-    Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Widget,
+    Color, Element, Layout, Length, Pixels, Rectangle, Size, Widget,
 };
 
 pub use crate::style::rule::{Appearance, FillMode, StyleSheet};
@@ -86,7 +87,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 12e544c5..e5cda4df 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -222,7 +222,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -231,18 +231,18 @@ where
             tree.state.downcast_mut::<State>(),
             event,
             layout,
-            cursor_position,
+            cursor,
             clipboard,
             shell,
             &self.vertical,
             self.horizontal.as_ref(),
             &self.on_scroll,
-            |event, layout, cursor_position, clipboard, shell| {
+            |event, layout, cursor, clipboard, shell| {
                 self.content.as_widget_mut().on_event(
                     &mut tree.children[0],
                     event,
                     layout,
-                    cursor_position,
+                    cursor,
                     renderer,
                     clipboard,
                     shell,
@@ -258,7 +258,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(
@@ -266,18 +266,18 @@ where
             renderer,
             theme,
             layout,
-            cursor_position,
+            cursor,
             &self.vertical,
             self.horizontal.as_ref(),
             &self.style,
-            |renderer, layout, cursor_position, viewport| {
+            |renderer, layout, cursor, viewport| {
                 self.content.as_widget().draw(
                     &tree.children[0],
                     renderer,
                     theme,
                     style,
                     layout,
-                    cursor_position,
+                    cursor,
                     viewport,
                 )
             },
@@ -288,21 +288,21 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         mouse_interaction(
             tree.state.downcast_ref::<State>(),
             layout,
-            cursor_position,
+            cursor,
             &self.vertical,
             self.horizontal.as_ref(),
-            |layout, cursor_position, viewport| {
+            |layout, cursor, viewport| {
                 self.content.as_widget().mouse_interaction(
                     &tree.children[0],
                     layout,
-                    cursor_position,
+                    cursor,
                     viewport,
                     renderer,
                 )
@@ -428,7 +428,7 @@ pub fn update<Message>(
     state: &mut State,
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     clipboard: &mut dyn Clipboard,
     shell: &mut Shell<'_, Message>,
     vertical: &Properties,
@@ -437,13 +437,13 @@ pub fn update<Message>(
     update_content: impl FnOnce(
         Event,
         Layout<'_>,
-        Point,
+        mouse::Cursor,
         &mut dyn Clipboard,
         &mut Shell<'_, Message>,
     ) -> event::Status,
 ) -> event::Status {
     let bounds = layout.bounds();
-    let mouse_over_scrollable = bounds.contains(cursor_position);
+    let cursor_over_scrollable = cursor.position_over(&bounds);
 
     let content = layout.children().next().unwrap();
     let content_bounds = content.bounds();
@@ -452,28 +452,21 @@ pub fn update<Message>(
         Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
-        scrollbars.is_mouse_over(cursor_position);
+        scrollbars.is_mouse_over(cursor);
 
     let event_status = {
-        let cursor_position = if mouse_over_scrollable
-            && !(mouse_over_y_scrollbar || mouse_over_x_scrollbar)
-        {
-            cursor_position + state.offset(bounds, content_bounds)
-        } else {
-            // TODO: Make `cursor_position` an `Option<Point>` so we can encode
-            // cursor availability.
-            // This will probably happen naturally once we add multi-window
-            // support.
-            Point::new(-1.0, -1.0)
+        let cursor = match cursor_over_scrollable {
+            Some(cursor_position)
+                if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
+            {
+                mouse::Cursor::Available(
+                    cursor_position + state.offset(bounds, content_bounds),
+                )
+            }
+            _ => mouse::Cursor::Unavailable,
         };
 
-        update_content(
-            event.clone(),
-            content,
-            cursor_position,
-            clipboard,
-            shell,
-        )
+        update_content(event.clone(), content, cursor, clipboard, shell)
     };
 
     if let event::Status::Captured = event_status {
@@ -487,76 +480,71 @@ pub fn update<Message>(
         return event::Status::Ignored;
     }
 
-    if mouse_over_scrollable {
-        match event {
-            Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
-                let delta = match delta {
-                    mouse::ScrollDelta::Lines { x, y } => {
-                        // TODO: Configurable speed/friction (?)
-                        let movement = if state.keyboard_modifiers.shift() {
-                            Vector::new(y, x)
-                        } else {
-                            Vector::new(x, y)
-                        };
+    let Some(cursor_position) = cursor_over_scrollable else {
+        return event::Status::Ignored
+    };
 
-                        movement * 60.0
-                    }
-                    mouse::ScrollDelta::Pixels { x, y } => Vector::new(x, y),
-                };
+    match event {
+        Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+            let delta = match delta {
+                mouse::ScrollDelta::Lines { x, y } => {
+                    // TODO: Configurable speed/friction (?)
+                    let movement = if state.keyboard_modifiers.shift() {
+                        Vector::new(y, x)
+                    } else {
+                        Vector::new(x, y)
+                    };
 
-                state.scroll(delta, bounds, content_bounds);
+                    movement * 60.0
+                }
+                mouse::ScrollDelta::Pixels { x, y } => Vector::new(x, y),
+            };
 
-                notify_on_scroll(
-                    state,
-                    on_scroll,
-                    bounds,
-                    content_bounds,
-                    shell,
-                );
+            state.scroll(delta, bounds, content_bounds);
+
+            notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
+
+            return event::Status::Captured;
+        }
+        Event::Touch(event)
+            if state.scroll_area_touched_at.is_some()
+                || !mouse_over_y_scrollbar && !mouse_over_x_scrollbar =>
+        {
+            match event {
+                touch::Event::FingerPressed { .. } => {
+                    state.scroll_area_touched_at = Some(cursor_position);
+                }
+                touch::Event::FingerMoved { .. } => {
+                    if let Some(scroll_box_touched_at) =
+                        state.scroll_area_touched_at
+                    {
+                        let delta = Vector::new(
+                            cursor_position.x - scroll_box_touched_at.x,
+                            cursor_position.y - scroll_box_touched_at.y,
+                        );
+
+                        state.scroll(delta, bounds, content_bounds);
 
-                return event::Status::Captured;
-            }
-            Event::Touch(event)
-                if state.scroll_area_touched_at.is_some()
-                    || !mouse_over_y_scrollbar && !mouse_over_x_scrollbar =>
-            {
-                match event {
-                    touch::Event::FingerPressed { .. } => {
                         state.scroll_area_touched_at = Some(cursor_position);
-                    }
-                    touch::Event::FingerMoved { .. } => {
-                        if let Some(scroll_box_touched_at) =
-                            state.scroll_area_touched_at
-                        {
-                            let delta = Vector::new(
-                                cursor_position.x - scroll_box_touched_at.x,
-                                cursor_position.y - scroll_box_touched_at.y,
-                            );
 
-                            state.scroll(delta, bounds, content_bounds);
-
-                            state.scroll_area_touched_at =
-                                Some(cursor_position);
-
-                            notify_on_scroll(
-                                state,
-                                on_scroll,
-                                bounds,
-                                content_bounds,
-                                shell,
-                            );
-                        }
-                    }
-                    touch::Event::FingerLifted { .. }
-                    | touch::Event::FingerLost { .. } => {
-                        state.scroll_area_touched_at = None;
+                        notify_on_scroll(
+                            state,
+                            on_scroll,
+                            bounds,
+                            content_bounds,
+                            shell,
+                        );
                     }
                 }
-
-                return event::Status::Captured;
+                touch::Event::FingerLifted { .. }
+                | touch::Event::FingerLost { .. } => {
+                    state.scroll_area_touched_at = None;
+                }
             }
-            _ => {}
+
+            return event::Status::Captured;
         }
+        _ => {}
     }
 
     if let Some(scroller_grabbed_at) = state.y_scroller_grabbed_at {
@@ -700,17 +688,17 @@ pub fn update<Message>(
 pub fn mouse_interaction(
     state: &State,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     vertical: &Properties,
     horizontal: Option<&Properties>,
     content_interaction: impl FnOnce(
         Layout<'_>,
-        Point,
+        mouse::Cursor,
         &Rectangle,
     ) -> mouse::Interaction,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let mouse_over_scrollable = bounds.contains(cursor_position);
+    let cursor_over_scrollable = cursor.position_over(&bounds);
 
     let content_layout = layout.children().next().unwrap();
     let content_bounds = content_layout.bounds();
@@ -719,7 +707,7 @@ pub fn mouse_interaction(
         Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
-        scrollbars.is_mouse_over(cursor_position);
+        scrollbars.is_mouse_over(cursor);
 
     if (mouse_over_x_scrollbar || mouse_over_y_scrollbar)
         || state.scrollers_grabbed()
@@ -728,17 +716,18 @@ pub fn mouse_interaction(
     } else {
         let offset = state.offset(bounds, content_bounds);
 
-        let cursor_position = if mouse_over_scrollable
-            && !(mouse_over_y_scrollbar || mouse_over_x_scrollbar)
-        {
-            cursor_position + offset
-        } else {
-            Point::new(-1.0, -1.0)
+        let cursor = match cursor_over_scrollable {
+            Some(cursor_position)
+                if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
+            {
+                mouse::Cursor::Available(cursor_position + offset)
+            }
+            _ => mouse::Cursor::Unavailable,
         };
 
         content_interaction(
             content_layout,
-            cursor_position,
+            cursor,
             &Rectangle {
                 y: bounds.y + offset.y,
                 x: bounds.x + offset.x,
@@ -754,11 +743,11 @@ pub fn draw<Renderer>(
     renderer: &mut Renderer,
     theme: &Renderer::Theme,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     vertical: &Properties,
     horizontal: Option<&Properties>,
     style: &<Renderer::Theme as StyleSheet>::Style,
-    draw_content: impl FnOnce(&mut Renderer, Layout<'_>, Point, &Rectangle),
+    draw_content: impl FnOnce(&mut Renderer, Layout<'_>, mouse::Cursor, &Rectangle),
 ) where
     Renderer: crate::core::Renderer,
     Renderer::Theme: StyleSheet,
@@ -770,18 +759,19 @@ pub fn draw<Renderer>(
     let scrollbars =
         Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
 
-    let mouse_over_scrollable = bounds.contains(cursor_position);
+    let cursor_over_scrollable = cursor.position_over(&bounds);
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
-        scrollbars.is_mouse_over(cursor_position);
+        scrollbars.is_mouse_over(cursor);
 
     let offset = state.offset(bounds, content_bounds);
 
-    let cursor_position = if mouse_over_scrollable
-        && !(mouse_over_x_scrollbar || mouse_over_y_scrollbar)
-    {
-        cursor_position + offset
-    } else {
-        Point::new(-1.0, -1.0)
+    let cursor = match cursor_over_scrollable {
+        Some(cursor_position)
+            if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
+        {
+            mouse::Cursor::Available(cursor_position + offset)
+        }
+        _ => mouse::Cursor::Unavailable,
     };
 
     // Draw inner content
@@ -793,7 +783,7 @@ pub fn draw<Renderer>(
                     draw_content(
                         renderer,
                         content_layout,
-                        cursor_position,
+                        cursor,
                         &Rectangle {
                             y: bounds.y + offset.y,
                             x: bounds.x + offset.x,
@@ -858,7 +848,7 @@ pub fn draw<Renderer>(
                 if let Some(scrollbar) = scrollbars.y {
                     let style = if state.y_scroller_grabbed_at.is_some() {
                         theme.dragging(style)
-                    } else if mouse_over_scrollable {
+                    } else if cursor_over_scrollable.is_some() {
                         theme.hovered(style, mouse_over_y_scrollbar)
                     } else {
                         theme.active(style)
@@ -871,7 +861,7 @@ pub fn draw<Renderer>(
                 if let Some(scrollbar) = scrollbars.x {
                     let style = if state.x_scroller_grabbed_at.is_some() {
                         theme.dragging_horizontal(style)
-                    } else if mouse_over_scrollable {
+                    } else if cursor_over_scrollable.is_some() {
                         theme.hovered_horizontal(style, mouse_over_x_scrollbar)
                     } else {
                         theme.active_horizontal(style)
@@ -885,7 +875,7 @@ pub fn draw<Renderer>(
         draw_content(
             renderer,
             content_layout,
-            cursor_position,
+            cursor,
             &Rectangle {
                 x: bounds.x + offset.x,
                 y: bounds.y + offset.y,
@@ -1283,17 +1273,21 @@ impl Scrollbars {
         }
     }
 
-    fn is_mouse_over(&self, cursor_position: Point) -> (bool, bool) {
-        (
-            self.y
-                .as_ref()
-                .map(|scrollbar| scrollbar.is_mouse_over(cursor_position))
-                .unwrap_or(false),
-            self.x
-                .as_ref()
-                .map(|scrollbar| scrollbar.is_mouse_over(cursor_position))
-                .unwrap_or(false),
-        )
+    fn is_mouse_over(&self, cursor: mouse::Cursor) -> (bool, bool) {
+        if let Some(cursor_position) = cursor.position() {
+            (
+                self.y
+                    .as_ref()
+                    .map(|scrollbar| scrollbar.is_mouse_over(cursor_position))
+                    .unwrap_or(false),
+                self.x
+                    .as_ref()
+                    .map(|scrollbar| scrollbar.is_mouse_over(cursor_position))
+                    .unwrap_or(false),
+            )
+        } else {
+            (false, false)
+        }
     }
 
     fn grab_y_scroller(&self, cursor_position: Point) -> Option<f32> {
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index c2498b87..4f35805c 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -183,7 +183,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -191,7 +191,7 @@ where
         update(
             event,
             layout,
-            cursor_position,
+            cursor,
             shell,
             tree.state.downcast_mut::<State>(),
             &mut self.value,
@@ -209,13 +209,13 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(
             renderer,
             layout,
-            cursor_position,
+            cursor,
             tree.state.downcast_ref::<State>(),
             self.value,
             &self.range,
@@ -228,15 +228,11 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(
-            layout,
-            cursor_position,
-            tree.state.downcast_ref::<State>(),
-        )
+        mouse_interaction(layout, cursor, tree.state.downcast_ref::<State>())
     }
 }
 
@@ -260,7 +256,7 @@ where
 pub fn update<Message, T>(
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
     state: &mut State,
     value: &mut T,
@@ -275,7 +271,7 @@ where
 {
     let is_dragging = state.is_dragging;
 
-    let mut change = || {
+    let mut change = |cursor_position: Point| {
         let bounds = layout.bounds();
         let new_value = if cursor_position.x <= bounds.x {
             *range.start()
@@ -309,8 +305,10 @@ where
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
-            if layout.bounds().contains(cursor_position) {
-                change();
+            if let Some(cursor_position) =
+                cursor.position_over(&layout.bounds())
+            {
+                change(cursor_position);
                 state.is_dragging = true;
 
                 return event::Status::Captured;
@@ -331,7 +329,7 @@ where
         Event::Mouse(mouse::Event::CursorMoved { .. })
         | Event::Touch(touch::Event::FingerMoved { .. }) => {
             if is_dragging {
-                change();
+                let _ = cursor.position().map(change);
 
                 return event::Status::Captured;
             }
@@ -346,7 +344,7 @@ where
 pub fn draw<T, R>(
     renderer: &mut R,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     state: &State,
     value: T,
     range: &RangeInclusive<T>,
@@ -358,7 +356,7 @@ pub fn draw<T, R>(
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
 
     let style = if state.is_dragging {
         style_sheet.dragging(style)
@@ -444,11 +442,11 @@ pub fn draw<T, R>(
 /// Computes the current [`mouse::Interaction`] of a [`Slider`].
 pub fn mouse_interaction(
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     state: &State,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
 
     if state.is_dragging {
         mouse::Interaction::Grabbing
diff --git a/widget/src/space.rs b/widget/src/space.rs
index e1e09d5a..9a5385e8 100644
--- a/widget/src/space.rs
+++ b/widget/src/space.rs
@@ -1,9 +1,10 @@
 //! Distribute content vertically.
 use crate::core;
 use crate::core::layout;
+use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::Tree;
-use crate::core::{Element, Layout, Length, Point, Rectangle, Size, Widget};
+use crate::core::{Element, Layout, Length, Rectangle, Size, Widget};
 
 /// An amount of empty space.
 ///
@@ -69,7 +70,7 @@ where
         _theme: &Renderer::Theme,
         _style: &renderer::Style,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
     }
diff --git a/widget/src/svg.rs b/widget/src/svg.rs
index 89017fcf..1ccc5d62 100644
--- a/widget/src/svg.rs
+++ b/widget/src/svg.rs
@@ -1,10 +1,11 @@
 //! Display vector graphics in your application.
 use crate::core::layout;
+use crate::core::mouse;
 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,
+    ContentFit, Element, Layout, Length, Rectangle, Size, Vector, Widget,
 };
 
 use std::path::PathBuf;
@@ -143,7 +144,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let Size { width, height } = renderer.dimensions(&self.handle);
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 8f243c1a..5b3705d4 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -207,14 +207,14 @@ where
         renderer: &mut Renderer,
         theme: &Renderer::Theme,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         value: Option<&Value>,
     ) {
         draw(
             renderer,
             theme,
             layout,
-            cursor_position,
+            cursor,
             tree.state.downcast_ref::<State>(),
             value.unwrap_or(&self.value),
             &self.placeholder,
@@ -298,7 +298,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -306,7 +306,7 @@ where
         update(
             event,
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
@@ -329,14 +329,14 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(
             renderer,
             theme,
             layout,
-            cursor_position,
+            cursor,
             tree.state.downcast_ref::<State>(),
             &self.value,
             &self.placeholder,
@@ -354,11 +354,11 @@ where
         &self,
         _state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(layout, cursor_position, self.on_input.is_none())
+        mouse_interaction(layout, cursor, self.on_input.is_none())
     }
 }
 
@@ -528,7 +528,7 @@ where
 pub fn update<'a, Message, Renderer>(
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     renderer: &Renderer,
     clipboard: &mut dyn Clipboard,
     shell: &mut Shell<'_, Message>,
@@ -550,10 +550,14 @@ where
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let state = state();
-            let is_clicked =
-                layout.bounds().contains(cursor_position) && on_input.is_some();
 
-            state.is_focused = if is_clicked {
+            let click_position = if on_input.is_some() {
+                cursor.position_over(&layout.bounds())
+            } else {
+                None
+            };
+
+            state.is_focused = if click_position.is_some() {
                 state.is_focused.or_else(|| {
                     let now = Instant::now();
 
@@ -566,7 +570,7 @@ where
                 None
             };
 
-            if is_clicked {
+            if let Some(cursor_position) = click_position {
                 let text_layout = layout.children().next().unwrap();
                 let target = cursor_position.x - text_layout.bounds().x;
 
@@ -944,7 +948,7 @@ pub fn draw<Renderer>(
     renderer: &mut Renderer,
     theme: &Renderer::Theme,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     state: &State,
     value: &Value,
     placeholder: &str,
@@ -967,7 +971,7 @@ pub fn draw<Renderer>(
     let mut children_layout = layout.children();
     let text_bounds = children_layout.next().unwrap().bounds();
 
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.is_over(&bounds);
 
     let appearance = if is_disabled {
         theme.disabled(style)
@@ -1154,10 +1158,10 @@ pub fn draw<Renderer>(
 /// Computes the current [`mouse::Interaction`] of the [`TextInput`].
 pub fn mouse_interaction(
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     is_disabled: bool,
 ) -> mouse::Interaction {
-    if layout.bounds().contains(cursor_position) {
+    if cursor.is_over(&layout.bounds()) {
         if is_disabled {
             mouse::Interaction::NotAllowed
         } else {
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index b1ba65c9..28715c5a 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -7,8 +7,8 @@ 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,
+    Alignment, Clipboard, Element, Event, Layout, Length, Pixels, Rectangle,
+    Shell, Widget,
 };
 use crate::{Row, Text};
 
@@ -202,14 +202,14 @@ where
         _state: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
-                let mouse_over = layout.bounds().contains(cursor_position);
+                let mouse_over = cursor.is_over(&layout.bounds());
 
                 if mouse_over {
                     shell.publish((self.on_toggle)(!self.is_toggled));
@@ -227,11 +227,11 @@ where
         &self,
         _state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if layout.bounds().contains(cursor_position) {
+        if cursor.is_over(&layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -245,7 +245,7 @@ where
         theme: &Renderer::Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         /// Makes sure that the border radius of the toggler looks good at every size.
@@ -278,7 +278,7 @@ where
         let toggler_layout = children.next().unwrap();
         let bounds = toggler_layout.bounds();
 
-        let is_mouse_over = bounds.contains(cursor_position);
+        let is_mouse_over = cursor.is_over(&layout.bounds());
 
         let style = if is_mouse_over {
             theme.hovered(&self.style, self.is_toggled)
diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index 084650d1..024cfa9c 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -9,7 +9,7 @@ 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,
+    Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell, Size,
     Vector, Widget,
 };
 use crate::Text;
@@ -136,7 +136,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -145,7 +145,7 @@ where
             &mut tree.children[0],
             event,
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
@@ -156,14 +156,14 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.content.as_widget().mouse_interaction(
             &tree.children[0],
             layout,
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         )
@@ -176,7 +176,7 @@ where
         theme: &Renderer::Theme,
         inherited_style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         self.content.as_widget().draw(
@@ -185,7 +185,7 @@ where
             theme,
             inherited_style,
             layout,
-            cursor_position,
+            cursor,
             viewport,
         );
 
@@ -196,7 +196,7 @@ where
             theme,
             inherited_style,
             layout,
-            cursor_position,
+            cursor,
             viewport,
             self.position,
             self.gap,
@@ -206,7 +206,7 @@ where
             |renderer, limits| {
                 Widget::<(), Renderer>::layout(tooltip, renderer, limits)
             },
-            |renderer, defaults, layout, cursor_position, viewport| {
+            |renderer, defaults, layout, viewport| {
                 Widget::<(), Renderer>::draw(
                     tooltip,
                     &Tree::empty(),
@@ -214,7 +214,7 @@ where
                     theme,
                     defaults,
                     layout,
-                    cursor_position,
+                    cursor,
                     viewport,
                 );
             },
@@ -270,7 +270,7 @@ pub fn draw<Renderer>(
     theme: &Renderer::Theme,
     inherited_style: &renderer::Style,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     viewport: &Rectangle,
     position: Position,
     gap: f32,
@@ -278,13 +278,7 @@ pub fn draw<Renderer>(
     snap_within_viewport: bool,
     style: &<Renderer::Theme as container::StyleSheet>::Style,
     layout_text: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
-    draw_text: impl FnOnce(
-        &mut Renderer,
-        &renderer::Style,
-        Layout<'_>,
-        Point,
-        &Rectangle,
-    ),
+    draw_text: impl FnOnce(&mut Renderer, &renderer::Style, Layout<'_>, &Rectangle),
 ) where
     Renderer: core::Renderer,
     Renderer::Theme: container::StyleSheet,
@@ -293,7 +287,7 @@ pub fn draw<Renderer>(
 
     let bounds = layout.bounds();
 
-    if bounds.contains(cursor_position) {
+    if let Some(cursor_position) = cursor.position_over(&bounds) {
         let style = theme.appearance(style);
 
         let defaults = renderer::Style {
@@ -380,7 +374,6 @@ pub fn draw<Renderer>(
                     ),
                     &text_layout,
                 ),
-                cursor_position,
                 viewport,
             )
         });
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index b14e5401..47b14d57 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -180,7 +180,7 @@ where
         tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -188,7 +188,7 @@ where
         update(
             event,
             layout,
-            cursor_position,
+            cursor,
             shell,
             tree.state.downcast_mut::<State>(),
             &mut self.value,
@@ -206,13 +206,13 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         draw(
             renderer,
             layout,
-            cursor_position,
+            cursor,
             tree.state.downcast_ref::<State>(),
             self.value,
             &self.range,
@@ -225,15 +225,11 @@ where
         &self,
         tree: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        mouse_interaction(
-            layout,
-            cursor_position,
-            tree.state.downcast_ref::<State>(),
-        )
+        mouse_interaction(layout, cursor, tree.state.downcast_ref::<State>())
     }
 }
 
@@ -257,7 +253,7 @@ where
 pub fn update<Message, T>(
     event: Event,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
     state: &mut State,
     value: &mut T,
@@ -272,8 +268,9 @@ where
 {
     let is_dragging = state.is_dragging;
 
-    let mut change = || {
+    let mut change = |cursor_position: Point| {
         let bounds = layout.bounds();
+
         let new_value = if cursor_position.y >= bounds.y + bounds.height {
             *range.start()
         } else if cursor_position.y <= bounds.y {
@@ -307,8 +304,10 @@ where
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
-            if layout.bounds().contains(cursor_position) {
-                change();
+            if let Some(cursor_position) =
+                cursor.position_over(&layout.bounds())
+            {
+                change(cursor_position);
                 state.is_dragging = true;
 
                 return event::Status::Captured;
@@ -329,7 +328,7 @@ where
         Event::Mouse(mouse::Event::CursorMoved { .. })
         | Event::Touch(touch::Event::FingerMoved { .. }) => {
             if is_dragging {
-                change();
+                let _ = cursor.position().map(change);
 
                 return event::Status::Captured;
             }
@@ -344,7 +343,7 @@ where
 pub fn draw<T, R>(
     renderer: &mut R,
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     state: &State,
     value: T,
     range: &RangeInclusive<T>,
@@ -356,7 +355,7 @@ pub fn draw<T, R>(
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.position_over(&bounds).is_some();
 
     let style = if state.is_dragging {
         style_sheet.dragging(style)
@@ -442,11 +441,11 @@ pub fn draw<T, R>(
 /// Computes the current [`mouse::Interaction`] of a [`VerticalSlider`].
 pub fn mouse_interaction(
     layout: Layout<'_>,
-    cursor_position: Point,
+    cursor: mouse::Cursor,
     state: &State,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = bounds.contains(cursor_position);
+    let is_mouse_over = cursor.position_over(&bounds).is_some();
 
     if state.is_dragging {
         mouse::Interaction::Grabbing

From 5c8cfb411ed0a9a6e55bd1193cd7e97252e63d28 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, 8 Jun 2023 20:16:46 +0200
Subject: [PATCH 356/440] Take `Rectangle` by value in `Cursor` API

---
 core/src/mouse/cursor.rs                 |  6 +++---
 examples/bezier_tool/src/main.rs         |  6 +++---
 examples/game_of_life/src/main.rs        | 11 +++++------
 examples/geometry/src/main.rs            |  2 +-
 examples/modal/src/main.rs               |  2 +-
 examples/sierpinski_triangle/src/main.rs | 12 ++++++------
 widget/src/button.rs                     |  8 ++++----
 widget/src/checkbox.rs                   |  6 +++---
 widget/src/image/viewer.rs               |  2 +-
 widget/src/mouse_area.rs                 |  2 +-
 widget/src/overlay/menu.rs               | 10 ++++------
 widget/src/pane_grid.rs                  |  2 +-
 widget/src/pane_grid/content.rs          |  2 +-
 widget/src/pick_list.rs                  |  8 ++++----
 widget/src/radio.rs                      |  6 +++---
 widget/src/scrollable.rs                 |  6 +++---
 widget/src/slider.rs                     |  7 +++----
 widget/src/text_input.rs                 |  6 +++---
 widget/src/toggler.rs                    |  6 +++---
 widget/src/tooltip.rs                    |  2 +-
 widget/src/vertical_slider.rs            |  7 +++----
 21 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
index d4cb415d..223ed96d 100644
--- a/core/src/mouse/cursor.rs
+++ b/core/src/mouse/cursor.rs
@@ -24,7 +24,7 @@ impl Cursor {
     ///
     /// If the [`Cursor`] is not over the provided bounds, this method will
     /// return `None`.
-    pub fn position_over(self, bounds: &Rectangle) -> Option<Point> {
+    pub fn position_over(self, bounds: Rectangle) -> Option<Point> {
         self.position().filter(|p| bounds.contains(*p))
     }
 
@@ -33,7 +33,7 @@ impl Cursor {
     ///
     /// If the [`Cursor`] is not over the provided bounds, this method will
     /// return `None`.
-    pub fn position_in(self, bounds: &Rectangle) -> Option<Point> {
+    pub fn position_in(self, bounds: Rectangle) -> Option<Point> {
         self.position_over(bounds)
             .map(|p| p - Vector::new(bounds.x, bounds.y))
     }
@@ -45,7 +45,7 @@ impl Cursor {
     }
 
     /// Returns true if the [`Cursor`] is over the given `bounds`.
-    pub fn is_over(self, bounds: &Rectangle) -> bool {
+    pub fn is_over(self, bounds: Rectangle) -> bool {
         self.position_over(bounds).is_some()
     }
 }
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index b4568cbf..310be28f 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -101,7 +101,7 @@ mod bezier {
             cursor: mouse::Cursor,
         ) -> (event::Status, Option<Curve>) {
             let cursor_position =
-                if let Some(position) = cursor.position_in(&bounds) {
+                if let Some(position) = cursor.position_in(bounds) {
                     position
                 } else {
                     return (event::Status::Ignored, None);
@@ -183,7 +183,7 @@ mod bezier {
             bounds: Rectangle,
             cursor: mouse::Cursor,
         ) -> mouse::Interaction {
-            if cursor.is_over(&bounds) {
+            if cursor.is_over(bounds) {
                 mouse::Interaction::Crosshair
             } else {
                 mouse::Interaction::default()
@@ -226,7 +226,7 @@ mod bezier {
         ) -> Geometry {
             let mut frame = Frame::new(renderer, bounds.size());
 
-            if let Some(cursor_position) = cursor.position_in(&bounds) {
+            if let Some(cursor_position) = cursor.position_in(bounds) {
                 match *self {
                     Pending::One { from } => {
                         let line = Path::line(from, cursor_position);
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index aaa8efd1..e951d734 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -407,7 +407,7 @@ mod grid {
             }
 
             let cursor_position =
-                if let Some(position) = cursor.position_in(&bounds) {
+                if let Some(position) = cursor.position_in(bounds) {
                     position
                 } else {
                     return (event::Status::Ignored, None);
@@ -567,10 +567,9 @@ mod grid {
             let overlay = {
                 let mut frame = Frame::new(renderer, bounds.size());
 
-                let hovered_cell =
-                    cursor.position_in(&bounds).map(|position| {
-                        Cell::at(self.project(position, frame.size()))
-                    });
+                let hovered_cell = cursor.position_in(bounds).map(|position| {
+                    Cell::at(self.project(position, frame.size()))
+                });
 
                 if let Some(cell) = hovered_cell {
                     frame.with_save(|frame| {
@@ -675,7 +674,7 @@ mod grid {
                 Interaction::Drawing => mouse::Interaction::Crosshair,
                 Interaction::Erasing => mouse::Interaction::Crosshair,
                 Interaction::Panning { .. } => mouse::Interaction::Grabbing,
-                Interaction::None if cursor.is_over(&bounds) => {
+                Interaction::None if cursor.is_over(bounds) => {
                     mouse::Interaction::Crosshair
                 }
                 _ => mouse::Interaction::default(),
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 1f949d10..29f78ea1 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -62,7 +62,7 @@ mod rainbow {
             let color_v = [0.75, 0.0, 0.5, 1.0];
 
             let posn_center = {
-                if let Some(cursor_position) = cursor.position_in(&bounds) {
+                if let Some(cursor_position) = cursor.position_in(bounds) {
                     [cursor_position.x, cursor_position.y]
                 } else {
                     [bounds.width / 2.0, bounds.height / 2.0]
diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 82ed05d2..5c43c203 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -390,7 +390,7 @@ mod modal {
                     mouse::Button::Left,
                 )) = &event
                 {
-                    if !cursor.is_over(&content_bounds) {
+                    if !cursor.is_over(content_bounds) {
                         shell.publish(message.clone());
                         return event::Status::Captured;
                     }
diff --git a/examples/sierpinski_triangle/src/main.rs b/examples/sierpinski_triangle/src/main.rs
index ad681a91..885d3c63 100644
--- a/examples/sierpinski_triangle/src/main.rs
+++ b/examples/sierpinski_triangle/src/main.rs
@@ -108,12 +108,12 @@ impl canvas::Program<Message> for SierpinskiGraph {
         bounds: Rectangle,
         cursor: mouse::Cursor,
     ) -> (event::Status, Option<Message>) {
-        let cursor_position =
-            if let Some(position) = cursor.position_in(&bounds) {
-                position
-            } else {
-                return (event::Status::Ignored, None);
-            };
+        let cursor_position = if let Some(position) = cursor.position_in(bounds)
+        {
+            position
+        } else {
+            return (event::Status::Ignored, None);
+        };
 
         match event {
             Event::Mouse(mouse_event) => {
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 89af341c..0f3cbde2 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -311,7 +311,7 @@ pub fn update<'a, Message: Clone>(
             if on_press.is_some() {
                 let bounds = layout.bounds();
 
-                if cursor.is_over(&bounds) {
+                if cursor.is_over(bounds) {
                     let state = state();
 
                     state.is_pressed = true;
@@ -330,7 +330,7 @@ pub fn update<'a, Message: Clone>(
 
                     let bounds = layout.bounds();
 
-                    if cursor.is_over(&bounds) {
+                    if cursor.is_over(bounds) {
                         shell.publish(on_press);
                     }
 
@@ -364,7 +364,7 @@ pub fn draw<'a, Renderer: crate::core::Renderer>(
 where
     Renderer::Theme: StyleSheet,
 {
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
 
     let styling = if !is_enabled {
         style_sheet.disabled(style)
@@ -440,7 +440,7 @@ pub fn mouse_interaction(
     cursor: mouse::Cursor,
     is_enabled: bool,
 ) -> mouse::Interaction {
-    let is_mouse_over = cursor.is_over(&layout.bounds());
+    let is_mouse_over = cursor.is_over(layout.bounds());
 
     if is_mouse_over && is_enabled {
         mouse::Interaction::Pointer
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 86f573dd..aa0bff42 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -212,7 +212,7 @@ where
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
-                let mouse_over = cursor.is_over(&layout.bounds());
+                let mouse_over = cursor.is_over(layout.bounds());
 
                 if mouse_over {
                     shell.publish((self.on_toggle)(!self.is_checked));
@@ -234,7 +234,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if cursor.is_over(&layout.bounds()) {
+        if cursor.is_over(layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -251,7 +251,7 @@ where
         cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
-        let is_mouse_over = cursor.is_over(&layout.bounds());
+        let is_mouse_over = cursor.is_over(layout.bounds());
 
         let mut children = layout.children();
 
diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index a2ee1e5c..8040d6bd 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -286,7 +286,7 @@ where
     ) -> mouse::Interaction {
         let state = tree.state.downcast_ref::<State>();
         let bounds = layout.bounds();
-        let is_mouse_over = cursor.is_over(&bounds);
+        let is_mouse_over = cursor.is_over(bounds);
 
         if state.is_cursor_grabbed() {
             mouse::Interaction::Grabbing
diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs
index 423f070c..da7dc88f 100644
--- a/widget/src/mouse_area.rs
+++ b/widget/src/mouse_area.rs
@@ -240,7 +240,7 @@ fn update<Message: Clone, Renderer>(
     cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
 ) -> event::Status {
-    if !cursor.is_over(&layout.bounds()) {
+    if !cursor.is_over(layout.bounds()) {
         return event::Status::Ignored;
     }
 
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index fe1175ac..b699def0 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -376,9 +376,7 @@ where
     ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
-                let bounds = layout.bounds();
-
-                if cursor.is_over(&bounds) {
+                if cursor.is_over(layout.bounds()) {
                     if let Some(index) = *self.hovered_option {
                         if let Some(option) = self.options.get(index) {
                             *self.last_selection = Some(option.clone());
@@ -388,7 +386,7 @@ where
             }
             Event::Mouse(mouse::Event::CursorMoved { .. }) => {
                 if let Some(cursor_position) =
-                    cursor.position_in(&layout.bounds())
+                    cursor.position_in(layout.bounds())
                 {
                     let text_size = self
                         .text_size
@@ -404,7 +402,7 @@ where
             }
             Event::Touch(touch::Event::FingerPressed { .. }) => {
                 if let Some(cursor_position) =
-                    cursor.position_in(&layout.bounds())
+                    cursor.position_in(layout.bounds())
                 {
                     let text_size = self
                         .text_size
@@ -438,7 +436,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        let is_mouse_over = cursor.is_over(&layout.bounds());
+        let is_mouse_over = cursor.is_over(layout.bounds());
 
         if is_mouse_over {
             mouse::Interaction::Pointer
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 7e0198fe..040d6bb3 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -524,7 +524,7 @@ pub fn update<'a, Message, T: Draggable>(
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let bounds = layout.bounds();
 
-            if let Some(cursor_position) = cursor.position_over(&bounds) {
+            if let Some(cursor_position) = cursor.position_over(bounds) {
                 event_status = event::Status::Captured;
 
                 match on_resize {
diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index fe5c6af0..c28ae6e3 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -113,7 +113,7 @@ where
             let title_bar_layout = children.next().unwrap();
             let body_layout = children.next().unwrap();
 
-            let show_controls = cursor.is_over(&bounds);
+            let show_controls = cursor.is_over(bounds);
 
             self.body.as_widget().draw(
                 &tree.children[0],
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index d1c03bcd..dc53a9c8 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -452,7 +452,7 @@ where
                 state.is_open = false;
 
                 event::Status::Captured
-            } else if cursor.is_over(&layout.bounds()) {
+            } else if cursor.is_over(layout.bounds()) {
                 state.is_open = true;
                 state.hovered_option =
                     options.iter().position(|option| Some(option) == selected);
@@ -478,7 +478,7 @@ where
             let state = state();
 
             if state.keyboard_modifiers.command()
-                && cursor.is_over(&layout.bounds())
+                && cursor.is_over(layout.bounds())
                 && !state.is_open
             {
                 fn find_next<'a, T: PartialEq>(
@@ -532,7 +532,7 @@ pub fn mouse_interaction(
     cursor: mouse::Cursor,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
 
     if is_mouse_over {
         mouse::Interaction::Pointer
@@ -610,7 +610,7 @@ pub fn draw<'a, T, Renderer>(
     T: ToString + 'a,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
     let is_selected = selected.is_some();
 
     let style = if is_mouse_over {
diff --git a/widget/src/radio.rs b/widget/src/radio.rs
index 9c954275..5b883147 100644
--- a/widget/src/radio.rs
+++ b/widget/src/radio.rs
@@ -237,7 +237,7 @@ where
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
-                if cursor.is_over(&layout.bounds()) {
+                if cursor.is_over(layout.bounds()) {
                     shell.publish(self.on_click.clone());
 
                     return event::Status::Captured;
@@ -257,7 +257,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if cursor.is_over(&layout.bounds()) {
+        if cursor.is_over(layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -274,7 +274,7 @@ where
         cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
-        let is_mouse_over = cursor.is_over(&layout.bounds());
+        let is_mouse_over = cursor.is_over(layout.bounds());
 
         let mut children = layout.children();
 
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index e5cda4df..d90aca2b 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -443,7 +443,7 @@ pub fn update<Message>(
     ) -> event::Status,
 ) -> event::Status {
     let bounds = layout.bounds();
-    let cursor_over_scrollable = cursor.position_over(&bounds);
+    let cursor_over_scrollable = cursor.position_over(bounds);
 
     let content = layout.children().next().unwrap();
     let content_bounds = content.bounds();
@@ -698,7 +698,7 @@ pub fn mouse_interaction(
     ) -> mouse::Interaction,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let cursor_over_scrollable = cursor.position_over(&bounds);
+    let cursor_over_scrollable = cursor.position_over(bounds);
 
     let content_layout = layout.children().next().unwrap();
     let content_bounds = content_layout.bounds();
@@ -759,7 +759,7 @@ pub fn draw<Renderer>(
     let scrollbars =
         Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
 
-    let cursor_over_scrollable = cursor.position_over(&bounds);
+    let cursor_over_scrollable = cursor.position_over(bounds);
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
 
diff --git a/widget/src/slider.rs b/widget/src/slider.rs
index 4f35805c..3ea4391b 100644
--- a/widget/src/slider.rs
+++ b/widget/src/slider.rs
@@ -305,8 +305,7 @@ where
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
-            if let Some(cursor_position) =
-                cursor.position_over(&layout.bounds())
+            if let Some(cursor_position) = cursor.position_over(layout.bounds())
             {
                 change(cursor_position);
                 state.is_dragging = true;
@@ -356,7 +355,7 @@ pub fn draw<T, R>(
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
 
     let style = if state.is_dragging {
         style_sheet.dragging(style)
@@ -446,7 +445,7 @@ pub fn mouse_interaction(
     state: &State,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
 
     if state.is_dragging {
         mouse::Interaction::Grabbing
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 5b3705d4..272263f9 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -552,7 +552,7 @@ where
             let state = state();
 
             let click_position = if on_input.is_some() {
-                cursor.position_over(&layout.bounds())
+                cursor.position_over(layout.bounds())
             } else {
                 None
             };
@@ -971,7 +971,7 @@ pub fn draw<Renderer>(
     let mut children_layout = layout.children();
     let text_bounds = children_layout.next().unwrap().bounds();
 
-    let is_mouse_over = cursor.is_over(&bounds);
+    let is_mouse_over = cursor.is_over(bounds);
 
     let appearance = if is_disabled {
         theme.disabled(style)
@@ -1161,7 +1161,7 @@ pub fn mouse_interaction(
     cursor: mouse::Cursor,
     is_disabled: bool,
 ) -> mouse::Interaction {
-    if cursor.is_over(&layout.bounds()) {
+    if cursor.is_over(layout.bounds()) {
         if is_disabled {
             mouse::Interaction::NotAllowed
         } else {
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 28715c5a..8b51f2d0 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -209,7 +209,7 @@ where
     ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
-                let mouse_over = cursor.is_over(&layout.bounds());
+                let mouse_over = cursor.is_over(layout.bounds());
 
                 if mouse_over {
                     shell.publish((self.on_toggle)(!self.is_toggled));
@@ -231,7 +231,7 @@ where
         _viewport: &Rectangle,
         _renderer: &Renderer,
     ) -> mouse::Interaction {
-        if cursor.is_over(&layout.bounds()) {
+        if cursor.is_over(layout.bounds()) {
             mouse::Interaction::Pointer
         } else {
             mouse::Interaction::default()
@@ -278,7 +278,7 @@ where
         let toggler_layout = children.next().unwrap();
         let bounds = toggler_layout.bounds();
 
-        let is_mouse_over = cursor.is_over(&layout.bounds());
+        let is_mouse_over = cursor.is_over(layout.bounds());
 
         let style = if is_mouse_over {
             theme.hovered(&self.style, self.is_toggled)
diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index 024cfa9c..d425de01 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -287,7 +287,7 @@ pub fn draw<Renderer>(
 
     let bounds = layout.bounds();
 
-    if let Some(cursor_position) = cursor.position_over(&bounds) {
+    if let Some(cursor_position) = cursor.position_over(bounds) {
         let style = theme.appearance(style);
 
         let defaults = renderer::Style {
diff --git a/widget/src/vertical_slider.rs b/widget/src/vertical_slider.rs
index 47b14d57..91f2b466 100644
--- a/widget/src/vertical_slider.rs
+++ b/widget/src/vertical_slider.rs
@@ -304,8 +304,7 @@ where
     match event {
         Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
-            if let Some(cursor_position) =
-                cursor.position_over(&layout.bounds())
+            if let Some(cursor_position) = cursor.position_over(layout.bounds())
             {
                 change(cursor_position);
                 state.is_dragging = true;
@@ -355,7 +354,7 @@ pub fn draw<T, R>(
     R::Theme: StyleSheet,
 {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.position_over(&bounds).is_some();
+    let is_mouse_over = cursor.is_over(bounds);
 
     let style = if state.is_dragging {
         style_sheet.dragging(style)
@@ -445,7 +444,7 @@ pub fn mouse_interaction(
     state: &State,
 ) -> mouse::Interaction {
     let bounds = layout.bounds();
-    let is_mouse_over = cursor.position_over(&bounds).is_some();
+    let is_mouse_over = cursor.is_over(bounds);
 
     if state.is_dragging {
         mouse::Interaction::Grabbing

From 57db196c3a169fe1ecd654e9b58ce66defa5dd7e 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, 8 Jun 2023 20:23:47 +0200
Subject: [PATCH 357/440] Increase width of controls in `pane_grid` example

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

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index 2ffdcc69..54c36d69 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -300,7 +300,7 @@ fn view_content<'a>(
         )
     ]
     .spacing(5)
-    .max_width(150);
+    .max_width(160);
 
     if total_panes > 1 && !is_pinned {
         controls = controls.push(

From aba98e49654852281ed17bedd1becac6f9db8700 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, 8 Jun 2023 20:35:40 +0200
Subject: [PATCH 358/440] Extend cursor availability to the shell level

---
 core/src/mouse/cursor.rs         |  3 +-
 examples/integration/src/main.rs |  5 ++-
 runtime/src/program/state.rs     | 10 ++---
 runtime/src/user_interface.rs    | 67 ++++++++++++++++++++------------
 winit/src/application.rs         |  8 ++--
 winit/src/application/state.rs   | 29 +++++++-------
 6 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
index 223ed96d..203526e9 100644
--- a/core/src/mouse/cursor.rs
+++ b/core/src/mouse/cursor.rs
@@ -1,12 +1,13 @@
 use crate::{Point, Rectangle, Vector};
 
 /// The mouse cursor state.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub enum Cursor {
     /// The cursor has a defined position.
     Available(Point),
 
     /// The cursor is currently unavailable (i.e. out of bounds or busy).
+    #[default]
     Unavailable,
 }
 
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index c935aca7..daecfeb2 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -6,6 +6,7 @@ use scene::Scene;
 
 use iced_wgpu::graphics::Viewport;
 use iced_wgpu::{wgpu, Backend, Renderer, Settings};
+use iced_winit::core::mouse;
 use iced_winit::core::renderer;
 use iced_winit::core::{Color, Size};
 use iced_winit::runtime::program;
@@ -194,10 +195,10 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                     // We update iced
                     let _ = state.update(
                         viewport.logical_size(),
-                        conversion::cursor_position(
+                        mouse::Cursor::Available(conversion::cursor_position(
                             cursor_position,
                             viewport.scale_factor(),
-                        ),
+                        )),
                         &mut renderer,
                         &Theme::Dark,
                         &renderer::Style { text_color: Color::WHITE },
diff --git a/runtime/src/program/state.rs b/runtime/src/program/state.rs
index 2fa9934d..d83e3f54 100644
--- a/runtime/src/program/state.rs
+++ b/runtime/src/program/state.rs
@@ -1,7 +1,7 @@
 use crate::core::event::{self, Event};
 use crate::core::mouse;
 use crate::core::renderer;
-use crate::core::{Clipboard, Point, Size};
+use crate::core::{Clipboard, Size};
 use crate::user_interface::{self, UserInterface};
 use crate::{Command, Debug, Program};
 
@@ -88,7 +88,7 @@ where
     pub fn update(
         &mut self,
         bounds: Size,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &mut P::Renderer,
         theme: &<P::Renderer as iced_core::Renderer>::Theme,
         style: &renderer::Style,
@@ -108,7 +108,7 @@ where
 
         let (_, event_statuses) = user_interface.update(
             &self.queued_events,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             &mut messages,
@@ -131,7 +131,7 @@ where
         let command = if messages.is_empty() {
             debug.draw_started();
             self.mouse_interaction =
-                user_interface.draw(renderer, theme, style, cursor_position);
+                user_interface.draw(renderer, theme, style, cursor);
             debug.draw_finished();
 
             self.cache = Some(user_interface.into_cache());
@@ -163,7 +163,7 @@ where
 
             debug.draw_started();
             self.mouse_interaction =
-                user_interface.draw(renderer, theme, style, cursor_position);
+                user_interface.draw(renderer, theme, style, cursor);
             debug.draw_finished();
 
             self.cache = Some(user_interface.into_cache());
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 7dee13bc..68ff6158 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -5,7 +5,7 @@ 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::{Clipboard, Rectangle, Size, Vector};
 use crate::core::{Element, Layout, Shell};
 
 /// A set of interactive graphical elements with a specific [`Layout`].
@@ -128,7 +128,9 @@ where
     /// #     pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
-    /// use iced_runtime::core::{clipboard, Size, Point};
+    /// use iced_runtime::core::clipboard;
+    /// use iced_runtime::core::mouse;
+    /// use iced_runtime::core::Size;
     /// use iced_runtime::user_interface::{self, UserInterface};
     /// use iced_wgpu::Renderer;
     ///
@@ -136,7 +138,7 @@ where
     /// let mut cache = user_interface::Cache::new();
     /// let mut renderer = Renderer::new();
     /// let mut window_size = Size::new(1024.0, 768.0);
-    /// let mut cursor_position = Point::default();
+    /// let mut cursor = mouse::Cursor::default();
     /// let mut clipboard = clipboard::Null;
     ///
     /// // Initialize our event storage
@@ -156,7 +158,7 @@ where
     ///     // Update the user interface
     ///     let (state, event_statuses) = user_interface.update(
     ///         &events,
-    ///         cursor_position,
+    ///         cursor,
     ///         &mut renderer,
     ///         &mut clipboard,
     ///         &mut messages
@@ -173,7 +175,7 @@ where
     pub fn update(
         &mut self,
         events: &[Event],
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &mut Renderer,
         clipboard: &mut dyn Clipboard,
         messages: &mut Vec<Message>,
@@ -203,7 +205,7 @@ where
                 let event_status = overlay.on_event(
                     event,
                     Layout::new(&layout),
-                    mouse::Cursor::Available(cursor_position),
+                    cursor,
                     renderer,
                     clipboard,
                     &mut shell,
@@ -255,19 +257,22 @@ where
             let base_cursor = manual_overlay
                 .as_ref()
                 .filter(|overlay| {
-                    overlay.is_over(Layout::new(&layout), cursor_position)
+                    cursor
+                        .position()
+                        .map(|cursor_position| {
+                            overlay
+                                .is_over(Layout::new(&layout), cursor_position)
+                        })
+                        .unwrap_or_default()
                 })
                 .map(|_| mouse::Cursor::Unavailable)
-                .unwrap_or(mouse::Cursor::Available(cursor_position));
+                .unwrap_or(cursor);
 
             self.overlay = Some(layout);
 
             (base_cursor, event_statuses)
         } else {
-            (
-                mouse::Cursor::Available(cursor_position),
-                vec![event::Status::Ignored; events.len()],
-            )
+            (cursor, vec![event::Status::Ignored; events.len()])
         };
 
         let _ = ManuallyDrop::into_inner(manual_overlay);
@@ -359,8 +364,9 @@ where
     /// #     pub fn update(&mut self, _: ()) {}
     /// # }
     /// use iced_runtime::core::clipboard;
+    /// use iced_runtime::core::mouse;
     /// use iced_runtime::core::renderer;
-    /// use iced_runtime::core::{Element, Size, Point};
+    /// use iced_runtime::core::{Element, Size};
     /// use iced_runtime::user_interface::{self, UserInterface};
     /// use iced_wgpu::{Renderer, Theme};
     ///
@@ -368,7 +374,7 @@ where
     /// let mut cache = user_interface::Cache::new();
     /// let mut renderer = Renderer::new();
     /// let mut window_size = Size::new(1024.0, 768.0);
-    /// let mut cursor_position = Point::default();
+    /// let mut cursor = mouse::Cursor::default();
     /// let mut clipboard = clipboard::Null;
     /// let mut events = Vec::new();
     /// let mut messages = Vec::new();
@@ -387,14 +393,14 @@ where
     ///     // Update the user interface
     ///     let event_statuses = user_interface.update(
     ///         &events,
-    ///         cursor_position,
+    ///         cursor,
     ///         &mut renderer,
     ///         &mut clipboard,
     ///         &mut messages
     ///     );
     ///
     ///     // Draw the user interface
-    ///     let mouse_cursor = user_interface.draw(&mut renderer, &theme, &renderer::Style::default(), cursor_position);
+    ///     let mouse_interaction = user_interface.draw(&mut renderer, &theme, &renderer::Style::default(), cursor);
     ///
     ///     cache = user_interface.into_cache();
     ///
@@ -411,7 +417,7 @@ where
         renderer: &mut Renderer,
         theme: &Renderer::Theme,
         style: &renderer::Style,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) -> mouse::Interaction {
         // TODO: Move to shell level (?)
         renderer.clear();
@@ -427,19 +433,24 @@ where
                 overlay.layout(renderer, self.bounds, Vector::ZERO)
             });
 
-            let cursor = if overlay
-                .is_over(Layout::new(&overlay_layout), cursor_position)
+            let cursor = if cursor
+                .position()
+                .map(|cursor_position| {
+                    overlay
+                        .is_over(Layout::new(&overlay_layout), cursor_position)
+                })
+                .unwrap_or_default()
             {
                 mouse::Cursor::Unavailable
             } else {
-                mouse::Cursor::Available(cursor_position)
+                cursor
             };
 
             self.overlay = Some(overlay_layout);
 
             cursor
         } else {
-            mouse::Cursor::Available(cursor_position)
+            cursor
         };
 
         self.root.as_widget().draw(
@@ -480,7 +491,7 @@ where
                     .map(|overlay| {
                         let overlay_interaction = overlay.mouse_interaction(
                             Layout::new(layout),
-                            mouse::Cursor::Available(cursor_position),
+                            cursor,
                             &viewport,
                             renderer,
                         );
@@ -493,11 +504,19 @@ where
                                 theme,
                                 style,
                                 Layout::new(layout),
-                                mouse::Cursor::Available(cursor_position),
+                                cursor,
                             );
                         });
 
-                        if overlay.is_over(Layout::new(layout), cursor_position)
+                        if cursor
+                            .position()
+                            .map(|cursor_position| {
+                                overlay.is_over(
+                                    Layout::new(layout),
+                                    cursor_position,
+                                )
+                            })
+                            .unwrap_or_default()
                         {
                             overlay_interaction
                         } else {
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 4147be17..be416ac8 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -356,7 +356,7 @@ async fn run_instance<A, E, C>(
 
                 let (interface_state, statuses) = user_interface.update(
                     &events,
-                    state.cursor_position(),
+                    state.cursor(),
                     &mut renderer,
                     &mut clipboard,
                     &mut messages,
@@ -422,7 +422,7 @@ async fn run_instance<A, E, C>(
 
                 let (interface_state, _) = user_interface.update(
                     &[redraw_event.clone()],
-                    state.cursor_position(),
+                    state.cursor(),
                     &mut renderer,
                     &mut clipboard,
                     &mut messages,
@@ -435,7 +435,7 @@ async fn run_instance<A, E, C>(
                     &renderer::Style {
                         text_color: state.text_color(),
                     },
-                    state.cursor_position(),
+                    state.cursor(),
                 );
                 debug.draw_finished();
 
@@ -508,7 +508,7 @@ async fn run_instance<A, E, C>(
                         &renderer::Style {
                             text_color: state.text_color(),
                         },
-                        state.cursor_position(),
+                        state.cursor(),
                     );
 
                     if new_mouse_interaction != mouse_interaction {
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index c37ccca6..967f43f2 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -1,7 +1,8 @@
 use crate::application::{self, StyleSheet as _};
 use crate::conversion;
 use crate::core;
-use crate::core::{Color, Point, Size};
+use crate::core::mouse;
+use crate::core::{Color, Size};
 use crate::graphics::Viewport;
 use crate::runtime::Debug;
 use crate::Application;
@@ -20,7 +21,7 @@ where
     scale_factor: f64,
     viewport: Viewport,
     viewport_version: usize,
-    cursor_position: winit::dpi::PhysicalPosition<f64>,
+    cursor_position: Option<winit::dpi::PhysicalPosition<f64>>,
     modifiers: winit::event::ModifiersState,
     theme: <A::Renderer as core::Renderer>::Theme,
     appearance: application::Appearance,
@@ -52,8 +53,7 @@ where
             scale_factor,
             viewport,
             viewport_version: 0,
-            // TODO: Encode cursor availability in the type-system
-            cursor_position: winit::dpi::PhysicalPosition::new(-1.0, -1.0),
+            cursor_position: None,
             modifiers: winit::event::ModifiersState::default(),
             theme,
             appearance,
@@ -89,11 +89,16 @@ where
     }
 
     /// Returns the current cursor position of the [`State`].
-    pub fn cursor_position(&self) -> Point {
-        conversion::cursor_position(
-            self.cursor_position,
-            self.viewport.scale_factor(),
-        )
+    pub fn cursor(&self) -> mouse::Cursor {
+        self.cursor_position
+            .map(|cursor_position| {
+                conversion::cursor_position(
+                    cursor_position,
+                    self.viewport.scale_factor(),
+                )
+            })
+            .map(mouse::Cursor::Available)
+            .unwrap_or(mouse::Cursor::Unavailable)
     }
 
     /// Returns the current keyboard modifiers of the [`State`].
@@ -153,12 +158,10 @@ where
             | WindowEvent::Touch(Touch {
                 location: position, ..
             }) => {
-                self.cursor_position = *position;
+                self.cursor_position = Some(*position);
             }
             WindowEvent::CursorLeft { .. } => {
-                // TODO: Encode cursor availability in the type-system
-                self.cursor_position =
-                    winit::dpi::PhysicalPosition::new(-1.0, -1.0);
+                self.cursor_position = None;
             }
             WindowEvent::ModifiersChanged(new_modifiers) => {
                 self.modifiers = *new_modifiers;

From 733c2bd9f594a21ce20444e8edcb4c5f88118e0a 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, 8 Jun 2023 20:45:48 +0200
Subject: [PATCH 359/440] Use `mouse::Cursor` in `integration` example

---
 examples/integration/src/main.rs | 42 ++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index daecfeb2..342d4c69 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -15,7 +15,6 @@ use iced_winit::style::Theme;
 use iced_winit::{conversion, futures, winit, Clipboard};
 
 use winit::{
-    dpi::PhysicalPosition,
     event::{Event, ModifiersState, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
 };
@@ -40,6 +39,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
             .and_then(|element| element.dyn_into::<HtmlCanvasElement>().ok())
             .expect("Get canvas element")
     };
+
     #[cfg(not(target_arch = "wasm32"))]
     env_logger::init();
 
@@ -59,7 +59,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
         Size::new(physical_size.width, physical_size.height),
         window.scale_factor(),
     );
-    let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
+    let mut cursor_position = None;
     let mut modifiers = ModifiersState::default();
     let mut clipboard = Clipboard::connect(&window);
 
@@ -166,7 +166,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
             Event::WindowEvent { event, .. } => {
                 match event {
                     WindowEvent::CursorMoved { position, .. } => {
-                        cursor_position = position;
+                        cursor_position = Some(position);
                     }
                     WindowEvent::ModifiersChanged(new_modifiers) => {
                         modifiers = new_modifiers;
@@ -195,13 +195,20 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                     // We update iced
                     let _ = state.update(
                         viewport.logical_size(),
-                        mouse::Cursor::Available(conversion::cursor_position(
-                            cursor_position,
-                            viewport.scale_factor(),
-                        )),
+                        cursor_position
+                            .map(|p| {
+                                conversion::cursor_position(
+                                    p,
+                                    viewport.scale_factor(),
+                                )
+                            })
+                            .map(mouse::Cursor::Available)
+                            .unwrap_or(mouse::Cursor::Unavailable),
                         &mut renderer,
                         &Theme::Dark,
-                        &renderer::Style { text_color: Color::WHITE },
+                        &renderer::Style {
+                            text_color: Color::WHITE,
+                        },
                         &mut clipboard,
                         &mut debug,
                     );
@@ -243,7 +250,9 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                         let program = state.program();
 
-                        let view = frame.texture.create_view(&wgpu::TextureViewDescriptor::default());
+                        let view = frame.texture.create_view(
+                            &wgpu::TextureViewDescriptor::default(),
+                        );
 
                         {
                             // We clear the frame
@@ -276,15 +285,18 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                         frame.present();
 
                         // Update the mouse cursor
-                         window.set_cursor_icon(
-                             iced_winit::conversion::mouse_interaction(
-                                 state.mouse_interaction(),
-                             ),
-                         );
+                        window.set_cursor_icon(
+                            iced_winit::conversion::mouse_interaction(
+                                state.mouse_interaction(),
+                            ),
+                        );
                     }
                     Err(error) => match error {
                         wgpu::SurfaceError::OutOfMemory => {
-                            panic!("Swapchain error: {error}. Rendering cannot continue.")
+                            panic!(
+                                "Swapchain error: {error}. \
+                                Rendering cannot continue."
+                            )
                         }
                         _ => {
                             // Try rendering again next frame.

From 27639c4ce6161fa07986c2f1d472a8a259ae2129 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, 8 Jun 2023 21:03:24 +0200
Subject: [PATCH 360/440] Fix mouse interactions in `Scrollable`

---
 widget/src/scrollable.rs | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index d90aca2b..5c00ee20 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -480,10 +480,6 @@ pub fn update<Message>(
         return event::Status::Ignored;
     }
 
-    let Some(cursor_position) = cursor_over_scrollable else {
-        return event::Status::Ignored
-    };
-
     match event {
         Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
             let delta = match delta {
@@ -512,12 +508,20 @@ pub fn update<Message>(
         {
             match event {
                 touch::Event::FingerPressed { .. } => {
+                    let Some(cursor_position) = cursor.position() else {
+                        return event::Status::Ignored
+                    };
+
                     state.scroll_area_touched_at = Some(cursor_position);
                 }
                 touch::Event::FingerMoved { .. } => {
                     if let Some(scroll_box_touched_at) =
                         state.scroll_area_touched_at
                     {
+                        let Some(cursor_position) = cursor.position() else {
+                            return event::Status::Ignored
+                        };
+
                         let delta = Vector::new(
                             cursor_position.x - scroll_box_touched_at.x,
                             cursor_position.y - scroll_box_touched_at.y,
@@ -559,6 +563,10 @@ pub fn update<Message>(
             Event::Mouse(mouse::Event::CursorMoved { .. })
             | Event::Touch(touch::Event::FingerMoved { .. }) => {
                 if let Some(scrollbar) = scrollbars.y {
+                    let Some(cursor_position) = cursor.position() else {
+                        return event::Status::Ignored
+                    };
+
                     state.scroll_y_to(
                         scrollbar.scroll_percentage_y(
                             scroller_grabbed_at,
@@ -585,6 +593,10 @@ pub fn update<Message>(
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
+                let Some(cursor_position) = cursor.position() else {
+                    return event::Status::Ignored
+                };
+
                 if let (Some(scroller_grabbed_at), Some(scrollbar)) =
                     (scrollbars.grab_y_scroller(cursor_position), scrollbars.y)
                 {
@@ -625,6 +637,10 @@ pub fn update<Message>(
             }
             Event::Mouse(mouse::Event::CursorMoved { .. })
             | Event::Touch(touch::Event::FingerMoved { .. }) => {
+                let Some(cursor_position) = cursor.position() else {
+                    return event::Status::Ignored
+                };
+
                 if let Some(scrollbar) = scrollbars.x {
                     state.scroll_x_to(
                         scrollbar.scroll_percentage_x(
@@ -652,6 +668,10 @@ pub fn update<Message>(
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
+                let Some(cursor_position) = cursor.position() else {
+                    return event::Status::Ignored
+                };
+
                 if let (Some(scroller_grabbed_at), Some(scrollbar)) =
                     (scrollbars.grab_x_scroller(cursor_position), scrollbars.x)
                 {

From 9d69af10ccb4317f01bff32e2e1e58d498b2fc89 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Thu, 8 Jun 2023 20:09:10 -0700
Subject: [PATCH 361/440] comment: fix typo

---
 examples/loading_spinners/src/circular.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 56ffa6f5..4e7bdc18 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -31,7 +31,7 @@ where
     style: <Theme as StyleSheet>::Style,
     easing: &'a Easing,
     cycle_duration: Duration,
-    rotaion_duration: Duration,
+    rotation_duration: Duration,
 }
 
 impl<'a, Theme> Circular<'a, Theme>
@@ -46,7 +46,7 @@ where
             style: <Theme as StyleSheet>::Style::default(),
             easing: &easing::STANDARD,
             cycle_duration: Duration::from_millis(600),
-            rotaion_duration: Duration::from_secs(2),
+            rotation_duration: Duration::from_secs(2),
         }
     }
 
@@ -83,7 +83,7 @@ where
     /// Sets the base rotation duration of this [`Circular`]. This is the duration that a full
     /// rotation would take if the cycle rotation were set to 0.0 (no expanding or contracting)
     pub fn rotation_duration(mut self, duration: Duration) -> Self {
-        self.rotaion_duration = duration;
+        self.rotation_duration = duration;
         self
     }
 }
@@ -273,7 +273,7 @@ where
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
             *state = state.timed_transition(
                 self.cycle_duration,
-                self.rotaion_duration,
+                self.rotation_duration,
                 now,
             );
 

From 290b47f312471db74e8b149e0f78df3891456208 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Fri, 9 Jun 2023 11:03:52 -0700
Subject: [PATCH 362/440] refactor: remove unnecessary canvas complexity

---
 examples/loading_spinners/src/circular.rs | 187 ++++++++--------------
 1 file changed, 67 insertions(+), 120 deletions(-)

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 4e7bdc18..55363de1 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -5,7 +5,7 @@ use iced::advanced::widget::tree::{self, Tree};
 use iced::advanced::{Clipboard, Layout, Renderer, Shell, Widget};
 use iced::event;
 use iced::time::Instant;
-use iced::widget::canvas::{self, Cursor, Program};
+use iced::widget::canvas;
 use iced::window::{self, RedrawRequest};
 use iced::{Background, Color, Element, Rectangle};
 use iced::{Event, Length, Point, Size, Vector};
@@ -15,8 +15,6 @@ use super::easing::{self, Easing};
 use std::f32::consts::PI;
 use std::time::Duration;
 
-type R<Theme> = iced::Renderer<Theme>;
-
 const MIN_RADIANS: f32 = PI / 8.0;
 const WRAP_RADIANS: f32 = 2.0 * PI - PI / 4.0;
 const BASE_ROTATION_SPEED: u32 = u32::MAX / 80;
@@ -98,7 +96,7 @@ where
 }
 
 #[derive(Clone, Copy)]
-enum State {
+enum Animation {
     Expanding {
         start: Instant,
         progress: f32,
@@ -113,7 +111,7 @@ enum State {
     },
 }
 
-impl Default for State {
+impl Default for Animation {
     fn default() -> Self {
         Self::Expanding {
             start: Instant::now(),
@@ -124,7 +122,7 @@ impl Default for State {
     }
 }
 
-impl State {
+impl Animation {
     fn next(&self, additional_rotation: u32, now: Instant) -> Self {
         match self {
             Self::Expanding { rotation, .. } => Self::Contracting {
@@ -224,7 +222,14 @@ impl State {
     }
 }
 
-impl<'a, Message, Theme> Widget<Message, R<Theme>> for Circular<'a, Theme>
+#[derive(Default)]
+struct State {
+    animation: Animation,
+    cache: canvas::Cache,
+}
+
+impl<'a, Message, Theme> Widget<Message, iced::Renderer<Theme>>
+    for Circular<'a, Theme>
 where
     Message: 'a + Clone,
     Theme: StyleSheet,
@@ -271,12 +276,13 @@ where
         let state = tree.state.downcast_mut::<State>();
 
         if let Event::Window(window::Event::RedrawRequested(now)) = event {
-            *state = state.timed_transition(
+            state.animation = state.animation.timed_transition(
                 self.cycle_duration,
                 self.rotation_duration,
                 now,
             );
 
+            state.cache.clear();
             shell.request_redraw(RedrawRequest::At(
                 now + Duration::from_millis(1000 / FRAME_RATE),
             ));
@@ -288,42 +294,76 @@ where
     fn draw(
         &self,
         tree: &Tree,
-        renderer: &mut R<Theme>,
+        renderer: &mut iced::Renderer<Theme>,
         theme: &Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
         _cursor_position: Point,
         _viewport: &Rectangle,
     ) {
-        let bounds = layout.bounds();
         let state = tree.state.downcast_ref::<State>();
+        let bounds = layout.bounds();
+        let custom_style =
+            <Theme as StyleSheet>::appearance(theme, &self.style);
+
+        let geometry = state.cache.draw(renderer, bounds.size(), |frame| {
+            let track_radius = frame.width() / 2.0 - self.bar_height;
+            let track_path = canvas::Path::circle(frame.center(), track_radius);
+
+            frame.stroke(
+                &track_path,
+                canvas::Stroke::default()
+                    .with_color(custom_style.track_color)
+                    .with_width(self.bar_height),
+            );
+
+            let mut builder = canvas::path::Builder::new();
+
+            let start = state.animation.rotation() * 2.0 * PI;
+
+            match state.animation {
+                Animation::Expanding { progress, .. } => {
+                    builder.arc(canvas::path::Arc {
+                        center: frame.center(),
+                        radius: track_radius,
+                        start_angle: start,
+                        end_angle: start
+                            + MIN_RADIANS
+                            + WRAP_RADIANS * (self.easing.y_at_x(progress)),
+                    });
+                }
+                Animation::Contracting { progress, .. } => {
+                    builder.arc(canvas::path::Arc {
+                        center: frame.center(),
+                        radius: track_radius,
+                        start_angle: start
+                            + WRAP_RADIANS * (self.easing.y_at_x(progress)),
+                        end_angle: start + MIN_RADIANS + WRAP_RADIANS,
+                    });
+                }
+            }
+
+            let bar_path = builder.build();
+
+            frame.stroke(
+                &bar_path,
+                canvas::Stroke::default()
+                    .with_color(custom_style.bar_color)
+                    .with_width(self.bar_height),
+            );
+        });
 
         renderer.with_translation(
             Vector::new(bounds.x, bounds.y),
             |renderer| {
-                canvas::Renderer::draw(
-                    renderer,
-                    <StateWithStyle<Theme> as Program<Message, R<Theme>>>::draw(
-                        &StateWithStyle {
-                            state,
-                            style: &self.style,
-                            bar_height: self.bar_height,
-                            easing: self.easing,
-                        },
-                        &(),
-                        renderer,
-                        theme,
-                        bounds,
-                        Cursor::Unavailable,
-                    ),
-                );
+                renderer.draw_primitive(geometry.0);
             },
         );
     }
 }
 
 impl<'a, Message, Theme> From<Circular<'a, Theme>>
-    for Element<'a, Message, R<Theme>>
+    for Element<'a, Message, iced::Renderer<Theme>>
 where
     Message: Clone + 'a,
     Theme: StyleSheet + 'a,
@@ -375,96 +415,3 @@ impl StyleSheet for iced::Theme {
         }
     }
 }
-
-struct StateWithStyle<'a, Theme>
-where
-    Theme: StyleSheet,
-{
-    state: &'a State,
-    style: &'a <Theme as StyleSheet>::Style,
-    easing: &'a Easing,
-    bar_height: f32,
-}
-
-impl<'a, Message, Theme> Program<Message, iced::Renderer<Theme>>
-    for StateWithStyle<'a, Theme>
-where
-    Theme: StyleSheet,
-{
-    type State = ();
-
-    fn update(
-        &self,
-        _state: &mut Self::State,
-        _event: canvas::Event,
-        _bounds: Rectangle,
-        _cursor: canvas::Cursor,
-    ) -> (canvas::event::Status, Option<Message>) {
-        (canvas::event::Status::Ignored, None)
-    }
-
-    fn draw(
-        &self,
-        _state: &Self::State,
-        renderer: &iced::Renderer<Theme>,
-        theme: &Theme,
-        bounds: Rectangle,
-        _cursor: canvas::Cursor,
-    ) -> Vec<canvas::Geometry> {
-        let mut frame = canvas::Frame::new(renderer, bounds.size());
-        let custom_style = <Theme as StyleSheet>::appearance(theme, self.style);
-        let track_radius = frame.width() / 2.0 - self.bar_height;
-
-        if let Some(Background::Color(color)) = custom_style.background {
-            let background_path =
-                canvas::Path::circle(frame.center(), track_radius);
-            frame.fill(&background_path, color);
-        }
-
-        let track_path = canvas::Path::circle(frame.center(), track_radius);
-
-        frame.stroke(
-            &track_path,
-            canvas::Stroke::default()
-                .with_color(custom_style.track_color)
-                .with_width(self.bar_height),
-        );
-
-        let mut builder = canvas::path::Builder::new();
-
-        let start = self.state.rotation() * 2.0 * PI;
-
-        match self.state {
-            State::Expanding { progress, .. } => {
-                builder.arc(canvas::path::Arc {
-                    center: frame.center(),
-                    radius: track_radius,
-                    start_angle: start,
-                    end_angle: start
-                        + MIN_RADIANS
-                        + WRAP_RADIANS * (self.easing.y_at_x(*progress)),
-                });
-            }
-            State::Contracting { progress, .. } => {
-                builder.arc(canvas::path::Arc {
-                    center: frame.center(),
-                    radius: track_radius,
-                    start_angle: start
-                        + WRAP_RADIANS * (self.easing.y_at_x(*progress)),
-                    end_angle: start + MIN_RADIANS + WRAP_RADIANS,
-                });
-            }
-        }
-
-        let bar_path = builder.build();
-
-        frame.stroke(
-            &bar_path,
-            canvas::Stroke::default()
-                .with_color(custom_style.bar_color)
-                .with_width(self.bar_height),
-        );
-
-        vec![frame.into_geometry()]
-    }
-}

From fcf906267997aae9ff7ee282b938cbb5f6119271 Mon Sep 17 00:00:00 2001
From: Jonathan Lindsey <jonathanilindsey@gmail.com>
Date: Sat, 10 Jun 2023 21:52:26 -0500
Subject: [PATCH 363/440] Make the subscription::channel function take a FnOnce
 closure instead of a Fn closure and remove Sync as a requirement for its
 output.

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

diff --git a/futures/src/subscription.rs b/futures/src/subscription.rs
index 801c2694..0642a924 100644
--- a/futures/src/subscription.rs
+++ b/futures/src/subscription.rs
@@ -417,7 +417,7 @@ where
 pub fn channel<I, Fut, Message>(
     id: I,
     size: usize,
-    f: impl Fn(mpsc::Sender<Message>) -> Fut + MaybeSend + Sync + 'static,
+    f: impl FnOnce(mpsc::Sender<Message>) -> Fut + MaybeSend + 'static,
 ) -> Subscription<Message>
 where
     I: Hash + 'static,

From 38da9535831d4371cac0bf21282d4c1a6a82c209 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 12 Jun 2023 13:15:11 -0700
Subject: [PATCH 364/440] Only scroll w/ wheel if over scrollable

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

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 5c00ee20..010befac 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -482,6 +482,10 @@ pub fn update<Message>(
 
     match event {
         Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
+            if cursor_over_scrollable.is_none() {
+                return event::Status::Ignored;
+            }
+
             let delta = match delta {
                 mouse::ScrollDelta::Lines { x, y } => {
                     // TODO: Configurable speed/friction (?)

From 55dc3b5619392f4a20389255708c61082b3d4c1a Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 14:31:38 -0800
Subject: [PATCH 365/440] Introduce internal `overlay::Nested` for
 `UserInterface`

---
 core/src/overlay.rs                   |  16 +-
 core/src/overlay/element.rs           |  27 ++-
 core/src/overlay/group.rs             |  11 +-
 examples/toast/src/main.rs            |   7 +-
 runtime/src/user_interface.rs         |  71 ++++---
 runtime/src/user_interface/overlay.rs | 288 ++++++++++++++++++++++++++
 widget/src/lazy.rs                    |   9 +-
 widget/src/lazy/component.rs          |   9 +-
 widget/src/lazy/responsive.rs         |   9 +-
 9 files changed, 406 insertions(+), 41 deletions(-)
 create mode 100644 runtime/src/user_interface/overlay.rs

diff --git a/core/src/overlay.rs b/core/src/overlay.rs
index 1fa994e4..2e05db93 100644
--- a/core/src/overlay.rs
+++ b/core/src/overlay.rs
@@ -91,9 +91,23 @@ where
     ///
     /// By default, it returns true if the bounds of the `layout` contain
     /// the `cursor_position`.
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        _renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
         layout.bounds().contains(cursor_position)
     }
+
+    /// Returns the nested overlay of the [`Overlay`], if there is any.
+    fn overlay<'a>(
+        &'a mut self,
+        _layout: Layout<'_>,
+        _renderer: &Renderer,
+    ) -> Option<Element<'a, Message, Renderer>> {
+        None
+    }
 }
 
 /// Returns a [`Group`] of overlay [`Element`] children.
diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
index be67fc76..edb1b443 100644
--- a/core/src/overlay/element.rs
+++ b/core/src/overlay/element.rs
@@ -112,8 +112,22 @@ where
     }
 
     /// Returns true if the cursor is over the [`Element`].
-    pub fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        self.overlay.is_over(layout, cursor_position)
+    pub fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
+        self.overlay.is_over(layout, renderer, cursor_position)
+    }
+
+    /// Returns the nested overlay of the [`Element`], if there is any.
+    pub fn overlay<'b>(
+        &'b mut self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+    ) -> Option<Element<'b, Message, Renderer>> {
+        self.overlay.overlay(layout, renderer)
     }
 }
 
@@ -248,7 +262,12 @@ where
         self.content.draw(renderer, theme, style, layout, cursor)
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        self.content.is_over(layout, cursor_position)
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
+        self.content.is_over(layout, renderer, cursor_position)
     }
 }
diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
index e770abf8..7a38222b 100644
--- a/core/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -147,11 +147,18 @@ where
         });
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
         self.children
             .iter()
             .zip(layout.children())
-            .any(|(child, layout)| child.is_over(layout, cursor_position))
+            .any(|(child, layout)| {
+                child.is_over(layout, renderer, cursor_position)
+            })
     }
 }
 
diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs
index 395cbc10..4282ddcf 100644
--- a/examples/toast/src/main.rs
+++ b/examples/toast/src/main.rs
@@ -650,7 +650,12 @@ mod toast {
                 .unwrap_or_default()
         }
 
-        fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+        fn is_over(
+            &self,
+            layout: Layout<'_>,
+            _renderer: &Renderer,
+            cursor_position: Point,
+        ) -> bool {
             layout
                 .children()
                 .any(|layout| layout.bounds().contains(cursor_position))
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 68ff6158..8ae0363a 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -1,12 +1,14 @@
 //! Implement your own event loop to drive a user interface.
+mod overlay;
+
 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, Rectangle, Size, Vector};
-use crate::core::{Element, Layout, Shell};
+use crate::core::{Clipboard, Point, Rectangle, Size};
+use crate::core::{Element, Layout, Overlay, Shell};
 
 /// A set of interactive graphical elements with a specific [`Layout`].
 ///
@@ -185,18 +187,18 @@ where
         let mut outdated = false;
         let mut redraw_request = None;
 
-        let mut manual_overlay =
-            ManuallyDrop::new(self.root.as_widget_mut().overlay(
-                &mut self.state,
-                Layout::new(&self.base),
-                renderer,
-            ));
+        let mut manual_overlay = ManuallyDrop::new(
+            self.root
+                .as_widget_mut()
+                .overlay(&mut self.state, Layout::new(&self.base), renderer)
+                .map(overlay::Nested::new),
+        );
 
         let (base_cursor, overlay_statuses) = if manual_overlay.is_some() {
             let bounds = self.bounds;
 
             let mut overlay = manual_overlay.as_mut().unwrap();
-            let mut layout = overlay.layout(renderer, bounds, Vector::ZERO);
+            let mut layout = overlay.layout(renderer, bounds, Point::ORIGIN);
             let mut event_statuses = Vec::new();
 
             for event in events.iter().cloned() {
@@ -231,12 +233,16 @@ where
                         &layout::Limits::new(Size::ZERO, self.bounds),
                     );
 
-                    manual_overlay =
-                        ManuallyDrop::new(self.root.as_widget_mut().overlay(
-                            &mut self.state,
-                            Layout::new(&self.base),
-                            renderer,
-                        ));
+                    manual_overlay = ManuallyDrop::new(
+                        self.root
+                            .as_widget_mut()
+                            .overlay(
+                                &mut self.state,
+                                Layout::new(&self.base),
+                                renderer,
+                            )
+                            .map(overlay::Nested::new),
+                    );
 
                     if manual_overlay.is_none() {
                         break;
@@ -245,7 +251,8 @@ where
                     overlay = manual_overlay.as_mut().unwrap();
 
                     shell.revalidate_layout(|| {
-                        layout = overlay.layout(renderer, bounds, Vector::ZERO);
+                        layout =
+                            overlay.layout(renderer, bounds, Point::ORIGIN);
                     });
                 }
 
@@ -260,8 +267,11 @@ where
                     cursor
                         .position()
                         .map(|cursor_position| {
-                            overlay
-                                .is_over(Layout::new(&layout), cursor_position)
+                            overlay.is_over(
+                                Layout::new(&layout),
+                                renderer,
+                                cursor_position,
+                            )
                         })
                         .unwrap_or_default()
                 })
@@ -428,16 +438,20 @@ where
             .root
             .as_widget_mut()
             .overlay(&mut self.state, Layout::new(&self.base), renderer)
+            .map(overlay::Nested::new)
         {
             let overlay_layout = self.overlay.take().unwrap_or_else(|| {
-                overlay.layout(renderer, self.bounds, Vector::ZERO)
+                overlay.layout(renderer, self.bounds, Point::ORIGIN)
             });
 
             let cursor = if cursor
                 .position()
                 .map(|cursor_position| {
-                    overlay
-                        .is_over(Layout::new(&overlay_layout), cursor_position)
+                    overlay.is_over(
+                        Layout::new(&overlay_layout),
+                        renderer,
+                        cursor_position,
+                    )
                 })
                 .unwrap_or_default()
             {
@@ -488,6 +502,7 @@ where
             .and_then(|layout| {
                 root.as_widget_mut()
                     .overlay(&mut self.state, Layout::new(base), renderer)
+                    .map(overlay::Nested::new)
                     .map(|overlay| {
                         let overlay_interaction = overlay.mouse_interaction(
                             Layout::new(layout),
@@ -513,6 +528,7 @@ where
                             .map(|cursor_position| {
                                 overlay.is_over(
                                     Layout::new(layout),
+                                    renderer,
                                     cursor_position,
                                 )
                             })
@@ -540,14 +556,15 @@ where
             operation,
         );
 
-        if let Some(mut overlay) = self.root.as_widget_mut().overlay(
-            &mut self.state,
-            Layout::new(&self.base),
-            renderer,
-        ) {
+        if let Some(mut overlay) = self
+            .root
+            .as_widget_mut()
+            .overlay(&mut self.state, Layout::new(&self.base), renderer)
+            .map(overlay::Nested::new)
+        {
             if self.overlay.is_none() {
                 self.overlay =
-                    Some(overlay.layout(renderer, self.bounds, Vector::ZERO));
+                    Some(overlay.layout(renderer, self.bounds, Point::ORIGIN));
             }
 
             overlay.operate(
diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
new file mode 100644
index 00000000..6dfed153
--- /dev/null
+++ b/runtime/src/user_interface/overlay.rs
@@ -0,0 +1,288 @@
+use crate::core::event;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::{
+    Clipboard, Event, Layout, Overlay, Point, Rectangle, Shell, Size,
+};
+
+use std::cell::RefCell;
+
+/// An [`Overlay`] container that displays nested overlays
+#[allow(missing_debug_implementations)]
+pub struct Nested<'a, Message, Renderer> {
+    overlay: Inner<'a, Message, Renderer>,
+}
+
+impl<'a, Message, Renderer> Nested<'a, Message, Renderer> {
+    /// Creates a nested overlay from the provided [`overlay::Element`]
+    pub fn new(element: overlay::Element<'a, Message, Renderer>) -> Self {
+        Self {
+            overlay: Inner(RefCell::new(element)),
+        }
+    }
+}
+
+struct Inner<'a, Message, Renderer>(
+    RefCell<overlay::Element<'a, Message, Renderer>>,
+);
+
+impl<'a, Message, Renderer> Inner<'a, Message, Renderer> {
+    fn with_element_mut<T>(
+        &self,
+        mut f: impl FnMut(&mut overlay::Element<'_, Message, Renderer>) -> T,
+    ) -> T {
+        (f)(&mut self.0.borrow_mut())
+    }
+}
+
+impl<'a, Message, Renderer> Overlay<Message, Renderer>
+    for Nested<'a, Message, Renderer>
+where
+    Renderer: renderer::Renderer,
+{
+    fn layout(
+        &self,
+        renderer: &Renderer,
+        bounds: Size,
+        position: Point,
+    ) -> layout::Node {
+        fn recurse<Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            renderer: &Renderer,
+            bounds: Size,
+            position: Point,
+        ) -> Vec<layout::Node>
+        where
+            Renderer: renderer::Renderer,
+        {
+            let translation = position - Point::ORIGIN;
+
+            let node = element.layout(renderer, bounds, translation);
+
+            if let Some(mut overlay) =
+                element.overlay(Layout::new(&node), renderer)
+            {
+                vec![node]
+                    .into_iter()
+                    .chain(recurse(&mut overlay, renderer, bounds, position))
+                    .collect()
+            } else {
+                vec![node]
+            }
+        }
+
+        self.overlay.with_element_mut(|element| {
+            layout::Node::with_children(
+                bounds,
+                recurse(element, renderer, bounds, position),
+            )
+        })
+    }
+
+    fn draw(
+        &self,
+        renderer: &mut Renderer,
+        theme: &<Renderer as renderer::Renderer>::Theme,
+        style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+    ) {
+        fn recurse<'a, Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            mut layouts: impl Iterator<Item = Layout<'a>>,
+            renderer: &mut Renderer,
+            theme: &<Renderer as renderer::Renderer>::Theme,
+            style: &renderer::Style,
+            cursor: mouse::Cursor,
+        ) where
+            Renderer: renderer::Renderer,
+        {
+            let layout = layouts.next().unwrap();
+
+            element.draw(renderer, theme, style, layout, cursor);
+
+            if let Some(mut overlay) = element.overlay(layout, renderer) {
+                recurse(&mut overlay, layouts, renderer, theme, style, cursor);
+            }
+        }
+
+        self.overlay.with_element_mut(|element| {
+            let layouts = layout.children();
+
+            recurse(element, layouts, renderer, theme, style, cursor);
+        })
+    }
+
+    fn operate(
+        &mut self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        operation: &mut dyn widget::Operation<Message>,
+    ) {
+        fn recurse<'a, Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            mut layouts: impl Iterator<Item = Layout<'a>>,
+            renderer: &Renderer,
+            operation: &mut dyn widget::Operation<Message>,
+        ) where
+            Renderer: renderer::Renderer,
+        {
+            let layout = layouts.next().unwrap();
+
+            element.operate(layout, renderer, operation);
+
+            if let Some(mut overlay) = element.overlay(layout, renderer) {
+                recurse(&mut overlay, layouts, renderer, operation);
+            }
+        }
+
+        let layouts = layout.children();
+
+        recurse(self.overlay.0.get_mut(), layouts, renderer, operation)
+    }
+
+    fn on_event(
+        &mut self,
+        event: Event,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        renderer: &Renderer,
+        clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+    ) -> event::Status {
+        fn recurse<'a, Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            mut layouts: impl Iterator<Item = Layout<'a>>,
+            event: Event,
+            cursor: mouse::Cursor,
+            renderer: &Renderer,
+            clipboard: &mut dyn Clipboard,
+            shell: &mut Shell<'_, Message>,
+        ) -> event::Status
+        where
+            Renderer: renderer::Renderer,
+        {
+            let layout = layouts.next().unwrap();
+
+            let status =
+                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                    recurse(
+                        &mut overlay,
+                        layouts,
+                        event.clone(),
+                        cursor,
+                        renderer,
+                        clipboard,
+                        shell,
+                    )
+                } else {
+                    event::Status::Ignored
+                };
+
+            if matches!(status, event::Status::Ignored) {
+                element
+                    .on_event(event, layout, cursor, renderer, clipboard, shell)
+            } else {
+                status
+            }
+        }
+
+        let layouts = layout.children();
+
+        recurse(
+            self.overlay.0.get_mut(),
+            layouts,
+            event,
+            cursor,
+            renderer,
+            clipboard,
+            shell,
+        )
+    }
+
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        viewport: &Rectangle,
+        renderer: &Renderer,
+    ) -> mouse::Interaction {
+        fn recurse<'a, Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            mut layouts: impl Iterator<Item = Layout<'a>>,
+            cursor: mouse::Cursor,
+            viewport: &Rectangle,
+            renderer: &Renderer,
+        ) -> mouse::Interaction
+        where
+            Renderer: renderer::Renderer,
+        {
+            let layout = layouts.next().unwrap();
+
+            let interaction =
+                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                    recurse(&mut overlay, layouts, cursor, viewport, renderer)
+                } else {
+                    mouse::Interaction::default()
+                };
+
+            element
+                .mouse_interaction(layout, cursor, viewport, renderer)
+                .max(interaction)
+        }
+
+        self.overlay.with_element_mut(|element| {
+            let layouts = layout.children();
+
+            recurse(element, layouts, cursor, viewport, renderer)
+        })
+    }
+
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
+        fn recurse<'a, Message, Renderer>(
+            element: &mut overlay::Element<'_, Message, Renderer>,
+            mut layouts: impl Iterator<Item = Layout<'a>>,
+            renderer: &Renderer,
+            cursor_position: Point,
+        ) -> bool
+        where
+            Renderer: renderer::Renderer,
+        {
+            let layout = layouts.next().unwrap();
+
+            let is_over = element.is_over(layout, renderer, cursor_position);
+
+            if is_over {
+                return true;
+            }
+
+            if let Some(mut overlay) = element.overlay(layout, renderer) {
+                recurse(&mut overlay, layouts, renderer, cursor_position)
+            } else {
+                false
+            }
+        }
+
+        self.overlay.with_element_mut(|element| {
+            let layouts = layout.children();
+
+            recurse(element, layouts, renderer, cursor_position)
+        })
+    }
+
+    fn overlay<'b>(
+        &'b mut self,
+        _layout: Layout<'_>,
+        _renderer: &Renderer,
+    ) -> Option<overlay::Element<'b, Message, Renderer>> {
+        None
+    }
+}
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 92a611c3..89376136 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -377,9 +377,14 @@ where
         .unwrap_or(event::Status::Ignored)
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
         self.with_overlay_maybe(|overlay| {
-            overlay.is_over(layout, cursor_position)
+            overlay.is_over(layout, renderer, cursor_position)
         })
         .unwrap_or_default()
     }
diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index f462c8cf..edd0c2a2 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -655,9 +655,14 @@ where
         event_status
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
         self.with_overlay_maybe(|overlay| {
-            overlay.is_over(layout, cursor_position)
+            overlay.is_over(layout, renderer, cursor_position)
         })
         .unwrap_or_default()
     }
diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs
index bd6385bc..c00b8618 100644
--- a/widget/src/lazy/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -409,9 +409,14 @@ where
         .unwrap_or(event::Status::Ignored)
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(
+        &self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        cursor_position: Point,
+    ) -> bool {
         self.with_overlay_maybe(|overlay| {
-            overlay.is_over(layout, cursor_position)
+            overlay.is_over(layout, renderer, cursor_position)
         })
         .unwrap_or_default()
     }

From 0a56ffb5d6260832d27c2cae70d4b8536e000001 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 13:48:10 -0800
Subject: [PATCH 366/440] Add nested overlay method to group & map

---
 core/src/overlay/element.rs | 10 ++++++++++
 core/src/overlay/group.rs   | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/core/src/overlay/element.rs b/core/src/overlay/element.rs
index edb1b443..c2134343 100644
--- a/core/src/overlay/element.rs
+++ b/core/src/overlay/element.rs
@@ -270,4 +270,14 @@ where
     ) -> bool {
         self.content.is_over(layout, renderer, cursor_position)
     }
+
+    fn overlay<'b>(
+        &'b mut self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+    ) -> Option<Element<'b, B, Renderer>> {
+        self.content
+            .overlay(layout, renderer)
+            .map(|overlay| overlay.map(self.mapper))
+    }
 }
diff --git a/core/src/overlay/group.rs b/core/src/overlay/group.rs
index 7a38222b..deffaad0 100644
--- a/core/src/overlay/group.rs
+++ b/core/src/overlay/group.rs
@@ -160,6 +160,21 @@ where
                 child.is_over(layout, renderer, cursor_position)
             })
     }
+
+    fn overlay<'b>(
+        &'b mut self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+    ) -> Option<overlay::Element<'b, Message, Renderer>> {
+        let children = self
+            .children
+            .iter_mut()
+            .zip(layout.children())
+            .filter_map(|(child, layout)| child.overlay(layout, renderer))
+            .collect::<Vec<_>>();
+
+        (!children.is_empty()).then(|| Group::with_children(children).overlay())
+    }
 }
 
 impl<'a, Message, Renderer> From<Group<'a, Message, Renderer>>

From f608056c5029727a9523e7a245b7118eb48caa5f Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 13:49:11 -0800
Subject: [PATCH 367/440] Add nested picklist to modal example

---
 examples/modal/src/main.rs | 57 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/examples/modal/src/main.rs b/examples/modal/src/main.rs
index 5c43c203..7fcbbfe4 100644
--- a/examples/modal/src/main.rs
+++ b/examples/modal/src/main.rs
@@ -3,11 +3,13 @@ use iced::keyboard;
 use iced::subscription::{self, Subscription};
 use iced::theme;
 use iced::widget::{
-    self, button, column, container, horizontal_space, row, text, text_input,
+    self, button, column, container, horizontal_space, pick_list, row, text,
+    text_input,
 };
 use iced::{Alignment, Application, Command, Element, Event, Length, Settings};
 
-use self::modal::Modal;
+use modal::Modal;
+use std::fmt;
 
 pub fn main() -> iced::Result {
     App::run(Settings::default())
@@ -18,6 +20,7 @@ struct App {
     show_modal: bool,
     email: String,
     password: String,
+    plan: Plan,
 }
 
 #[derive(Debug, Clone)]
@@ -26,6 +29,7 @@ enum Message {
     HideModal,
     Email(String),
     Password(String),
+    Plan(Plan),
     Submit,
     Event(Event),
 }
@@ -66,6 +70,10 @@ impl Application for App {
                 self.password = password;
                 Command::none()
             }
+            Message::Plan(plan) => {
+                self.plan = plan;
+                Command::none()
+            }
             Message::Submit => {
                 if !self.email.is_empty() && !self.password.is_empty() {
                     self.hide_modal();
@@ -149,6 +157,16 @@ impl Application for App {
                                 .padding(5),
                         ]
                         .spacing(5),
+                        column![
+                            text("Plan").size(12),
+                            pick_list(
+                                Plan::ALL,
+                                Some(self.plan),
+                                Message::Plan
+                            )
+                            .padding(5),
+                        ]
+                        .spacing(5),
                         button(text("Submit")).on_press(Message::HideModal),
                     ]
                     .spacing(10)
@@ -176,6 +194,29 @@ impl App {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+enum Plan {
+    #[default]
+    Basic,
+    Pro,
+    Enterprise,
+}
+
+impl Plan {
+    pub const ALL: &[Self] = &[Self::Basic, Self::Pro, Self::Enterprise];
+}
+
+impl fmt::Display for Plan {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Plan::Basic => "Basic",
+            Plan::Pro => "Pro",
+            Plan::Enterprise => "Enterprise",
+        }
+        .fmt(f)
+    }
+}
+
 mod modal {
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::overlay;
@@ -469,6 +510,18 @@ mod modal {
                 renderer,
             )
         }
+
+        fn overlay<'c>(
+            &'c mut self,
+            layout: Layout<'_>,
+            renderer: &Renderer,
+        ) -> Option<overlay::Element<'c, Message, Renderer>> {
+            self.content.as_widget_mut().overlay(
+                self.tree,
+                layout.children().next().unwrap(),
+                renderer,
+            )
+        }
     }
 
     impl<'a, Message, Renderer> From<Modal<'a, Message, Renderer>>

From f44d4292838f0eaa3fca3ce074977082bb2a6be9 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 13:49:25 -0800
Subject: [PATCH 368/440] Render nested in layer

---
 runtime/src/user_interface/overlay.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index 6dfed153..590cc49f 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -102,7 +102,9 @@ where
         {
             let layout = layouts.next().unwrap();
 
-            element.draw(renderer, theme, style, layout, cursor);
+            renderer.with_layer(layout.bounds(), |renderer| {
+                element.draw(renderer, theme, style, layout, cursor);
+            });
 
             if let Some(mut overlay) = element.overlay(layout, renderer) {
                 recurse(&mut overlay, layouts, renderer, theme, style, cursor);

From 1ce047cdb3bb210a8a949794d3db88b3a029df81 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 13:53:22 -0800
Subject: [PATCH 369/440] Prioritize mouse interaction of deepest `Overlay`

---
 runtime/src/user_interface/overlay.rs | 30 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index 590cc49f..f80d1914 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -224,16 +224,28 @@ where
         {
             let layout = layouts.next().unwrap();
 
-            let interaction =
-                if let Some(mut overlay) = element.overlay(layout, renderer) {
-                    recurse(&mut overlay, layouts, cursor, viewport, renderer)
-                } else {
-                    mouse::Interaction::default()
-                };
+            if let Some(cursor_position) = cursor.position() {
+                match element.overlay(layout, renderer) {
+                    Some(mut overlay)
+                        if overlay.is_over(
+                            layout,
+                            renderer,
+                            cursor_position,
+                        ) =>
+                    {
+                        return recurse(
+                            &mut overlay,
+                            layouts,
+                            cursor,
+                            viewport,
+                            renderer,
+                        );
+                    }
+                    _ => {}
+                }
+            }
 
-            element
-                .mouse_interaction(layout, cursor, viewport, renderer)
-                .max(interaction)
+            element.mouse_interaction(layout, cursor, viewport, renderer)
         }
 
         self.overlay.with_element_mut(|element| {

From d4bb7c0b24e3bf7939bdecf2f3e1e0dba67587fc Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 15:06:44 -0800
Subject: [PATCH 370/440] Remove unwraps in `overlay::Nested` and fix
 `mouse_interaction`

---
 runtime/src/user_interface/overlay.rs | 120 +++++++++++++++-----------
 1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index f80d1914..332eb32d 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -100,14 +100,25 @@ where
         ) where
             Renderer: renderer::Renderer,
         {
-            let layout = layouts.next().unwrap();
+            if let Some(layout) = layouts.next() {
+                renderer.with_layer(layout.bounds(), |renderer| {
+                    element.draw(renderer, theme, style, layout, cursor);
+                });
 
-            renderer.with_layer(layout.bounds(), |renderer| {
-                element.draw(renderer, theme, style, layout, cursor);
-            });
+                renderer.with_layer(layout.bounds(), |renderer| {
+                    element.draw(renderer, theme, style, layout, cursor);
+                });
 
-            if let Some(mut overlay) = element.overlay(layout, renderer) {
-                recurse(&mut overlay, layouts, renderer, theme, style, cursor);
+                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                    recurse(
+                        &mut overlay,
+                        layouts,
+                        renderer,
+                        theme,
+                        style,
+                        cursor,
+                    );
+                }
             }
         }
 
@@ -132,12 +143,12 @@ where
         ) where
             Renderer: renderer::Renderer,
         {
-            let layout = layouts.next().unwrap();
+            if let Some(layout) = layouts.next() {
+                element.operate(layout, renderer, operation);
 
-            element.operate(layout, renderer, operation);
-
-            if let Some(mut overlay) = element.overlay(layout, renderer) {
-                recurse(&mut overlay, layouts, renderer, operation);
+                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                    recurse(&mut overlay, layouts, renderer, operation);
+                }
             }
         }
 
@@ -167,10 +178,10 @@ where
         where
             Renderer: renderer::Renderer,
         {
-            let layout = layouts.next().unwrap();
-
-            let status =
-                if let Some(mut overlay) = element.overlay(layout, renderer) {
+            if let Some(layout) = layouts.next() {
+                let status = if let Some(mut overlay) =
+                    element.overlay(layout, renderer)
+                {
                     recurse(
                         &mut overlay,
                         layouts,
@@ -184,11 +195,15 @@ where
                     event::Status::Ignored
                 };
 
-            if matches!(status, event::Status::Ignored) {
-                element
-                    .on_event(event, layout, cursor, renderer, clipboard, shell)
+                if matches!(status, event::Status::Ignored) {
+                    element.on_event(
+                        event, layout, cursor, renderer, clipboard, shell,
+                    )
+                } else {
+                    status
+                }
             } else {
-                status
+                event::Status::Ignored
             }
         }
 
@@ -218,41 +233,44 @@ where
             cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
-        ) -> mouse::Interaction
+        ) -> Option<mouse::Interaction>
         where
             Renderer: renderer::Renderer,
         {
-            let layout = layouts.next().unwrap();
+            let layout = layouts.next()?;
+            let cursor_position = cursor.position()?;
 
-            if let Some(cursor_position) = cursor.position() {
-                match element.overlay(layout, renderer) {
-                    Some(mut overlay)
-                        if overlay.is_over(
-                            layout,
-                            renderer,
-                            cursor_position,
-                        ) =>
-                    {
-                        return recurse(
+            if !element.is_over(layout, renderer, cursor_position) {
+                return None;
+            }
+
+            Some(
+                element
+                    .overlay(layout, renderer)
+                    .and_then(|mut overlay| {
+                        recurse(
                             &mut overlay,
                             layouts,
                             cursor,
                             viewport,
                             renderer,
-                        );
-                    }
-                    _ => {}
-                }
-            }
-
-            element.mouse_interaction(layout, cursor, viewport, renderer)
+                        )
+                    })
+                    .unwrap_or_else(|| {
+                        element.mouse_interaction(
+                            layout, cursor, viewport, renderer,
+                        )
+                    }),
+            )
         }
 
-        self.overlay.with_element_mut(|element| {
-            let layouts = layout.children();
+        self.overlay
+            .with_element_mut(|element| {
+                let layouts = layout.children();
 
-            recurse(element, layouts, cursor, viewport, renderer)
-        })
+                recurse(element, layouts, cursor, viewport, renderer)
+            })
+            .unwrap_or_default()
     }
 
     fn is_over(
@@ -270,16 +288,16 @@ where
         where
             Renderer: renderer::Renderer,
         {
-            let layout = layouts.next().unwrap();
+            if let Some(layout) = layouts.next() {
+                if element.is_over(layout, renderer, cursor_position) {
+                    return true;
+                }
 
-            let is_over = element.is_over(layout, renderer, cursor_position);
-
-            if is_over {
-                return true;
-            }
-
-            if let Some(mut overlay) = element.overlay(layout, renderer) {
-                recurse(&mut overlay, layouts, renderer, cursor_position)
+                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                    recurse(&mut overlay, layouts, renderer, cursor_position)
+                } else {
+                    false
+                }
             } else {
                 false
             }

From 12c623f35bea0b76bae5e2eeb7d46390b8b9f0e4 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 15:58:07 -0800
Subject: [PATCH 371/440] Cursor availability by layer

---
 runtime/src/user_interface/overlay.rs | 34 ++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index 332eb32d..44f64c61 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -9,6 +9,7 @@ use crate::core::{
 };
 
 use std::cell::RefCell;
+use std::iter::Peekable;
 
 /// An [`Overlay`] container that displays nested overlays
 #[allow(missing_debug_implementations)]
@@ -92,7 +93,7 @@ where
     ) {
         fn recurse<'a, Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: impl Iterator<Item = Layout<'a>>,
+            mut layouts: Peekable<impl Iterator<Item = Layout<'a>>>,
             renderer: &mut Renderer,
             theme: &<Renderer as renderer::Renderer>::Theme,
             style: &renderer::Style,
@@ -101,12 +102,33 @@ where
             Renderer: renderer::Renderer,
         {
             if let Some(layout) = layouts.next() {
-                renderer.with_layer(layout.bounds(), |renderer| {
-                    element.draw(renderer, theme, style, layout, cursor);
-                });
+                let is_over = cursor
+                    .position()
+                    .and_then(|cursor_position| {
+                        layouts.peek().and_then(|nested_layout| {
+                            element.overlay(layout, renderer).map(|overlay| {
+                                overlay.is_over(
+                                    *nested_layout,
+                                    renderer,
+                                    cursor_position,
+                                )
+                            })
+                        })
+                    })
+                    .unwrap_or_default();
 
                 renderer.with_layer(layout.bounds(), |renderer| {
-                    element.draw(renderer, theme, style, layout, cursor);
+                    element.draw(
+                        renderer,
+                        theme,
+                        style,
+                        layout,
+                        if is_over {
+                            mouse::Cursor::Unavailable
+                        } else {
+                            cursor
+                        },
+                    );
                 });
 
                 if let Some(mut overlay) = element.overlay(layout, renderer) {
@@ -123,7 +145,7 @@ where
         }
 
         self.overlay.with_element_mut(|element| {
-            let layouts = layout.children();
+            let layouts = layout.children().peekable();
 
             recurse(element, layouts, renderer, theme, style, cursor);
         })

From 3e6f6eedcb51150b8a599530021cebdc629fddd2 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 16:08:05 -0800
Subject: [PATCH 372/440] Use layout with children for nesting

---
 runtime/src/user_interface/overlay.rs | 130 ++++++++++++++------------
 1 file changed, 71 insertions(+), 59 deletions(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index 44f64c61..c495bb28 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -9,7 +9,6 @@ use crate::core::{
 };
 
 use std::cell::RefCell;
-use std::iter::Peekable;
 
 /// An [`Overlay`] container that displays nested overlays
 #[allow(missing_debug_implementations)]
@@ -55,7 +54,7 @@ where
             renderer: &Renderer,
             bounds: Size,
             position: Point,
-        ) -> Vec<layout::Node>
+        ) -> layout::Node
         where
             Renderer: renderer::Renderer,
         {
@@ -63,23 +62,23 @@ where
 
             let node = element.layout(renderer, bounds, translation);
 
-            if let Some(mut overlay) =
+            if let Some(mut nested) =
                 element.overlay(Layout::new(&node), renderer)
             {
-                vec![node]
-                    .into_iter()
-                    .chain(recurse(&mut overlay, renderer, bounds, position))
-                    .collect()
+                layout::Node::with_children(
+                    node.size(),
+                    vec![
+                        node,
+                        recurse(&mut nested, renderer, bounds, position),
+                    ],
+                )
             } else {
-                vec![node]
+                layout::Node::with_children(node.size(), vec![node])
             }
         }
 
         self.overlay.with_element_mut(|element| {
-            layout::Node::with_children(
-                bounds,
-                recurse(element, renderer, bounds, position),
-            )
+            recurse(element, renderer, bounds, position)
         })
     }
 
@@ -91,9 +90,9 @@ where
         layout: Layout<'_>,
         cursor: mouse::Cursor,
     ) {
-        fn recurse<'a, Message, Renderer>(
+        fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: Peekable<impl Iterator<Item = Layout<'a>>>,
+            layout: Layout<'_>,
             renderer: &mut Renderer,
             theme: &<Renderer as renderer::Renderer>::Theme,
             style: &renderer::Style,
@@ -101,18 +100,21 @@ where
         ) where
             Renderer: renderer::Renderer,
         {
+            let mut layouts = layout.children();
+
             if let Some(layout) = layouts.next() {
+                let nested_layout = layouts.next();
+
                 let is_over = cursor
                     .position()
-                    .and_then(|cursor_position| {
-                        layouts.peek().and_then(|nested_layout| {
-                            element.overlay(layout, renderer).map(|overlay| {
-                                overlay.is_over(
-                                    *nested_layout,
-                                    renderer,
-                                    cursor_position,
-                                )
-                            })
+                    .zip(nested_layout)
+                    .and_then(|(cursor_position, nested_layout)| {
+                        element.overlay(layout, renderer).map(|nested| {
+                            nested.is_over(
+                                nested_layout,
+                                renderer,
+                                cursor_position,
+                            )
                         })
                     })
                     .unwrap_or_default();
@@ -131,10 +133,12 @@ where
                     );
                 });
 
-                if let Some(mut overlay) = element.overlay(layout, renderer) {
+                if let Some((mut nested, nested_layout)) =
+                    element.overlay(layout, renderer).zip(nested_layout)
+                {
                     recurse(
-                        &mut overlay,
-                        layouts,
+                        &mut nested,
+                        nested_layout,
                         renderer,
                         theme,
                         style,
@@ -145,9 +149,7 @@ where
         }
 
         self.overlay.with_element_mut(|element| {
-            let layouts = layout.children().peekable();
-
-            recurse(element, layouts, renderer, theme, style, cursor);
+            recurse(element, layout, renderer, theme, style, cursor);
         })
     }
 
@@ -157,26 +159,28 @@ where
         renderer: &Renderer,
         operation: &mut dyn widget::Operation<Message>,
     ) {
-        fn recurse<'a, Message, Renderer>(
+        fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: impl Iterator<Item = Layout<'a>>,
+            layout: Layout<'_>,
             renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
         ) where
             Renderer: renderer::Renderer,
         {
+            let mut layouts = layout.children();
+
             if let Some(layout) = layouts.next() {
                 element.operate(layout, renderer, operation);
 
-                if let Some(mut overlay) = element.overlay(layout, renderer) {
-                    recurse(&mut overlay, layouts, renderer, operation);
+                if let Some((mut nested, nested_layout)) =
+                    element.overlay(layout, renderer).zip(layouts.next())
+                {
+                    recurse(&mut nested, nested_layout, renderer, operation);
                 }
             }
         }
 
-        let layouts = layout.children();
-
-        recurse(self.overlay.0.get_mut(), layouts, renderer, operation)
+        recurse(self.overlay.0.get_mut(), layout, renderer, operation)
     }
 
     fn on_event(
@@ -188,9 +192,9 @@ where
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
-        fn recurse<'a, Message, Renderer>(
+        fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: impl Iterator<Item = Layout<'a>>,
+            layout: Layout<'_>,
             event: Event,
             cursor: mouse::Cursor,
             renderer: &Renderer,
@@ -200,13 +204,15 @@ where
         where
             Renderer: renderer::Renderer,
         {
+            let mut layouts = layout.children();
+
             if let Some(layout) = layouts.next() {
-                let status = if let Some(mut overlay) =
-                    element.overlay(layout, renderer)
+                let status = if let Some((mut nested, nested_layout)) =
+                    element.overlay(layout, renderer).zip(layouts.next())
                 {
                     recurse(
-                        &mut overlay,
-                        layouts,
+                        &mut nested,
+                        nested_layout,
                         event.clone(),
                         cursor,
                         renderer,
@@ -229,11 +235,9 @@ where
             }
         }
 
-        let layouts = layout.children();
-
         recurse(
             self.overlay.0.get_mut(),
-            layouts,
+            layout,
             event,
             cursor,
             renderer,
@@ -249,9 +253,9 @@ where
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        fn recurse<'a, Message, Renderer>(
+        fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: impl Iterator<Item = Layout<'a>>,
+            layout: Layout<'_>,
             cursor: mouse::Cursor,
             viewport: &Rectangle,
             renderer: &Renderer,
@@ -259,6 +263,8 @@ where
         where
             Renderer: renderer::Renderer,
         {
+            let mut layouts = layout.children();
+
             let layout = layouts.next()?;
             let cursor_position = cursor.position()?;
 
@@ -269,10 +275,11 @@ where
             Some(
                 element
                     .overlay(layout, renderer)
-                    .and_then(|mut overlay| {
+                    .zip(layouts.next())
+                    .and_then(|(mut overlay, layout)| {
                         recurse(
                             &mut overlay,
-                            layouts,
+                            layout,
                             cursor,
                             viewport,
                             renderer,
@@ -288,9 +295,7 @@ where
 
         self.overlay
             .with_element_mut(|element| {
-                let layouts = layout.children();
-
-                recurse(element, layouts, cursor, viewport, renderer)
+                recurse(element, layout, cursor, viewport, renderer)
             })
             .unwrap_or_default()
     }
@@ -301,22 +306,31 @@ where
         renderer: &Renderer,
         cursor_position: Point,
     ) -> bool {
-        fn recurse<'a, Message, Renderer>(
+        fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
-            mut layouts: impl Iterator<Item = Layout<'a>>,
+            layout: Layout<'_>,
             renderer: &Renderer,
             cursor_position: Point,
         ) -> bool
         where
             Renderer: renderer::Renderer,
         {
+            let mut layouts = layout.children();
+
             if let Some(layout) = layouts.next() {
                 if element.is_over(layout, renderer, cursor_position) {
                     return true;
                 }
 
-                if let Some(mut overlay) = element.overlay(layout, renderer) {
-                    recurse(&mut overlay, layouts, renderer, cursor_position)
+                if let Some((mut nested, nested_layout)) =
+                    element.overlay(layout, renderer).zip(layouts.next())
+                {
+                    recurse(
+                        &mut nested,
+                        nested_layout,
+                        renderer,
+                        cursor_position,
+                    )
                 } else {
                     false
                 }
@@ -326,9 +340,7 @@ where
         }
 
         self.overlay.with_element_mut(|element| {
-            let layouts = layout.children();
-
-            recurse(element, layouts, renderer, cursor_position)
+            recurse(element, layout, renderer, cursor_position)
         })
     }
 

From 83140d6049c165020c2afc1db303b2556e40488e Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 19:03:52 -0800
Subject: [PATCH 373/440] Remove interior mutability

Nested doesn't need to implement Overlay trait, it can be be used
mutably in user interface so we don't need interior mutability.
---
 runtime/src/user_interface.rs         | 37 ++++++------
 runtime/src/user_interface/overlay.rs | 87 ++++++++-------------------
 2 files changed, 43 insertions(+), 81 deletions(-)

diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 8ae0363a..1d55970e 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -8,7 +8,7 @@ use crate::core::renderer;
 use crate::core::widget;
 use crate::core::window;
 use crate::core::{Clipboard, Point, Rectangle, Size};
-use crate::core::{Element, Layout, Overlay, Shell};
+use crate::core::{Element, Layout, Shell};
 
 /// A set of interactive graphical elements with a specific [`Layout`].
 ///
@@ -261,22 +261,23 @@ where
                 }
             }
 
-            let base_cursor = manual_overlay
-                .as_ref()
-                .filter(|overlay| {
-                    cursor
-                        .position()
-                        .map(|cursor_position| {
-                            overlay.is_over(
-                                Layout::new(&layout),
-                                renderer,
-                                cursor_position,
-                            )
-                        })
-                        .unwrap_or_default()
+            let base_cursor = if manual_overlay
+                .as_mut()
+                .and_then(|overlay| {
+                    cursor.position().map(|cursor_position| {
+                        overlay.is_over(
+                            Layout::new(&layout),
+                            renderer,
+                            cursor_position,
+                        )
+                    })
                 })
-                .map(|_| mouse::Cursor::Unavailable)
-                .unwrap_or(cursor);
+                .unwrap_or_default()
+            {
+                mouse::Cursor::Unavailable
+            } else {
+                cursor
+            };
 
             self.overlay = Some(layout);
 
@@ -434,7 +435,7 @@ where
 
         let viewport = Rectangle::with_size(self.bounds);
 
-        let base_cursor = if let Some(overlay) = self
+        let base_cursor = if let Some(mut overlay) = self
             .root
             .as_widget_mut()
             .overlay(&mut self.state, Layout::new(&self.base), renderer)
@@ -503,7 +504,7 @@ where
                 root.as_widget_mut()
                     .overlay(&mut self.state, Layout::new(base), renderer)
                     .map(overlay::Nested::new)
-                    .map(|overlay| {
+                    .map(|mut overlay| {
                         let overlay_interaction = overlay.mouse_interaction(
                             Layout::new(layout),
                             cursor,
diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index c495bb28..24ddb649 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -4,47 +4,25 @@ use crate::core::mouse;
 use crate::core::overlay;
 use crate::core::renderer;
 use crate::core::widget;
-use crate::core::{
-    Clipboard, Event, Layout, Overlay, Point, Rectangle, Shell, Size,
-};
-
-use std::cell::RefCell;
+use crate::core::{Clipboard, Event, Layout, Point, Rectangle, Shell, Size};
 
 /// An [`Overlay`] container that displays nested overlays
 #[allow(missing_debug_implementations)]
 pub struct Nested<'a, Message, Renderer> {
-    overlay: Inner<'a, Message, Renderer>,
+    overlay: overlay::Element<'a, Message, Renderer>,
 }
 
-impl<'a, Message, Renderer> Nested<'a, Message, Renderer> {
-    /// Creates a nested overlay from the provided [`overlay::Element`]
-    pub fn new(element: overlay::Element<'a, Message, Renderer>) -> Self {
-        Self {
-            overlay: Inner(RefCell::new(element)),
-        }
-    }
-}
-
-struct Inner<'a, Message, Renderer>(
-    RefCell<overlay::Element<'a, Message, Renderer>>,
-);
-
-impl<'a, Message, Renderer> Inner<'a, Message, Renderer> {
-    fn with_element_mut<T>(
-        &self,
-        mut f: impl FnMut(&mut overlay::Element<'_, Message, Renderer>) -> T,
-    ) -> T {
-        (f)(&mut self.0.borrow_mut())
-    }
-}
-
-impl<'a, Message, Renderer> Overlay<Message, Renderer>
-    for Nested<'a, Message, Renderer>
+impl<'a, Message, Renderer> Nested<'a, Message, Renderer>
 where
     Renderer: renderer::Renderer,
 {
-    fn layout(
-        &self,
+    /// Creates a nested overlay from the provided [`overlay::Element`]
+    pub fn new(element: overlay::Element<'a, Message, Renderer>) -> Self {
+        Self { overlay: element }
+    }
+
+    pub fn layout(
+        &mut self,
         renderer: &Renderer,
         bounds: Size,
         position: Point,
@@ -77,13 +55,11 @@ where
             }
         }
 
-        self.overlay.with_element_mut(|element| {
-            recurse(element, renderer, bounds, position)
-        })
+        recurse(&mut self.overlay, renderer, bounds, position)
     }
 
-    fn draw(
-        &self,
+    pub fn draw(
+        &mut self,
         renderer: &mut Renderer,
         theme: &<Renderer as renderer::Renderer>::Theme,
         style: &renderer::Style,
@@ -148,12 +124,10 @@ where
             }
         }
 
-        self.overlay.with_element_mut(|element| {
-            recurse(element, layout, renderer, theme, style, cursor);
-        })
+        recurse(&mut self.overlay, layout, renderer, theme, style, cursor);
     }
 
-    fn operate(
+    pub fn operate(
         &mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
@@ -180,10 +154,10 @@ where
             }
         }
 
-        recurse(self.overlay.0.get_mut(), layout, renderer, operation)
+        recurse(&mut self.overlay, layout, renderer, operation)
     }
 
-    fn on_event(
+    pub fn on_event(
         &mut self,
         event: Event,
         layout: Layout<'_>,
@@ -236,7 +210,7 @@ where
         }
 
         recurse(
-            self.overlay.0.get_mut(),
+            &mut self.overlay,
             layout,
             event,
             cursor,
@@ -246,8 +220,8 @@ where
         )
     }
 
-    fn mouse_interaction(
-        &self,
+    pub fn mouse_interaction(
+        &mut self,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         viewport: &Rectangle,
@@ -293,15 +267,12 @@ where
             )
         }
 
-        self.overlay
-            .with_element_mut(|element| {
-                recurse(element, layout, cursor, viewport, renderer)
-            })
+        recurse(&mut self.overlay, layout, cursor, viewport, renderer)
             .unwrap_or_default()
     }
 
-    fn is_over(
-        &self,
+    pub fn is_over(
+        &mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
         cursor_position: Point,
@@ -339,16 +310,6 @@ where
             }
         }
 
-        self.overlay.with_element_mut(|element| {
-            recurse(element, layout, renderer, cursor_position)
-        })
-    }
-
-    fn overlay<'b>(
-        &'b mut self,
-        _layout: Layout<'_>,
-        _renderer: &Renderer,
-    ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        None
+        recurse(&mut self.overlay, layout, renderer, cursor_position)
     }
 }

From 4de6ee6fa18be5b8fa511bffe93bbec2c5811bfc Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 18 Feb 2023 19:11:50 -0800
Subject: [PATCH 374/440] Cursor availability during on_event

---
 runtime/src/user_interface/overlay.rs | 73 ++++++++++++++++++---------
 1 file changed, 50 insertions(+), 23 deletions(-)

diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/user_interface/overlay.rs
index 24ddb649..1211d55b 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/user_interface/overlay.rs
@@ -174,42 +174,67 @@ where
             renderer: &Renderer,
             clipboard: &mut dyn Clipboard,
             shell: &mut Shell<'_, Message>,
-        ) -> event::Status
+        ) -> (event::Status, bool)
         where
             Renderer: renderer::Renderer,
         {
             let mut layouts = layout.children();
 
             if let Some(layout) = layouts.next() {
-                let status = if let Some((mut nested, nested_layout)) =
-                    element.overlay(layout, renderer).zip(layouts.next())
-                {
-                    recurse(
-                        &mut nested,
-                        nested_layout,
-                        event.clone(),
-                        cursor,
-                        renderer,
-                        clipboard,
-                        shell,
-                    )
-                } else {
-                    event::Status::Ignored
-                };
+                let (nested_status, nested_is_over) =
+                    if let Some((mut nested, nested_layout)) =
+                        element.overlay(layout, renderer).zip(layouts.next())
+                    {
+                        recurse(
+                            &mut nested,
+                            nested_layout,
+                            event.clone(),
+                            cursor,
+                            renderer,
+                            clipboard,
+                            shell,
+                        )
+                    } else {
+                        (event::Status::Ignored, false)
+                    };
 
-                if matches!(status, event::Status::Ignored) {
-                    element.on_event(
-                        event, layout, cursor, renderer, clipboard, shell,
+                if matches!(nested_status, event::Status::Ignored) {
+                    let is_over = nested_is_over
+                        || cursor
+                            .position()
+                            .map(|cursor_position| {
+                                element.is_over(
+                                    layout,
+                                    renderer,
+                                    cursor_position,
+                                )
+                            })
+                            .unwrap_or_default();
+
+                    (
+                        element.on_event(
+                            event,
+                            layout,
+                            if nested_is_over {
+                                mouse::Cursor::Unavailable
+                            } else {
+                                cursor
+                            },
+                            renderer,
+                            clipboard,
+                            shell,
+                        ),
+                        is_over,
                     )
                 } else {
-                    status
+                    (nested_status, nested_is_over)
                 }
             } else {
-                event::Status::Ignored
+                (event::Status::Ignored, false)
             }
         }
 
-        recurse(
+        let (status, _) = recurse(
             &mut self.overlay,
             layout,
             event,
@@ -217,7 +242,9 @@ where
             renderer,
             clipboard,
             shell,
-        )
+        );
+
+        status
     }
 
     pub fn mouse_interaction(

From b0205e03d8e4794850e55e8c4bf83a40dd41aa9d Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sun, 19 Feb 2023 17:43:13 -0800
Subject: [PATCH 375/440] Use nested for lazy widgets

---
 runtime/src/lib.rs                            |  1 +
 runtime/src/overlay.rs                        |  4 ++
 .../overlay.rs => overlay/nested.rs}          | 13 +++++-
 runtime/src/user_interface.rs                 |  6 +--
 widget/src/lazy.rs                            | 33 ++++++++-------
 widget/src/lazy/component.rs                  | 42 +++++++++++--------
 widget/src/lazy/responsive.rs                 | 27 ++++++------
 7 files changed, 77 insertions(+), 49 deletions(-)
 create mode 100644 runtime/src/overlay.rs
 rename runtime/src/{user_interface/overlay.rs => overlay/nested.rs} (94%)

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 50abf7b2..4bbf9687 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -47,6 +47,7 @@ pub mod clipboard;
 pub mod command;
 pub mod font;
 pub mod keyboard;
+pub mod overlay;
 pub mod program;
 pub mod system;
 pub mod user_interface;
diff --git a/runtime/src/overlay.rs b/runtime/src/overlay.rs
new file mode 100644
index 00000000..03390980
--- /dev/null
+++ b/runtime/src/overlay.rs
@@ -0,0 +1,4 @@
+//! Overlays for user interfaces.
+mod nested;
+
+pub use nested::Nested;
diff --git a/runtime/src/user_interface/overlay.rs b/runtime/src/overlay/nested.rs
similarity index 94%
rename from runtime/src/user_interface/overlay.rs
rename to runtime/src/overlay/nested.rs
index 1211d55b..5c5fafde 100644
--- a/runtime/src/user_interface/overlay.rs
+++ b/runtime/src/overlay/nested.rs
@@ -21,6 +21,12 @@ where
         Self { overlay: element }
     }
 
+    /// Returns the position of the [`Nested`] overlay.
+    pub fn position(&self) -> Point {
+        self.overlay.position()
+    }
+
+    /// Returns the layout [`Node`] of the [`Nested`] overlay.
     pub fn layout(
         &mut self,
         renderer: &Renderer,
@@ -36,7 +42,7 @@ where
         where
             Renderer: renderer::Renderer,
         {
-            let translation = position - Point::ORIGIN;
+            let translation = position - element.position();
 
             let node = element.layout(renderer, bounds, translation);
 
@@ -58,6 +64,7 @@ where
         recurse(&mut self.overlay, renderer, bounds, position)
     }
 
+    /// Draws the [`Nested`] overlay using the associated `Renderer`.
     pub fn draw(
         &mut self,
         renderer: &mut Renderer,
@@ -127,6 +134,7 @@ where
         recurse(&mut self.overlay, layout, renderer, theme, style, cursor);
     }
 
+    /// Applies a [`widget::Operation`] to the [`Nested`] overlay.
     pub fn operate(
         &mut self,
         layout: Layout<'_>,
@@ -157,6 +165,7 @@ where
         recurse(&mut self.overlay, layout, renderer, operation)
     }
 
+    /// Processes a runtime [`Event`].
     pub fn on_event(
         &mut self,
         event: Event,
@@ -247,6 +256,7 @@ where
         status
     }
 
+    /// Returns the current [`mouse::Interaction`] of the [`Nested`] overlay.
     pub fn mouse_interaction(
         &mut self,
         layout: Layout<'_>,
@@ -298,6 +308,7 @@ where
             .unwrap_or_default()
     }
 
+    /// Returns true if the cursor is over the [`Nested`] overlay.
     pub fn is_over(
         &mut self,
         layout: Layout<'_>,
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 1d55970e..619423fd 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -1,14 +1,12 @@
 //! Implement your own event loop to drive a user interface.
-mod overlay;
-
 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};
-use crate::core::{Element, Layout, Shell};
+use crate::core::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
+use crate::overlay;
 
 /// A set of interactive graphical elements with a specific [`Layout`].
 ///
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 89376136..4903d0ed 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -20,6 +20,7 @@ use crate::core::Element;
 use crate::core::{
     self, Clipboard, Hasher, Length, Point, Rectangle, Shell, Size,
 };
+use crate::runtime::overlay::Nested;
 
 use ouroboros::self_referencing;
 use std::cell::RefCell;
@@ -260,14 +261,17 @@ where
                     .unwrap(),
                 tree: &mut tree.children[0],
                 overlay_builder: |element, tree| {
-                    element.as_widget_mut().overlay(tree, layout, renderer)
+                    element
+                        .as_widget_mut()
+                        .overlay(tree, layout, renderer)
+                        .map(|overlay| RefCell::new(Nested::new(overlay)))
                 },
             }
             .build(),
         ));
 
-        let has_overlay = overlay
-            .with_overlay_maybe(|overlay| overlay::Element::position(overlay));
+        let has_overlay =
+            overlay.with_overlay_maybe(|overlay| overlay.position());
 
         has_overlay
             .map(|position| overlay::Element::new(position, Box::new(overlay)))
@@ -285,8 +289,8 @@ where
     tree: &'a mut Tree,
 
     #[borrows(mut element, mut tree)]
-    #[covariant]
-    overlay: Option<overlay::Element<'this, Message, Renderer>>,
+    #[not_covariant]
+    overlay: Option<RefCell<Nested<'this, Message, Renderer>>>,
 }
 
 struct Overlay<'a, Message, Renderer>(Option<Inner<'a, Message, Renderer>>);
@@ -301,19 +305,20 @@ impl<'a, Message, Renderer> Drop for Overlay<'a, Message, Renderer> {
 impl<'a, Message, Renderer> Overlay<'a, Message, Renderer> {
     fn with_overlay_maybe<T>(
         &self,
-        f: impl FnOnce(&overlay::Element<'_, Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Message, Renderer>) -> T,
     ) -> Option<T> {
-        self.0.as_ref().unwrap().borrow_overlay().as_ref().map(f)
+        self.0.as_ref().unwrap().with_overlay(|overlay| {
+            overlay.as_ref().map(|nested| (f)(&mut nested.borrow_mut()))
+        })
     }
 
     fn with_overlay_mut_maybe<T>(
         &mut self,
-        f: impl FnOnce(&mut overlay::Element<'_, Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Message, Renderer>) -> T,
     ) -> Option<T> {
-        self.0
-            .as_mut()
-            .unwrap()
-            .with_overlay_mut(|overlay| overlay.as_mut().map(f))
+        self.0.as_mut().unwrap().with_overlay_mut(|overlay| {
+            overlay.as_mut().map(|nested| (f)(nested.get_mut()))
+        })
     }
 }
 
@@ -329,9 +334,7 @@ where
         position: Point,
     ) -> layout::Node {
         self.with_overlay_maybe(|overlay| {
-            let translation = position - overlay.position();
-
-            overlay.layout(renderer, bounds, translation)
+            overlay.layout(renderer, bounds, position)
         })
         .unwrap_or_default()
     }
diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index edd0c2a2..f955d9dd 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -9,6 +9,7 @@ use crate::core::widget::tree::{self, Tree};
 use crate::core::{
     self, Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
+use crate::runtime::overlay::Nested;
 
 use ouroboros::self_referencing;
 use std::cell::RefCell;
@@ -455,11 +456,18 @@ where
                 overlay_builder: |instance, tree| {
                     instance.state.get_mut().as_mut().unwrap().with_element_mut(
                         move |element| {
-                            element.as_mut().unwrap().as_widget_mut().overlay(
-                                &mut tree.children[0],
-                                layout,
-                                renderer,
-                            )
+                            element
+                                .as_mut()
+                                .unwrap()
+                                .as_widget_mut()
+                                .overlay(
+                                    &mut tree.children[0],
+                                    layout,
+                                    renderer,
+                                )
+                                .map(|overlay| {
+                                    RefCell::new(Nested::new(overlay))
+                                })
                         },
                     )
                 },
@@ -468,7 +476,7 @@ where
         ));
 
         let has_overlay = overlay.0.as_ref().unwrap().with_overlay(|overlay| {
-            overlay.as_ref().map(overlay::Element::position)
+            overlay.as_ref().map(|nested| nested.borrow().position())
         });
 
         has_overlay.map(|position| {
@@ -503,8 +511,8 @@ struct Inner<'a, 'b, Message, Renderer, Event, S> {
     types: PhantomData<(Message, Event, S)>,
 
     #[borrows(mut instance, mut tree)]
-    #[covariant]
-    overlay: Option<overlay::Element<'this, Event, Renderer>>,
+    #[not_covariant]
+    overlay: Option<RefCell<Nested<'this, Event, Renderer>>>,
 }
 
 struct OverlayInstance<'a, 'b, Message, Renderer, Event, S> {
@@ -516,7 +524,7 @@ impl<'a, 'b, Message, Renderer, Event, S>
 {
     fn with_overlay_maybe<T>(
         &self,
-        f: impl FnOnce(&overlay::Element<'_, Event, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Event, Renderer>) -> T,
     ) -> Option<T> {
         self.overlay
             .as_ref()
@@ -524,14 +532,14 @@ impl<'a, 'b, Message, Renderer, Event, S>
             .0
             .as_ref()
             .unwrap()
-            .borrow_overlay()
-            .as_ref()
-            .map(f)
+            .with_overlay(|overlay| {
+                overlay.as_ref().map(|nested| (f)(&mut nested.borrow_mut()))
+            })
     }
 
     fn with_overlay_mut_maybe<T>(
         &mut self,
-        f: impl FnOnce(&mut overlay::Element<'_, Event, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Event, Renderer>) -> T,
     ) -> Option<T> {
         self.overlay
             .as_mut()
@@ -539,7 +547,9 @@ impl<'a, 'b, Message, Renderer, Event, S>
             .0
             .as_mut()
             .unwrap()
-            .with_overlay_mut(|overlay| overlay.as_mut().map(f))
+            .with_overlay_mut(|overlay| {
+                overlay.as_mut().map(|nested| (f)(nested.get_mut()))
+            })
     }
 }
 
@@ -556,9 +566,7 @@ where
         position: Point,
     ) -> layout::Node {
         self.with_overlay_maybe(|overlay| {
-            let translation = position - overlay.position();
-
-            overlay.layout(renderer, bounds, translation)
+            overlay.layout(renderer, bounds, position)
         })
         .unwrap_or_default()
     }
diff --git a/widget/src/lazy/responsive.rs b/widget/src/lazy/responsive.rs
index c00b8618..07300857 100644
--- a/widget/src/lazy/responsive.rs
+++ b/widget/src/lazy/responsive.rs
@@ -9,6 +9,7 @@ use crate::core::{
     self, Clipboard, Element, Length, Point, Rectangle, Shell, Size, Widget,
 };
 use crate::horizontal_space;
+use crate::runtime::overlay::Nested;
 
 use ouroboros::self_referencing;
 use std::cell::{RefCell, RefMut};
@@ -298,13 +299,13 @@ where
                 element
                     .as_widget_mut()
                     .overlay(tree, content_layout, renderer)
+                    .map(|overlay| RefCell::new(Nested::new(overlay)))
             },
         }
         .build();
 
-        let has_overlay = overlay.with_overlay(|overlay| {
-            overlay.as_ref().map(overlay::Element::position)
-        });
+        let has_overlay =
+            overlay.with_overlay_maybe(|overlay| overlay.position());
 
         has_overlay
             .map(|position| overlay::Element::new(position, Box::new(overlay)))
@@ -329,23 +330,27 @@ struct Overlay<'a, 'b, Message, Renderer> {
     types: PhantomData<Message>,
 
     #[borrows(mut content, mut tree)]
-    #[covariant]
-    overlay: Option<overlay::Element<'this, Message, Renderer>>,
+    #[not_covariant]
+    overlay: Option<RefCell<Nested<'this, Message, Renderer>>>,
 }
 
 impl<'a, 'b, Message, Renderer> Overlay<'a, 'b, Message, Renderer> {
     fn with_overlay_maybe<T>(
         &self,
-        f: impl FnOnce(&overlay::Element<'_, Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Message, Renderer>) -> T,
     ) -> Option<T> {
-        self.borrow_overlay().as_ref().map(f)
+        self.with_overlay(|overlay| {
+            overlay.as_ref().map(|nested| (f)(&mut nested.borrow_mut()))
+        })
     }
 
     fn with_overlay_mut_maybe<T>(
         &mut self,
-        f: impl FnOnce(&mut overlay::Element<'_, Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Nested<'_, Message, Renderer>) -> T,
     ) -> Option<T> {
-        self.with_overlay_mut(|overlay| overlay.as_mut().map(f))
+        self.with_overlay_mut(|overlay| {
+            overlay.as_mut().map(|nested| (f)(nested.get_mut()))
+        })
     }
 }
 
@@ -361,9 +366,7 @@ where
         position: Point,
     ) -> layout::Node {
         self.with_overlay_maybe(|overlay| {
-            let translation = position - overlay.position();
-
-            overlay.layout(renderer, bounds, translation)
+            overlay.layout(renderer, bounds, position)
         })
         .unwrap_or_default()
     }

From 87db76a11ffd0e3e2350c2b2531fde1c56ffeea6 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, 14 Jun 2023 11:25:05 +0200
Subject: [PATCH 376/440] Make `overlay::Menu` publish messages on selection

---
 widget/src/overlay/menu.rs | 40 +++++++++++++++++++---------------
 widget/src/pick_list.rs    | 44 ++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index b699def0..ccf4dfb5 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -19,7 +19,7 @@ pub use iced_style::menu::{Appearance, StyleSheet};
 
 /// A list of selectable options.
 #[allow(missing_debug_implementations)]
-pub struct Menu<'a, T, Renderer = crate::Renderer>
+pub struct Menu<'a, T, Message, Renderer = crate::Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -27,7 +27,7 @@ where
     state: &'a mut State,
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
-    last_selection: &'a mut Option<T>,
+    on_selected: Box<dyn FnMut(T) -> Message + 'a>,
     width: f32,
     padding: Padding,
     text_size: Option<f32>,
@@ -37,9 +37,10 @@ where
     style: <Renderer::Theme as StyleSheet>::Style,
 }
 
-impl<'a, T, Renderer> Menu<'a, T, Renderer>
+impl<'a, T, Message, Renderer> Menu<'a, T, Message, Renderer>
 where
     T: ToString + Clone,
+    Message: 'a,
     Renderer: text::Renderer + 'a,
     Renderer::Theme:
         StyleSheet + container::StyleSheet + scrollable::StyleSheet,
@@ -50,13 +51,13 @@ where
         state: &'a mut State,
         options: &'a [T],
         hovered_option: &'a mut Option<usize>,
-        last_selection: &'a mut Option<T>,
+        on_selected: impl FnMut(T) -> Message + 'a,
     ) -> Self {
         Menu {
             state,
             options,
             hovered_option,
-            last_selection,
+            on_selected: Box::new(on_selected),
             width: 0.0,
             padding: Padding::ZERO,
             text_size: None,
@@ -121,7 +122,7 @@ where
     /// The `target_height` will be used to display the menu either on top
     /// of the target or under it, depending on the screen position and the
     /// dimensions of the [`Menu`].
-    pub fn overlay<Message: 'a>(
+    pub fn overlay(
         self,
         position: Point,
         target_height: f32,
@@ -174,7 +175,10 @@ where
     Renderer::Theme:
         StyleSheet + container::StyleSheet + scrollable::StyleSheet,
 {
-    pub fn new<T>(menu: Menu<'a, T, Renderer>, target_height: f32) -> Self
+    pub fn new<T>(
+        menu: Menu<'a, T, Message, Renderer>,
+        target_height: f32,
+    ) -> Self
     where
         T: Clone + ToString,
     {
@@ -182,7 +186,7 @@ where
             state,
             options,
             hovered_option,
-            last_selection,
+            on_selected,
             width,
             padding,
             font,
@@ -195,7 +199,7 @@ where
         let container = Container::new(Scrollable::new(List {
             options,
             hovered_option,
-            last_selection,
+            on_selected,
             font,
             text_size,
             text_line_height,
@@ -306,14 +310,14 @@ where
     }
 }
 
-struct List<'a, T, Renderer>
+struct List<'a, T, Message, Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
-    last_selection: &'a mut Option<T>,
+    on_selected: Box<dyn FnMut(T) -> Message + 'a>,
     padding: Padding,
     text_size: Option<f32>,
     text_line_height: text::LineHeight,
@@ -323,7 +327,7 @@ where
 }
 
 impl<'a, T, Message, Renderer> Widget<Message, Renderer>
-    for List<'a, T, Renderer>
+    for List<'a, T, Message, Renderer>
 where
     T: Clone + ToString,
     Renderer: text::Renderer,
@@ -372,14 +376,15 @@ where
         cursor: mouse::Cursor,
         renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
-        _shell: &mut Shell<'_, Message>,
+        shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
                 if cursor.is_over(layout.bounds()) {
                     if let Some(index) = *self.hovered_option {
                         if let Some(option) = self.options.get(index) {
-                            *self.last_selection = Some(option.clone());
+                            shell.publish((self.on_selected)(option.clone()));
+                            return event::Status::Captured;
                         }
                     }
                 }
@@ -417,7 +422,8 @@ where
 
                     if let Some(index) = *self.hovered_option {
                         if let Some(option) = self.options.get(index) {
-                            *self.last_selection = Some(option.clone());
+                            shell.publish((self.on_selected)(option.clone()));
+                            return event::Status::Captured;
                         }
                     }
                 }
@@ -521,7 +527,7 @@ where
     }
 }
 
-impl<'a, T, Message, Renderer> From<List<'a, T, Renderer>>
+impl<'a, T, Message, Renderer> From<List<'a, T, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     T: ToString + Clone,
@@ -529,7 +535,7 @@ where
     Renderer: 'a + text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn from(list: List<'a, T, Renderer>) -> Self {
+    fn from(list: List<'a, T, Message, Renderer>) -> Self {
         Element::new(list)
     }
 }
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index dc53a9c8..832aae6b 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -157,11 +157,11 @@ where
         From<<Renderer::Theme as StyleSheet>::Style>,
 {
     fn tag(&self) -> tree::Tag {
-        tree::Tag::of::<State<T>>()
+        tree::Tag::of::<State>()
     }
 
     fn state(&self) -> tree::State {
-        tree::State::new(State::<T>::new())
+        tree::State::new(State::new())
     }
 
     fn width(&self) -> Length {
@@ -209,7 +209,7 @@ where
             self.on_selected.as_ref(),
             self.selected.as_ref(),
             &self.options,
-            || tree.state.downcast_mut::<State<T>>(),
+            || tree.state.downcast_mut::<State>(),
         )
     }
 
@@ -249,7 +249,7 @@ where
             self.selected.as_ref(),
             &self.handle,
             &self.style,
-            || tree.state.downcast_ref::<State<T>>(),
+            || tree.state.downcast_ref::<State>(),
         )
     }
 
@@ -259,7 +259,7 @@ where
         layout: Layout<'_>,
         renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        let state = tree.state.downcast_mut::<State<T>>();
+        let state = tree.state.downcast_mut::<State>();
 
         overlay(
             layout,
@@ -269,6 +269,7 @@ where
             self.text_shaping,
             self.font.unwrap_or_else(|| renderer.default_font()),
             &self.options,
+            &self.on_selected,
             self.style.clone(),
         )
     }
@@ -295,15 +296,14 @@ where
 
 /// The local state of a [`PickList`].
 #[derive(Debug)]
-pub struct State<T> {
+pub struct State {
     menu: menu::State,
     keyboard_modifiers: keyboard::Modifiers,
     is_open: bool,
     hovered_option: Option<usize>,
-    last_selection: Option<T>,
 }
 
-impl<T> State<T> {
+impl State {
     /// Creates a new [`State`] for a [`PickList`].
     pub fn new() -> Self {
         Self {
@@ -311,12 +311,11 @@ impl<T> State<T> {
             keyboard_modifiers: keyboard::Modifiers::default(),
             is_open: bool::default(),
             hovered_option: Option::default(),
-            last_selection: Option::default(),
         }
     }
 }
 
-impl<T> Default for State<T> {
+impl Default for State {
     fn default() -> Self {
         Self::new()
     }
@@ -436,7 +435,7 @@ pub fn update<'a, T, Message>(
     on_selected: &dyn Fn(T) -> Message,
     selected: Option<&T>,
     options: &[T],
-    state: impl FnOnce() -> &'a mut State<T>,
+    state: impl FnOnce() -> &'a mut State,
 ) -> event::Status
 where
     T: PartialEq + Clone + 'a,
@@ -446,7 +445,7 @@ where
         | Event::Touch(touch::Event::FingerPressed { .. }) => {
             let state = state();
 
-            let event_status = if state.is_open {
+            if state.is_open {
                 // Event wasn't processed by overlay, so cursor was clicked either outside it's
                 // bounds or on the drop-down, either way we close the overlay.
                 state.is_open = false;
@@ -460,16 +459,6 @@ where
                 event::Status::Captured
             } else {
                 event::Status::Ignored
-            };
-
-            if let Some(last_selection) = state.last_selection.take() {
-                shell.publish((on_selected)(last_selection));
-
-                state.is_open = false;
-
-                event::Status::Captured
-            } else {
-                event_status
             }
         }
         Event::Mouse(mouse::Event::WheelScrolled {
@@ -544,12 +533,13 @@ pub fn mouse_interaction(
 /// Returns the current overlay of a [`PickList`].
 pub fn overlay<'a, T, Message, Renderer>(
     layout: Layout<'_>,
-    state: &'a mut State<T>,
+    state: &'a mut State,
     padding: Padding,
     text_size: Option<f32>,
     text_shaping: text::Shaping,
     font: Renderer::Font,
     options: &'a [T],
+    on_selected: &'a dyn Fn(T) -> Message,
     style: <Renderer::Theme as StyleSheet>::Style,
 ) -> Option<overlay::Element<'a, Message, Renderer>>
 where
@@ -570,7 +560,11 @@ where
             &mut state.menu,
             options,
             &mut state.hovered_option,
-            &mut state.last_selection,
+            |option| {
+                state.is_open = false;
+
+                (on_selected)(option)
+            },
         )
         .width(bounds.width)
         .padding(padding)
@@ -603,7 +597,7 @@ pub fn draw<'a, T, Renderer>(
     selected: Option<&T>,
     handle: &Handle<Renderer::Font>,
     style: &<Renderer::Theme as StyleSheet>::Style,
-    state: impl FnOnce() -> &'a State<T>,
+    state: impl FnOnce() -> &'a State,
 ) where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,

From 9803b276ad087846dfc3bb349113c5799ce00141 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, 14 Jun 2023 11:27:42 +0200
Subject: [PATCH 377/440] Fix cursor availability in `overlay::Nested::draw`

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

diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs
index 5c5fafde..cd258ab6 100644
--- a/runtime/src/overlay/nested.rs
+++ b/runtime/src/overlay/nested.rs
@@ -94,7 +94,7 @@ where
                     .and_then(|(cursor_position, nested_layout)| {
                         element.overlay(layout, renderer).map(|nested| {
                             nested.is_over(
-                                nested_layout,
+                                nested_layout.children().next().unwrap(),
                                 renderer,
                                 cursor_position,
                             )

From d955b3444da19e24bf0de6d6f432f06623ed5db2 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 14 Jun 2023 11:10:09 -0700
Subject: [PATCH 378/440] Replaced offscreen_blit.wgsl with existing blit.wgsl.

---
 wgpu/src/offscreen.rs               | 163 ++++++++++------------------
 wgpu/src/shader/offscreen_blit.wgsl |  27 -----
 2 files changed, 60 insertions(+), 130 deletions(-)
 delete mode 100644 wgpu/src/shader/offscreen_blit.wgsl

diff --git a/wgpu/src/offscreen.rs b/wgpu/src/offscreen.rs
index baa069e8..b25602e4 100644
--- a/wgpu/src/offscreen.rs
+++ b/wgpu/src/offscreen.rs
@@ -1,16 +1,12 @@
 use crate::graphics::color;
 use std::borrow::Cow;
-use wgpu::util::DeviceExt;
-use wgpu::vertex_attr_array;
 
 /// A simple compute pipeline to convert any texture to Rgba8UnormSrgb.
 #[derive(Debug)]
 pub struct Pipeline {
     pipeline: wgpu::RenderPipeline,
-    vertices: wgpu::Buffer,
-    indices: wgpu::Buffer,
-    sampler: wgpu::Sampler,
-    layout: wgpu::BindGroupLayout,
+    sampler_bind_group: wgpu::BindGroup,
+    texture_layout: wgpu::BindGroupLayout,
 }
 
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
@@ -22,88 +18,67 @@ struct Vertex {
 
 impl Pipeline {
     pub fn new(device: &wgpu::Device) -> Self {
-        let shader =
-            device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.shader"),
-                source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
-                    "shader/offscreen_blit.wgsl"
-                ))),
-            });
-
-        let vertices =
-            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-                label: Some("iced_wgpu.offscreen.vertex_buffer"),
-                contents: bytemuck::cast_slice(&[
-                    //bottom left
-                    Vertex {
-                        ndc: [-1.0, -1.0],
-                        uv: [0.0, 1.0],
-                    },
-                    //bottom right
-                    Vertex {
-                        ndc: [1.0, -1.0],
-                        uv: [1.0, 1.0],
-                    },
-                    //top right
-                    Vertex {
-                        ndc: [1.0, 1.0],
-                        uv: [1.0, 0.0],
-                    },
-                    //top left
-                    Vertex {
-                        ndc: [-1.0, 1.0],
-                        uv: [0.0, 0.0],
-                    },
-                ]),
-                usage: wgpu::BufferUsages::VERTEX,
-            });
-
-        let indices =
-            device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-                label: Some("iced_wgpu.offscreen.index_buffer"),
-                contents: bytemuck::cast_slice(&[0u16, 1, 2, 2, 3, 0]),
-                usage: wgpu::BufferUsages::INDEX,
-            });
-
         let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
             label: Some("iced_wgpu.offscreen.sampler"),
             ..Default::default()
         });
 
-        let bind_group_layout =
+        //sampler in 0
+        let sampler_layout =
             device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.bind_group_layout"),
-                entries: &[
-                    wgpu::BindGroupLayoutEntry {
-                        binding: 0,
-                        visibility: wgpu::ShaderStages::FRAGMENT,
-                        ty: wgpu::BindingType::Texture {
-                            sample_type: wgpu::TextureSampleType::Float {
-                                filterable: false,
-                            },
-                            view_dimension: wgpu::TextureViewDimension::D2,
-                            multisampled: false,
+                label: Some("iced_wgpu.offscreen.blit.sampler_layout"),
+                entries: &[wgpu::BindGroupLayoutEntry {
+                    binding: 0,
+                    visibility: wgpu::ShaderStages::FRAGMENT,
+                    ty: wgpu::BindingType::Sampler(
+                        wgpu::SamplerBindingType::NonFiltering,
+                    ),
+                    count: None,
+                }],
+            });
+
+        let sampler_bind_group =
+            device.create_bind_group(&wgpu::BindGroupDescriptor {
+                label: Some("iced_wgpu.offscreen.sampler.bind_group"),
+                layout: &sampler_layout,
+                entries: &[wgpu::BindGroupEntry {
+                    binding: 0,
+                    resource: wgpu::BindingResource::Sampler(&sampler),
+                }],
+            });
+
+        let texture_layout =
+            device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.texture_layout"),
+                entries: &[wgpu::BindGroupLayoutEntry {
+                    binding: 0,
+                    visibility: wgpu::ShaderStages::FRAGMENT,
+                    ty: wgpu::BindingType::Texture {
+                        sample_type: wgpu::TextureSampleType::Float {
+                            filterable: false,
                         },
-                        count: None,
+                        view_dimension: wgpu::TextureViewDimension::D2,
+                        multisampled: false,
                     },
-                    wgpu::BindGroupLayoutEntry {
-                        binding: 1,
-                        visibility: wgpu::ShaderStages::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler(
-                            wgpu::SamplerBindingType::NonFiltering,
-                        ),
-                        count: None,
-                    },
-                ],
+                    count: None,
+                }],
             });
 
         let pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("iced_wgpu.offscreen.blit.pipeline_layout"),
-                bind_group_layouts: &[&bind_group_layout],
+                bind_group_layouts: &[&sampler_layout, &texture_layout],
                 push_constant_ranges: &[],
             });
 
+        let shader =
+            device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.shader"),
+                source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
+                    "shader/blit.wgsl"
+                ))),
+            });
+
         let pipeline =
             device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
                 label: Some("iced_wgpu.offscreen.blit.pipeline"),
@@ -111,14 +86,7 @@ impl Pipeline {
                 vertex: wgpu::VertexState {
                     module: &shader,
                     entry_point: "vs_main",
-                    buffers: &[wgpu::VertexBufferLayout {
-                        array_stride: std::mem::size_of::<Vertex>() as u64,
-                        step_mode: wgpu::VertexStepMode::Vertex,
-                        attributes: &vertex_attr_array![
-                            0 => Float32x2, // quad ndc pos
-                            1 => Float32x2, // texture uv
-                        ],
-                    }],
+                    buffers: &[],
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
@@ -156,10 +124,8 @@ impl Pipeline {
 
         Self {
             pipeline,
-            vertices,
-            indices,
-            sampler,
-            layout: bind_group_layout,
+            sampler_bind_group,
+            texture_layout,
         }
     }
 
@@ -189,20 +155,15 @@ impl Pipeline {
         let view =
             &texture.create_view(&wgpu::TextureViewDescriptor::default());
 
-        let bind = device.create_bind_group(&wgpu::BindGroupDescriptor {
-            label: Some("iced_wgpu.offscreen.blit.bind_group"),
-            layout: &self.layout,
-            entries: &[
-                wgpu::BindGroupEntry {
+        let texture_bind_group =
+            device.create_bind_group(&wgpu::BindGroupDescriptor {
+                label: Some("iced_wgpu.offscreen.blit.texture_bind_group"),
+                layout: &self.texture_layout,
+                entries: &[wgpu::BindGroupEntry {
                     binding: 0,
                     resource: wgpu::BindingResource::TextureView(frame),
-                },
-                wgpu::BindGroupEntry {
-                    binding: 1,
-                    resource: wgpu::BindingResource::Sampler(&self.sampler),
-                },
-            ],
-        });
+                }],
+            });
 
         let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
             label: Some("iced_wgpu.offscreen.blit.render_pass"),
@@ -218,13 +179,9 @@ impl Pipeline {
         });
 
         pass.set_pipeline(&self.pipeline);
-        pass.set_bind_group(0, &bind, &[]);
-        pass.set_vertex_buffer(0, self.vertices.slice(..));
-        pass.set_index_buffer(
-            self.indices.slice(..),
-            wgpu::IndexFormat::Uint16,
-        );
-        pass.draw_indexed(0..6u32, 0, 0..1);
+        pass.set_bind_group(0, &self.sampler_bind_group, &[]);
+        pass.set_bind_group(1, &texture_bind_group, &[]);
+        pass.draw(0..6, 0..1);
 
         texture
     }
diff --git a/wgpu/src/shader/offscreen_blit.wgsl b/wgpu/src/shader/offscreen_blit.wgsl
deleted file mode 100644
index 08952d62..00000000
--- a/wgpu/src/shader/offscreen_blit.wgsl
+++ /dev/null
@@ -1,27 +0,0 @@
-@group(0) @binding(0) var frame_texture: texture_2d<f32>;
-@group(0) @binding(1) var frame_sampler: sampler;
-
-struct VertexInput {
-    @location(0) v_pos: vec2<f32>,
-    @location(1) texel_coord: vec2<f32>,
-}
-
-struct VertexOutput {
-    @builtin(position) clip_pos: vec4<f32>,
-    @location(0) uv: vec2<f32>,
-}
-
-@vertex
-fn vs_main(input: VertexInput) -> VertexOutput {
-    var output: VertexOutput;
-
-    output.clip_pos = vec4<f32>(input.v_pos, 0.0, 1.0);
-    output.uv = input.texel_coord;
-
-    return output;
-}
-
-@fragment
-fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
-    return textureSample(frame_texture, frame_sampler, input.uv);
-}
\ No newline at end of file

From 93673836cd2932351b25dea6ca46ae50d0e35ace Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 14 Jun 2023 11:45:29 -0700
Subject: [PATCH 379/440] Fixed documentation

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

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 0735f81f..7c962308 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -124,7 +124,7 @@ impl Backend {
     }
 
     /// Performs an offscreen render pass. If the `format` selected by WGPU is not
-    /// `wgpu::TextureFormat::Rgba8UnormSrgb`, a conversion compute pipeline will run.
+    /// `wgpu::TextureFormat::Rgba8UnormSrgb`, it will be run through a blit.
     ///
     /// Returns `None` if the `frame` is `Rgba8UnormSrgb`, else returns the newly
     /// converted texture view in `Rgba8UnormSrgb`.

From 0c65936664dfba70fe5d22d1347c14cf9f85d0da 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, 16 Jun 2023 15:50:03 +0200
Subject: [PATCH 380/440] Update `glyphon` and `cosmic-text`

---
 tiny_skia/Cargo.toml |  2 +-
 wgpu/Cargo.toml      |  2 +-
 wgpu/src/text.rs     | 31 +++++++++++++------------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 400eee6a..1571afb8 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 = "b85d6a4f2376f8a8a7dadc0f8bcb89d4db10a1c9"
+rev = "e8b10fd675832cb9c1cc9de30922beb4cf883876"
 
 [dependencies.twox-hash]
 version = "1.6"
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 7e50dff2..f3a83acb 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -45,7 +45,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "26f92369da3704988e3e27f0b35e705c6b2de203"
+rev = "8dbf36020e5759fa9144517b321372266160113e"
 
 [dependencies.glam]
 version = "0.24"
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 0d88865c..6a552270 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -53,7 +53,7 @@ impl Pipeline {
     }
 
     pub fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
-        self.font_system.get_mut().db_mut().load_font_source(
+        let _ = self.font_system.get_mut().db_mut().load_font_source(
             glyphon::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
         );
     }
@@ -116,15 +116,7 @@ impl Pipeline {
                     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 (max_width, total_height) = measure(buffer);
 
                     let x = section.bounds.x * scale_factor;
                     let y = section.bounds.y * scale_factor;
@@ -265,14 +257,7 @@ impl Pipeline {
             },
         );
 
-        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, line_height * total_lines as f32)
+        measure(paragraph)
     }
 
     pub fn hit_test(
@@ -312,6 +297,16 @@ impl Pipeline {
     }
 }
 
+fn measure(buffer: &glyphon::Buffer) -> (f32, f32) {
+    let (width, total_lines) = buffer
+        .layout_runs()
+        .fold((0.0, 0usize), |(width, total_lines), run| {
+            (run.line_w.max(width), total_lines + 1)
+        });
+
+    (width, total_lines as f32 * buffer.metrics().line_height)
+}
+
 fn to_family(family: font::Family) -> glyphon::Family<'static> {
     match family {
         font::Family::Name(name) => glyphon::Family::Name(name),

From 8ae4e28013ac2b4ae1c0a6d3b0672b59692e45d1 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, 16 Jun 2023 16:23:37 +0200
Subject: [PATCH 381/440] Fix outdated release version in `BUG-REPORT.yml`

---
 .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
index e93a01ae..9d2ed825 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -62,8 +62,8 @@ body:
 
         If you are using an older release, please upgrade to the latest one before filing an issue.
       options:
+        - crates.io release
         - master
-        - 0.7
     validations:
       required: true
   - type: dropdown

From 5bc7cbf5bca039ec3a4cbe82b161c087a4b39680 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, 20 Jun 2023 06:22:17 +0200
Subject: [PATCH 382/440] Use subpixel glyph positioning and layout linearity

... for offsetting and scaling text
---
 graphics/src/backend.rs  | 12 ----------
 graphics/src/lib.rs      |  1 -
 graphics/src/renderer.rs | 28 ++++++++---------------
 renderer/src/backend.rs  |  6 -----
 tiny_skia/Cargo.toml     |  2 +-
 tiny_skia/src/backend.rs |  6 -----
 tiny_skia/src/text.rs    | 49 +++++++++++++++-------------------------
 wgpu/Cargo.toml          |  2 +-
 wgpu/src/backend.rs      |  6 -----
 wgpu/src/text.rs         | 43 +++++++++++++++--------------------
 10 files changed, 47 insertions(+), 108 deletions(-)

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index ae89da06..6a082576 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -6,18 +6,6 @@ use iced_core::{Font, Point, Size};
 
 use std::borrow::Cow;
 
-/// The graphics backend of a [`Renderer`].
-///
-/// [`Renderer`]: crate::Renderer
-pub trait Backend {
-    /// Trims the measurements cache.
-    ///
-    /// This method is currently necessary to properly trim the text cache in
-    /// `iced_wgpu` and `iced_glow` because of limitations in the text rendering
-    /// pipeline. It will be removed in the future.
-    fn trim_measurements(&mut self) {}
-}
-
 /// A graphics backend that supports text rendering.
 pub trait Text {
     /// The icon font of the backend.
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index f6bc87fb..226b245b 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -41,7 +41,6 @@ pub mod geometry;
 pub mod image;
 
 pub use antialiasing::Antialiasing;
-pub use backend::Backend;
 pub use compositor::Compositor;
 pub use error::Error;
 pub use gradient::Gradient;
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index de905503..4241d45c 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,5 +1,5 @@
 //! Create a renderer from a [`Backend`].
-use crate::backend::{self, Backend};
+use crate::backend;
 use crate::Primitive;
 
 use iced_core::image;
@@ -16,13 +16,13 @@ use std::marker::PhantomData;
 
 /// A backend-agnostic renderer that supports all the built-in widgets.
 #[derive(Debug)]
-pub struct Renderer<B: Backend, Theme> {
+pub struct Renderer<B, Theme> {
     backend: B,
     primitives: Vec<Primitive>,
     theme: PhantomData<Theme>,
 }
 
-impl<B: Backend, T> Renderer<B, T> {
+impl<B, T> Renderer<B, T> {
     /// Creates a new [`Renderer`] from the given [`Backend`].
     pub fn new(backend: B) -> Self {
         Self {
@@ -52,10 +52,7 @@ impl<B: Backend, T> Renderer<B, T> {
     }
 }
 
-impl<B, T> iced_core::Renderer for Renderer<B, T>
-where
-    B: Backend,
-{
+impl<B, T> iced_core::Renderer for Renderer<B, T> {
     type Theme = T;
 
     fn layout<Message>(
@@ -63,11 +60,7 @@ where
         element: &Element<'_, Message, Self>,
         limits: &layout::Limits,
     ) -> layout::Node {
-        let layout = element.as_widget().layout(self, limits);
-
-        self.backend.trim_measurements();
-
-        layout
+        element.as_widget().layout(self, limits)
     }
 
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
@@ -116,7 +109,7 @@ where
 
 impl<B, T> text::Renderer for Renderer<B, T>
 where
-    B: Backend + backend::Text,
+    B: backend::Text,
 {
     type Font = Font;
 
@@ -195,7 +188,7 @@ where
 
 impl<B, T> image::Renderer for Renderer<B, T>
 where
-    B: Backend + backend::Image,
+    B: backend::Image,
 {
     type Handle = image::Handle;
 
@@ -210,7 +203,7 @@ where
 
 impl<B, T> svg::Renderer for Renderer<B, T>
 where
-    B: Backend + backend::Svg,
+    B: backend::Svg,
 {
     fn dimensions(&self, handle: &svg::Handle) -> Size<u32> {
         self.backend().viewport_dimensions(handle)
@@ -231,10 +224,7 @@ where
 }
 
 #[cfg(feature = "geometry")]
-impl<B, T> crate::geometry::Renderer for Renderer<B, T>
-where
-    B: Backend,
-{
+impl<B, T> crate::geometry::Renderer for Renderer<B, T> {
     fn draw(&mut self, layers: Vec<crate::Geometry>) {
         self.primitives
             .extend(layers.into_iter().map(crate::Geometry::into));
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index c9d79851..18f9f3fc 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -21,12 +21,6 @@ macro_rules! delegate {
     };
 }
 
-impl iced_graphics::Backend for Backend {
-    fn trim_measurements(&mut self) {
-        delegate!(self, backend, backend.trim_measurements());
-    }
-}
-
 impl backend::Text for Backend {
     const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 1571afb8..ef993fb9 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 = "e8b10fd675832cb9c1cc9de30922beb4cf883876"
+rev = "c3cd24dc972bb8fd55d016c81ac9fa637e0a4ada"
 
 [dependencies.twox-hash]
 version = "1.6"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 9d0fc527..bcc667f9 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -658,12 +658,6 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
     );
 }
 
-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::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index a34c7317..be5fc4e1 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -14,8 +14,7 @@ use std::sync::Arc;
 pub struct Pipeline {
     font_system: RefCell<cosmic_text::FontSystem>,
     glyph_cache: GlyphCache,
-    measurement_cache: RefCell<Cache>,
-    render_cache: Cache,
+    cache: RefCell<Cache>,
 }
 
 impl Pipeline {
@@ -29,8 +28,7 @@ impl Pipeline {
                 .into_iter(),
             )),
             glyph_cache: GlyphCache::new(),
-            measurement_cache: RefCell::new(Cache::new()),
-            render_cache: Cache::new(),
+            cache: RefCell::new(Cache::new()),
         }
     }
 
@@ -55,20 +53,11 @@ impl Pipeline {
         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 line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
         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())
-            },
+            bounds: bounds.size(),
             content,
             font,
             size,
@@ -76,7 +65,7 @@ impl Pipeline {
             shaping,
         };
 
-        let (_, buffer) = self.render_cache.allocate(font_system, key);
+        let (_, buffer) = self.cache.get_mut().allocate(font_system, key);
 
         let (total_lines, max_width) = buffer
             .layout_runs()
@@ -85,7 +74,10 @@ impl Pipeline {
                 (i + 1, buffer.line_w.max(max))
             });
 
-        let total_height = total_lines as f32 * line_height;
+        let total_height = total_lines as f32 * line_height * scale_factor;
+        let max_width = max_width * scale_factor;
+
+        let bounds = bounds * scale_factor;
 
         let x = match horizontal_alignment {
             alignment::Horizontal::Left => bounds.x,
@@ -99,16 +91,14 @@ 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() {
             for glyph in run.glyphs {
+                let physical_glyph = glyph.physical((x, y), scale_factor);
+
                 if let Some((buffer, placement)) = self.glyph_cache.allocate(
-                    glyph.cache_key,
+                    physical_glyph.cache_key,
                     color,
                     font_system,
                     &mut swash,
@@ -121,8 +111,9 @@ impl Pipeline {
                     .expect("Create glyph pixel map");
 
                     pixels.draw_pixmap(
-                        x + glyph.x_int + placement.left,
-                        y - glyph.y_int - placement.top + run.line_y as i32,
+                        physical_glyph.x + placement.left,
+                        physical_glyph.y - placement.top
+                            + (run.line_y * scale_factor).round() as i32,
                         pixmap,
                         &tiny_skia::PixmapPaint::default(),
                         tiny_skia::Transform::identity(),
@@ -134,7 +125,7 @@ impl Pipeline {
     }
 
     pub fn trim_cache(&mut self) {
-        self.render_cache.trim();
+        self.cache.get_mut().trim();
         self.glyph_cache.trim();
     }
 
@@ -147,7 +138,7 @@ impl Pipeline {
         bounds: Size,
         shaping: Shaping,
     ) -> (f32, f32) {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
+        let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
@@ -184,7 +175,7 @@ impl Pipeline {
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
+        let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
@@ -204,10 +195,6 @@ impl Pipeline {
 
         Some(Hit::CharOffset(cursor.index))
     }
-
-    pub fn trim_measurement_cache(&mut self) {
-        self.measurement_cache.borrow_mut().trim();
-    }
 }
 
 fn to_family(family: font::Family) -> cosmic_text::Family<'static> {
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index f3a83acb..15db5b5d 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -45,7 +45,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "8dbf36020e5759fa9144517b321372266160113e"
+rev = "8324f20158a62f8520bad4ed09f6aa5552f8f2a6"
 
 [dependencies.glam]
 version = "0.24"
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index b524c615..eecba2f1 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -334,12 +334,6 @@ impl Backend {
     }
 }
 
-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::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 6a552270..71dcc249 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -18,8 +18,7 @@ pub struct Pipeline {
     renderers: Vec<glyphon::TextRenderer>,
     atlas: glyphon::TextAtlas,
     prepare_layer: usize,
-    measurement_cache: RefCell<Cache>,
-    render_cache: Cache,
+    cache: RefCell<Cache>,
 }
 
 impl Pipeline {
@@ -47,8 +46,7 @@ impl Pipeline {
                 },
             ),
             prepare_layer: 0,
-            measurement_cache: RefCell::new(Cache::new()),
-            render_cache: Cache::new(),
+            cache: RefCell::new(Cache::new()),
         }
     }
 
@@ -78,25 +76,25 @@ impl Pipeline {
 
         let font_system = self.font_system.get_mut();
         let renderer = &mut self.renderers[self.prepare_layer];
+        let cache = self.cache.get_mut();
 
         let keys: Vec<_> = sections
             .iter()
             .map(|section| {
-                let (key, _) = self.render_cache.allocate(
+                let (key, _) = cache.allocate(
                     font_system,
                     Key {
                         content: section.content,
-                        size: section.size * scale_factor,
+                        size: section.size,
                         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(),
-                            height: (section.bounds.height * scale_factor)
-                                .ceil(),
+                            width: section.bounds.width,
+                            height: section.bounds.height,
                         },
                         shaping: section.shaping,
                     },
@@ -113,14 +111,16 @@ impl Pipeline {
                 .iter()
                 .zip(keys.iter())
                 .filter_map(|(section, key)| {
-                    let buffer =
-                        self.render_cache.get(key).expect("Get cached buffer");
-
-                    let (max_width, total_height) = measure(buffer);
+                    let buffer = cache.get(key).expect("Get cached buffer");
 
                     let x = section.bounds.x * scale_factor;
                     let y = section.bounds.y * scale_factor;
 
+                    let (max_width, total_height) = measure(buffer);
+
+                    let max_width = max_width * scale_factor;
+                    let total_height = total_height * scale_factor;
+
                     let left = match section.horizontal_alignment {
                         alignment::Horizontal::Left => x,
                         alignment::Horizontal::Center => x - max_width / 2.0,
@@ -142,14 +142,11 @@ impl Pipeline {
 
                     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,
+                        scale: scale_factor,
                         bounds: glyphon::TextBounds {
                             left: clip_bounds.x as i32,
                             top: clip_bounds.y as i32,
@@ -227,7 +224,7 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.atlas.trim();
-        self.render_cache.trim();
+        self.cache.get_mut().trim();
 
         self.prepare_layer = 0;
     }
@@ -241,7 +238,7 @@ impl Pipeline {
         bounds: Size,
         shaping: Shaping,
     ) -> (f32, f32) {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
+        let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
@@ -271,7 +268,7 @@ impl Pipeline {
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        let mut measurement_cache = self.measurement_cache.borrow_mut();
+        let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
@@ -291,10 +288,6 @@ impl Pipeline {
 
         Some(Hit::CharOffset(cursor.index))
     }
-
-    pub fn trim_measurement_cache(&mut self) {
-        self.measurement_cache.borrow_mut().trim();
-    }
 }
 
 fn measure(buffer: &glyphon::Buffer) -> (f32, f32) {

From 716bf099233411b7c1f0bb8f8811f5d356992ef6 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, 21 Jun 2023 01:43:25 +0200
Subject: [PATCH 383/440] Fix `translation` in `layout` of `Nested` overlay

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

diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs
index cd258ab6..b729f769 100644
--- a/runtime/src/overlay/nested.rs
+++ b/runtime/src/overlay/nested.rs
@@ -42,7 +42,7 @@ where
         where
             Renderer: renderer::Renderer,
         {
-            let translation = position - element.position();
+            let translation = position - Point::ORIGIN;
 
             let node = element.layout(renderer, bounds, translation);
 

From 3a5519d01216197024ba7166a16a971320bcd4fb 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, 21 Jun 2023 01:53:36 +0200
Subject: [PATCH 384/440] Update `ouroboros` dependency

---
 widget/Cargo.toml  | 2 +-
 widget/src/lazy.rs | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/widget/Cargo.toml b/widget/Cargo.toml
index 40e4db37..14aae72e 100644
--- a/widget/Cargo.toml
+++ b/widget/Cargo.toml
@@ -28,7 +28,7 @@ version = "0.8"
 path = "../style"
 
 [dependencies.ouroboros]
-version = "0.13"
+version = "0.17"
 optional = true
 
 [dependencies.qrcode]
diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 4903d0ed..da287f06 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -279,11 +279,7 @@ where
 }
 
 #[self_referencing]
-struct Inner<'a, Message, Renderer>
-where
-    Message: 'a,
-    Renderer: 'a,
-{
+struct Inner<'a, Message: 'a, Renderer: 'a> {
     cell: Rc<RefCell<Option<Element<'static, Message, Renderer>>>>,
     element: Element<'static, Message, Renderer>,
     tree: &'a mut Tree,

From b38f7d28372712e345672515d8c1643bc040c1f1 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, 21 Jun 2023 18:07:26 +0200
Subject: [PATCH 385/440] Center `Submit` button vertically in `styling`
 example

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

diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index e2015bac..f8a4c80a 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -127,7 +127,9 @@ impl Sandbox for Styling {
         let content = column![
             choose_theme,
             horizontal_rule(38),
-            row![text_input, button].spacing(10),
+            row![text_input, button]
+                .spacing(10)
+                .align_items(Alignment::Center),
             slider,
             progress_bar,
             row![

From 21a71b753d6da2233bce913f4e623ee14859ec23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20=C3=96zdemir?= <yigitozdemir1299@gmail.com>
Date: Wed, 21 Jun 2023 19:43:20 +0300
Subject: [PATCH 386/440] Add command to retrieve window size

---
 core/src/window.rs            |  2 ++
 core/src/window/fetch_size.rs |  8 ++++++++
 runtime/src/window/action.rs  | 16 ++++++++++++++++
 winit/src/application.rs      | 16 ++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 core/src/window/fetch_size.rs

diff --git a/core/src/window.rs b/core/src/window.rs
index a6dbdfb4..cd343893 100644
--- a/core/src/window.rs
+++ b/core/src/window.rs
@@ -6,6 +6,7 @@ mod level;
 mod mode;
 mod redraw_request;
 mod user_attention;
+mod fetch_size;
 
 pub use event::Event;
 pub use icon::Icon;
@@ -13,3 +14,4 @@ pub use level::Level;
 pub use mode::Mode;
 pub use redraw_request::RedrawRequest;
 pub use user_attention::UserAttention;
+pub use fetch_size::SizeType;
\ No newline at end of file
diff --git a/core/src/window/fetch_size.rs b/core/src/window/fetch_size.rs
new file mode 100644
index 00000000..aa3431aa
--- /dev/null
+++ b/core/src/window/fetch_size.rs
@@ -0,0 +1,8 @@
+/// A `struct` defining which size to fetch.
+#[derive(Debug, Clone, Copy)]
+pub enum SizeType {
+    /// Inner size. (not including title bars and so other OS decorations)
+    Inner,
+    /// Outer size. (including everything)
+    Outer,
+}
\ No newline at end of file
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index a9d2a3d0..4ea9d474 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,3 +1,7 @@
+
+
+use iced_core::window::SizeType;
+
 use crate::core::window::{Icon, Level, Mode, UserAttention};
 use crate::futures::MaybeSend;
 
@@ -20,6 +24,13 @@ pub enum Action<T> {
         /// The new logical height of the window
         height: u32,
     },
+    /// Fetch the current size of the window.
+    FetchSize {
+        /// Which size to fetch
+        size_type: SizeType,
+        /// Callback function
+        callback: Box<dyn FnOnce((u32, u32)) -> T + 'static>,
+    },
     /// Set the window to maximized or back
     Maximize(bool),
     /// Set the window to minimized or back
@@ -104,6 +115,10 @@ impl<T> Action<T> {
             Self::Close => Action::Close,
             Self::Drag => Action::Drag,
             Self::Resize { width, height } => Action::Resize { width, height },
+            Self::FetchSize { size_type, callback } => Action::FetchSize {
+                size_type: size_type,
+                callback: Box::new(move |s| f(callback(s))),
+            },
             Self::Maximize(maximized) => Action::Maximize(maximized),
             Self::Minimize(minimized) => Action::Minimize(minimized),
             Self::Move { x, y } => Action::Move { x, y },
@@ -131,6 +146,7 @@ impl<T> fmt::Debug for Action<T> {
                 f,
                 "Action::Resize {{ widget: {width}, height: {height} }}"
             ),
+            Self::FetchSize { size_type, .. } => write!(f, "Action::FetchSize {{ size_type: {size_type:?} }}"),
             Self::Maximize(maximized) => {
                 write!(f, "Action::Maximize({maximized})")
             }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index be416ac8..ff5afa69 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -3,6 +3,7 @@
 mod profiler;
 mod state;
 
+use iced_graphics::core::window::SizeType;
 pub use state::State;
 
 use crate::conversion;
@@ -747,6 +748,21 @@ pub fn run_command<A, E>(
                         height,
                     });
                 }
+                window::Action::FetchSize {
+                    size_type,
+                    callback,
+                } => {
+                    let width_height = match size_type {
+                        SizeType::Inner => window.inner_size(),
+                        SizeType::Outer => window.outer_size(),
+                    };
+                    let width_height =
+                        (width_height.width, width_height.height);
+
+                    proxy
+                        .send_event(callback(width_height))
+                        .expect("Send message to event loop")
+                }
                 window::Action::Maximize(maximized) => {
                     window.set_maximized(maximized);
                 }

From ef87ff1e8ab24279a551b3eef6bacd8813712530 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, 21 Jun 2023 21:47:29 +0200
Subject: [PATCH 387/440] Clear text caches after a font is loaded

---
 tiny_skia/src/text.rs | 2 ++
 wgpu/src/text.rs      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index be5fc4e1..6ff797db 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -36,6 +36,8 @@ impl Pipeline {
         self.font_system.get_mut().db_mut().load_font_source(
             cosmic_text::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
         );
+
+        self.cache = RefCell::new(Cache::new());
     }
 
     pub fn draw(
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 71dcc249..c9188bd1 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -54,6 +54,8 @@ impl Pipeline {
         let _ = self.font_system.get_mut().db_mut().load_font_source(
             glyphon::fontdb::Source::Binary(Arc::new(bytes.into_owned())),
         );
+
+        self.cache = RefCell::new(Cache::new());
     }
 
     pub fn prepare(

From b394c84b37eacb266d45663d5d6626f1b616af7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20=C3=96zdemir?= <yigitozdemir1299@gmail.com>
Date: Thu, 22 Jun 2023 18:28:32 +0300
Subject: [PATCH 388/440] Add FetchSize command - apply the changes discussed
 at #water-cooler

---
 core/src/window.rs            |  4 +---
 core/src/window/fetch_size.rs |  8 --------
 runtime/src/window/action.rs  | 18 +++---------------
 winit/src/application.rs      | 15 +++------------
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 core/src/window/fetch_size.rs

diff --git a/core/src/window.rs b/core/src/window.rs
index cd343893..4beebf9f 100644
--- a/core/src/window.rs
+++ b/core/src/window.rs
@@ -6,12 +6,10 @@ mod level;
 mod mode;
 mod redraw_request;
 mod user_attention;
-mod fetch_size;
 
 pub use event::Event;
 pub use icon::Icon;
 pub use level::Level;
 pub use mode::Mode;
 pub use redraw_request::RedrawRequest;
-pub use user_attention::UserAttention;
-pub use fetch_size::SizeType;
\ No newline at end of file
+pub use user_attention::UserAttention;
\ No newline at end of file
diff --git a/core/src/window/fetch_size.rs b/core/src/window/fetch_size.rs
deleted file mode 100644
index aa3431aa..00000000
--- a/core/src/window/fetch_size.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-/// A `struct` defining which size to fetch.
-#[derive(Debug, Clone, Copy)]
-pub enum SizeType {
-    /// Inner size. (not including title bars and so other OS decorations)
-    Inner,
-    /// Outer size. (including everything)
-    Outer,
-}
\ No newline at end of file
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index 4ea9d474..551d0a01 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,7 +1,3 @@
-
-
-use iced_core::window::SizeType;
-
 use crate::core::window::{Icon, Level, Mode, UserAttention};
 use crate::futures::MaybeSend;
 
@@ -25,12 +21,7 @@ pub enum Action<T> {
         height: u32,
     },
     /// Fetch the current size of the window.
-    FetchSize {
-        /// Which size to fetch
-        size_type: SizeType,
-        /// Callback function
-        callback: Box<dyn FnOnce((u32, u32)) -> T + 'static>,
-    },
+    FetchSize(Box<dyn FnOnce((u32, u32)) -> T + 'static>),
     /// Set the window to maximized or back
     Maximize(bool),
     /// Set the window to minimized or back
@@ -115,10 +106,7 @@ impl<T> Action<T> {
             Self::Close => Action::Close,
             Self::Drag => Action::Drag,
             Self::Resize { width, height } => Action::Resize { width, height },
-            Self::FetchSize { size_type, callback } => Action::FetchSize {
-                size_type: size_type,
-                callback: Box::new(move |s| f(callback(s))),
-            },
+            Self::FetchSize(o) => Action::FetchSize(Box::new(move |s| f(o(s)))),
             Self::Maximize(maximized) => Action::Maximize(maximized),
             Self::Minimize(minimized) => Action::Minimize(minimized),
             Self::Move { x, y } => Action::Move { x, y },
@@ -146,7 +134,7 @@ impl<T> fmt::Debug for Action<T> {
                 f,
                 "Action::Resize {{ widget: {width}, height: {height} }}"
             ),
-            Self::FetchSize { size_type, .. } => write!(f, "Action::FetchSize {{ size_type: {size_type:?} }}"),
+            Self::FetchSize(_) => write!(f, "Action::FetchSize"),
             Self::Maximize(maximized) => {
                 write!(f, "Action::Maximize({maximized})")
             }
diff --git a/winit/src/application.rs b/winit/src/application.rs
index ff5afa69..b0824e0e 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -3,7 +3,6 @@
 mod profiler;
 mod state;
 
-use iced_graphics::core::window::SizeType;
 pub use state::State;
 
 use crate::conversion;
@@ -748,19 +747,11 @@ pub fn run_command<A, E>(
                         height,
                     });
                 }
-                window::Action::FetchSize {
-                    size_type,
-                    callback,
-                } => {
-                    let width_height = match size_type {
-                        SizeType::Inner => window.inner_size(),
-                        SizeType::Outer => window.outer_size(),
-                    };
-                    let width_height =
-                        (width_height.width, width_height.height);
+                window::Action::FetchSize(callback) => {
+                    let size = window.inner_size();
 
                     proxy
-                        .send_event(callback(width_height))
+                        .send_event(callback((size.width, size.height)))
                         .expect("Send message to event loop")
                 }
                 window::Action::Maximize(maximized) => {

From 8152513bf85dadd7a7da99efeac6698bdd41f418 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Thu, 22 Jun 2023 19:16:45 -0700
Subject: [PATCH 389/440] Provide access to font from each crate

---
 tiny_skia/fonts/Iced-Icons.ttf | Bin 0 -> 5108 bytes
 tiny_skia/src/text.rs          |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 tiny_skia/fonts/Iced-Icons.ttf

diff --git a/tiny_skia/fonts/Iced-Icons.ttf b/tiny_skia/fonts/Iced-Icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e3273141c45fff98c2f411b421e2e3fd225668aa
GIT binary patch
literal 5108
zcmZQzWME(rU}RumVPJ4`3-O)xzj-$UgYXRo1_l{-7gsk1bp{Cr2H_nH3=9hX!TLsa
z3IS^v7#KSk7#PBma}x`G=sw=ez`*#0fq~I0xvWHi?dpFP1_pi$kovTO^xUqA6CxQH
zm>n1xxC_z~iwi)uF)#>kU|?Y2NYANEbANfRhJk@Ug@J+LKt^g}itJxr9R>zQ9tH*m
zvy6<?M7E#I5ey8BE({C|DjB&Y72FXFE({Ee4;UC2L~`<z6B#rZ5*QfxBN!MMcybdf
z3K-Tgcr!3CW`OL^OUzCE(sXAg1A~AH0|RqlL4I+`%M~sG3=F~*3=9kw1x2X^PaU=Q
zFfj0e+|vdQ3q}S8^Le|s#Pi#HWsqln!N9=4aO=RUFcAG9<vz$BM&_kVGeGWVU;>FU
zFo5(i2mQ}tV1TG+UJ4R{%0Vbrum~%I7?@^YU}9in5MwB2U|`T=kOeDYWENzcz`)AD
zz*NPwhk=2i2SPJGU@&B40%>4n2CKs$0@7Sl7#v<OeBc4QA&NPOVH(6uAf*r&F)%Rt
zGB7Y%gIx#;OORP0ECY3q3j;HlCBwkNpuxbvz{bGBz{tP^GWGv|1_lT%!OZ^ytO{f>
z10x&Q;}A9|BtRI<gA$;W1!WFjY6F9g!Ul%W2-ipj1@9dUe1YB@*n*=XHke3n(1=V(
zQ|Jnf*ubQkxRZl{gCRLtIZ0YkaRWo-1_ozkmrV?e49*Eox*HgEHYg;d>26@sQAknP
za3Ej<i(1qs4Mr|!*JRhA=m<q+Md_{xg$)4#5sDieBBd2JSb$g-k&y};A&L@HHfRJy
zC_;G(8w^151|XFO0wNUB6uP<+6*h1ML?lQnY)}Bnae-K7AeLEzbV6igr1S<x?Z`;w
z4GaMhsgaSo8<=$zTopF3s3xW;Y+!W`h}giY?6iSR*-2VaF>(WAg6;+u9c4vjMTL}&
ztVvD^AQ_0|AaVm^f@|^yW-Ud94Q$Q|T?$<r7_~PVu&QogQ45Sn2#`(;ii}W>R8-jD
z5FD|AQCk}1DX7i58(4KVusdsSVqk&<4V%sec4a4Jg$)eKPKg_slF~LXCU0O&*ubi#
zyMbLt0pv(-=j0tM3`q(gw{LJrhy*D~Z~;4#LuV5^H-odQla?YpusL;51D^|G3Zu62
z1_tL1EUF0#u3gHBpojp66oWJ<G&d+nZ*YKz&jw~y<wO^V72G(qZ%_${*uVhN1@#)T
zCLU0lQFhwI&Bg2*p(w4a7^$VGyMb3{BNLPBhLl7X-3@#?8yFK56gKcUdx89=uz^R}
zDRKiZh!+&0uz^?EDN=U>zmCEN0dSBg>|kL??ov+Nz~`Kx(3PODflt{<S$Bhgj(14J
zMwS$pNR<t|smc|)8w7Q{10%eHA%fD1kt!R6!Qw(X8yWbWLnAiw^E+=~Omy17uMJA1
z8<<p`Hu8W7UM5wi4UA&S3LBVJ10ptpQtk#8Ri~~l1+cYRipm=p6Jcy=h&)IOlWO7y
zJ}t$_4Lr{78+e`F6E-lRMwP+_tP!}8fk9Z=Wdo!01_rxLjEs!nj3TVVu#thuH6&sK
zzp|5p>jrLRrwv@n8yFLu6cRQtCT<lFU}WH9aB}KO*eJxNy`e~3S}9U@gNV*X24QX8
z4Wc?589}s|&PFB>Ev~bX8AMCyY-9n^k~$k%L9~?4Mm7*Ft+SCGM9b)G<N(pKIvY7b
zw44sZ23~D493ro?kwH#dcY}h?Mn({=sI!p?L@ViRWCqd7IvZI)w2IC~RuHYKvylx%
ztLbcH2hr*}8#zF<hR#M#5Ur`BU;|F)S~>~|8w3&*oIzpX3@UFxc|;SGsI+x9XlZZI
z($d|aqobhUu7D%Bl@l$LL1h(Q71D~4x*K%ialk0HK}Tx?qo@Hml=YB91yxF4N5K^A
zP6Hi=4UDds*>wY>Hr7-C5@!(G!T<s;cFGnT^%+IAbT=64DA*{t<M7D_2IoWz-3>-M
zdg3;^8;l7l-N5LaY@xfsL}w!tgP5v<o`O55sM)}z>e<!huI#Rys1T7P4Jz}Loi-UW
zGKz|5>25I9*}x#Sfkkx#iz-;j22N+~)Gj?`1qGWf3*8N72x$d9umXh*EXqzGRSFvt
z0wNSPI0Qy)W>R2QklxIs#w-=-1S;S-oE5s1!K#(r5;m|nqvw+Zg$<0_kdmCqIUz-P
z1G95tN<hR0Cg()y4b097ksFv*(e)%MD=2JWQB!tHw2)Tbz~St+fk|}(hcnog1O;rC
zD1&TK-oWCV01A6n)x-^~7^ZGuQA-5X4PZy8CZq&FiZFy-k-8hqL1Cbvps;~e4H^c@
zHWs=YEWpAWIFy|f6cpT)-8V35D}!Ro5+n}x05n7yLL&4OY?KwHK`v&32r7Ww0t<3B
z)eWqwo}i=-t6Cuug_*b#l%X-B3`)LMAe$66a5zJqrH}xsd(i_97M0dI$_jd*P;(24
zP_T*A+o;VbqOH5Z1}+?cENlxG2CIf?MNwm?v%ypwCIeOmGt^#ZgPC@hf`Sbwv2<Br
zQL}-?S#N{3w(bT8kSD+i5Ei<i#HFlYqoAj30d=FJ&PEOvRVR2#h4~j`I!HC{r09+<
zVSv&Fsi|)Rld2o2T(MEMkXA&BZ^cNc8=XLb0rS5z$p4C<kOw&t>JPY=U34}uh(a>w
zCI(PG6xQ2dsHMBX6^FQ+&PE1C5#bF+TDlwDbvBr2>2B}<g_^6ff}Vm~mvSO3oIG_v
z$#H{+w(bTmolOi3j@r5#ymdA)FoGC9I-3~5BECAC7{MZbAT>_fx*PmKYCwztkQxvp
z5Tpjg2m-0G)7IS(3{nGPgn-n57@;6FAVwHSjf1xChH#J?5F-Ml2E>R2sR1#fKx&+|
zbvHzV)PNW<AT=OHEJzKA5eHIZudTZw9;61uNC2q;F%m&)K#U}v4d&W<&@fL1aW+_M
z>uyK^vuw0=H>83>W`nu*23u|24QV<XEa0lsK^(B^3@{6%IupzSDb3Q^U<p^64dQ^6
z=73osrMX}hNNJwV1}nJId=Lk$v;fQkDJ=xEKuU{rHgmEt!CFR6+8a1hH!!ONRDh})
zT?X$R3@3sjHZn5yMQ&h(<o$w;46II|2A&p(v6+jBkpsfwV*s<*oOUrCU|?k6)Y{0v
z?zD@+0m5cxaM`HB*bx}9!J#8!BXf$&Ml}#`7e@mFBa1^va!ABRW(JqY$jHdeJWPx{
zT00p3w{BqR-N*#$fr6?e6fD62hM+ze2*c$-{Zmj+Xf=}!<68zk25|=w21W)(Mt2aI
z&%nTtW-7wODyGdS!q3R2q|c~kVrHypB*tXT^^04E`xmzuALAE3F~*a8+`qWFe{su*
ziGjLZE)0-fs3?Q1gA_l+JSIk_e7K<^;v&qf;@XTN?2K$m>Wpe8_Kapm@{C|YjCrZR
zKLr6Dfq$>~`F#X*1eP%73Frv;2r!9>3H(#w=VufHa|M<%<_ie;@G~$l2r=A)_xwy5
za-eKR1}=sjP&N|-JHurto0&nCQ60)=Vc=p+hO${1xEUe6Y)}uAi*W^1oQpx5i5tr1
zW)NnI2lYl-I2jlivKSbkY(@qVhDA^|69XT^VJMrK!HeNGl+D5*!srWSvoeS==0VwP
z3?ht^plmLNFviVLHaCMBlR1MkLq0<RLnT8ILncEyLk2?$g93vFgENCBg93vQg8>*T
zFeEWlGAJ<QLsexm<S`^N<S-~OBr=pTlrUs~Wr`UT7#tWB7}6N>8S)rP7*ZK>7;+f$
z8T1&E8S)u&85o@N3o45;(=$pGG@LaRj0}tn6p|_x@{2OlGxHL26cS5IGV+Ux6&w`O
z^7Bekb8_<alJj#J7(5x08B!Ti7<9obklDoy44%oUDY~A?`FX_*3_%R34CxG|3^@#m
z3`GnKL8<AbIf+FK3~o?|faoHIbcR&0m-HA67!(++7!<(9feePQAO=HZOc-<-jKCNa
z0LBaqZuxm7Zuv#&sR~AV1`1XRAnO&t)+<;knCKem8W|WFBb<tCBG{=AwG0el45<u7
z48;tYV5ccC7&3sI!w{BQRGgWgr(mdOfG`B7f87~U8S=meC4z%Fg#i{p#SCQ(=?q2;
zB@87DY2c_R0tdYUJS<?5qQFqV0FujMNM%T7C}GfJU~o^(OD#$)NlgL8N^x1bQAtUf
zLRwLNt^&ySp!iTID9X=DO)k-604J0Zh5`mF27Ly7+)<uUQc_^0ua6p`44?rWND;vW
zp)g2R@E8sgBNHPtM@oKqo^DEJ5mSCPD1-n1&%h7PEuc{{0R{>1I1~%iOi)<^!k|)u
Pfq~)v&0Qc>C}UUvroxeh

literal 0
HcmV?d00001

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index a34c7317..c57d2244 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -23,8 +23,7 @@ impl Pipeline {
         Pipeline {
             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(),
+                    include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
                 ))]
                 .into_iter(),
             )),

From a047588ae80cc22a791f07ad5e74a7e955160b24 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Fri, 23 Jun 2023 08:21:30 -0700
Subject: [PATCH 390/440] Update winit

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

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index b75b1929..de7c1c62 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -31,7 +31,7 @@ raw-window-handle = "0.5"
 [dependencies.winit]
 version = "0.28"
 git = "https://github.com/iced-rs/winit.git"
-rev = "ac1ddfe0bd870910b3aa64a18d386fdd55b30a1d"
+rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e"
 default-features = false
 
 [dependencies.iced_runtime]

From 3136669c7f591dcf8f4168b47a815bb43ddf0762 Mon Sep 17 00:00:00 2001
From: Giuliano Bellini <100347457+GyulyVGC@users.noreply.github.com>
Date: Sun, 25 Jun 2023 10:47:48 +0200
Subject: [PATCH 391/440] Update BUG-REPORT.yml

---
 .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
index 9d2ed825..d4c94fcd 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -69,8 +69,8 @@ body:
   - type: dropdown
     id: os
     attributes:
-      label: Operative System
-      description: Which operative system are you using?
+      label: Operating System
+      description: Which operating system are you using?
       options:
         - Windows
         - macOS

From 5ae726e02c4d6c9889ef7335d9bc80ef1992e34f 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, 27 Jun 2023 19:41:03 +0200
Subject: [PATCH 392/440] Move `Screenshot` inside `window` module

---
 examples/screenshot/src/main.rs        | 9 +++++----
 runtime/src/lib.rs                     | 2 --
 runtime/src/window.rs                  | 4 +++-
 runtime/src/window/action.rs           | 2 +-
 runtime/src/{ => window}/screenshot.rs | 1 +
 src/lib.rs                             | 1 +
 winit/src/application.rs               | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)
 rename runtime/src/{ => window}/screenshot.rs (98%)

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index ef2be4fe..83824535 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,16 +1,17 @@
-use ::image as img;
-use ::image::ColorType;
 use iced::alignment;
 use iced::keyboard::KeyCode;
 use iced::theme::{Button, Container};
-use iced::widget::runtime::{CropError, Screenshot};
 use iced::widget::{button, column, container, image, row, text, text_input};
+use iced::window::screenshot::{self, Screenshot};
 use iced::{
     event, executor, keyboard, subscription, Alignment, Application, Command,
     ContentFit, Element, Event, Length, Rectangle, Renderer, Subscription,
     Theme,
 };
 
+use ::image as img;
+use ::image::ColorType;
+
 fn main() -> iced::Result {
     env_logger::builder().format_timestamp(None).init();
 
@@ -21,7 +22,7 @@ struct Example {
     screenshot: Option<Screenshot>,
     saved_png_path: Option<Result<String, PngError>>,
     png_saving: bool,
-    crop_error: Option<CropError>,
+    crop_error: Option<screenshot::CropError>,
     x_input_value: Option<u32>,
     y_input_value: Option<u32>,
     width_input_value: Option<u32>,
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 32ed14d8..50abf7b2 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -60,7 +60,6 @@ mod debug;
 #[cfg(not(feature = "debug"))]
 #[path = "debug/null.rs"]
 mod debug;
-mod screenshot;
 
 pub use iced_core as core;
 pub use iced_futures as futures;
@@ -69,5 +68,4 @@ pub use command::Command;
 pub use debug::Debug;
 pub use font::Font;
 pub use program::Program;
-pub use screenshot::{CropError, Screenshot};
 pub use user_interface::UserInterface;
diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index 9b66cb0e..e448edef 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -1,13 +1,15 @@
 //! Build window-based GUI applications.
 mod action;
 
+pub mod screenshot;
+
 pub use action::Action;
+pub use screenshot::Screenshot;
 
 use crate::command::{self, Command};
 use crate::core::time::Instant;
 use crate::core::window::{Event, Icon, Level, Mode, UserAttention};
 use crate::futures::subscription::{self, Subscription};
-use crate::screenshot::Screenshot;
 
 /// Subscribes to the frames of the window of the running application.
 ///
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index cb430681..09be1810 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,7 +1,7 @@
 use crate::core::window::{Icon, Level, Mode, UserAttention};
 use crate::futures::MaybeSend;
+use crate::window::Screenshot;
 
-use crate::screenshot::Screenshot;
 use std::fmt;
 
 /// An operation to be performed on some window.
diff --git a/runtime/src/screenshot.rs b/runtime/src/window/screenshot.rs
similarity index 98%
rename from runtime/src/screenshot.rs
rename to runtime/src/window/screenshot.rs
index b88f2c20..c84286b6 100644
--- a/runtime/src/screenshot.rs
+++ b/runtime/src/window/screenshot.rs
@@ -1,3 +1,4 @@
+//! Take screenshots of a window.
 use crate::core::{Rectangle, Size};
 
 use std::fmt::{Debug, Formatter};
diff --git a/src/lib.rs b/src/lib.rs
index a0b8a956..513fb432 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -276,6 +276,7 @@ pub mod widget {
     mod native {}
     mod renderer {}
     mod style {}
+    mod runtime {}
 }
 
 pub use application::Application;
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 5176bec6..a4687375 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -19,7 +19,7 @@ use crate::graphics::compositor::{self, Compositor};
 use crate::runtime::clipboard;
 use crate::runtime::program::Program;
 use crate::runtime::user_interface::{self, UserInterface};
-use crate::runtime::{Command, Debug, Screenshot};
+use crate::runtime::{Command, Debug};
 use crate::style::application::{Appearance, StyleSheet};
 use crate::{Clipboard, Error, Proxy, Settings};
 
@@ -819,7 +819,7 @@ pub fn run_command<A, C, E>(
                     );
 
                     proxy
-                        .send_event(tag(Screenshot::new(
+                        .send_event(tag(window::Screenshot::new(
                             bytes,
                             state.physical_size(),
                         )))

From 5b6e205e998cbb20b3c8aaff8b515d78315d6703 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, 27 Jun 2023 20:26:13 +0200
Subject: [PATCH 393/440] Simplify `offscreen` API as `color` module in
 `iced_wgpu`

---
 wgpu/src/backend.rs           |  44 +-------
 wgpu/src/color.rs             | 165 +++++++++++++++++++++++++++++
 wgpu/src/lib.rs               |   2 +-
 wgpu/src/offscreen.rs         | 188 ----------------------------------
 wgpu/src/window/compositor.rs |  17 ++-
 5 files changed, 180 insertions(+), 236 deletions(-)
 create mode 100644 wgpu/src/color.rs
 delete mode 100644 wgpu/src/offscreen.rs

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 7c962308..b524c615 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -1,3 +1,4 @@
+use crate::core;
 use crate::core::{Color, Font, Point, Size};
 use crate::graphics::backend;
 use crate::graphics::color;
@@ -5,7 +6,6 @@ use crate::graphics::{Primitive, Transformation, Viewport};
 use crate::quad;
 use crate::text;
 use crate::triangle;
-use crate::{core, offscreen};
 use crate::{Layer, Settings};
 
 #[cfg(feature = "tracing")]
@@ -123,48 +123,6 @@ impl Backend {
         self.image_pipeline.end_frame();
     }
 
-    /// Performs an offscreen render pass. If the `format` selected by WGPU is not
-    /// `wgpu::TextureFormat::Rgba8UnormSrgb`, it will be run through a blit.
-    ///
-    /// Returns `None` if the `frame` is `Rgba8UnormSrgb`, else returns the newly
-    /// converted texture view in `Rgba8UnormSrgb`.
-    pub fn offscreen<T: AsRef<str>>(
-        &mut self,
-        device: &wgpu::Device,
-        queue: &wgpu::Queue,
-        encoder: &mut wgpu::CommandEncoder,
-        clear_color: Option<Color>,
-        frame: &wgpu::TextureView,
-        format: wgpu::TextureFormat,
-        primitives: &[Primitive],
-        viewport: &Viewport,
-        overlay_text: &[T],
-        size: wgpu::Extent3d,
-    ) -> Option<wgpu::Texture> {
-        #[cfg(feature = "tracing")]
-        let _ = info_span!("iced_wgpu::offscreen", "DRAW").entered();
-
-        self.present(
-            device,
-            queue,
-            encoder,
-            clear_color,
-            frame,
-            primitives,
-            viewport,
-            overlay_text,
-        );
-
-        if format != wgpu::TextureFormat::Rgba8UnormSrgb {
-            log::info!("Texture format is {format:?}; performing conversion to rgba8..");
-            let pipeline = offscreen::Pipeline::new(device);
-
-            return Some(pipeline.convert(device, frame, size, encoder));
-        }
-
-        None
-    }
-
     fn prepare_text(
         &mut self,
         device: &wgpu::Device,
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
new file mode 100644
index 00000000..a1025601
--- /dev/null
+++ b/wgpu/src/color.rs
@@ -0,0 +1,165 @@
+use std::borrow::Cow;
+
+pub fn convert(
+    device: &wgpu::Device,
+    encoder: &mut wgpu::CommandEncoder,
+    source: wgpu::Texture,
+    format: wgpu::TextureFormat,
+) -> wgpu::Texture {
+    if source.format() == format {
+        return source;
+    }
+
+    let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
+        label: Some("iced_wgpu.offscreen.sampler"),
+        ..Default::default()
+    });
+
+    //sampler in 0
+    let sampler_layout =
+        device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.sampler_layout"),
+            entries: &[wgpu::BindGroupLayoutEntry {
+                binding: 0,
+                visibility: wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Sampler(
+                    wgpu::SamplerBindingType::NonFiltering,
+                ),
+                count: None,
+            }],
+        });
+
+    let sampler_bind_group =
+        device.create_bind_group(&wgpu::BindGroupDescriptor {
+            label: Some("iced_wgpu.offscreen.sampler.bind_group"),
+            layout: &sampler_layout,
+            entries: &[wgpu::BindGroupEntry {
+                binding: 0,
+                resource: wgpu::BindingResource::Sampler(&sampler),
+            }],
+        });
+
+    let texture_layout =
+        device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.texture_layout"),
+            entries: &[wgpu::BindGroupLayoutEntry {
+                binding: 0,
+                visibility: wgpu::ShaderStages::FRAGMENT,
+                ty: wgpu::BindingType::Texture {
+                    sample_type: wgpu::TextureSampleType::Float {
+                        filterable: false,
+                    },
+                    view_dimension: wgpu::TextureViewDimension::D2,
+                    multisampled: false,
+                },
+                count: None,
+            }],
+        });
+
+    let pipeline_layout =
+        device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.pipeline_layout"),
+            bind_group_layouts: &[&sampler_layout, &texture_layout],
+            push_constant_ranges: &[],
+        });
+
+    let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
+        label: Some("iced_wgpu.offscreen.blit.shader"),
+        source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
+            "shader/blit.wgsl"
+        ))),
+    });
+
+    let pipeline =
+        device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.pipeline"),
+            layout: Some(&pipeline_layout),
+            vertex: wgpu::VertexState {
+                module: &shader,
+                entry_point: "vs_main",
+                buffers: &[],
+            },
+            fragment: Some(wgpu::FragmentState {
+                module: &shader,
+                entry_point: "fs_main",
+                targets: &[Some(wgpu::ColorTargetState {
+                    format,
+                    blend: Some(wgpu::BlendState {
+                        color: wgpu::BlendComponent {
+                            src_factor: wgpu::BlendFactor::SrcAlpha,
+                            dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                            operation: wgpu::BlendOperation::Add,
+                        },
+                        alpha: wgpu::BlendComponent {
+                            src_factor: wgpu::BlendFactor::One,
+                            dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                            operation: wgpu::BlendOperation::Add,
+                        },
+                    }),
+                    write_mask: wgpu::ColorWrites::ALL,
+                })],
+            }),
+            primitive: wgpu::PrimitiveState {
+                topology: wgpu::PrimitiveTopology::TriangleList,
+                front_face: wgpu::FrontFace::Cw,
+                ..Default::default()
+            },
+            depth_stencil: None,
+            multisample: Default::default(),
+            multiview: None,
+        });
+
+    let texture = device.create_texture(&wgpu::TextureDescriptor {
+        label: Some("iced_wgpu.offscreen.conversion.source_texture"),
+        size: source.size(),
+        mip_level_count: 1,
+        sample_count: 1,
+        dimension: wgpu::TextureDimension::D2,
+        format,
+        usage: wgpu::TextureUsages::RENDER_ATTACHMENT
+            | wgpu::TextureUsages::COPY_SRC,
+        view_formats: &[],
+    });
+
+    let view = &texture.create_view(&wgpu::TextureViewDescriptor::default());
+
+    let texture_bind_group =
+        device.create_bind_group(&wgpu::BindGroupDescriptor {
+            label: Some("iced_wgpu.offscreen.blit.texture_bind_group"),
+            layout: &texture_layout,
+            entries: &[wgpu::BindGroupEntry {
+                binding: 0,
+                resource: wgpu::BindingResource::TextureView(
+                    &source
+                        .create_view(&wgpu::TextureViewDescriptor::default()),
+                ),
+            }],
+        });
+
+    let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+        label: Some("iced_wgpu.offscreen.blit.render_pass"),
+        color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+            view,
+            resolve_target: None,
+            ops: wgpu::Operations {
+                load: wgpu::LoadOp::Load,
+                store: true,
+            },
+        })],
+        depth_stencil_attachment: None,
+    });
+
+    pass.set_pipeline(&pipeline);
+    pass.set_bind_group(0, &sampler_bind_group, &[]);
+    pass.set_bind_group(1, &texture_bind_group, &[]);
+    pass.draw(0..6, 0..1);
+
+    texture
+}
+
+#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+#[repr(C)]
+struct Vertex {
+    ndc: [f32; 2],
+    uv: [f32; 2],
+}
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 827acb89..86a962a5 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -46,7 +46,7 @@ pub mod geometry;
 
 mod backend;
 mod buffer;
-mod offscreen;
+mod color;
 mod quad;
 mod text;
 mod triangle;
diff --git a/wgpu/src/offscreen.rs b/wgpu/src/offscreen.rs
deleted file mode 100644
index b25602e4..00000000
--- a/wgpu/src/offscreen.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use crate::graphics::color;
-use std::borrow::Cow;
-
-/// A simple compute pipeline to convert any texture to Rgba8UnormSrgb.
-#[derive(Debug)]
-pub struct Pipeline {
-    pipeline: wgpu::RenderPipeline,
-    sampler_bind_group: wgpu::BindGroup,
-    texture_layout: wgpu::BindGroupLayout,
-}
-
-#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-#[repr(C)]
-struct Vertex {
-    ndc: [f32; 2],
-    uv: [f32; 2],
-}
-
-impl Pipeline {
-    pub fn new(device: &wgpu::Device) -> Self {
-        let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
-            label: Some("iced_wgpu.offscreen.sampler"),
-            ..Default::default()
-        });
-
-        //sampler in 0
-        let sampler_layout =
-            device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.sampler_layout"),
-                entries: &[wgpu::BindGroupLayoutEntry {
-                    binding: 0,
-                    visibility: wgpu::ShaderStages::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler(
-                        wgpu::SamplerBindingType::NonFiltering,
-                    ),
-                    count: None,
-                }],
-            });
-
-        let sampler_bind_group =
-            device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu.offscreen.sampler.bind_group"),
-                layout: &sampler_layout,
-                entries: &[wgpu::BindGroupEntry {
-                    binding: 0,
-                    resource: wgpu::BindingResource::Sampler(&sampler),
-                }],
-            });
-
-        let texture_layout =
-            device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.texture_layout"),
-                entries: &[wgpu::BindGroupLayoutEntry {
-                    binding: 0,
-                    visibility: wgpu::ShaderStages::FRAGMENT,
-                    ty: wgpu::BindingType::Texture {
-                        sample_type: wgpu::TextureSampleType::Float {
-                            filterable: false,
-                        },
-                        view_dimension: wgpu::TextureViewDimension::D2,
-                        multisampled: false,
-                    },
-                    count: None,
-                }],
-            });
-
-        let pipeline_layout =
-            device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.pipeline_layout"),
-                bind_group_layouts: &[&sampler_layout, &texture_layout],
-                push_constant_ranges: &[],
-            });
-
-        let shader =
-            device.create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.shader"),
-                source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
-                    "shader/blit.wgsl"
-                ))),
-            });
-
-        let pipeline =
-            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.pipeline"),
-                layout: Some(&pipeline_layout),
-                vertex: wgpu::VertexState {
-                    module: &shader,
-                    entry_point: "vs_main",
-                    buffers: &[],
-                },
-                fragment: Some(wgpu::FragmentState {
-                    module: &shader,
-                    entry_point: "fs_main",
-                    targets: &[Some(wgpu::ColorTargetState {
-                        format: if color::GAMMA_CORRECTION {
-                            wgpu::TextureFormat::Rgba8UnormSrgb
-                        } else {
-                            wgpu::TextureFormat::Rgba8Unorm
-                        },
-                        blend: Some(wgpu::BlendState {
-                            color: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::SrcAlpha,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                            alpha: wgpu::BlendComponent {
-                                src_factor: wgpu::BlendFactor::One,
-                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
-                                operation: wgpu::BlendOperation::Add,
-                            },
-                        }),
-                        write_mask: wgpu::ColorWrites::ALL,
-                    })],
-                }),
-                primitive: wgpu::PrimitiveState {
-                    topology: wgpu::PrimitiveTopology::TriangleList,
-                    front_face: wgpu::FrontFace::Cw,
-                    ..Default::default()
-                },
-                depth_stencil: None,
-                multisample: Default::default(),
-                multiview: None,
-            });
-
-        Self {
-            pipeline,
-            sampler_bind_group,
-            texture_layout,
-        }
-    }
-
-    pub fn convert(
-        &self,
-        device: &wgpu::Device,
-        frame: &wgpu::TextureView,
-        size: wgpu::Extent3d,
-        encoder: &mut wgpu::CommandEncoder,
-    ) -> wgpu::Texture {
-        let texture = device.create_texture(&wgpu::TextureDescriptor {
-            label: Some("iced_wgpu.offscreen.conversion.source_texture"),
-            size,
-            mip_level_count: 1,
-            sample_count: 1,
-            dimension: wgpu::TextureDimension::D2,
-            format: if color::GAMMA_CORRECTION {
-                wgpu::TextureFormat::Rgba8UnormSrgb
-            } else {
-                wgpu::TextureFormat::Rgba8Unorm
-            },
-            usage: wgpu::TextureUsages::RENDER_ATTACHMENT
-                | wgpu::TextureUsages::COPY_SRC,
-            view_formats: &[],
-        });
-
-        let view =
-            &texture.create_view(&wgpu::TextureViewDescriptor::default());
-
-        let texture_bind_group =
-            device.create_bind_group(&wgpu::BindGroupDescriptor {
-                label: Some("iced_wgpu.offscreen.blit.texture_bind_group"),
-                layout: &self.texture_layout,
-                entries: &[wgpu::BindGroupEntry {
-                    binding: 0,
-                    resource: wgpu::BindingResource::TextureView(frame),
-                }],
-            });
-
-        let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-            label: Some("iced_wgpu.offscreen.blit.render_pass"),
-            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                view,
-                resolve_target: None,
-                ops: wgpu::Operations {
-                    load: wgpu::LoadOp::Load,
-                    store: true,
-                },
-            })],
-            depth_stencil_attachment: None,
-        });
-
-        pass.set_pipeline(&self.pipeline);
-        pass.set_bind_group(0, &self.sampler_bind_group, &[]);
-        pass.set_bind_group(1, &texture_bind_group, &[]);
-        pass.draw(0..6, 0..1);
-
-        texture
-    }
-}
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 43c3dce5..1cfd7b67 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -345,17 +345,26 @@ pub fn screenshot<Theme, T: AsRef<str>>(
 
     let view = texture.create_view(&wgpu::TextureViewDescriptor::default());
 
-    let rgba_texture = backend.offscreen(
+    backend.present(
         &compositor.device,
         &compositor.queue,
         &mut encoder,
         Some(background_color),
         &view,
-        compositor.format,
         primitives,
         viewport,
         overlay,
-        texture_extent,
+    );
+
+    let texture = crate::color::convert(
+        &compositor.device,
+        &mut encoder,
+        texture,
+        if color::GAMMA_CORRECTION {
+            wgpu::TextureFormat::Rgba8UnormSrgb
+        } else {
+            wgpu::TextureFormat::Rgba8Unorm
+        },
     );
 
     let output_buffer =
@@ -368,7 +377,7 @@ pub fn screenshot<Theme, T: AsRef<str>>(
         });
 
     encoder.copy_texture_to_buffer(
-        rgba_texture.unwrap_or(texture).as_image_copy(),
+        texture.as_image_copy(),
         wgpu::ImageCopyBuffer {
             buffer: &output_buffer,
             layout: wgpu::ImageDataLayout {

From bf7d636ebf90b6eba3ab6e4c718439e382ce9ec0 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, 27 Jun 2023 22:05:49 +0200
Subject: [PATCH 394/440] Draw border path for `quad` only if it has a border
 in `iced_tiny_skia`

---
 tiny_skia/src/backend.rs | 212 ++++++++++++++++++++-------------------
 1 file changed, 108 insertions(+), 104 deletions(-)

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index d0d24b23..86eccdda 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -159,7 +159,6 @@ impl Backend {
                 border_width,
                 border_color,
             } => {
-                // XXX border seems to be contained by the bounds of the primitive in wgpu and for damage regions, so we do the same here
                 let physical_bounds = (*bounds + translation) * scale_factor;
 
                 if !clip_bounds.intersects(&physical_bounds) {
@@ -206,115 +205,120 @@ impl Backend {
                     clip_mask,
                 );
 
-                // border path is offset by half the border width
-                let path_bounds = Rectangle {
-                    x: bounds.x + border_width / 2.0,
-                    y: bounds.y + border_width / 2.0,
-                    width: bounds.width - border_width,
-                    height: bounds.height - border_width,
-                };
-
-                // Make sure the border radius is correct
-                let mut border_radius = *border_radius;
-                let mut border_radius_gt_half_border_width =
-                    [true, true, true, true];
-                for (i, radius) in &mut border_radius.iter_mut().enumerate() {
-                    *radius = if *radius == 0.0 {
-                        // Path should handle this fine
-                        0.0
-                    } else if *radius > border_width / 2.0 {
-                        *radius - border_width / 2.0
-                    } else {
-                        border_radius_gt_half_border_width[i] = false;
-                        0.0
-                    }
-                    .min(path_bounds.width / 2.0)
-                    .min(path_bounds.height / 2.0);
-                }
-
-                // Stroking a path works well in this case.
-                if border_radius_gt_half_border_width.iter().all(|b| *b) {
-                    let border_radius_path =
-                        rounded_rectangle(path_bounds, border_radius);
-
-                    pixels.stroke_path(
-                        &border_radius_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,
-                    );
-                } else {
-                    // Draw corners that have to small border radii as having no border radius,
-                    // but mask them with the rounded rectangle with the correct border radius.
-
-                    let mut temp_pixmap =
-                        Pixmap::new(bounds.width as u32, bounds.height as u32)
-                            .unwrap();
-
-                    let mut quad_mask =
-                        Mask::new(bounds.width as u32, bounds.height as u32)
-                            .unwrap();
-
-                    let zero_bounds = Rectangle {
-                        x: 0.0,
-                        y: 0.0,
-                        width: bounds.width,
-                        height: bounds.height,
-                    };
-                    let path =
-                        rounded_rectangle(zero_bounds, fill_border_radius);
-
-                    quad_mask.fill_path(
-                        &path,
-                        tiny_skia::FillRule::EvenOdd,
-                        true,
-                        transform,
-                    );
-                    let path_bounds = Rectangle {
-                        x: border_width / 2.0,
-                        y: border_width / 2.0,
+                if border_width > 0.0 {
+                    // Border path is offset by half the border width
+                    let border_bounds = Rectangle {
+                        x: bounds.x + border_width / 2.0,
+                        y: bounds.y + border_width / 2.0,
                         width: bounds.width - border_width,
                         height: bounds.height - border_width,
                     };
 
-                    let border_radius_path =
-                        rounded_rectangle(path_bounds, border_radius);
+                    // Make sure the border radius is correct
+                    let mut border_radius = *border_radius;
+                    let mut is_simple_border = true;
 
-                    temp_pixmap.stroke_path(
-                        &border_radius_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,
-                        Some(&quad_mask),
-                    );
+                    for radius in &mut border_radius {
+                        *radius = if *radius == 0.0 {
+                            // Path should handle this fine
+                            0.0
+                        } else if *radius > border_width / 2.0 {
+                            *radius - border_width / 2.0
+                        } else {
+                            is_simple_border = false;
+                            0.0
+                        }
+                        .min(border_bounds.width / 2.0)
+                        .min(border_bounds.height / 2.0);
+                    }
 
-                    pixels.draw_pixmap(
-                        bounds.x as i32,
-                        bounds.y as i32,
-                        temp_pixmap.as_ref(),
-                        &PixmapPaint::default(),
-                        transform,
-                        clip_mask,
-                    );
+                    // Stroking a path works well in this case
+                    if is_simple_border {
+                        let border_path =
+                            rounded_rectangle(border_bounds, border_radius);
+
+                        pixels.stroke_path(
+                            &border_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,
+                        );
+                    } else {
+                        // Draw corners that have too small border radii as having no border radius,
+                        // but mask them with the rounded rectangle with the correct border radius.
+                        let mut temp_pixmap = Pixmap::new(
+                            bounds.width as u32,
+                            bounds.height as u32,
+                        )
+                        .unwrap();
+
+                        let mut quad_mask = Mask::new(
+                            bounds.width as u32,
+                            bounds.height as u32,
+                        )
+                        .unwrap();
+
+                        let zero_bounds = Rectangle {
+                            x: 0.0,
+                            y: 0.0,
+                            width: bounds.width,
+                            height: bounds.height,
+                        };
+                        let path =
+                            rounded_rectangle(zero_bounds, fill_border_radius);
+
+                        quad_mask.fill_path(
+                            &path,
+                            tiny_skia::FillRule::EvenOdd,
+                            true,
+                            transform,
+                        );
+                        let path_bounds = Rectangle {
+                            x: border_width / 2.0,
+                            y: border_width / 2.0,
+                            width: bounds.width - border_width,
+                            height: bounds.height - border_width,
+                        };
+
+                        let border_radius_path =
+                            rounded_rectangle(path_bounds, border_radius);
+
+                        temp_pixmap.stroke_path(
+                            &border_radius_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,
+                            Some(&quad_mask),
+                        );
+
+                        pixels.draw_pixmap(
+                            bounds.x as i32,
+                            bounds.y as i32,
+                            temp_pixmap.as_ref(),
+                            &PixmapPaint::default(),
+                            transform,
+                            clip_mask,
+                        );
+                    }
                 }
             }
             Primitive::Text {

From 2f886b0e4e1927ead031b1256026d53f48d5f8eb 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, 27 Jun 2023 22:06:32 +0200
Subject: [PATCH 395/440] Fix import consistency in `iced_tiny_skia`

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

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 86eccdda..87738174 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -1,5 +1,3 @@
-use tiny_skia::{Mask, Pixmap, PixmapPaint};
-
 use crate::core::text;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::backend;
@@ -256,13 +254,13 @@ impl Backend {
                     } else {
                         // Draw corners that have too small border radii as having no border radius,
                         // but mask them with the rounded rectangle with the correct border radius.
-                        let mut temp_pixmap = Pixmap::new(
+                        let mut temp_pixmap = tiny_skia::Pixmap::new(
                             bounds.width as u32,
                             bounds.height as u32,
                         )
                         .unwrap();
 
-                        let mut quad_mask = Mask::new(
+                        let mut quad_mask = tiny_skia::Mask::new(
                             bounds.width as u32,
                             bounds.height as u32,
                         )
@@ -314,7 +312,7 @@ impl Backend {
                             bounds.x as i32,
                             bounds.y as i32,
                             temp_pixmap.as_ref(),
-                            &PixmapPaint::default(),
+                            &tiny_skia::PixmapPaint::default(),
                             transform,
                             clip_mask,
                         );

From fa04f40524ab7a4ee23bcbc09bc4960c05b192db Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@protonmail.com>
Date: Fri, 26 May 2023 20:27:17 -0400
Subject: [PATCH 396/440] Make vertical scroll properties optional

Co-Authored-By: Austin M. Reppert <austinmreppert@gmail.com>
---
 examples/scrollable/src/main.rs |  18 ++---
 widget/src/scrollable.rs        | 130 ++++++++++++++++++++++----------
 2 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 3038661e..1ba81609 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -1,4 +1,6 @@
-use iced::widget::scrollable::{Properties, Scrollbar, Scroller};
+use iced::widget::scrollable::{
+    Properties, ScrollbarProperties, Scrollbar, Scroller,
+};
 use iced::widget::{
     button, column, container, horizontal_space, progress_bar, radio, row,
     scrollable, slider, text, vertical_space,
@@ -199,12 +201,12 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .vertical_scroll(
+                .scrollbar_properties(ScrollbarProperties::Vertical(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
                         .scroller_width(self.scroller_width),
-                )
+                ))
                 .id(SCROLLABLE_ID.clone())
                 .on_scroll(Message::Scrolled),
                 Direction::Horizontal => scrollable(
@@ -223,12 +225,12 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .horizontal_scroll(
+                .scrollbar_properties(ScrollbarProperties::Horizontal(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
                         .scroller_width(self.scroller_width),
-                )
+                ))
                 .style(theme::Scrollable::custom(ScrollbarCustomStyle))
                 .id(SCROLLABLE_ID.clone())
                 .on_scroll(Message::Scrolled),
@@ -264,18 +266,16 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .vertical_scroll(
+                .scrollbar_properties(ScrollbarProperties::Both(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
                         .scroller_width(self.scroller_width),
-                )
-                .horizontal_scroll(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
                         .scroller_width(self.scroller_width),
-                )
+                ))
                 .style(theme::Scrollable::Custom(Box::new(
                     ScrollbarCustomStyle,
                 )))
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 010befac..1a326848 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -29,8 +29,7 @@ where
     id: Option<Id>,
     width: Length,
     height: Length,
-    vertical: Properties,
-    horizontal: Option<Properties>,
+    scrollbar_properties: ScrollbarProperties,
     content: Element<'a, Message, Renderer>,
     on_scroll: Option<Box<dyn Fn(Viewport) -> Message + 'a>>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -47,8 +46,7 @@ where
             id: None,
             width: Length::Shrink,
             height: Length::Shrink,
-            vertical: Properties::default(),
-            horizontal: None,
+            scrollbar_properties: Default::default(),
             content: content.into(),
             on_scroll: None,
             style: Default::default(),
@@ -73,15 +71,12 @@ where
         self
     }
 
-    /// Configures the vertical scrollbar of the [`Scrollable`] .
-    pub fn vertical_scroll(mut self, properties: Properties) -> Self {
-        self.vertical = properties;
-        self
-    }
-
-    /// Configures the horizontal scrollbar of the [`Scrollable`] .
-    pub fn horizontal_scroll(mut self, properties: Properties) -> Self {
-        self.horizontal = Some(properties);
+    /// Configures the scrollbar(s) of the [`Scrollable`] .
+    pub fn scrollbar_properties(
+        mut self,
+        scrollbar_properties: ScrollbarProperties,
+    ) -> Self {
+        self.scrollbar_properties = scrollbar_properties;
         self
     }
 
@@ -103,6 +98,43 @@ where
     }
 }
 
+/// Properties of the scrollbar(s) within a [`Scrollable`].
+#[derive(Debug)]
+pub enum ScrollbarProperties {
+    /// Vertical Scrollbar.
+    Vertical(Properties),
+    /// Horizontal Scrollbar.
+    Horizontal(Properties),
+    /// Both Vertical and Horizontal Scrollbars.
+    Both(Properties, Properties),
+}
+
+impl ScrollbarProperties {
+    /// Returns the horizontal [`Properties`] of the [`ScrollbarProperties`].
+    pub fn horizontal(&self) -> Option<&Properties> {
+        match self {
+            Self::Horizontal(properties) => Some(properties),
+            Self::Both(_, properties) => Some(properties),
+            _ => None,
+        }
+    }
+
+    /// Returns the vertical [`Properties`] of the [`ScrollbarProperties`].
+    pub fn vertical(&self) -> Option<&Properties> {
+        match self {
+            Self::Vertical(properties) => Some(properties),
+            Self::Both(properties, _) => Some(properties),
+            _ => None,
+        }
+    }
+}
+
+impl Default for ScrollbarProperties {
+    fn default() -> Self {
+        Self::Vertical(Properties::default())
+    }
+}
+
 /// Properties of a scrollbar within a [`Scrollable`].
 #[derive(Debug)]
 pub struct Properties {
@@ -186,7 +218,8 @@ where
             limits,
             self.width,
             self.height,
-            self.horizontal.is_some(),
+            self.scrollbar_properties.horizontal().is_some(),
+            self.scrollbar_properties.vertical().is_some(),
             |renderer, limits| {
                 self.content.as_widget().layout(renderer, limits)
             },
@@ -234,8 +267,7 @@ where
             cursor,
             clipboard,
             shell,
-            &self.vertical,
-            self.horizontal.as_ref(),
+            &self.scrollbar_properties,
             &self.on_scroll,
             |event, layout, cursor, clipboard, shell| {
                 self.content.as_widget_mut().on_event(
@@ -267,8 +299,7 @@ where
             theme,
             layout,
             cursor,
-            &self.vertical,
-            self.horizontal.as_ref(),
+            &self.scrollbar_properties,
             &self.style,
             |renderer, layout, cursor, viewport| {
                 self.content.as_widget().draw(
@@ -296,8 +327,7 @@ where
             tree.state.downcast_ref::<State>(),
             layout,
             cursor,
-            &self.vertical,
-            self.horizontal.as_ref(),
+            &self.scrollbar_properties,
             |layout, cursor, viewport| {
                 self.content.as_widget().mouse_interaction(
                     &tree.children[0],
@@ -400,19 +430,24 @@ pub fn layout<Renderer>(
     width: Length,
     height: Length,
     horizontal_enabled: bool,
+    vertical_enabled: bool,
     layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
 ) -> layout::Node {
     let limits = limits.width(width).height(height);
 
     let child_limits = layout::Limits::new(
-        Size::new(limits.min().width, 0.0),
+        Size::new(limits.min().width, limits.min().height),
         Size::new(
             if horizontal_enabled {
                 f32::INFINITY
             } else {
                 limits.max().width
             },
-            f32::MAX,
+            if vertical_enabled {
+                f32::MAX
+            } else {
+                limits.max().height
+            },
         ),
     );
 
@@ -431,8 +466,7 @@ pub fn update<Message>(
     cursor: mouse::Cursor,
     clipboard: &mut dyn Clipboard,
     shell: &mut Shell<'_, Message>,
-    vertical: &Properties,
-    horizontal: Option<&Properties>,
+    scrollbar_properties: &ScrollbarProperties,
     on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     update_content: impl FnOnce(
         Event,
@@ -449,7 +483,7 @@ pub fn update<Message>(
     let content_bounds = content.bounds();
 
     let scrollbars =
-        Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
+        Scrollbars::new(state, &scrollbar_properties, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
@@ -531,6 +565,17 @@ pub fn update<Message>(
                             cursor_position.y - scroll_box_touched_at.y,
                         );
 
+                        let delta = Vector::new(
+                            delta.x
+                                * scrollbar_properties
+                                    .horizontal()
+                                    .map_or(0.0, |_| 1.0),
+                            delta.y
+                                * scrollbar_properties
+                                    .vertical()
+                                    .map_or(0.0, |_| 1.0),
+                        );
+
                         state.scroll(delta, bounds, content_bounds);
 
                         state.scroll_area_touched_at = Some(cursor_position);
@@ -713,8 +758,7 @@ pub fn mouse_interaction(
     state: &State,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    vertical: &Properties,
-    horizontal: Option<&Properties>,
+    scrollbar_properties: &ScrollbarProperties,
     content_interaction: impl FnOnce(
         Layout<'_>,
         mouse::Cursor,
@@ -728,7 +772,7 @@ pub fn mouse_interaction(
     let content_bounds = content_layout.bounds();
 
     let scrollbars =
-        Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
+        Scrollbars::new(state, scrollbar_properties, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
@@ -768,8 +812,7 @@ pub fn draw<Renderer>(
     theme: &Renderer::Theme,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    vertical: &Properties,
-    horizontal: Option<&Properties>,
+    scrollbar_properties: &ScrollbarProperties,
     style: &<Renderer::Theme as StyleSheet>::Style,
     draw_content: impl FnOnce(&mut Renderer, Layout<'_>, mouse::Cursor, &Rectangle),
 ) where
@@ -781,7 +824,7 @@ pub fn draw<Renderer>(
     let content_bounds = content_layout.bounds();
 
     let scrollbars =
-        Scrollbars::new(state, vertical, horizontal, bounds, content_bounds);
+        Scrollbars::new(state, &scrollbar_properties, bounds, content_bounds);
 
     let cursor_over_scrollable = cursor.position_over(bounds);
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
@@ -1157,22 +1200,30 @@ impl Scrollbars {
     /// Create y and/or x scrollbar(s) if content is overflowing the [`Scrollable`] bounds.
     fn new(
         state: &State,
-        vertical: &Properties,
-        horizontal: Option<&Properties>,
+        scrollbar_properties: &ScrollbarProperties,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Self {
         let offset = state.offset(bounds, content_bounds);
 
-        let show_scrollbar_x = horizontal.and_then(|h| {
-            if content_bounds.width > bounds.width {
-                Some(h)
+        let show_scrollbar_x =
+            scrollbar_properties.horizontal().and_then(|h| {
+                if content_bounds.width > bounds.width {
+                    Some(h)
+                } else {
+                    None
+                }
+            });
+
+        let show_scrollbar_y = scrollbar_properties.vertical().and_then(|v| {
+            if content_bounds.height > bounds.height {
+                Some(v)
             } else {
                 None
             }
         });
 
-        let y_scrollbar = if content_bounds.height > bounds.height {
+        let y_scrollbar = if let Some(vertical) = show_scrollbar_y {
             let Properties {
                 width,
                 margin,
@@ -1240,9 +1291,8 @@ impl Scrollbars {
 
             // Need to adjust the width of the horizontal scrollbar if the vertical scrollbar
             // is present
-            let scrollbar_y_width = y_scrollbar.map_or(0.0, |_| {
-                vertical.width.max(vertical.scroller_width) + vertical.margin
-            });
+            let scrollbar_y_width = show_scrollbar_y
+                .map_or(0.0, |v| v.width.max(v.scroller_width) + v.margin);
 
             let total_scrollbar_height =
                 width.max(scroller_width) + 2.0 * margin;

From 493571695a8853ee91309a92d04b8dbea29bab8d 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, 27 Jun 2023 22:30:54 +0200
Subject: [PATCH 397/440] Rename `ScrollbarProperties` to `Direction` in
 `scrollable`

---
 examples/scrollable/src/main.rs |  26 ++++----
 widget/src/scrollable.rs        | 105 +++++++++++++++-----------------
 2 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 1ba81609..4104871f 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -1,12 +1,11 @@
-use iced::widget::scrollable::{
-    Properties, ScrollbarProperties, Scrollbar, Scroller,
-};
+use iced::widget::scrollable::{Properties, Scrollbar, Scroller};
 use iced::widget::{
     button, column, container, horizontal_space, progress_bar, radio, row,
     scrollable, slider, text, vertical_space,
 };
 use iced::{executor, theme, Alignment, Color};
 use iced::{Application, Command, Element, Length, Settings, Theme};
+
 use once_cell::sync::Lazy;
 
 static SCROLLABLE_ID: Lazy<scrollable::Id> = Lazy::new(scrollable::Id::unique);
@@ -201,7 +200,7 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .scrollbar_properties(ScrollbarProperties::Vertical(
+                .direction(scrollable::Direction::Vertical(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
@@ -225,7 +224,7 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .scrollbar_properties(ScrollbarProperties::Horizontal(
+                .direction(scrollable::Direction::Horizontal(
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
@@ -266,16 +265,17 @@ impl Application for ScrollableDemo {
                     .spacing(40),
                 )
                 .height(Length::Fill)
-                .scrollbar_properties(ScrollbarProperties::Both(
-                    Properties::new()
+                .direction({
+                    let properties = Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
-                        .scroller_width(self.scroller_width),
-                    Properties::new()
-                        .width(self.scrollbar_width)
-                        .margin(self.scrollbar_margin)
-                        .scroller_width(self.scroller_width),
-                ))
+                        .scroller_width(self.scroller_width);
+
+                    scrollable::Direction::Both {
+                        horizontal: properties,
+                        vertical: properties,
+                    }
+                })
                 .style(theme::Scrollable::Custom(Box::new(
                     ScrollbarCustomStyle,
                 )))
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 1a326848..82f71dff 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -29,7 +29,7 @@ where
     id: Option<Id>,
     width: Length,
     height: Length,
-    scrollbar_properties: ScrollbarProperties,
+    direction: Direction,
     content: Element<'a, Message, Renderer>,
     on_scroll: Option<Box<dyn Fn(Viewport) -> Message + 'a>>,
     style: <Renderer::Theme as StyleSheet>::Style,
@@ -46,7 +46,7 @@ where
             id: None,
             width: Length::Shrink,
             height: Length::Shrink,
-            scrollbar_properties: Default::default(),
+            direction: Default::default(),
             content: content.into(),
             on_scroll: None,
             style: Default::default(),
@@ -71,12 +71,9 @@ where
         self
     }
 
-    /// Configures the scrollbar(s) of the [`Scrollable`] .
-    pub fn scrollbar_properties(
-        mut self,
-        scrollbar_properties: ScrollbarProperties,
-    ) -> Self {
-        self.scrollbar_properties = scrollbar_properties;
+    /// Sets the [`Direction`] of the [`Scrollable`] .
+    pub fn direction(mut self, direction: Direction) -> Self {
+        self.direction = direction;
         self
     }
 
@@ -98,45 +95,50 @@ where
     }
 }
 
-/// Properties of the scrollbar(s) within a [`Scrollable`].
-#[derive(Debug)]
-pub enum ScrollbarProperties {
-    /// Vertical Scrollbar.
+/// The direction of [`Scrollable`].
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Direction {
+    /// Vertical scrolling
     Vertical(Properties),
-    /// Horizontal Scrollbar.
+    /// Horizontal scrolling
     Horizontal(Properties),
-    /// Both Vertical and Horizontal Scrollbars.
-    Both(Properties, Properties),
+    /// Both vertical and horizontal scrolling
+    Both {
+        /// The properties of the vertical scrollbar.
+        vertical: Properties,
+        /// The properties of the horizontal scrollbar.
+        horizontal: Properties,
+    },
 }
 
-impl ScrollbarProperties {
-    /// Returns the horizontal [`Properties`] of the [`ScrollbarProperties`].
+impl Direction {
+    /// Returns the [`Properties`] of the horizontal scrollbar, if any.
     pub fn horizontal(&self) -> Option<&Properties> {
         match self {
             Self::Horizontal(properties) => Some(properties),
-            Self::Both(_, properties) => Some(properties),
+            Self::Both { horizontal, .. } => Some(horizontal),
             _ => None,
         }
     }
 
-    /// Returns the vertical [`Properties`] of the [`ScrollbarProperties`].
+    /// Returns the [`Properties`] of the vertical scrollbar, if any.
     pub fn vertical(&self) -> Option<&Properties> {
         match self {
             Self::Vertical(properties) => Some(properties),
-            Self::Both(properties, _) => Some(properties),
+            Self::Both { vertical, .. } => Some(vertical),
             _ => None,
         }
     }
 }
 
-impl Default for ScrollbarProperties {
+impl Default for Direction {
     fn default() -> Self {
         Self::Vertical(Properties::default())
     }
 }
 
 /// Properties of a scrollbar within a [`Scrollable`].
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Properties {
     width: f32,
     margin: f32,
@@ -218,8 +220,7 @@ where
             limits,
             self.width,
             self.height,
-            self.scrollbar_properties.horizontal().is_some(),
-            self.scrollbar_properties.vertical().is_some(),
+            &self.direction,
             |renderer, limits| {
                 self.content.as_widget().layout(renderer, limits)
             },
@@ -267,7 +268,7 @@ where
             cursor,
             clipboard,
             shell,
-            &self.scrollbar_properties,
+            &self.direction,
             &self.on_scroll,
             |event, layout, cursor, clipboard, shell| {
                 self.content.as_widget_mut().on_event(
@@ -299,7 +300,7 @@ where
             theme,
             layout,
             cursor,
-            &self.scrollbar_properties,
+            &self.direction,
             &self.style,
             |renderer, layout, cursor, viewport| {
                 self.content.as_widget().draw(
@@ -327,7 +328,7 @@ where
             tree.state.downcast_ref::<State>(),
             layout,
             cursor,
-            &self.scrollbar_properties,
+            &self.direction,
             |layout, cursor, viewport| {
                 self.content.as_widget().mouse_interaction(
                     &tree.children[0],
@@ -429,8 +430,7 @@ pub fn layout<Renderer>(
     limits: &layout::Limits,
     width: Length,
     height: Length,
-    horizontal_enabled: bool,
-    vertical_enabled: bool,
+    direction: &Direction,
     layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
 ) -> layout::Node {
     let limits = limits.width(width).height(height);
@@ -438,12 +438,12 @@ pub fn layout<Renderer>(
     let child_limits = layout::Limits::new(
         Size::new(limits.min().width, limits.min().height),
         Size::new(
-            if horizontal_enabled {
+            if direction.horizontal().is_some() {
                 f32::INFINITY
             } else {
                 limits.max().width
             },
-            if vertical_enabled {
+            if direction.vertical().is_some() {
                 f32::MAX
             } else {
                 limits.max().height
@@ -466,7 +466,7 @@ pub fn update<Message>(
     cursor: mouse::Cursor,
     clipboard: &mut dyn Clipboard,
     shell: &mut Shell<'_, Message>,
-    scrollbar_properties: &ScrollbarProperties,
+    direction: &Direction,
     on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     update_content: impl FnOnce(
         Event,
@@ -482,8 +482,7 @@ pub fn update<Message>(
     let content = layout.children().next().unwrap();
     let content_bounds = content.bounds();
 
-    let scrollbars =
-        Scrollbars::new(state, &scrollbar_properties, bounds, content_bounds);
+    let scrollbars = Scrollbars::new(state, direction, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
@@ -567,13 +566,8 @@ pub fn update<Message>(
 
                         let delta = Vector::new(
                             delta.x
-                                * scrollbar_properties
-                                    .horizontal()
-                                    .map_or(0.0, |_| 1.0),
-                            delta.y
-                                * scrollbar_properties
-                                    .vertical()
-                                    .map_or(0.0, |_| 1.0),
+                                * direction.horizontal().map_or(0.0, |_| 1.0),
+                            delta.y * direction.vertical().map_or(0.0, |_| 1.0),
                         );
 
                         state.scroll(delta, bounds, content_bounds);
@@ -758,7 +752,7 @@ pub fn mouse_interaction(
     state: &State,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    scrollbar_properties: &ScrollbarProperties,
+    direction: &Direction,
     content_interaction: impl FnOnce(
         Layout<'_>,
         mouse::Cursor,
@@ -771,8 +765,7 @@ pub fn mouse_interaction(
     let content_layout = layout.children().next().unwrap();
     let content_bounds = content_layout.bounds();
 
-    let scrollbars =
-        Scrollbars::new(state, scrollbar_properties, bounds, content_bounds);
+    let scrollbars = Scrollbars::new(state, direction, bounds, content_bounds);
 
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
@@ -812,7 +805,7 @@ pub fn draw<Renderer>(
     theme: &Renderer::Theme,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    scrollbar_properties: &ScrollbarProperties,
+    direction: &Direction,
     style: &<Renderer::Theme as StyleSheet>::Style,
     draw_content: impl FnOnce(&mut Renderer, Layout<'_>, mouse::Cursor, &Rectangle),
 ) where
@@ -823,8 +816,7 @@ pub fn draw<Renderer>(
     let content_layout = layout.children().next().unwrap();
     let content_bounds = content_layout.bounds();
 
-    let scrollbars =
-        Scrollbars::new(state, &scrollbar_properties, bounds, content_bounds);
+    let scrollbars = Scrollbars::new(state, direction, bounds, content_bounds);
 
     let cursor_over_scrollable = cursor.position_over(bounds);
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
@@ -1200,22 +1192,21 @@ impl Scrollbars {
     /// Create y and/or x scrollbar(s) if content is overflowing the [`Scrollable`] bounds.
     fn new(
         state: &State,
-        scrollbar_properties: &ScrollbarProperties,
+        direction: &Direction,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Self {
         let offset = state.offset(bounds, content_bounds);
 
-        let show_scrollbar_x =
-            scrollbar_properties.horizontal().and_then(|h| {
-                if content_bounds.width > bounds.width {
-                    Some(h)
-                } else {
-                    None
-                }
-            });
+        let show_scrollbar_x = direction.horizontal().and_then(|h| {
+            if content_bounds.width > bounds.width {
+                Some(h)
+            } else {
+                None
+            }
+        });
 
-        let show_scrollbar_y = scrollbar_properties.vertical().and_then(|v| {
+        let show_scrollbar_y = direction.vertical().and_then(|v| {
             if content_bounds.height > bounds.height {
                 Some(v)
             } else {

From 412e15b170a61f7d7369122d7d0b089491e1b0ea 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, 27 Jun 2023 22:41:16 +0200
Subject: [PATCH 398/440] Require a `Direction` when computing `State::offset`
 in `scrollable`

---
 widget/src/scrollable.rs | 41 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 82f71dff..5bc6914c 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -358,10 +358,11 @@ where
                 let bounds = layout.bounds();
                 let content_layout = layout.children().next().unwrap();
                 let content_bounds = content_layout.bounds();
-                let offset = tree
-                    .state
-                    .downcast_ref::<State>()
-                    .offset(bounds, content_bounds);
+                let offset = tree.state.downcast_ref::<State>().offset(
+                    &self.direction,
+                    bounds,
+                    content_bounds,
+                );
 
                 overlay.translate(Vector::new(-offset.x, -offset.y))
             })
@@ -493,7 +494,8 @@ pub fn update<Message>(
                 if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
             {
                 mouse::Cursor::Available(
-                    cursor_position + state.offset(bounds, content_bounds),
+                    cursor_position
+                        + state.offset(direction, bounds, content_bounds),
                 )
             }
             _ => mouse::Cursor::Unavailable,
@@ -564,12 +566,6 @@ pub fn update<Message>(
                             cursor_position.y - scroll_box_touched_at.y,
                         );
 
-                        let delta = Vector::new(
-                            delta.x
-                                * direction.horizontal().map_or(0.0, |_| 1.0),
-                            delta.y * direction.vertical().map_or(0.0, |_| 1.0),
-                        );
-
                         state.scroll(delta, bounds, content_bounds);
 
                         state.scroll_area_touched_at = Some(cursor_position);
@@ -775,7 +771,7 @@ pub fn mouse_interaction(
     {
         mouse::Interaction::Idle
     } else {
-        let offset = state.offset(bounds, content_bounds);
+        let offset = state.offset(direction, bounds, content_bounds);
 
         let cursor = match cursor_over_scrollable {
             Some(cursor_position)
@@ -822,7 +818,7 @@ pub fn draw<Renderer>(
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
 
-    let offset = state.offset(bounds, content_bounds);
+    let offset = state.offset(direction, bounds, content_bounds);
 
     let cursor = match cursor_over_scrollable {
         Some(cursor_position)
@@ -1161,16 +1157,25 @@ impl State {
         );
     }
 
-    /// Returns the scrolling offset of the [`State`], given the bounds of the
-    /// [`Scrollable`] and its contents.
+    /// Returns the scrolling offset of the [`State`], given a [`Direction`],
+    /// the bounds of the [`Scrollable`] and its contents.
     pub fn offset(
         &self,
+        direction: &Direction,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Vector {
         Vector::new(
-            self.offset_x.absolute(bounds.width, content_bounds.width),
-            self.offset_y.absolute(bounds.height, content_bounds.height),
+            if direction.horizontal().is_some() {
+                self.offset_x.absolute(bounds.width, content_bounds.width)
+            } else {
+                0.0
+            },
+            if direction.vertical().is_some() {
+                self.offset_y.absolute(bounds.height, content_bounds.height)
+            } else {
+                0.0
+            },
         )
     }
 
@@ -1196,7 +1201,7 @@ impl Scrollbars {
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Self {
-        let offset = state.offset(bounds, content_bounds);
+        let offset = state.offset(direction, bounds, content_bounds);
 
         let show_scrollbar_x = direction.horizontal().and_then(|h| {
             if content_bounds.width > bounds.width {

From 1c26440f0bd8f7a002946524dd4d522ba9fb7f29 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, 27 Jun 2023 22:46:04 +0200
Subject: [PATCH 399/440] Use `Option::filter` instead of `and_then` in
 `scrollable`

---
 widget/src/scrollable.rs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 5bc6914c..473124ca 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -1203,21 +1203,13 @@ impl Scrollbars {
     ) -> Self {
         let offset = state.offset(direction, bounds, content_bounds);
 
-        let show_scrollbar_x = direction.horizontal().and_then(|h| {
-            if content_bounds.width > bounds.width {
-                Some(h)
-            } else {
-                None
-            }
-        });
+        let show_scrollbar_x = direction
+            .horizontal()
+            .filter(|_| content_bounds.width > bounds.width);
 
-        let show_scrollbar_y = direction.vertical().and_then(|v| {
-            if content_bounds.height > bounds.height {
-                Some(v)
-            } else {
-                None
-            }
-        });
+        let show_scrollbar_y = direction
+            .vertical()
+            .filter(|_| content_bounds.height > bounds.height);
 
         let y_scrollbar = if let Some(vertical) = show_scrollbar_y {
             let Properties {

From af62ec1c877d0d6d29277fb7dcfd4c681fd499af 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, 28 Jun 2023 00:11:41 +0200
Subject: [PATCH 400/440] Fix `loading_spinners` example

---
 examples/loading_spinners/src/circular.rs | 10 ++++++----
 examples/loading_spinners/src/linear.rs   |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 55363de1..4cef081e 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -4,11 +4,13 @@ use iced::advanced::renderer;
 use iced::advanced::widget::tree::{self, Tree};
 use iced::advanced::{Clipboard, Layout, Renderer, Shell, Widget};
 use iced::event;
+use iced::mouse;
 use iced::time::Instant;
 use iced::widget::canvas;
 use iced::window::{self, RedrawRequest};
-use iced::{Background, Color, Element, Rectangle};
-use iced::{Event, Length, Point, Size, Vector};
+use iced::{
+    Background, Color, Element, Event, Length, Rectangle, Size, Vector,
+};
 
 use super::easing::{self, Easing};
 
@@ -266,7 +268,7 @@ where
         tree: &mut Tree,
         event: Event,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _renderer: &iced::Renderer<Theme>,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -298,7 +300,7 @@ where
         theme: &Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let state = tree.state.downcast_ref::<State>();
diff --git a/examples/loading_spinners/src/linear.rs b/examples/loading_spinners/src/linear.rs
index ea0807c2..3d95729b 100644
--- a/examples/loading_spinners/src/linear.rs
+++ b/examples/loading_spinners/src/linear.rs
@@ -4,10 +4,10 @@ use iced::advanced::renderer::{self, Quad};
 use iced::advanced::widget::tree::{self, Tree};
 use iced::advanced::{Clipboard, Layout, Shell, Widget};
 use iced::event;
+use iced::mouse;
 use iced::time::Instant;
 use iced::window::{self, RedrawRequest};
-use iced::{Background, Color, Element, Rectangle};
-use iced::{Event, Length, Point, Size};
+use iced::{Background, Color, Element, Event, Length, Rectangle, Size};
 
 use super::easing::{self, Easing};
 
@@ -189,7 +189,7 @@ where
         tree: &mut Tree,
         event: Event,
         _layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -216,7 +216,7 @@ where
         theme: &Renderer::Theme,
         _style: &renderer::Style,
         layout: Layout<'_>,
-        _cursor_position: Point,
+        _cursor: mouse::Cursor,
         _viewport: &Rectangle,
     ) {
         let bounds = layout.bounds();

From 78ad365db232e53cbdf12105e40c1dbe87a3238c 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, 28 Jun 2023 00:35:37 +0200
Subject: [PATCH 401/440] Reuse entries in `text::Cache` in `iced_wgpu`

---
 core/src/renderer/null.rs |  4 +-
 core/src/text.rs          |  6 +--
 core/src/widget/text.rs   | 10 ++---
 graphics/src/backend.rs   |  2 +-
 graphics/src/renderer.rs  |  2 +-
 renderer/src/backend.rs   |  2 +-
 tiny_skia/src/backend.rs  |  2 +-
 tiny_skia/src/text.rs     |  4 +-
 wgpu/src/backend.rs       |  2 +-
 wgpu/src/text.rs          | 81 +++++++++++++++++++++++++--------------
 10 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index f0cc952e..5d49699e 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -64,8 +64,8 @@ impl text::Renderer for Null {
         _font: Font,
         _bounds: Size,
         _shaping: text::Shaping,
-    ) -> (f32, f32) {
-        (0.0, 20.0)
+    ) -> Size {
+        Size::new(0.0, 20.0)
     }
 
     fn hit_test(
diff --git a/core/src/text.rs b/core/src/text.rs
index c154cc27..fc8aa20e 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -163,7 +163,7 @@ pub trait Renderer: crate::Renderer {
         font: Self::Font,
         bounds: Size,
         shaping: Shaping,
-    ) -> (f32, f32);
+    ) -> Size;
 
     /// Measures the width of the text as if it were laid out in a single line.
     fn measure_width(
@@ -173,7 +173,7 @@ pub trait Renderer: crate::Renderer {
         font: Self::Font,
         shaping: Shaping,
     ) -> f32 {
-        let (width, _) = self.measure(
+        let bounds = self.measure(
             content,
             size,
             LineHeight::Absolute(Pixels(size)),
@@ -182,7 +182,7 @@ pub trait Renderer: crate::Renderer {
             shaping,
         );
 
-        width
+        bounds.width
     }
 
     /// Tests whether the provided point is within the boundaries of text
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index e934a2f5..79df2b02 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -5,7 +5,7 @@ use crate::mouse;
 use crate::renderer;
 use crate::text;
 use crate::widget::Tree;
-use crate::{Color, Element, Layout, Length, Pixels, Rectangle, Size, Widget};
+use crate::{Color, Element, Layout, Length, Pixels, Rectangle, Widget};
 
 use std::borrow::Cow;
 
@@ -139,18 +139,16 @@ where
 
         let size = self.size.unwrap_or_else(|| renderer.default_size());
 
-        let bounds = limits.max();
-
-        let (width, height) = renderer.measure(
+        let bounds = renderer.measure(
             &self.content,
             size,
             self.line_height,
             self.font.unwrap_or_else(|| renderer.default_font()),
-            bounds,
+            limits.max(),
             self.shaping,
         );
 
-        let size = limits.resolve(Size::new(width, height));
+        let size = limits.resolve(bounds);
 
         layout::Node::new(size)
     }
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 6a082576..70ccc664 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -38,7 +38,7 @@ pub trait Text {
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
-    ) -> (f32, f32);
+    ) -> Size;
 
     /// Tests whether the provided point is within the boundaries of [`Text`]
     /// laid out with the given parameters, returning information about
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 4241d45c..7e70a766 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -133,7 +133,7 @@ where
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         self.backend().measure(
             content,
             size,
diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 18f9f3fc..3f229b52 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -42,7 +42,7 @@ impl backend::Text for Backend {
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         delegate!(
             self,
             backend,
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index ba038052..c8999561 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -787,7 +787,7 @@ impl backend::Text for Backend {
         font: Font,
         bounds: Size,
         shaping: text::Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         self.text_pipeline.measure(
             contents,
             size,
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 3441da8f..4f89ef52 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -138,7 +138,7 @@ impl Pipeline {
         font: Font,
         bounds: Size,
         shaping: Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
@@ -162,7 +162,7 @@ impl Pipeline {
                 (i + 1, buffer.line_w.max(max))
             });
 
-        (max_width, line_height * total_lines as f32)
+        Size::new(max_width, line_height * total_lines as f32)
     }
 
     pub fn hit_test(
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index eecba2f1..f8829e47 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -355,7 +355,7 @@ impl backend::Text for Backend {
         font: Font,
         bounds: Size,
         shaping: core::text::Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         self.text_pipeline.measure(
             contents,
             size,
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index c9188bd1..04943049 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -113,15 +113,13 @@ impl Pipeline {
                 .iter()
                 .zip(keys.iter())
                 .filter_map(|(section, key)| {
-                    let buffer = cache.get(key).expect("Get cached buffer");
+                    let entry = cache.get(key).expect("Get cached buffer");
 
                     let x = section.bounds.x * scale_factor;
                     let y = section.bounds.y * scale_factor;
 
-                    let (max_width, total_height) = measure(buffer);
-
-                    let max_width = max_width * scale_factor;
-                    let total_height = total_height * scale_factor;
+                    let max_width = entry.bounds.width * scale_factor;
+                    let total_height = entry.bounds.height * scale_factor;
 
                     let left = match section.horizontal_alignment {
                         alignment::Horizontal::Left => x,
@@ -145,7 +143,7 @@ impl Pipeline {
                     let clip_bounds = bounds.intersection(&section_bounds)?;
 
                     Some(glyphon::TextArea {
-                        buffer,
+                        buffer: &entry.buffer,
                         left,
                         top,
                         scale: scale_factor,
@@ -239,12 +237,12 @@ impl Pipeline {
         font: Font,
         bounds: Size,
         shaping: Shaping,
-    ) -> (f32, f32) {
+    ) -> Size {
         let mut measurement_cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, paragraph) = measurement_cache.allocate(
+        let (_, entry) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -256,7 +254,7 @@ impl Pipeline {
             },
         );
 
-        measure(paragraph)
+        entry.bounds
     }
 
     pub fn hit_test(
@@ -274,7 +272,7 @@ impl Pipeline {
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, paragraph) = measurement_cache.allocate(
+        let (_, entry) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -286,20 +284,20 @@ impl Pipeline {
             },
         );
 
-        let cursor = paragraph.hit(point.x, point.y)?;
+        let cursor = entry.buffer.hit(point.x, point.y)?;
 
         Some(Hit::CharOffset(cursor.index))
     }
 }
 
-fn measure(buffer: &glyphon::Buffer) -> (f32, f32) {
+fn measure(buffer: &glyphon::Buffer) -> Size {
     let (width, total_lines) = buffer
         .layout_runs()
         .fold((0.0, 0usize), |(width, total_lines), run| {
             (run.line_w.max(width), total_lines + 1)
         });
 
-    (width, total_lines as f32 * buffer.metrics().line_height)
+    Size::new(width, total_lines as f32 * buffer.metrics().line_height)
 }
 
 fn to_family(family: font::Family) -> glyphon::Family<'static> {
@@ -349,11 +347,17 @@ fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
 }
 
 struct Cache {
-    entries: FxHashMap<KeyHash, glyphon::Buffer>,
+    entries: FxHashMap<KeyHash, Entry>,
+    bound_entries: FxHashMap<KeyHash, KeyHash>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
 }
 
+struct Entry {
+    buffer: glyphon::Buffer,
+    bounds: Size,
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 type HashBuilder = twox_hash::RandomXxHashBuilder64;
 
@@ -364,12 +368,13 @@ impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
+            bound_entries: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
         }
     }
 
-    fn get(&self, key: &KeyHash) -> Option<&glyphon::Buffer> {
+    fn get(&self, key: &KeyHash) -> Option<&Entry> {
         self.entries.get(key)
     }
 
@@ -377,20 +382,15 @@ impl Cache {
         &mut self,
         font_system: &mut glyphon::FontSystem,
         key: Key<'_>,
-    ) -> (KeyHash, &mut glyphon::Buffer) {
-        let hash = {
-            let mut hasher = self.hasher.build_hasher();
+    ) -> (KeyHash, &mut Entry) {
+        let hash = key.hash(self.hasher.build_hasher());
 
-            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);
+        if let Some(bound_hash) = self.bound_entries.get(&hash) {
+            let _ = self.recently_used.insert(hash);
+            let _ = self.recently_used.insert(*bound_hash);
 
-            hasher.finish()
-        };
+            return (*bound_hash, self.entries.get_mut(&bound_hash).unwrap());
+        }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
             let metrics = glyphon::Metrics::new(key.size, key.line_height);
@@ -411,7 +411,16 @@ impl Cache {
                 to_shaping(key.shaping),
             );
 
-            let _ = entry.insert(buffer);
+            let bounds = measure(&buffer);
+
+            let _ = entry.insert(Entry { buffer, bounds });
+
+            if key.bounds != bounds {
+                let _ = self.bound_entries.insert(
+                    Key { bounds, ..key }.hash(self.hasher.build_hasher()),
+                    hash,
+                );
+            }
         }
 
         let _ = self.recently_used.insert(hash);
@@ -422,6 +431,8 @@ impl Cache {
     fn trim(&mut self) {
         self.entries
             .retain(|key, _| self.recently_used.contains(key));
+        self.bound_entries
+            .retain(|key, _| self.recently_used.contains(key));
 
         self.recently_used.clear();
     }
@@ -437,4 +448,18 @@ struct Key<'a> {
     shaping: Shaping,
 }
 
+impl Key<'_> {
+    fn hash<H: Hasher>(self, mut hasher: H) -> KeyHash {
+        self.content.hash(&mut hasher);
+        self.size.to_bits().hash(&mut hasher);
+        self.line_height.to_bits().hash(&mut hasher);
+        self.font.hash(&mut hasher);
+        self.bounds.width.to_bits().hash(&mut hasher);
+        self.bounds.height.to_bits().hash(&mut hasher);
+        self.shaping.hash(&mut hasher);
+
+        hasher.finish()
+    }
+}
+
 type KeyHash = u64;

From 73dca5e323756ad29003517587c4092e8b6a246d 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, 28 Jun 2023 00:44:23 +0200
Subject: [PATCH 402/440] Reuse entries in `text::Cache` in `iced_tiny_skia`

---
 tiny_skia/src/text.rs | 98 +++++++++++++++++++++++++++----------------
 wgpu/src/text.rs      | 17 ++++----
 2 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 4f89ef52..22c17507 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -66,17 +66,10 @@ impl Pipeline {
             shaping,
         };
 
-        let (_, buffer) = self.cache.get_mut().allocate(font_system, key);
+        let (_, entry) = self.cache.get_mut().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 * line_height * scale_factor;
-        let max_width = max_width * scale_factor;
+        let max_width = entry.bounds.width * scale_factor;
+        let total_height = entry.bounds.height * scale_factor;
 
         let bounds = bounds * scale_factor;
 
@@ -94,7 +87,7 @@ impl Pipeline {
 
         let mut swash = cosmic_text::SwashCache::new();
 
-        for run in buffer.layout_runs() {
+        for run in entry.buffer.layout_runs() {
             for glyph in run.glyphs {
                 let physical_glyph = glyph.physical((x, y), scale_factor);
 
@@ -143,7 +136,7 @@ impl Pipeline {
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, paragraph) = measurement_cache.allocate(
+        let (_, entry) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -155,14 +148,7 @@ impl Pipeline {
             },
         );
 
-        let (total_lines, max_width) = paragraph
-            .layout_runs()
-            .enumerate()
-            .fold((0, 0.0), |(_, max), (i, buffer)| {
-                (i + 1, buffer.line_w.max(max))
-            });
-
-        Size::new(max_width, line_height * total_lines as f32)
+        entry.bounds
     }
 
     pub fn hit_test(
@@ -180,7 +166,7 @@ impl Pipeline {
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, paragraph) = measurement_cache.allocate(
+        let (_, entry) = measurement_cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -192,12 +178,22 @@ impl Pipeline {
             },
         );
 
-        let cursor = paragraph.hit(point.x, point.y)?;
+        let cursor = entry.buffer.hit(point.x, point.y)?;
 
         Some(Hit::CharOffset(cursor.index))
     }
 }
 
+fn measure(buffer: &cosmic_text::Buffer) -> Size {
+    let (width, total_lines) = buffer
+        .layout_runs()
+        .fold((0.0, 0usize), |(width, total_lines), run| {
+            (run.line_w.max(width), total_lines + 1)
+        });
+
+    Size::new(width, total_lines as f32 * buffer.metrics().line_height)
+}
+
 fn to_family(family: font::Family) -> cosmic_text::Family<'static> {
     match family {
         font::Family::Name(name) => cosmic_text::Family::Name(name),
@@ -354,12 +350,18 @@ impl GlyphCache {
 }
 
 struct Cache {
-    entries: FxHashMap<KeyHash, cosmic_text::Buffer>,
+    entries: FxHashMap<KeyHash, Entry>,
+    measurements: FxHashMap<KeyHash, KeyHash>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
     trim_count: usize,
 }
 
+struct Entry {
+    buffer: cosmic_text::Buffer,
+    bounds: Size,
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 type HashBuilder = twox_hash::RandomXxHashBuilder64;
 
@@ -372,6 +374,7 @@ impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
+            measurements: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
             trim_count: 0,
@@ -382,20 +385,18 @@ impl Cache {
         &mut self,
         font_system: &mut cosmic_text::FontSystem,
         key: Key<'_>,
-    ) -> (KeyHash, &mut cosmic_text::Buffer) {
-        let hash = {
-            let mut hasher = self.hasher.build_hasher();
+    ) -> (KeyHash, &mut Entry) {
+        let hash = key.hash(self.hasher.build_hasher());
 
-            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);
+        if let Some(measured_hash) = self.measurements.get(&hash) {
+            let _ = self.recently_used.insert(hash);
+            let _ = self.recently_used.insert(*measured_hash);
 
-            hasher.finish()
-        };
+            return (
+                *measured_hash,
+                self.entries.get_mut(&measured_hash).unwrap(),
+            );
+        }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
             let metrics = cosmic_text::Metrics::new(key.size, key.size * 1.2);
@@ -416,7 +417,16 @@ impl Cache {
                 to_shaping(key.shaping),
             );
 
-            let _ = entry.insert(buffer);
+            let bounds = measure(&buffer);
+
+            let _ = entry.insert(Entry { buffer, bounds });
+
+            if key.bounds != bounds {
+                let _ = self.measurements.insert(
+                    Key { bounds, ..key }.hash(self.hasher.build_hasher()),
+                    hash,
+                );
+            }
         }
 
         let _ = self.recently_used.insert(hash);
@@ -428,6 +438,8 @@ impl Cache {
         if self.trim_count > Self::TRIM_INTERVAL {
             self.entries
                 .retain(|key, _| self.recently_used.contains(key));
+            self.measurements
+                .retain(|key, _| self.recently_used.contains(key));
 
             self.recently_used.clear();
 
@@ -448,4 +460,18 @@ struct Key<'a> {
     shaping: Shaping,
 }
 
+impl Key<'_> {
+    fn hash<H: Hasher>(self, mut hasher: H) -> KeyHash {
+        self.content.hash(&mut hasher);
+        self.size.to_bits().hash(&mut hasher);
+        self.line_height.to_bits().hash(&mut hasher);
+        self.font.hash(&mut hasher);
+        self.bounds.width.to_bits().hash(&mut hasher);
+        self.bounds.height.to_bits().hash(&mut hasher);
+        self.shaping.hash(&mut hasher);
+
+        hasher.finish()
+    }
+}
+
 type KeyHash = u64;
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 04943049..e0484239 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -348,7 +348,7 @@ fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
 
 struct Cache {
     entries: FxHashMap<KeyHash, Entry>,
-    bound_entries: FxHashMap<KeyHash, KeyHash>,
+    measurements: FxHashMap<KeyHash, KeyHash>,
     recently_used: FxHashSet<KeyHash>,
     hasher: HashBuilder,
 }
@@ -368,7 +368,7 @@ impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
-            bound_entries: FxHashMap::default(),
+            measurements: FxHashMap::default(),
             recently_used: FxHashSet::default(),
             hasher: HashBuilder::default(),
         }
@@ -385,11 +385,14 @@ impl Cache {
     ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
-        if let Some(bound_hash) = self.bound_entries.get(&hash) {
+        if let Some(measured_hash) = self.measurements.get(&hash) {
             let _ = self.recently_used.insert(hash);
-            let _ = self.recently_used.insert(*bound_hash);
+            let _ = self.recently_used.insert(*measured_hash);
 
-            return (*bound_hash, self.entries.get_mut(&bound_hash).unwrap());
+            return (
+                *measured_hash,
+                self.entries.get_mut(&measured_hash).unwrap(),
+            );
         }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
@@ -416,7 +419,7 @@ impl Cache {
             let _ = entry.insert(Entry { buffer, bounds });
 
             if key.bounds != bounds {
-                let _ = self.bound_entries.insert(
+                let _ = self.measurements.insert(
                     Key { bounds, ..key }.hash(self.hasher.build_hasher()),
                     hash,
                 );
@@ -431,7 +434,7 @@ impl Cache {
     fn trim(&mut self) {
         self.entries
             .retain(|key, _| self.recently_used.contains(key));
-        self.bound_entries
+        self.measurements
             .retain(|key, _| self.recently_used.contains(key));
 
         self.recently_used.clear();

From c8d79a5cd984c23862c184f437dcbe7639fe72c0 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, 28 Jun 2023 00:45:41 +0200
Subject: [PATCH 403/440] Fix needless borrow in `iced_wgpu` and
 `iced_tiny_skia`

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

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 22c17507..38e9bf3a 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -394,7 +394,7 @@ impl Cache {
 
             return (
                 *measured_hash,
-                self.entries.get_mut(&measured_hash).unwrap(),
+                self.entries.get_mut(measured_hash).unwrap(),
             );
         }
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index e0484239..ae780c1e 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -391,7 +391,7 @@ impl Cache {
 
             return (
                 *measured_hash,
-                self.entries.get_mut(&measured_hash).unwrap(),
+                self.entries.get_mut(measured_hash).unwrap(),
             );
         }
 

From 975eebfc6251539d154183f7d3cc69c41a96b156 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, 28 Jun 2023 00:51:40 +0200
Subject: [PATCH 404/440] Retain measurements for text entries even if not
 directly used

---
 tiny_skia/src/text.rs | 6 ++++--
 wgpu/src/text.rs      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 38e9bf3a..8b249a8f 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -438,8 +438,10 @@ impl Cache {
         if self.trim_count > Self::TRIM_INTERVAL {
             self.entries
                 .retain(|key, _| self.recently_used.contains(key));
-            self.measurements
-                .retain(|key, _| self.recently_used.contains(key));
+            self.measurements.retain(|key, value| {
+                self.recently_used.contains(key)
+                    || self.recently_used.contains(value)
+            });
 
             self.recently_used.clear();
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index ae780c1e..b11b91c1 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -434,8 +434,10 @@ impl Cache {
     fn trim(&mut self) {
         self.entries
             .retain(|key, _| self.recently_used.contains(key));
-        self.measurements
-            .retain(|key, _| self.recently_used.contains(key));
+        self.measurements.retain(|key, value| {
+            self.recently_used.contains(key)
+                || self.recently_used.contains(value)
+        });
 
         self.recently_used.clear();
     }

From 00859c25f576b399871de74f0b9399d074deea35 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, 28 Jun 2023 01:27:09 +0200
Subject: [PATCH 405/440] Retain text measurements as long as original entries

---
 tiny_skia/src/text.rs | 34 ++++++++++++++++++----------------
 wgpu/src/text.rs      | 35 ++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 8b249a8f..8f494650 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -388,14 +388,10 @@ impl Cache {
     ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
-        if let Some(measured_hash) = self.measurements.get(&hash) {
-            let _ = self.recently_used.insert(hash);
-            let _ = self.recently_used.insert(*measured_hash);
+        if let Some(hash) = self.measurements.get(&hash) {
+            let _ = self.recently_used.insert(*hash);
 
-            return (
-                *measured_hash,
-                self.entries.get_mut(measured_hash).unwrap(),
-            );
+            return (*hash, self.entries.get_mut(hash).unwrap());
         }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
@@ -421,11 +417,19 @@ impl Cache {
 
             let _ = entry.insert(Entry { buffer, bounds });
 
-            if key.bounds != bounds {
-                let _ = self.measurements.insert(
-                    Key { bounds, ..key }.hash(self.hasher.build_hasher()),
-                    hash,
-                );
+            for bounds in [
+                bounds,
+                Size {
+                    width: key.bounds.width,
+                    ..bounds
+                },
+            ] {
+                if key.bounds != bounds {
+                    let _ = self.measurements.insert(
+                        Key { bounds, ..key }.hash(self.hasher.build_hasher()),
+                        hash,
+                    );
+                }
             }
         }
 
@@ -438,10 +442,8 @@ impl Cache {
         if self.trim_count > Self::TRIM_INTERVAL {
             self.entries
                 .retain(|key, _| self.recently_used.contains(key));
-            self.measurements.retain(|key, value| {
-                self.recently_used.contains(key)
-                    || self.recently_used.contains(value)
-            });
+            self.measurements
+                .retain(|_, value| self.recently_used.contains(value));
 
             self.recently_used.clear();
 
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index b11b91c1..1b94edf6 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -385,14 +385,10 @@ impl Cache {
     ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
-        if let Some(measured_hash) = self.measurements.get(&hash) {
-            let _ = self.recently_used.insert(hash);
-            let _ = self.recently_used.insert(*measured_hash);
+        if let Some(hash) = self.measurements.get(&hash) {
+            let _ = self.recently_used.insert(*hash);
 
-            return (
-                *measured_hash,
-                self.entries.get_mut(measured_hash).unwrap(),
-            );
+            return (*hash, self.entries.get_mut(hash).unwrap());
         }
 
         if let hash_map::Entry::Vacant(entry) = self.entries.entry(hash) {
@@ -415,14 +411,21 @@ impl Cache {
             );
 
             let bounds = measure(&buffer);
-
             let _ = entry.insert(Entry { buffer, bounds });
 
-            if key.bounds != bounds {
-                let _ = self.measurements.insert(
-                    Key { bounds, ..key }.hash(self.hasher.build_hasher()),
-                    hash,
-                );
+            for bounds in [
+                bounds,
+                Size {
+                    width: key.bounds.width,
+                    ..bounds
+                },
+            ] {
+                if key.bounds != bounds {
+                    let _ = self.measurements.insert(
+                        Key { bounds, ..key }.hash(self.hasher.build_hasher()),
+                        hash,
+                    );
+                }
             }
         }
 
@@ -434,10 +437,8 @@ impl Cache {
     fn trim(&mut self) {
         self.entries
             .retain(|key, _| self.recently_used.contains(key));
-        self.measurements.retain(|key, value| {
-            self.recently_used.contains(key)
-                || self.recently_used.contains(value)
-        });
+        self.measurements
+            .retain(|_, value| self.recently_used.contains(value));
 
         self.recently_used.clear();
     }

From 4b831a917d81def2320a5910ea8975acb2baaaf1 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Wed, 28 Jun 2023 18:51:14 +0200
Subject: [PATCH 406/440] runtime: Add `operate` method to `program::State`

---
 runtime/src/program/state.rs | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/runtime/src/program/state.rs b/runtime/src/program/state.rs
index d83e3f54..f57d2d8d 100644
--- a/runtime/src/program/state.rs
+++ b/runtime/src/program/state.rs
@@ -1,6 +1,7 @@
 use crate::core::event::{self, Event};
 use crate::core::mouse;
 use crate::core::renderer;
+use crate::core::widget::operation::{Operation, Outcome};
 use crate::core::{Clipboard, Size};
 use crate::user_interface::{self, UserInterface};
 use crate::{Command, Debug, Program};
@@ -173,6 +174,43 @@ where
 
         (uncaptured_events, command)
     }
+
+    /// Applies [`widget::Operation`]s to the [`State`]
+    pub fn operate<'a>(
+        &mut self,
+        renderer: &mut P::Renderer,
+        operations: impl Iterator<Item = &'a mut dyn Operation<P::Message>>,
+        bounds: Size,
+        debug: &mut Debug,
+    ) {
+        let mut user_interface = build_user_interface(
+            &mut self.program,
+            self.cache.take().unwrap(),
+            renderer,
+            bounds,
+            debug,
+        );
+
+        for operation in operations {
+            let mut owned_op;
+            let mut current_operation = Some(operation);
+            while let Some(operation) = current_operation.take() {
+                user_interface.operate(renderer, operation);
+                match operation.finish() {
+                    Outcome::None => {}
+                    Outcome::Some(message) => {
+                        self.queued_messages.push(message)
+                    }
+                    Outcome::Chain(op) => {
+                        owned_op = op;
+                        current_operation = Some(owned_op.as_mut());
+                    }
+                };
+            }
+        }
+
+        self.cache = Some(user_interface.into_cache());
+    }
 }
 
 fn build_user_interface<'a, P: Program>(

From 0ae1baa37bd7b6607f79b33b8a6d8c5daafde0b2 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, 22 Jun 2023 00:38:36 +0200
Subject: [PATCH 407/440] Introduce custom backend-specific primitives

---
 examples/geometry/Cargo.toml              |   1 -
 examples/geometry/src/main.rs             |   7 +-
 examples/loading_spinners/src/circular.rs |   4 +-
 graphics/Cargo.toml                       |   4 -
 graphics/src/backend.rs                   |   7 +
 graphics/src/damage.rs                    |  68 +++++-
 graphics/src/geometry.rs                  |  16 +-
 graphics/src/lib.rs                       |   9 +-
 graphics/src/primitive.rs                 | 107 +---------
 graphics/src/renderer.rs                  |  70 +++---
 renderer/src/compositor.rs                |  80 ++++---
 renderer/src/geometry.rs                  |  24 ++-
 renderer/src/geometry/cache.rs            |  52 ++++-
 renderer/src/lib.rs                       | 248 +++++++++++++++++++++-
 tiny_skia/Cargo.toml                      |   1 -
 tiny_skia/src/backend.rs                  |  36 ++--
 tiny_skia/src/geometry.rs                 |  47 ++--
 tiny_skia/src/lib.rs                      |   2 +
 tiny_skia/src/primitive.rs                |  48 +++++
 tiny_skia/src/window/compositor.rs        |   4 +-
 wgpu/src/backend.rs                       |   7 +-
 wgpu/src/geometry.rs                      |   6 +-
 wgpu/src/layer.rs                         |  11 +-
 wgpu/src/lib.rs                           |   6 +-
 wgpu/src/primitive.rs                     |   3 +
 wgpu/src/window/compositor.rs             |   4 +-
 widget/src/canvas/program.rs              |   6 +-
 widget/src/qr_code.rs                     |   3 +-
 28 files changed, 618 insertions(+), 263 deletions(-)
 create mode 100644 tiny_skia/src/primitive.rs
 create mode 100644 wgpu/src/primitive.rs

diff --git a/examples/geometry/Cargo.toml b/examples/geometry/Cargo.toml
index 79fe52d5..6068d651 100644
--- a/examples/geometry/Cargo.toml
+++ b/examples/geometry/Cargo.toml
@@ -7,4 +7,3 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["advanced"] }
-iced_graphics = { path = "../../graphics" }
diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 29f78ea1..e146c6bd 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -1,9 +1,8 @@
 //! This example showcases a simple native custom widget that renders using
 //! arbitrary low-level geometry.
 mod rainbow {
-    use iced_graphics::primitive::{ColoredVertex2D, Primitive};
-
     use iced::advanced::graphics::color;
+    use iced::advanced::graphics::primitive::{ColoredVertex2D, Primitive};
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
@@ -46,8 +45,8 @@ mod rainbow {
             cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
+            use iced::advanced::graphics::primitive::Mesh2D;
             use iced::advanced::Renderer as _;
-            use iced_graphics::primitive::Mesh2D;
 
             let bounds = layout.bounds();
 
@@ -135,7 +134,7 @@ mod rainbow {
             renderer.with_translation(
                 Vector::new(bounds.x, bounds.y),
                 |renderer| {
-                    renderer.draw_primitive(mesh);
+                    renderer.draw_with_wgpu(mesh);
                 },
             );
         }
diff --git a/examples/loading_spinners/src/circular.rs b/examples/loading_spinners/src/circular.rs
index 4cef081e..3a35e029 100644
--- a/examples/loading_spinners/src/circular.rs
+++ b/examples/loading_spinners/src/circular.rs
@@ -358,7 +358,9 @@ where
         renderer.with_translation(
             Vector::new(bounds.x, bounds.y),
             |renderer| {
-                renderer.draw_primitive(geometry.0);
+                use iced::advanced::graphics::geometry::Renderer as _;
+
+                renderer.draw(vec![geometry]);
             },
         );
     }
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index 02621695..7a9e6aee 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -32,10 +32,6 @@ features = ["derive"]
 version = "0.9"
 path = "../core"
 
-[dependencies.tiny-skia]
-version = "0.9"
-optional = true
-
 [dependencies.image]
 version = "0.24"
 optional = true
diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 70ccc664..3ff24335 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -6,6 +6,13 @@ use iced_core::{Font, Point, Size};
 
 use std::borrow::Cow;
 
+/// The graphics backend of a [`Renderer`].
+///
+/// [`Renderer`]: crate::Renderer
+pub trait Backend {
+    type Primitive;
+}
+
 /// A graphics backend that supports text rendering.
 pub trait Text {
     /// The icon font of the backend.
diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
index c6b0f759..1add6707 100644
--- a/graphics/src/damage.rs
+++ b/graphics/src/damage.rs
@@ -1,11 +1,68 @@
 //! Track and compute the damage of graphical primitives.
+use crate::core::alignment;
 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> {
+pub trait Damage: PartialEq {
+    /// Returns the bounds of the [`Damage`].
+    fn bounds(&self) -> Rectangle;
+}
+
+impl<T: Damage> Damage for Primitive<T> {
+    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.5)
+            }
+            Self::Quad { bounds, .. }
+            | Self::Image { bounds, .. }
+            | Self::Svg { bounds, .. } => bounds.expand(1.0),
+            Self::Clip { bounds, .. } => bounds.expand(1.0),
+            Self::SolidMesh { size, .. } | Self::GradientMesh { size, .. } => {
+                Rectangle::with_size(*size)
+            }
+            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(),
+            Self::Custom(custom) => custom.bounds(),
+        }
+    }
+}
+
+fn regions<T: Damage>(a: &Primitive<T>, b: &Primitive<T>) -> Vec<Rectangle> {
     match (a, b) {
         (
             Primitive::Group {
@@ -76,7 +133,10 @@ 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> {
+pub fn list<T: Damage>(
+    previous: &[Primitive<T>],
+    current: &[Primitive<T>],
+) -> Vec<Rectangle> {
     let damage = previous
         .iter()
         .zip(current)
@@ -93,7 +153,7 @@ pub fn list(previous: &[Primitive], current: &[Primitive]) -> Vec<Rectangle> {
 
         // Extend damage by the added/removed primitives
         damage
-            .chain(bigger[smaller.len()..].iter().map(Primitive::bounds))
+            .chain(bigger[smaller.len()..].iter().map(Damage::bounds))
             .collect()
     }
 }
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 729c3d44..5e547bae 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -14,20 +14,10 @@ pub use text::Text;
 
 pub use crate::gradient::{self, Gradient};
 
-use crate::Primitive;
-
-/// A bunch of shapes that can be drawn.
-#[derive(Debug, Clone)]
-pub struct Geometry(pub Primitive);
-
-impl From<Geometry> for Primitive {
-    fn from(geometry: Geometry) -> Self {
-        geometry.0
-    }
-}
-
 /// A renderer capable of drawing some [`Geometry`].
 pub trait Renderer: crate::core::Renderer {
+    type Geometry;
+
     /// Draws the given layers of [`Geometry`].
-    fn draw(&mut self, layers: Vec<Geometry>);
+    fn draw(&mut self, layers: Vec<Self::Geometry>);
 }
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 226b245b..055a9216 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -8,8 +8,8 @@
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
 #![deny(
-    missing_debug_implementations,
-    missing_docs,
+    //missing_debug_implementations,
+    //missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
@@ -41,7 +41,9 @@ pub mod geometry;
 pub mod image;
 
 pub use antialiasing::Antialiasing;
+pub use backend::Backend;
 pub use compositor::Compositor;
+pub use damage::Damage;
 pub use error::Error;
 pub use gradient::Gradient;
 pub use primitive::Primitive;
@@ -49,7 +51,4 @@ pub use renderer::Renderer;
 pub use transformation::Transformation;
 pub use viewport::Viewport;
 
-#[cfg(feature = "geometry")]
-pub use geometry::Geometry;
-
 pub use iced_core as core;
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 187c6c6c..f8b005ad 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -12,8 +12,7 @@ use std::sync::Arc;
 
 /// A rendering primitive.
 #[derive(Debug, Clone, PartialEq)]
-#[non_exhaustive]
-pub enum Primitive {
+pub enum Primitive<T> {
     /// A text primitive
     Text {
         /// The contents of the text
@@ -90,41 +89,17 @@ pub enum Primitive {
         /// Any geometry that falls out of this region will be clipped.
         size: Size,
     },
-    /// 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
     Group {
         /// The primitives of the group
-        primitives: Vec<Primitive>,
+        primitives: Vec<Primitive<T>>,
     },
     /// A clip primitive
     Clip {
         /// The bounds of the clip
         bounds: Rectangle,
         /// The content of the clip
-        content: Box<Primitive>,
+        content: Box<Primitive<T>>,
     },
     /// A primitive that applies a translation
     Translate {
@@ -132,7 +107,7 @@ pub enum Primitive {
         translation: Vector,
 
         /// The primitive to translate
-        content: Box<Primitive>,
+        content: Box<Primitive<T>>,
     },
     /// A cached primitive.
     ///
@@ -140,11 +115,13 @@ pub enum Primitive {
     /// generation is expensive.
     Cache {
         /// The cached primitive
-        content: Arc<Primitive>,
+        content: Arc<Primitive<T>>,
     },
+    /// A backend-specific primitive.
+    Custom(T),
 }
 
-impl Primitive {
+impl<T> Primitive<T> {
     /// Creates a [`Primitive::Group`].
     pub fn group(primitives: Vec<Self>) -> Self {
         Self::Group { primitives }
@@ -165,68 +142,6 @@ impl Primitive {
             content: Box::new(self),
         }
     }
-
-    /// Returns the bounds of the [`Primitive`].
-    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.5)
-            }
-            Self::Quad { bounds, .. }
-            | Self::Image { bounds, .. }
-            | Self::Svg { bounds, .. } => bounds.expand(1.0),
-            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(),
-        }
-    }
 }
 
 /// A set of [`Vertex2D`] and indices representing a list of triangles.
@@ -268,9 +183,3 @@ unsafe impl Zeroable for GradientVertex2D {}
 
 #[allow(unsafe_code)]
 unsafe impl Pod for GradientVertex2D {}
-
-impl From<()> for Primitive {
-    fn from(_: ()) -> Self {
-        Self::Group { primitives: vec![] }
-    }
-}
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 7e70a766..9acfc2b7 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -1,5 +1,5 @@
 //! Create a renderer from a [`Backend`].
-use crate::backend;
+use crate::backend::{self, Backend};
 use crate::Primitive;
 
 use iced_core::image;
@@ -16,13 +16,13 @@ use std::marker::PhantomData;
 
 /// A backend-agnostic renderer that supports all the built-in widgets.
 #[derive(Debug)]
-pub struct Renderer<B, Theme> {
+pub struct Renderer<B: Backend, Theme> {
     backend: B,
-    primitives: Vec<Primitive>,
+    primitives: Vec<Primitive<B::Primitive>>,
     theme: PhantomData<Theme>,
 }
 
-impl<B, T> Renderer<B, T> {
+impl<B: Backend, T> Renderer<B, T> {
     /// Creates a new [`Renderer`] from the given [`Backend`].
     pub fn new(backend: B) -> Self {
         Self {
@@ -38,7 +38,7 @@ impl<B, T> Renderer<B, T> {
     }
 
     /// Enqueues the given [`Primitive`] in the [`Renderer`] for drawing.
-    pub fn draw_primitive(&mut self, primitive: Primitive) {
+    pub fn draw_primitive(&mut self, primitive: Primitive<B::Primitive>) {
         self.primitives.push(primitive);
     }
 
@@ -46,13 +46,42 @@ impl<B, T> Renderer<B, T> {
     /// of the [`Renderer`].
     pub fn with_primitives<O>(
         &mut self,
-        f: impl FnOnce(&mut B, &[Primitive]) -> O,
+        f: impl FnOnce(&mut B, &[Primitive<B::Primitive>]) -> O,
     ) -> O {
         f(&mut self.backend, &self.primitives)
     }
+
+    pub fn start_layer(&mut self) -> Vec<Primitive<B::Primitive>> {
+        std::mem::take(&mut self.primitives)
+    }
+
+    pub fn end_layer(
+        &mut self,
+        primitives: Vec<Primitive<B::Primitive>>,
+        bounds: Rectangle,
+    ) {
+        let layer = std::mem::replace(&mut self.primitives, primitives);
+
+        self.primitives.push(Primitive::group(layer).clip(bounds));
+    }
+
+    pub fn start_translation(&mut self) -> Vec<Primitive<B::Primitive>> {
+        std::mem::take(&mut self.primitives)
+    }
+
+    pub fn end_translation(
+        &mut self,
+        primitives: Vec<Primitive<B::Primitive>>,
+        translation: Vector,
+    ) {
+        let layer = std::mem::replace(&mut self.primitives, primitives);
+
+        self.primitives
+            .push(Primitive::group(layer).translate(translation));
+    }
 }
 
-impl<B, T> iced_core::Renderer for Renderer<B, T> {
+impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> {
     type Theme = T;
 
     fn layout<Message>(
@@ -64,13 +93,11 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
     }
 
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
-        let current = std::mem::take(&mut self.primitives);
+        let current = self.start_layer();
 
         f(self);
 
-        let layer = std::mem::replace(&mut self.primitives, current);
-
-        self.primitives.push(Primitive::group(layer).clip(bounds));
+        self.end_layer(current, bounds);
     }
 
     fn with_translation(
@@ -78,14 +105,11 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
         translation: Vector,
         f: impl FnOnce(&mut Self),
     ) {
-        let current = std::mem::take(&mut self.primitives);
+        let current = self.start_translation();
 
         f(self);
 
-        let layer = std::mem::replace(&mut self.primitives, current);
-
-        self.primitives
-            .push(Primitive::group(layer).translate(translation));
+        self.end_translation(current, translation);
     }
 
     fn fill_quad(
@@ -109,7 +133,7 @@ impl<B, T> iced_core::Renderer for Renderer<B, T> {
 
 impl<B, T> text::Renderer for Renderer<B, T>
 where
-    B: backend::Text,
+    B: Backend + backend::Text,
 {
     type Font = Font;
 
@@ -188,7 +212,7 @@ where
 
 impl<B, T> image::Renderer for Renderer<B, T>
 where
-    B: backend::Image,
+    B: Backend + backend::Image,
 {
     type Handle = image::Handle;
 
@@ -203,7 +227,7 @@ where
 
 impl<B, T> svg::Renderer for Renderer<B, T>
 where
-    B: backend::Svg,
+    B: Backend + backend::Svg,
 {
     fn dimensions(&self, handle: &svg::Handle) -> Size<u32> {
         self.backend().viewport_dimensions(handle)
@@ -222,11 +246,3 @@ where
         })
     }
 }
-
-#[cfg(feature = "geometry")]
-impl<B, T> crate::geometry::Renderer for Renderer<B, T> {
-    fn draw(&mut self, layers: Vec<crate::Geometry>) {
-        self.primitives
-            .extend(layers.into_iter().map(crate::Geometry::into));
-    }
-}
diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 57317b28..8b17a4b0 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -100,26 +100,28 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         background_color: Color,
         overlay: &[T],
     ) -> Result<(), SurfaceError> {
-        renderer.with_primitives(|backend, primitives| {
-            match (self, backend, surface) {
-                (
-                    Self::TinySkia(_compositor),
-                    crate::Backend::TinySkia(backend),
-                    Surface::TinySkia(surface),
-                ) => iced_tiny_skia::window::compositor::present(
+        match (self, renderer, surface) {
+            (
+                Self::TinySkia(_compositor),
+                crate::Renderer::TinySkia(renderer),
+                Surface::TinySkia(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_tiny_skia::window::compositor::present(
                     backend,
                     surface,
                     primitives,
                     viewport,
                     background_color,
                     overlay,
-                ),
-                #[cfg(feature = "wgpu")]
-                (
-                    Self::Wgpu(compositor),
-                    crate::Backend::Wgpu(backend),
-                    Surface::Wgpu(surface),
-                ) => iced_wgpu::window::compositor::present(
+                )
+            }),
+            #[cfg(feature = "wgpu")]
+            (
+                Self::Wgpu(compositor),
+                crate::Renderer::Wgpu(renderer),
+                Surface::Wgpu(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_wgpu::window::compositor::present(
                     compositor,
                     backend,
                     surface,
@@ -127,14 +129,14 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     viewport,
                     background_color,
                     overlay,
-                ),
-                #[allow(unreachable_patterns)]
-                _ => panic!(
-                    "The provided renderer or surface are not compatible \
+                )
+            }),
+            #[allow(unreachable_patterns)]
+            _ => panic!(
+                "The provided renderer or surface are not compatible \
                     with the compositor."
-                ),
-            }
-        })
+            ),
+        }
     }
 
     fn screenshot<T: AsRef<str>>(
@@ -145,12 +147,27 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         background_color: Color,
         overlay: &[T],
     ) -> Vec<u8> {
-        renderer.with_primitives(|backend, primitives| match (self, backend, surface) {
-            (Self::TinySkia(_compositor), crate::Backend::TinySkia(backend), Surface::TinySkia(surface)) => {
-                iced_tiny_skia::window::compositor::screenshot(surface, backend, primitives, viewport, background_color, overlay)
-            },
+        match (self, renderer, surface) {
+            (
+                Self::TinySkia(_compositor),
+                Renderer::TinySkia(renderer),
+                Surface::TinySkia(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_tiny_skia::window::compositor::screenshot(
+                    surface,
+                    backend,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            }),
             #[cfg(feature = "wgpu")]
-            (Self::Wgpu(compositor), crate::Backend::Wgpu(backend), Surface::Wgpu(_)) => {
+            (
+                Self::Wgpu(compositor),
+                Renderer::Wgpu(renderer),
+                Surface::Wgpu(_),
+            ) => renderer.with_primitives(|backend, primitives| {
                 iced_wgpu::window::compositor::screenshot(
                     compositor,
                     backend,
@@ -159,12 +176,13 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     background_color,
                     overlay,
                 )
-            },
+            }),
             #[allow(unreachable_patterns)]
             _ => panic!(
-                "The provided renderer or backend are not compatible with the compositor."
+                "The provided renderer or backend are not compatible \
+                with the compositor."
             ),
-        })
+        }
     }
 }
 
@@ -215,7 +233,7 @@ impl Candidate {
 
                 Ok((
                     Compositor::TinySkia(compositor),
-                    Renderer::new(crate::Backend::TinySkia(backend)),
+                    Renderer::TinySkia(iced_tiny_skia::Renderer::new(backend)),
                 ))
             }
             #[cfg(feature = "wgpu")]
@@ -232,7 +250,7 @@ impl Candidate {
 
                 Ok((
                     Compositor::Wgpu(compositor),
-                    Renderer::new(crate::Backend::Wgpu(backend)),
+                    Renderer::Wgpu(iced_wgpu::Renderer::new(backend)),
                 ))
             }
             #[cfg(not(feature = "wgpu"))]
diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index 26e2fed0..04b5d9e6 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -3,8 +3,8 @@ mod cache;
 pub use cache::Cache;
 
 use crate::core::{Point, Rectangle, Size, Vector};
-use crate::graphics::geometry::{Fill, Geometry, Path, Stroke, Text};
-use crate::Backend;
+use crate::graphics::geometry::{Fill, Path, Stroke, Text};
+use crate::Renderer;
 
 pub enum Frame {
     TinySkia(iced_tiny_skia::geometry::Frame),
@@ -12,6 +12,12 @@ pub enum Frame {
     Wgpu(iced_wgpu::geometry::Frame),
 }
 
+pub enum Geometry {
+    TinySkia(iced_tiny_skia::Primitive),
+    #[cfg(feature = "wgpu")]
+    Wgpu(iced_wgpu::Primitive),
+}
+
 macro_rules! delegate {
     ($frame:expr, $name:ident, $body:expr) => {
         match $frame {
@@ -23,13 +29,13 @@ macro_rules! delegate {
 }
 
 impl Frame {
-    pub fn new<Theme>(renderer: &crate::Renderer<Theme>, size: Size) -> Self {
-        match renderer.backend() {
-            Backend::TinySkia(_) => {
+    pub fn new<Theme>(renderer: &Renderer<Theme>, size: Size) -> Self {
+        match renderer {
+            Renderer::TinySkia(_) => {
                 Frame::TinySkia(iced_tiny_skia::geometry::Frame::new(size))
             }
             #[cfg(feature = "wgpu")]
-            Backend::Wgpu(_) => {
+            Renderer::Wgpu(_) => {
                 Frame::Wgpu(iced_wgpu::geometry::Frame::new(size))
             }
         }
@@ -169,6 +175,10 @@ impl Frame {
     }
 
     pub fn into_geometry(self) -> Geometry {
-        Geometry(delegate!(self, frame, frame.into_primitive()))
+        match self {
+            Self::TinySkia(frame) => Geometry::TinySkia(frame.into_primitive()),
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu(frame) => Geometry::Wgpu(frame.into_primitive()),
+        }
     }
 }
diff --git a/renderer/src/geometry/cache.rs b/renderer/src/geometry/cache.rs
index 2a3534d0..d82e7f69 100644
--- a/renderer/src/geometry/cache.rs
+++ b/renderer/src/geometry/cache.rs
@@ -1,6 +1,5 @@
 use crate::core::Size;
 use crate::geometry::{Frame, Geometry};
-use crate::graphics::Primitive;
 use crate::Renderer;
 
 use std::cell::RefCell;
@@ -21,10 +20,17 @@ enum State {
     Empty,
     Filled {
         bounds: Size,
-        primitive: Arc<Primitive>,
+        primitive: Internal,
     },
 }
 
+#[derive(Debug, Clone)]
+enum Internal {
+    TinySkia(Arc<iced_tiny_skia::Primitive>),
+    #[cfg(feature = "wgpu")]
+    Wgpu(Arc<iced_wgpu::Primitive>),
+}
+
 impl Cache {
     /// Creates a new empty [`Cache`].
     pub fn new() -> Self {
@@ -62,9 +68,21 @@ impl Cache {
         } = self.state.borrow().deref()
         {
             if *cached_bounds == bounds {
-                return Geometry(Primitive::Cache {
-                    content: primitive.clone(),
-                });
+                match primitive {
+                    Internal::TinySkia(primitive) => {
+                        return Geometry::TinySkia(
+                            iced_tiny_skia::Primitive::Cache {
+                                content: primitive.clone(),
+                            },
+                        );
+                    }
+                    #[cfg(feature = "wgpu")]
+                    Internal::Wgpu(primitive) => {
+                        return Geometry::Wgpu(iced_wgpu::Primitive::Cache {
+                            content: primitive.clone(),
+                        });
+                    }
+                }
             }
         }
 
@@ -74,7 +92,15 @@ impl Cache {
         let primitive = {
             let geometry = frame.into_geometry();
 
-            Arc::new(geometry.0)
+            match geometry {
+                Geometry::TinySkia(primitive) => {
+                    Internal::TinySkia(Arc::new(primitive))
+                }
+                #[cfg(feature = "wgpu")]
+                Geometry::Wgpu(primitive) => {
+                    Internal::Wgpu(Arc::new(primitive))
+                }
+            }
         };
 
         *self.state.borrow_mut() = State::Filled {
@@ -82,6 +108,18 @@ impl Cache {
             primitive: primitive.clone(),
         };
 
-        Geometry(Primitive::Cache { content: primitive })
+        match primitive {
+            Internal::TinySkia(primitive) => {
+                Geometry::TinySkia(iced_tiny_skia::Primitive::Cache {
+                    content: primitive,
+                })
+            }
+            #[cfg(feature = "wgpu")]
+            Internal::Wgpu(primitive) => {
+                Geometry::Wgpu(iced_wgpu::Primitive::Cache {
+                    content: primitive,
+                })
+            }
+        }
     }
 }
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 22ec7bd1..89b8f4c6 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -3,17 +3,259 @@ pub mod compositor;
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
-mod backend;
 mod settings;
 
 pub use iced_graphics as graphics;
 pub use iced_graphics::core;
 
-pub use backend::Backend;
 pub use compositor::Compositor;
 pub use settings::Settings;
 
+#[cfg(feature = "geometry")]
+pub use geometry::Geometry;
+
+use crate::core::renderer;
+use crate::core::text::{self, Text};
+use crate::core::{Background, Font, Point, Rectangle, Size, Vector};
+
+use std::borrow::Cow;
+
 /// The default graphics renderer for [`iced`].
 ///
 /// [`iced`]: https://github.com/iced-rs/iced
-pub type Renderer<Theme> = iced_graphics::Renderer<Backend, Theme>;
+pub enum Renderer<Theme> {
+    TinySkia(iced_tiny_skia::Renderer<Theme>),
+    #[cfg(feature = "wgpu")]
+    Wgpu(iced_wgpu::Renderer<Theme>),
+}
+
+macro_rules! delegate {
+    ($renderer:expr, $name:ident, $body:expr) => {
+        match $renderer {
+            Self::TinySkia($name) => $body,
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu($name) => $body,
+        }
+    };
+}
+
+impl<T> Renderer<T> {
+    #[cfg(feature = "wgpu")]
+    pub fn draw_with_wgpu(&mut self, primitive: iced_wgpu::Primitive) {
+        if let Self::Wgpu(renderer) = self {
+            renderer.draw_primitive(primitive);
+        }
+    }
+}
+
+impl<T> core::Renderer for Renderer<T> {
+    type Theme = T;
+
+    fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
+        match self {
+            Self::TinySkia(renderer) => {
+                let primitives = renderer.start_layer();
+
+                f(self);
+
+                match self {
+                    Self::TinySkia(renderer) => {
+                        renderer.end_layer(primitives, bounds);
+                    }
+                    #[cfg(feature = "wgpu")]
+                    _ => unreachable!(),
+                }
+            }
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu(renderer) => {
+                let primitives = renderer.start_layer();
+
+                f(self);
+
+                match self {
+                    #[cfg(feature = "wgpu")]
+                    Self::Wgpu(renderer) => {
+                        renderer.end_layer(primitives, bounds);
+                    }
+                    _ => unreachable!(),
+                }
+            }
+        }
+    }
+
+    fn with_translation(
+        &mut self,
+        translation: Vector,
+        f: impl FnOnce(&mut Self),
+    ) {
+        match self {
+            Self::TinySkia(renderer) => {
+                let primitives = renderer.start_translation();
+
+                f(self);
+
+                match self {
+                    Self::TinySkia(renderer) => {
+                        renderer.end_translation(primitives, translation);
+                    }
+                    #[cfg(feature = "wgpu")]
+                    _ => unreachable!(),
+                }
+            }
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu(renderer) => {
+                let primitives = renderer.start_translation();
+
+                f(self);
+
+                match self {
+                    #[cfg(feature = "wgpu")]
+                    Self::Wgpu(renderer) => {
+                        renderer.end_translation(primitives, translation);
+                    }
+                    _ => unreachable!(),
+                }
+            }
+        }
+    }
+
+    fn fill_quad(
+        &mut self,
+        quad: renderer::Quad,
+        background: impl Into<Background>,
+    ) {
+        delegate!(self, renderer, renderer.fill_quad(quad, background));
+    }
+
+    fn clear(&mut self) {
+        delegate!(self, renderer, renderer.clear());
+    }
+}
+
+impl<T> text::Renderer for Renderer<T> {
+    type Font = Font;
+
+    const ICON_FONT: Font = iced_tiny_skia::Renderer::<T>::ICON_FONT;
+    const CHECKMARK_ICON: char = iced_tiny_skia::Renderer::<T>::CHECKMARK_ICON;
+    const ARROW_DOWN_ICON: char =
+        iced_tiny_skia::Renderer::<T>::ARROW_DOWN_ICON;
+
+    fn default_font(&self) -> Self::Font {
+        delegate!(self, renderer, renderer.default_font())
+    }
+
+    fn default_size(&self) -> f32 {
+        delegate!(self, renderer, renderer.default_size())
+    }
+
+    fn measure(
+        &self,
+        content: &str,
+        size: f32,
+        line_height: text::LineHeight,
+        font: Font,
+        bounds: Size,
+        shaping: text::Shaping,
+    ) -> Size {
+        delegate!(
+            self,
+            renderer,
+            renderer.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,
+        point: Point,
+        nearest_only: bool,
+    ) -> Option<text::Hit> {
+        delegate!(
+            self,
+            renderer,
+            renderer.hit_test(
+                content,
+                size,
+                line_height,
+                font,
+                bounds,
+                shaping,
+                point,
+                nearest_only
+            )
+        )
+    }
+
+    fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
+        delegate!(self, renderer, renderer.load_font(bytes));
+    }
+
+    fn fill_text(&mut self, text: Text<'_, Self::Font>) {
+        delegate!(self, renderer, renderer.fill_text(text));
+    }
+}
+
+#[cfg(feature = "image")]
+impl<T> crate::core::image::Renderer for Renderer<T> {
+    type Handle = crate::core::image::Handle;
+
+    fn dimensions(&self, handle: &crate::core::image::Handle) -> Size<u32> {
+        delegate!(self, renderer, renderer.dimensions(handle))
+    }
+
+    fn draw(&mut self, handle: crate::core::image::Handle, bounds: Rectangle) {
+        delegate!(self, renderer, renderer.draw(handle, bounds));
+    }
+}
+
+#[cfg(feature = "svg")]
+impl<T> crate::core::svg::Renderer for Renderer<T> {
+    fn dimensions(&self, handle: &crate::core::svg::Handle) -> Size<u32> {
+        delegate!(self, renderer, renderer.dimensions(handle))
+    }
+
+    fn draw(
+        &mut self,
+        handle: crate::core::svg::Handle,
+        color: Option<crate::core::Color>,
+        bounds: Rectangle,
+    ) {
+        delegate!(self, renderer, renderer.draw(handle, color, bounds))
+    }
+}
+
+#[cfg(feature = "geometry")]
+impl<T> crate::graphics::geometry::Renderer for Renderer<T> {
+    type Geometry = crate::Geometry;
+
+    fn draw(&mut self, layers: Vec<Self::Geometry>) {
+        match self {
+            Self::TinySkia(renderer) => {
+                for layer in layers {
+                    match layer {
+                        crate::Geometry::TinySkia(primitive) => {
+                            renderer.draw_primitive(primitive);
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+            }
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu(renderer) => {
+                for layer in layers {
+                    match layer {
+                        crate::Geometry::Wgpu(primitive) => {
+                            renderer.draw_primitive(primitive);
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index ef993fb9..431f324b 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -20,7 +20,6 @@ log = "0.4"
 [dependencies.iced_graphics]
 version = "0.8"
 path = "../graphics"
-features = ["tiny-skia"]
 
 [dependencies.cosmic-text]
 git = "https://github.com/hecrj/cosmic-text.git"
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index c8999561..0d06ef70 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -2,7 +2,8 @@ use crate::core::text;
 use crate::core::Gradient;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::backend;
-use crate::graphics::{Primitive, Viewport};
+use crate::graphics::{Damage, Viewport};
+use crate::primitive::{self, Primitive};
 use crate::Settings;
 
 use std::borrow::Cow;
@@ -419,6 +420,13 @@ impl Backend {
                 self.raster_pipeline
                     .draw(handle, *bounds, pixels, transform, clip_mask);
             }
+            #[cfg(not(feature = "image"))]
+            Primitive::Image { .. } => {
+                log::warn!(
+                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
+                    primitive
+                );
+            }
             #[cfg(feature = "svg")]
             Primitive::Svg {
                 handle,
@@ -442,12 +450,19 @@ impl Backend {
                     clip_mask,
                 );
             }
-            Primitive::Fill {
+            #[cfg(not(feature = "svg"))]
+            Primitive::Svg { .. } => {
+                log::warn!(
+                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
+                    primitive
+                );
+            }
+            Primitive::Custom(primitive::Custom::Fill {
                 path,
                 paint,
                 rule,
                 transform,
-            } => {
+            }) => {
                 let bounds = path.bounds();
 
                 let physical_bounds = (Rectangle {
@@ -475,12 +490,12 @@ impl Backend {
                     clip_mask,
                 );
             }
-            Primitive::Stroke {
+            Primitive::Custom(primitive::Custom::Stroke {
                 path,
                 paint,
                 stroke,
                 transform,
-            } => {
+            }) => {
                 let bounds = path.bounds();
 
                 let physical_bounds = (Rectangle {
@@ -588,13 +603,6 @@ impl Backend {
                     primitive
                 );
             }
-            _ => {
-                // Not supported!
-                log::warn!(
-                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
-                    primitive
-                );
-            }
         }
     }
 }
@@ -766,6 +774,10 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
     );
 }
 
+impl iced_graphics::Backend for Backend {
+    type Primitive = primitive::Custom;
+}
+
 impl backend::Text for Backend {
     const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
diff --git a/tiny_skia/src/geometry.rs b/tiny_skia/src/geometry.rs
index ee347c73..9bd47556 100644
--- a/tiny_skia/src/geometry.rs
+++ b/tiny_skia/src/geometry.rs
@@ -3,7 +3,7 @@ use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::stroke::{self, Stroke};
 use crate::graphics::geometry::{Path, Style, Text};
 use crate::graphics::Gradient;
-use crate::graphics::Primitive;
+use crate::primitive::{self, Primitive};
 
 pub struct Frame {
     size: Size,
@@ -42,12 +42,13 @@ impl Frame {
         let Some(path) = convert_path(path) else { return };
         let fill = fill.into();
 
-        self.primitives.push(Primitive::Fill {
-            path,
-            paint: into_paint(fill.style),
-            rule: into_fill_rule(fill.rule),
-            transform: self.transform,
-        });
+        self.primitives
+            .push(Primitive::Custom(primitive::Custom::Fill {
+                path,
+                paint: into_paint(fill.style),
+                rule: into_fill_rule(fill.rule),
+                transform: self.transform,
+            }));
     }
 
     pub fn fill_rectangle(
@@ -59,15 +60,16 @@ impl Frame {
         let Some(path) = convert_path(&Path::rectangle(top_left, size)) else { return };
         let fill = fill.into();
 
-        self.primitives.push(Primitive::Fill {
-            path,
-            paint: tiny_skia::Paint {
-                anti_alias: false,
-                ..into_paint(fill.style)
-            },
-            rule: into_fill_rule(fill.rule),
-            transform: self.transform,
-        });
+        self.primitives
+            .push(Primitive::Custom(primitive::Custom::Fill {
+                path,
+                paint: tiny_skia::Paint {
+                    anti_alias: false,
+                    ..into_paint(fill.style)
+                },
+                rule: into_fill_rule(fill.rule),
+                transform: self.transform,
+            }));
     }
 
     pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
@@ -76,12 +78,13 @@ impl Frame {
         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,
-        });
+        self.primitives
+            .push(Primitive::Custom(primitive::Custom::Stroke {
+                path,
+                paint: into_paint(stroke.style),
+                stroke: skia_stroke,
+                transform: self.transform,
+            }));
     }
 
     pub fn fill_text(&mut self, text: impl Into<Text>) {
diff --git a/tiny_skia/src/lib.rs b/tiny_skia/src/lib.rs
index 83baef1c..15de6ce2 100644
--- a/tiny_skia/src/lib.rs
+++ b/tiny_skia/src/lib.rs
@@ -1,6 +1,7 @@
 pub mod window;
 
 mod backend;
+mod primitive;
 mod settings;
 mod text;
 
@@ -17,6 +18,7 @@ pub use iced_graphics as graphics;
 pub use iced_graphics::core;
 
 pub use backend::Backend;
+pub use primitive::Primitive;
 pub use settings::Settings;
 
 /// 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 00000000..0ed24969
--- /dev/null
+++ b/tiny_skia/src/primitive.rs
@@ -0,0 +1,48 @@
+use crate::core::Rectangle;
+use crate::graphics::Damage;
+
+pub type Primitive = crate::graphics::Primitive<Custom>;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Custom {
+    /// A path filled with some paint.
+    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 path stroked with some paint.
+    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,
+    },
+}
+
+impl Damage for Custom {
+    fn bounds(&self) -> Rectangle {
+        match self {
+            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)
+            }
+        }
+    }
+}
diff --git a/tiny_skia/src/window/compositor.rs b/tiny_skia/src/window/compositor.rs
index f3be3f16..775cf9e5 100644
--- a/tiny_skia/src/window/compositor.rs
+++ b/tiny_skia/src/window/compositor.rs
@@ -1,8 +1,8 @@
 use crate::core::{Color, Rectangle, Size};
 use crate::graphics::compositor::{self, Information};
 use crate::graphics::damage;
-use crate::graphics::{Error, Primitive, Viewport};
-use crate::{Backend, Renderer, Settings};
+use crate::graphics::{Error, Viewport};
+use crate::{Backend, Primitive, Renderer, Settings};
 
 use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
 use std::marker::PhantomData;
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index f8829e47..596d43c5 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -2,7 +2,8 @@ use crate::core;
 use crate::core::{Color, Font, Point, Size};
 use crate::graphics::backend;
 use crate::graphics::color;
-use crate::graphics::{Primitive, Transformation, Viewport};
+use crate::graphics::{Transformation, Viewport};
+use crate::primitive::{self, Primitive};
 use crate::quad;
 use crate::text;
 use crate::triangle;
@@ -334,6 +335,10 @@ impl Backend {
     }
 }
 
+impl crate::graphics::Backend for Backend {
+    type Primitive = primitive::Custom;
+}
+
 impl backend::Text for Backend {
     const ICON_FONT: Font = Font::with_name("Iced-Icons");
     const CHECKMARK_ICON: char = '\u{f00c}';
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index f81b5b2f..d43f1065 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -5,10 +5,10 @@ use crate::graphics::geometry::fill::{self, Fill};
 use crate::graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
-use crate::graphics::primitive::{self, Primitive};
-use crate::graphics::Gradient;
+use crate::graphics::gradient::{self, Gradient};
+use crate::graphics::primitive;
+use crate::Primitive;
 
-use iced_graphics::gradient;
 use lyon::geom::euclid;
 use lyon::tessellation;
 use std::borrow::Cow;
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 71570e3d..ef850cd9 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -12,8 +12,9 @@ use crate::core;
 use crate::core::alignment;
 use crate::core::{Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::color;
-use crate::graphics::{Primitive, Viewport};
+use crate::graphics::Viewport;
 use crate::quad::{self, Quad};
+use crate::Primitive;
 
 /// A group of primitives that should be clipped together.
 #[derive(Debug)]
@@ -262,13 +263,7 @@ impl<'a> Layer<'a> {
                     current_layer,
                 );
             }
-            _ => {
-                // Not supported!
-                log::warn!(
-                    "Unsupported primitive in `iced_wgpu`: {:?}",
-                    primitive
-                );
-            }
+            Primitive::Custom(()) => {}
         }
     }
 }
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 86a962a5..79dfdd24 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -24,8 +24,8 @@
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
 #![deny(
-    missing_debug_implementations,
-    missing_docs,
+    //missing_debug_implementations,
+    //missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
@@ -47,6 +47,7 @@ pub mod geometry;
 mod backend;
 mod buffer;
 mod color;
+mod primitive;
 mod quad;
 mod text;
 mod triangle;
@@ -60,6 +61,7 @@ pub use wgpu;
 
 pub use backend::Backend;
 pub use layer::Layer;
+pub use primitive::Primitive;
 pub use settings::Settings;
 
 #[cfg(any(feature = "image", feature = "svg"))]
diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
new file mode 100644
index 00000000..2e31cd53
--- /dev/null
+++ b/wgpu/src/primitive.rs
@@ -0,0 +1,3 @@
+pub type Primitive = crate::graphics::Primitive<Custom>;
+
+pub type Custom = ();
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 1cfd7b67..cd5b20cc 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -3,8 +3,8 @@ use crate::core::{Color, Size};
 use crate::graphics;
 use crate::graphics::color;
 use crate::graphics::compositor;
-use crate::graphics::{Error, Primitive, Viewport};
-use crate::{Backend, Renderer, Settings};
+use crate::graphics::{Error, Viewport};
+use crate::{Backend, Primitive, Renderer, Settings};
 
 use futures::stream::{self, StreamExt};
 
diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
index 929ee285..b3f6175e 100644
--- a/widget/src/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -1,7 +1,7 @@
 use crate::canvas::event::{self, Event};
 use crate::canvas::mouse;
 use crate::core::Rectangle;
-use crate::graphics::geometry::{self, Geometry};
+use crate::graphics::geometry;
 
 /// The state and logic of a [`Canvas`].
 ///
@@ -51,7 +51,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: mouse::Cursor,
-    ) -> Vec<Geometry>;
+    ) -> Vec<Renderer::Geometry>;
 
     /// Returns the current mouse interaction of the [`Program`].
     ///
@@ -93,7 +93,7 @@ where
         theme: &Renderer::Theme,
         bounds: Rectangle,
         cursor: mouse::Cursor,
-    ) -> Vec<Geometry> {
+    ) -> Vec<Renderer::Geometry> {
         T::draw(self, state, renderer, theme, bounds, cursor)
     }
 
diff --git a/widget/src/qr_code.rs b/widget/src/qr_code.rs
index 06be93c0..51a541fd 100644
--- a/widget/src/qr_code.rs
+++ b/widget/src/qr_code.rs
@@ -7,6 +7,7 @@ use crate::core::widget::Tree;
 use crate::core::{
     Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
 };
+use crate::graphics::geometry::Renderer as _;
 use crate::Renderer;
 use thiserror::Error;
 
@@ -121,7 +122,7 @@ impl<'a, Message, Theme> Widget<Message, Renderer<Theme>> for QRCode<'a> {
         let translation = Vector::new(bounds.x, bounds.y);
 
         renderer.with_translation(translation, |renderer| {
-            renderer.draw_primitive(geometry.0);
+            renderer.draw(vec![geometry]);
         });
     }
 }

From 2128472c2a8afcb59927712497c4f613612e9dcc 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, 22 Jun 2023 01:04:07 +0200
Subject: [PATCH 408/440] Remove `layout` method from `core::Renderer` trait

---
 core/src/renderer.rs          | 15 +--------------
 graphics/src/renderer.rs      | 13 +------------
 runtime/src/user_interface.rs | 13 +++++++------
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/core/src/renderer.rs b/core/src/renderer.rs
index 7c73d2e4..1b327e56 100644
--- a/core/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -5,26 +5,13 @@ mod null;
 #[cfg(debug_assertions)]
 pub use null::Null;
 
-use crate::layout;
-use crate::{Background, BorderRadius, Color, Element, Rectangle, Vector};
+use crate::{Background, BorderRadius, Color, Rectangle, Vector};
 
 /// A component that can be used by widgets to draw themselves on a screen.
 pub trait Renderer: Sized {
     /// The supported theme of the [`Renderer`].
     type Theme;
 
-    /// Lays out the elements of a user interface.
-    ///
-    /// You should override this if you need to perform any operations before or
-    /// after layouting. For instance, trimming the measurements cache.
-    fn layout<Message>(
-        &mut self,
-        element: &Element<'_, Message, Self>,
-        limits: &layout::Limits,
-    ) -> layout::Node {
-        element.as_widget().layout(self, limits)
-    }
-
     /// Draws the primitives recorded in the given closure in a new layer.
     ///
     /// The layer will clip its contents to the provided `bounds`.
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 9acfc2b7..459faf40 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -3,13 +3,10 @@ use crate::backend::{self, Backend};
 use crate::Primitive;
 
 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 iced_core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 
 use std::borrow::Cow;
 use std::marker::PhantomData;
@@ -84,14 +81,6 @@ impl<B: Backend, T> Renderer<B, T> {
 impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> {
     type Theme = T;
 
-    fn layout<Message>(
-        &mut self,
-        element: &Element<'_, Message, Self>,
-        limits: &layout::Limits,
-    ) -> layout::Node {
-        element.as_widget().layout(self, limits)
-    }
-
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
         let current = self.start_layer();
 
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 619423fd..34b2ada0 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -95,8 +95,9 @@ where
         let Cache { mut state } = cache;
         state.diff(root.as_widget());
 
-        let base =
-            renderer.layout(&root, &layout::Limits::new(Size::ZERO, bounds));
+        let base = root
+            .as_widget()
+            .layout(renderer, &layout::Limits::new(Size::ZERO, bounds));
 
         UserInterface {
             root,
@@ -226,8 +227,8 @@ where
                 if shell.is_layout_invalid() {
                     let _ = ManuallyDrop::into_inner(manual_overlay);
 
-                    self.base = renderer.layout(
-                        &self.root,
+                    self.base = self.root.as_widget().layout(
+                        renderer,
                         &layout::Limits::new(Size::ZERO, self.bounds),
                     );
 
@@ -322,8 +323,8 @@ where
                 }
 
                 shell.revalidate_layout(|| {
-                    self.base = renderer.layout(
-                        &self.root,
+                    self.base = self.root.as_widget().layout(
+                        renderer,
                         &layout::Limits::new(Size::ZERO, self.bounds),
                     );
 

From fa5650cfd1115e6ccec2ad795cf58fd970d5b43c 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, 29 Jun 2023 07:48:03 +0200
Subject: [PATCH 409/440] Decouple `Mesh` primitives from main `Primitive` type

---
 examples/geometry/src/main.rs | 27 ++++++-----
 graphics/src/damage.rs        |  3 --
 graphics/src/gradient.rs      |  3 +-
 graphics/src/lib.rs           |  2 +
 graphics/src/mesh.rs          | 75 ++++++++++++++++++++++++++++++
 graphics/src/primitive.rs     | 69 +---------------------------
 renderer/Cargo.toml           |  1 +
 renderer/src/lib.rs           | 16 +++++--
 tiny_skia/src/backend.rs      |  8 ----
 wgpu/src/geometry.rs          | 64 ++++++++++++++------------
 wgpu/src/layer.rs             | 86 ++++++++++++++++++++---------------
 wgpu/src/layer/mesh.rs        |  6 +--
 wgpu/src/lib.rs               |  2 +-
 wgpu/src/primitive.rs         | 16 ++++++-
 wgpu/src/triangle.rs          | 75 +++++++++++++++---------------
 15 files changed, 248 insertions(+), 205 deletions(-)
 create mode 100644 graphics/src/mesh.rs

diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index e146c6bd..3bc7f46b 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -2,7 +2,6 @@
 //! arbitrary low-level geometry.
 mod rainbow {
     use iced::advanced::graphics::color;
-    use iced::advanced::graphics::primitive::{ColoredVertex2D, Primitive};
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
@@ -45,7 +44,7 @@ mod rainbow {
             cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
-            use iced::advanced::graphics::primitive::Mesh2D;
+            use iced::advanced::graphics::mesh::{self, Mesh, SolidVertex2D};
             use iced::advanced::Renderer as _;
 
             let bounds = layout.bounds();
@@ -77,43 +76,43 @@ mod rainbow {
             let posn_bl = [0.0, bounds.height];
             let posn_l = [0.0, bounds.height / 2.0];
 
-            let mesh = Primitive::SolidMesh {
+            let mesh = Mesh::Solid {
                 size: bounds.size(),
-                buffers: Mesh2D {
+                buffers: mesh::Indexed {
                     vertices: vec![
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_center,
                             color: color::pack([1.0, 1.0, 1.0, 1.0]),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_tl,
                             color: color::pack(color_r),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_t,
                             color: color::pack(color_o),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_tr,
                             color: color::pack(color_y),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_r,
                             color: color::pack(color_g),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_br,
                             color: color::pack(color_gb),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_b,
                             color: color::pack(color_b),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_bl,
                             color: color::pack(color_i),
                         },
-                        ColoredVertex2D {
+                        SolidVertex2D {
                             position: posn_l,
                             color: color::pack(color_v),
                         },
@@ -134,7 +133,7 @@ mod rainbow {
             renderer.with_translation(
                 Vector::new(bounds.x, bounds.y),
                 |renderer| {
-                    renderer.draw_with_wgpu(mesh);
+                    renderer.draw_mesh(mesh);
                 },
             );
         }
diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
index 1add6707..be17b935 100644
--- a/graphics/src/damage.rs
+++ b/graphics/src/damage.rs
@@ -43,9 +43,6 @@ impl<T: Damage> Damage for Primitive<T> {
             | Self::Image { bounds, .. }
             | Self::Svg { bounds, .. } => bounds.expand(1.0),
             Self::Clip { bounds, .. } => bounds.expand(1.0),
-            Self::SolidMesh { size, .. } | Self::GradientMesh { size, .. } => {
-                Rectangle::with_size(*size)
-            }
             Self::Group { primitives } => primitives
                 .iter()
                 .map(Self::bounds)
diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs
index 3f5d0509..4db565d8 100644
--- a/graphics/src/gradient.rs
+++ b/graphics/src/gradient.rs
@@ -7,6 +7,7 @@ use crate::color;
 use crate::core::gradient::ColorStop;
 use crate::core::{self, Color, Point, Rectangle};
 
+use bytemuck::{Pod, Zeroable};
 use half::f16;
 use std::cmp::Ordering;
 
@@ -135,7 +136,7 @@ impl Linear {
 }
 
 /// Packed [`Gradient`] data for use in shader code.
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Zeroable, Pod)]
 #[repr(C)]
 pub struct Packed {
     // 8 colors, each channel = 16 bit float, 2 colors packed into 1 u32
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 055a9216..cef36003 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -31,6 +31,7 @@ pub mod color;
 pub mod compositor;
 pub mod damage;
 pub mod gradient;
+pub mod mesh;
 pub mod primitive;
 pub mod renderer;
 
@@ -46,6 +47,7 @@ pub use compositor::Compositor;
 pub use damage::Damage;
 pub use error::Error;
 pub use gradient::Gradient;
+pub use mesh::Mesh;
 pub use primitive::Primitive;
 pub use renderer::Renderer;
 pub use transformation::Transformation;
diff --git a/graphics/src/mesh.rs b/graphics/src/mesh.rs
new file mode 100644
index 00000000..6ca7f79f
--- /dev/null
+++ b/graphics/src/mesh.rs
@@ -0,0 +1,75 @@
+use crate::color;
+use crate::core::{Rectangle, Size};
+use crate::gradient;
+use crate::Damage;
+
+use bytemuck::{Pod, Zeroable};
+
+/// A low-level primitive to render a mesh of triangles.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Mesh {
+    /// A mesh with a solid color.
+    Solid {
+        /// The vertices and indices of the mesh.
+        buffers: Indexed<SolidVertex2D>,
+
+        /// The size of the drawable region of the mesh.
+        ///
+        /// Any geometry that falls out of this region will be clipped.
+        size: Size,
+    },
+    /// A mesh with a gradient.
+    Gradient {
+        /// The vertices and indices of the mesh.
+        buffers: Indexed<GradientVertex2D>,
+
+        /// The size of the drawable region of the mesh.
+        ///
+        /// Any geometry that falls out of this region will be clipped.
+        size: Size,
+    },
+}
+
+impl Damage for Mesh {
+    fn bounds(&self) -> Rectangle {
+        match self {
+            Self::Solid { size, .. } | Self::Gradient { size, .. } => {
+                Rectangle::with_size(*size)
+            }
+        }
+    }
+}
+
+/// A set of [`Vertex2D`] and indices representing a list of triangles.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Indexed<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 with a color.
+#[derive(Copy, Clone, Debug, PartialEq, Zeroable, Pod)]
+#[repr(C)]
+pub struct SolidVertex2D {
+    /// The vertex position in 2D space.
+    pub position: [f32; 2],
+
+    /// The color of the vertex in __linear__ RGBA.
+    pub color: color::Packed,
+}
+
+/// A vertex which contains 2D position & packed gradient data.
+#[derive(Copy, Clone, Debug, PartialEq, Zeroable, Pod)]
+#[repr(C)]
+pub struct GradientVertex2D {
+    /// The vertex position in 2D space.
+    pub position: [f32; 2],
+
+    /// The packed vertex data of the gradient.
+    pub gradient: gradient::Packed,
+}
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index f8b005ad..7592a410 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,13 +1,10 @@
 //! Draw using different graphical primitives.
-use crate::color;
 use crate::core::alignment;
 use crate::core::image;
 use crate::core::svg;
 use crate::core::text;
-use crate::core::{Background, Color, Font, Rectangle, Size, Vector};
-use crate::gradient;
+use crate::core::{Background, Color, Font, Rectangle, Vector};
 
-use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
 
 /// A rendering primitive.
@@ -65,30 +62,6 @@ pub enum Primitive<T> {
         /// The bounds of the viewport
         bounds: Rectangle,
     },
-    /// 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: Mesh2D<ColoredVertex2D>,
-
-        /// The size of the drawable region of the mesh.
-        ///
-        /// Any geometry that falls out of this region will be clipped.
-        size: Size,
-    },
-    /// A low-level primitive to render a mesh of triangles with a gradient.
-    ///
-    /// It can be used to render many kinds of geometry freely.
-    GradientMesh {
-        /// The vertices and indices of the mesh.
-        buffers: Mesh2D<GradientVertex2D>,
-
-        /// The size of the drawable region of the mesh.
-        ///
-        /// Any geometry that falls out of this region will be clipped.
-        size: Size,
-    },
     /// A group of primitives
     Group {
         /// The primitives of the group
@@ -143,43 +116,3 @@ impl<T> Primitive<T> {
         }
     }
 }
-
-/// A set of [`Vertex2D`] and indices representing a list of triangles.
-#[derive(Clone, Debug, PartialEq, Eq)]
-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 with a color.
-#[derive(Copy, Clone, Debug, PartialEq, 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: color::Packed,
-}
-
-/// A vertex which contains 2D position & packed gradient data.
-#[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C)]
-pub struct GradientVertex2D {
-    /// The vertex position in 2D space.
-    pub position: [f32; 2],
-
-    /// The packed vertex data of the gradient.
-    pub gradient: gradient::Packed,
-}
-
-#[allow(unsafe_code)]
-unsafe impl Zeroable for GradientVertex2D {}
-
-#[allow(unsafe_code)]
-unsafe impl Pod for GradientVertex2D {}
diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml
index ddfb6445..fda2bc7b 100644
--- a/renderer/Cargo.toml
+++ b/renderer/Cargo.toml
@@ -14,6 +14,7 @@ web-colors = ["iced_wgpu?/web-colors"]
 [dependencies]
 raw-window-handle = "0.5"
 thiserror = "1"
+log = "0.4"
 
 [dependencies.iced_graphics]
 version = "0.8"
diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 89b8f4c6..7d1a02c2 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -17,6 +17,7 @@ pub use geometry::Geometry;
 use crate::core::renderer;
 use crate::core::text::{self, Text};
 use crate::core::{Background, Font, Point, Rectangle, Size, Vector};
+use crate::graphics::Mesh;
 
 use std::borrow::Cow;
 
@@ -40,10 +41,17 @@ macro_rules! delegate {
 }
 
 impl<T> Renderer<T> {
-    #[cfg(feature = "wgpu")]
-    pub fn draw_with_wgpu(&mut self, primitive: iced_wgpu::Primitive) {
-        if let Self::Wgpu(renderer) = self {
-            renderer.draw_primitive(primitive);
+    pub fn draw_mesh(&mut self, mesh: Mesh) {
+        match self {
+            Self::TinySkia(_) => {
+                log::warn!("Unsupported mesh primitive: {:?}", mesh)
+            }
+            #[cfg(feature = "wgpu")]
+            Self::Wgpu(renderer) => {
+                renderer.draw_primitive(iced_wgpu::Primitive::Custom(
+                    iced_wgpu::primitive::Custom::Mesh(mesh),
+                ));
+            }
         }
     }
 }
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 0d06ef70..e0134220 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -595,14 +595,6 @@ impl Backend {
                     translation,
                 );
             }
-            Primitive::SolidMesh { .. } | Primitive::GradientMesh { .. } => {
-                // Not supported!
-                // TODO: Draw a placeholder (?)
-                log::warn!(
-                    "Unsupported primitive in `iced_tiny_skia`: {:?}",
-                    primitive
-                );
-            }
         }
     }
 }
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index d43f1065..e421e0b0 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -6,8 +6,8 @@ use crate::graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
 use crate::graphics::gradient::{self, Gradient};
-use crate::graphics::primitive;
-use crate::Primitive;
+use crate::graphics::mesh::{self, Mesh};
+use crate::primitive::{self, Primitive};
 
 use lyon::geom::euclid;
 use lyon::tessellation;
@@ -25,8 +25,8 @@ pub struct Frame {
 }
 
 enum Buffer {
-    Solid(tessellation::VertexBuffers<primitive::ColoredVertex2D, u32>),
-    Gradient(tessellation::VertexBuffers<primitive::GradientVertex2D, u32>),
+    Solid(tessellation::VertexBuffers<mesh::SolidVertex2D, u32>),
+    Gradient(tessellation::VertexBuffers<mesh::GradientVertex2D, u32>),
 }
 
 struct BufferStack {
@@ -464,24 +464,28 @@ impl Frame {
             match buffer {
                 Buffer::Solid(buffer) => {
                     if !buffer.indices.is_empty() {
-                        self.primitives.push(Primitive::SolidMesh {
-                            buffers: primitive::Mesh2D {
-                                vertices: buffer.vertices,
-                                indices: buffer.indices,
-                            },
-                            size: self.size,
-                        })
+                        self.primitives.push(Primitive::Custom(
+                            primitive::Custom::Mesh(Mesh::Solid {
+                                buffers: mesh::Indexed {
+                                    vertices: buffer.vertices,
+                                    indices: buffer.indices,
+                                },
+                                size: self.size,
+                            }),
+                        ))
                     }
                 }
                 Buffer::Gradient(buffer) => {
                     if !buffer.indices.is_empty() {
-                        self.primitives.push(Primitive::GradientMesh {
-                            buffers: primitive::Mesh2D {
-                                vertices: buffer.vertices,
-                                indices: buffer.indices,
-                            },
-                            size: self.size,
-                        })
+                        self.primitives.push(Primitive::Custom(
+                            primitive::Custom::Mesh(Mesh::Gradient {
+                                buffers: mesh::Indexed {
+                                    vertices: buffer.vertices,
+                                    indices: buffer.indices,
+                                },
+                                size: self.size,
+                            }),
+                        ))
                     }
                 }
             }
@@ -495,32 +499,32 @@ struct GradientVertex2DBuilder {
     gradient: gradient::Packed,
 }
 
-impl tessellation::FillVertexConstructor<primitive::GradientVertex2D>
+impl tessellation::FillVertexConstructor<mesh::GradientVertex2D>
     for GradientVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::FillVertex<'_>,
-    ) -> primitive::GradientVertex2D {
+    ) -> mesh::GradientVertex2D {
         let position = vertex.position();
 
-        primitive::GradientVertex2D {
+        mesh::GradientVertex2D {
             position: [position.x, position.y],
             gradient: self.gradient,
         }
     }
 }
 
-impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
+impl tessellation::StrokeVertexConstructor<mesh::GradientVertex2D>
     for GradientVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::StrokeVertex<'_, '_>,
-    ) -> primitive::GradientVertex2D {
+    ) -> mesh::GradientVertex2D {
         let position = vertex.position();
 
-        primitive::GradientVertex2D {
+        mesh::GradientVertex2D {
             position: [position.x, position.y],
             gradient: self.gradient,
         }
@@ -529,32 +533,32 @@ impl tessellation::StrokeVertexConstructor<primitive::GradientVertex2D>
 
 struct TriangleVertex2DBuilder(color::Packed);
 
-impl tessellation::FillVertexConstructor<primitive::ColoredVertex2D>
+impl tessellation::FillVertexConstructor<mesh::SolidVertex2D>
     for TriangleVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::FillVertex<'_>,
-    ) -> primitive::ColoredVertex2D {
+    ) -> mesh::SolidVertex2D {
         let position = vertex.position();
 
-        primitive::ColoredVertex2D {
+        mesh::SolidVertex2D {
             position: [position.x, position.y],
             color: self.0,
         }
     }
 }
 
-impl tessellation::StrokeVertexConstructor<primitive::ColoredVertex2D>
+impl tessellation::StrokeVertexConstructor<mesh::SolidVertex2D>
     for TriangleVertex2DBuilder
 {
     fn new_vertex(
         &mut self,
         vertex: tessellation::StrokeVertex<'_, '_>,
-    ) -> primitive::ColoredVertex2D {
+    ) -> mesh::SolidVertex2D {
         let position = vertex.position();
 
-        primitive::ColoredVertex2D {
+        mesh::SolidVertex2D {
             position: [position.x, position.y],
             color: self.0,
         }
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index ef850cd9..b8f32db1 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -11,10 +11,11 @@ pub use text::Text;
 use crate::core;
 use crate::core::alignment;
 use crate::core::{Color, Font, Point, Rectangle, Size, Vector};
+use crate::graphics;
 use crate::graphics::color;
 use crate::graphics::Viewport;
+use crate::primitive::{self, Primitive};
 use crate::quad::{self, Quad};
-use crate::Primitive;
 
 /// A group of primitives that should be clipped together.
 #[derive(Debug)]
@@ -180,40 +181,6 @@ impl<'a> Layer<'a> {
                     bounds: *bounds + translation,
                 });
             }
-            Primitive::SolidMesh { buffers, size } => {
-                let layer = &mut layers[current_layer];
-
-                let bounds = Rectangle::new(
-                    Point::new(translation.x, translation.y),
-                    *size,
-                );
-
-                // Only draw visible content
-                if let Some(clip_bounds) = layer.bounds.intersection(&bounds) {
-                    layer.meshes.push(Mesh::Solid {
-                        origin: Point::new(translation.x, translation.y),
-                        buffers,
-                        clip_bounds,
-                    });
-                }
-            }
-            Primitive::GradientMesh { buffers, size } => {
-                let layer = &mut layers[current_layer];
-
-                let bounds = Rectangle::new(
-                    Point::new(translation.x, translation.y),
-                    *size,
-                );
-
-                // Only draw visible content
-                if let Some(clip_bounds) = layer.bounds.intersection(&bounds) {
-                    layer.meshes.push(Mesh::Gradient {
-                        origin: Point::new(translation.x, translation.y),
-                        buffers,
-                        clip_bounds,
-                    });
-                }
-            }
             Primitive::Group { primitives } => {
                 // TODO: Inspect a bit and regroup (?)
                 for primitive in primitives {
@@ -263,7 +230,54 @@ impl<'a> Layer<'a> {
                     current_layer,
                 );
             }
-            Primitive::Custom(()) => {}
+            Primitive::Custom(custom) => match custom {
+                primitive::Custom::Mesh(mesh) => match mesh {
+                    graphics::Mesh::Solid { buffers, size } => {
+                        let layer = &mut layers[current_layer];
+
+                        let bounds = Rectangle::new(
+                            Point::new(translation.x, translation.y),
+                            *size,
+                        );
+
+                        // Only draw visible content
+                        if let Some(clip_bounds) =
+                            layer.bounds.intersection(&bounds)
+                        {
+                            layer.meshes.push(Mesh::Solid {
+                                origin: Point::new(
+                                    translation.x,
+                                    translation.y,
+                                ),
+                                buffers,
+                                clip_bounds,
+                            });
+                        }
+                    }
+                    graphics::Mesh::Gradient { buffers, size } => {
+                        let layer = &mut layers[current_layer];
+
+                        let bounds = Rectangle::new(
+                            Point::new(translation.x, translation.y),
+                            *size,
+                        );
+
+                        // Only draw visible content
+                        if let Some(clip_bounds) =
+                            layer.bounds.intersection(&bounds)
+                        {
+                            layer.meshes.push(Mesh::Gradient {
+                                origin: Point::new(
+                                    translation.x,
+                                    translation.y,
+                                ),
+                                buffers,
+                                clip_bounds,
+                            });
+                        }
+                    }
+                },
+            },
         }
     }
 }
diff --git a/wgpu/src/layer/mesh.rs b/wgpu/src/layer/mesh.rs
index b7dd9a0b..7c6206cd 100644
--- a/wgpu/src/layer/mesh.rs
+++ b/wgpu/src/layer/mesh.rs
@@ -1,6 +1,6 @@
 //! A collection of triangle primitives.
 use crate::core::{Point, Rectangle};
-use crate::graphics::primitive;
+use crate::graphics::mesh;
 
 /// A mesh of triangles.
 #[derive(Debug, Clone, Copy)]
@@ -11,7 +11,7 @@ pub enum Mesh<'a> {
         origin: Point,
 
         /// The vertex and index buffers of the [`Mesh`].
-        buffers: &'a primitive::Mesh2D<primitive::ColoredVertex2D>,
+        buffers: &'a mesh::Indexed<mesh::SolidVertex2D>,
 
         /// 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 primitive::Mesh2D<primitive::GradientVertex2D>,
+        buffers: &'a mesh::Indexed<mesh::GradientVertex2D>,
 
         /// The clipping bounds of the [`Mesh`].
         clip_bounds: Rectangle<f32>,
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 79dfdd24..0ffaeeef 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -38,6 +38,7 @@
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 pub mod layer;
+pub mod primitive;
 pub mod settings;
 pub mod window;
 
@@ -47,7 +48,6 @@ pub mod geometry;
 mod backend;
 mod buffer;
 mod color;
-mod primitive;
 mod quad;
 mod text;
 mod triangle;
diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index 2e31cd53..a8f1119c 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -1,3 +1,17 @@
+use crate::core::Rectangle;
+use crate::graphics::{Damage, Mesh};
+
 pub type Primitive = crate::graphics::Primitive<Custom>;
 
-pub type Custom = ();
+#[derive(Debug, Clone, PartialEq)]
+pub enum Custom {
+    Mesh(Mesh),
+}
+
+impl Damage for Custom {
+    fn bounds(&self) -> Rectangle {
+        match self {
+            Self::Mesh(mesh) => mesh.bounds(),
+        }
+    }
+}
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 3f3635cf..d8b23dfe 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -393,7 +393,7 @@ impl Uniforms {
 }
 
 mod solid {
-    use crate::graphics::primitive;
+    use crate::graphics::mesh;
     use crate::graphics::Antialiasing;
     use crate::triangle;
     use crate::Buffer;
@@ -406,7 +406,7 @@ mod solid {
 
     #[derive(Debug)]
     pub struct Layer {
-        pub vertices: Buffer<primitive::ColoredVertex2D>,
+        pub vertices: Buffer<mesh::SolidVertex2D>,
         pub uniforms: Buffer<triangle::Uniforms>,
         pub constants: wgpu::BindGroup,
     }
@@ -493,38 +493,40 @@ mod solid {
                     ),
                 });
 
-            let pipeline = device.create_render_pipeline(
-                &wgpu::RenderPipelineDescriptor {
-                    label: Some("iced_wgpu::triangle::solid pipeline"),
-                    layout: Some(&layout),
-                    vertex: wgpu::VertexState {
-                        module: &shader,
-                        entry_point: "solid_vs_main",
-                        buffers: &[wgpu::VertexBufferLayout {
-                            array_stride: std::mem::size_of::<
-                                primitive::ColoredVertex2D,
-                            >()
-                                as u64,
-                            step_mode: wgpu::VertexStepMode::Vertex,
-                            attributes: &wgpu::vertex_attr_array!(
-                                // Position
-                                0 => Float32x2,
-                                // Color
-                                1 => Float32x4,
-                            ),
-                        }],
+            let pipeline =
+                device.create_render_pipeline(
+                    &wgpu::RenderPipelineDescriptor {
+                        label: Some("iced_wgpu::triangle::solid pipeline"),
+                        layout: Some(&layout),
+                        vertex: wgpu::VertexState {
+                            module: &shader,
+                            entry_point: "solid_vs_main",
+                            buffers: &[wgpu::VertexBufferLayout {
+                                array_stride: std::mem::size_of::<
+                                    mesh::SolidVertex2D,
+                                >(
+                                )
+                                    as u64,
+                                step_mode: wgpu::VertexStepMode::Vertex,
+                                attributes: &wgpu::vertex_attr_array!(
+                                    // Position
+                                    0 => Float32x2,
+                                    // Color
+                                    1 => Float32x4,
+                                ),
+                            }],
+                        },
+                        fragment: Some(wgpu::FragmentState {
+                            module: &shader,
+                            entry_point: "solid_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: "solid_fs_main",
-                        targets: &[triangle::fragment_target(format)],
-                    }),
-                    primitive: triangle::primitive_state(),
-                    depth_stencil: None,
-                    multisample: triangle::multisample_state(antialiasing),
-                    multiview: None,
-                },
-            );
+                );
 
             Self {
                 pipeline,
@@ -535,7 +537,8 @@ mod solid {
 }
 
 mod gradient {
-    use crate::graphics::{primitive, Antialiasing};
+    use crate::graphics::mesh;
+    use crate::graphics::Antialiasing;
     use crate::triangle;
     use crate::Buffer;
 
@@ -547,7 +550,7 @@ mod gradient {
 
     #[derive(Debug)]
     pub struct Layer {
-        pub vertices: Buffer<primitive::GradientVertex2D>,
+        pub vertices: Buffer<mesh::GradientVertex2D>,
         pub uniforms: Buffer<triangle::Uniforms>,
         pub constants: wgpu::BindGroup,
     }
@@ -645,7 +648,7 @@ mod gradient {
                         entry_point: "gradient_vs_main",
                         buffers: &[wgpu::VertexBufferLayout {
                             array_stride: std::mem::size_of::<
-                                primitive::GradientVertex2D,
+                                mesh::GradientVertex2D,
                             >()
                                 as u64,
                             step_mode: wgpu::VertexStepMode::Vertex,

From 6921564c9f66e8103e19ec658099c5f5c32e8cc5 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, 29 Jun 2023 07:55:52 +0200
Subject: [PATCH 410/440] Write missing docs in `iced_graphics` and `iced_wgpu`

---
 graphics/src/backend.rs  | 1 +
 graphics/src/damage.rs   | 1 +
 graphics/src/geometry.rs | 1 +
 graphics/src/lib.rs      | 6 +++---
 graphics/src/mesh.rs     | 1 +
 graphics/src/renderer.rs | 4 ++++
 wgpu/src/lib.rs          | 4 ++--
 wgpu/src/primitive.rs    | 4 ++++
 8 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 3ff24335..77bb650b 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -10,6 +10,7 @@ use std::borrow::Cow;
 ///
 /// [`Renderer`]: crate::Renderer
 pub trait Backend {
+    /// The custom kind of primitives this [`Backend`] supports.
     type Primitive;
 }
 
diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs
index be17b935..2f29956e 100644
--- a/graphics/src/damage.rs
+++ b/graphics/src/damage.rs
@@ -5,6 +5,7 @@ use crate::Primitive;
 
 use std::sync::Arc;
 
+/// A type that has some damage bounds.
 pub trait Damage: PartialEq {
     /// Returns the bounds of the [`Damage`].
     fn bounds(&self) -> Rectangle;
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 5e547bae..7cd3dd3a 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -16,6 +16,7 @@ pub use crate::gradient::{self, Gradient};
 
 /// A renderer capable of drawing some [`Geometry`].
 pub trait Renderer: crate::core::Renderer {
+    /// The kind of geometry this renderer can draw.
     type Geometry;
 
     /// Draws the given layers of [`Geometry`].
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index cef36003..af374a2f 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -8,8 +8,8 @@
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
 #![deny(
-    //missing_debug_implementations,
-    //missing_docs,
+    missing_debug_implementations,
+    missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
@@ -23,6 +23,7 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 mod antialiasing;
 mod error;
+mod primitive;
 mod transformation;
 mod viewport;
 
@@ -32,7 +33,6 @@ pub mod compositor;
 pub mod damage;
 pub mod gradient;
 pub mod mesh;
-pub mod primitive;
 pub mod renderer;
 
 #[cfg(feature = "geometry")]
diff --git a/graphics/src/mesh.rs b/graphics/src/mesh.rs
index 6ca7f79f..cfb5a60f 100644
--- a/graphics/src/mesh.rs
+++ b/graphics/src/mesh.rs
@@ -1,3 +1,4 @@
+//! Draw triangles!
 use crate::color;
 use crate::core::{Rectangle, Size};
 use crate::gradient;
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 459faf40..d80dea34 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -48,10 +48,12 @@ impl<B: Backend, T> Renderer<B, T> {
         f(&mut self.backend, &self.primitives)
     }
 
+    /// Starts recording a new layer.
     pub fn start_layer(&mut self) -> Vec<Primitive<B::Primitive>> {
         std::mem::take(&mut self.primitives)
     }
 
+    /// Ends the recording of a layer.
     pub fn end_layer(
         &mut self,
         primitives: Vec<Primitive<B::Primitive>>,
@@ -62,10 +64,12 @@ impl<B: Backend, T> Renderer<B, T> {
         self.primitives.push(Primitive::group(layer).clip(bounds));
     }
 
+    /// Starts recording a translation.
     pub fn start_translation(&mut self) -> Vec<Primitive<B::Primitive>> {
         std::mem::take(&mut self.primitives)
     }
 
+    /// Ends the recording of a translation.
     pub fn end_translation(
         &mut self,
         primitives: Vec<Primitive<B::Primitive>>,
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 0ffaeeef..deb223ef 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -24,8 +24,8 @@
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
 #![deny(
-    //missing_debug_implementations,
-    //missing_docs,
+    missing_debug_implementations,
+    missing_docs,
     unsafe_code,
     unused_results,
     clippy::extra_unused_lifetimes,
diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index a8f1119c..8dbf3008 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -1,10 +1,14 @@
+//! Draw using different graphical primitives.
 use crate::core::Rectangle;
 use crate::graphics::{Damage, Mesh};
 
+/// The graphical primitives supported by `iced_wgpu`.
 pub type Primitive = crate::graphics::Primitive<Custom>;
 
+/// The custom primitives supported by `iced_wgpu`.
 #[derive(Debug, Clone, PartialEq)]
 pub enum Custom {
+    /// A mesh primitive.
     Mesh(Mesh),
 }
 

From 0cc85c7820136f3ad858c287e8e35884604e7bd0 Mon Sep 17 00:00:00 2001
From: "Austin M. Reppert" <austinmreppert@gmail.com>
Date: Thu, 29 Jun 2023 02:14:21 -0400
Subject: [PATCH 411/440] Add touch support for toggler. (#1935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add touch support for toggler.

* Fix formatting.

* Fix consistency of imports in `iced_widget::toggler`

---------

Co-authored-by: Austin M. Reppert <austinmreppert@protonmail.com>
Co-authored-by: Héctor Ramón Jiménez <hector0193@gmail.com>
---
 widget/src/toggler.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 8b51f2d0..1b31765f 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -5,6 +5,7 @@ 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, Event, Layout, Length, Pixels, Rectangle,
@@ -208,7 +209,8 @@ where
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
         match event {
-            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
+            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
+            | Event::Touch(touch::Event::FingerPressed { .. }) => {
                 let mouse_over = cursor.is_over(layout.bounds());
 
                 if mouse_over {

From ae2709f2c4ce30b2006471ef23589e12f41c9a80 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, 29 Jun 2023 08:14:44 +0200
Subject: [PATCH 412/440] Take `Box` instead of reference in `State::operate`

---
 runtime/src/program/state.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/src/program/state.rs b/runtime/src/program/state.rs
index f57d2d8d..9ae504ee 100644
--- a/runtime/src/program/state.rs
+++ b/runtime/src/program/state.rs
@@ -176,10 +176,10 @@ where
     }
 
     /// Applies [`widget::Operation`]s to the [`State`]
-    pub fn operate<'a>(
+    pub fn operate(
         &mut self,
         renderer: &mut P::Renderer,
-        operations: impl Iterator<Item = &'a mut dyn Operation<P::Message>>,
+        operations: impl Iterator<Item = Box<dyn Operation<P::Message>>>,
         bounds: Size,
         debug: &mut Debug,
     ) {
@@ -192,18 +192,18 @@ where
         );
 
         for operation in operations {
-            let mut owned_op;
             let mut current_operation = Some(operation);
-            while let Some(operation) = current_operation.take() {
-                user_interface.operate(renderer, operation);
+
+            while let Some(mut operation) = current_operation.take() {
+                user_interface.operate(renderer, operation.as_mut());
+
                 match operation.finish() {
                     Outcome::None => {}
                     Outcome::Some(message) => {
                         self.queued_messages.push(message)
                     }
-                    Outcome::Chain(op) => {
-                        owned_op = op;
-                        current_operation = Some(owned_op.as_mut());
+                    Outcome::Chain(next) => {
+                        current_operation = Some(next);
                     }
                 };
             }

From af4d65c42862190adc9266dd95d98195bb1107de 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, 29 Jun 2023 08:15:30 +0200
Subject: [PATCH 413/440] Keep imports consistent in `program::state`

---
 runtime/src/program/state.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/src/program/state.rs b/runtime/src/program/state.rs
index 9ae504ee..35df6078 100644
--- a/runtime/src/program/state.rs
+++ b/runtime/src/program/state.rs
@@ -1,7 +1,7 @@
 use crate::core::event::{self, Event};
 use crate::core::mouse;
 use crate::core::renderer;
-use crate::core::widget::operation::{Operation, Outcome};
+use crate::core::widget::operation::{self, Operation};
 use crate::core::{Clipboard, Size};
 use crate::user_interface::{self, UserInterface};
 use crate::{Command, Debug, Program};
@@ -198,11 +198,11 @@ where
                 user_interface.operate(renderer, operation.as_mut());
 
                 match operation.finish() {
-                    Outcome::None => {}
-                    Outcome::Some(message) => {
+                    operation::Outcome::None => {}
+                    operation::Outcome::Some(message) => {
                         self.queued_messages.push(message)
                     }
-                    Outcome::Chain(next) => {
+                    operation::Outcome::Chain(next) => {
                         current_operation = Some(next);
                     }
                 };

From 98febd9a428f56e28112257adb72ef603fd2ddc5 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, 29 Jun 2023 17:54:54 +0200
Subject: [PATCH 414/440] Introduce `Mode` for `text::Cache` and trim only when
 switching modes

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

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 1b94edf6..c87b94a8 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -80,6 +80,11 @@ impl Pipeline {
         let renderer = &mut self.renderers[self.prepare_layer];
         let cache = self.cache.get_mut();
 
+        if self.prepare_layer == 0 {
+            let _ = cache.switch(Mode::Drawing);
+            cache.trim();
+        }
+
         let keys: Vec<_> = sections
             .iter()
             .map(|section| {
@@ -224,7 +229,6 @@ impl Pipeline {
 
     pub fn end_frame(&mut self) {
         self.atlas.trim();
-        self.cache.get_mut().trim();
 
         self.prepare_layer = 0;
     }
@@ -238,11 +242,15 @@ impl Pipeline {
         bounds: Size,
         shaping: Shaping,
     ) -> Size {
-        let mut measurement_cache = self.cache.borrow_mut();
+        let mut cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, entry) = measurement_cache.allocate(
+        if cache.switch(Mode::Measuring) {
+            cache.trim();
+        }
+
+        let (_, entry) = cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -268,11 +276,15 @@ impl Pipeline {
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
-        let mut measurement_cache = self.cache.borrow_mut();
+        let mut cache = self.cache.borrow_mut();
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        let (_, entry) = measurement_cache.allocate(
+        if cache.switch(Mode::Measuring) {
+            cache.trim();
+        }
+
+        let (_, entry) = cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
                 content,
@@ -348,9 +360,11 @@ fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
 
 struct Cache {
     entries: FxHashMap<KeyHash, Entry>,
-    measurements: FxHashMap<KeyHash, KeyHash>,
-    recently_used: FxHashSet<KeyHash>,
+    aliases: FxHashMap<KeyHash, KeyHash>,
+    recently_measured: FxHashSet<KeyHash>,
+    recently_drawn: FxHashSet<KeyHash>,
     hasher: HashBuilder,
+    mode: Mode,
 }
 
 struct Entry {
@@ -358,6 +372,12 @@ struct Entry {
     bounds: Size,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum Mode {
+    Measuring,
+    Drawing,
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 type HashBuilder = twox_hash::RandomXxHashBuilder64;
 
@@ -368,9 +388,11 @@ impl Cache {
     fn new() -> Self {
         Self {
             entries: FxHashMap::default(),
-            measurements: FxHashMap::default(),
-            recently_used: FxHashSet::default(),
+            aliases: FxHashMap::default(),
+            recently_measured: FxHashSet::default(),
+            recently_drawn: FxHashSet::default(),
             hasher: HashBuilder::default(),
+            mode: Mode::Measuring,
         }
     }
 
@@ -378,6 +400,14 @@ impl Cache {
         self.entries.get(key)
     }
 
+    fn switch(&mut self, mode: Mode) -> bool {
+        let has_changed = self.mode != mode;
+
+        self.mode = mode;
+
+        has_changed
+    }
+
     fn allocate(
         &mut self,
         font_system: &mut glyphon::FontSystem,
@@ -385,8 +415,13 @@ impl Cache {
     ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
-        if let Some(hash) = self.measurements.get(&hash) {
-            let _ = self.recently_used.insert(*hash);
+        let recently_used = match self.mode {
+            Mode::Measuring => &mut self.recently_measured,
+            Mode::Drawing => &mut self.recently_drawn,
+        };
+
+        if let Some(hash) = self.aliases.get(&hash) {
+            let _ = recently_used.insert(*hash);
 
             return (*hash, self.entries.get_mut(hash).unwrap());
         }
@@ -421,7 +456,7 @@ impl Cache {
                 },
             ] {
                 if key.bounds != bounds {
-                    let _ = self.measurements.insert(
+                    let _ = self.aliases.insert(
                         Key { bounds, ..key }.hash(self.hasher.build_hasher()),
                         hash,
                     );
@@ -429,18 +464,29 @@ impl Cache {
             }
         }
 
-        let _ = self.recently_used.insert(hash);
+        let _ = 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.measurements
-            .retain(|_, value| self.recently_used.contains(value));
+        self.entries.retain(|key, _| {
+            self.recently_measured.contains(key)
+                || self.recently_drawn.contains(key)
+        });
+        self.aliases.retain(|_, value| {
+            self.recently_measured.contains(value)
+                || self.recently_drawn.contains(value)
+        });
 
-        self.recently_used.clear();
+        match self.mode {
+            Mode::Measuring => {
+                self.recently_measured.clear();
+            }
+            Mode::Drawing => {
+                self.recently_drawn.clear();
+            }
+        }
     }
 }
 

From cdce03cf7f520ef0227aaec4eaed19332197f53b 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, 29 Jun 2023 18:17:18 +0200
Subject: [PATCH 415/440] Revert "Remove `layout` method from `core::Renderer`
 trait"

This reverts commit 2128472c2a8afcb59927712497c4f613612e9dcc.
---
 core/src/renderer.rs          | 15 ++++++++++++++-
 graphics/src/renderer.rs      | 13 ++++++++++++-
 runtime/src/user_interface.rs | 13 ++++++-------
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/core/src/renderer.rs b/core/src/renderer.rs
index 1b327e56..7c73d2e4 100644
--- a/core/src/renderer.rs
+++ b/core/src/renderer.rs
@@ -5,13 +5,26 @@ mod null;
 #[cfg(debug_assertions)]
 pub use null::Null;
 
-use crate::{Background, BorderRadius, Color, Rectangle, Vector};
+use crate::layout;
+use crate::{Background, BorderRadius, Color, Element, Rectangle, Vector};
 
 /// A component that can be used by widgets to draw themselves on a screen.
 pub trait Renderer: Sized {
     /// The supported theme of the [`Renderer`].
     type Theme;
 
+    /// Lays out the elements of a user interface.
+    ///
+    /// You should override this if you need to perform any operations before or
+    /// after layouting. For instance, trimming the measurements cache.
+    fn layout<Message>(
+        &mut self,
+        element: &Element<'_, Message, Self>,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        element.as_widget().layout(self, limits)
+    }
+
     /// Draws the primitives recorded in the given closure in a new layer.
     ///
     /// The layer will clip its contents to the provided `bounds`.
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index d80dea34..476aa407 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -3,10 +3,13 @@ use crate::backend::{self, Backend};
 use crate::Primitive;
 
 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, Font, Point, Rectangle, Size, Vector};
+use iced_core::{
+    Background, Color, Element, Font, Point, Rectangle, Size, Vector,
+};
 
 use std::borrow::Cow;
 use std::marker::PhantomData;
@@ -85,6 +88,14 @@ impl<B: Backend, T> Renderer<B, T> {
 impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> {
     type Theme = T;
 
+    fn layout<Message>(
+        &mut self,
+        element: &Element<'_, Message, Self>,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        element.as_widget().layout(self, limits)
+    }
+
     fn with_layer(&mut self, bounds: Rectangle, f: impl FnOnce(&mut Self)) {
         let current = self.start_layer();
 
diff --git a/runtime/src/user_interface.rs b/runtime/src/user_interface.rs
index 34b2ada0..619423fd 100644
--- a/runtime/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -95,9 +95,8 @@ where
         let Cache { mut state } = cache;
         state.diff(root.as_widget());
 
-        let base = root
-            .as_widget()
-            .layout(renderer, &layout::Limits::new(Size::ZERO, bounds));
+        let base =
+            renderer.layout(&root, &layout::Limits::new(Size::ZERO, bounds));
 
         UserInterface {
             root,
@@ -227,8 +226,8 @@ where
                 if shell.is_layout_invalid() {
                     let _ = ManuallyDrop::into_inner(manual_overlay);
 
-                    self.base = self.root.as_widget().layout(
-                        renderer,
+                    self.base = renderer.layout(
+                        &self.root,
                         &layout::Limits::new(Size::ZERO, self.bounds),
                     );
 
@@ -323,8 +322,8 @@ where
                 }
 
                 shell.revalidate_layout(|| {
-                    self.base = self.root.as_widget().layout(
-                        renderer,
+                    self.base = renderer.layout(
+                        &self.root,
                         &layout::Limits::new(Size::ZERO, self.bounds),
                     );
 

From d666e739cdcc2084c14593888867d40066c232fe 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, 29 Jun 2023 18:23:11 +0200
Subject: [PATCH 416/440] Trim text measurements only before `layout`

---
 graphics/src/backend.rs  |  7 +++++++
 graphics/src/renderer.rs |  2 ++
 wgpu/src/backend.rs      |  4 ++++
 wgpu/src/text.rs         | 45 +++++++++++++++-------------------------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 77bb650b..59e95bf8 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -12,6 +12,13 @@ use std::borrow::Cow;
 pub trait Backend {
     /// The custom kind of primitives this [`Backend`] supports.
     type Primitive;
+
+    /// Trims the measurements cache.
+    ///
+    /// This method is currently necessary to properly trim the text cache in
+    /// `iced_wgpu` and `iced_glow` because of limitations in the text rendering
+    /// pipeline. It will be removed in the future.
+    fn trim_measurements(&mut self) {}
 }
 
 /// A graphics backend that supports text rendering.
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 476aa407..c0cec60a 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -93,6 +93,8 @@ impl<B: Backend, T> iced_core::Renderer for Renderer<B, T> {
         element: &Element<'_, Message, Self>,
         limits: &layout::Limits,
     ) -> layout::Node {
+        self.backend.trim_measurements();
+
         element.as_widget().layout(self, limits)
     }
 
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 596d43c5..4a0c54f0 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -337,6 +337,10 @@ impl Backend {
 
 impl crate::graphics::Backend for Backend {
     type Primitive = primitive::Custom;
+
+    fn trim_measurements(&mut self) {
+        self.text_pipeline.trim_measurements();
+    }
 }
 
 impl backend::Text for Backend {
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index c87b94a8..65d3b818 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -81,8 +81,7 @@ impl Pipeline {
         let cache = self.cache.get_mut();
 
         if self.prepare_layer == 0 {
-            let _ = cache.switch(Mode::Drawing);
-            cache.trim();
+            cache.trim(Purpose::Drawing);
         }
 
         let keys: Vec<_> = sections
@@ -105,6 +104,7 @@ impl Pipeline {
                         },
                         shaping: section.shaping,
                     },
+                    Purpose::Drawing,
                 );
 
                 key
@@ -233,6 +233,10 @@ impl Pipeline {
         self.prepare_layer = 0;
     }
 
+    pub fn trim_measurements(&mut self) {
+        self.cache.get_mut().trim(Purpose::Measuring);
+    }
+
     pub fn measure(
         &self,
         content: &str,
@@ -246,10 +250,6 @@ impl Pipeline {
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        if cache.switch(Mode::Measuring) {
-            cache.trim();
-        }
-
         let (_, entry) = cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
@@ -260,6 +260,7 @@ impl Pipeline {
                 bounds,
                 shaping,
             },
+            Purpose::Measuring,
         );
 
         entry.bounds
@@ -280,10 +281,6 @@ impl Pipeline {
 
         let line_height = f32::from(line_height.to_absolute(Pixels(size)));
 
-        if cache.switch(Mode::Measuring) {
-            cache.trim();
-        }
-
         let (_, entry) = cache.allocate(
             &mut self.font_system.borrow_mut(),
             Key {
@@ -294,6 +291,7 @@ impl Pipeline {
                 bounds,
                 shaping,
             },
+            Purpose::Measuring,
         );
 
         let cursor = entry.buffer.hit(point.x, point.y)?;
@@ -364,7 +362,6 @@ struct Cache {
     recently_measured: FxHashSet<KeyHash>,
     recently_drawn: FxHashSet<KeyHash>,
     hasher: HashBuilder,
-    mode: Mode,
 }
 
 struct Entry {
@@ -373,7 +370,7 @@ struct Entry {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Mode {
+enum Purpose {
     Measuring,
     Drawing,
 }
@@ -392,7 +389,6 @@ impl Cache {
             recently_measured: FxHashSet::default(),
             recently_drawn: FxHashSet::default(),
             hasher: HashBuilder::default(),
-            mode: Mode::Measuring,
         }
     }
 
@@ -400,24 +396,17 @@ impl Cache {
         self.entries.get(key)
     }
 
-    fn switch(&mut self, mode: Mode) -> bool {
-        let has_changed = self.mode != mode;
-
-        self.mode = mode;
-
-        has_changed
-    }
-
     fn allocate(
         &mut self,
         font_system: &mut glyphon::FontSystem,
         key: Key<'_>,
+        purpose: Purpose,
     ) -> (KeyHash, &mut Entry) {
         let hash = key.hash(self.hasher.build_hasher());
 
-        let recently_used = match self.mode {
-            Mode::Measuring => &mut self.recently_measured,
-            Mode::Drawing => &mut self.recently_drawn,
+        let recently_used = match purpose {
+            Purpose::Measuring => &mut self.recently_measured,
+            Purpose::Drawing => &mut self.recently_drawn,
         };
 
         if let Some(hash) = self.aliases.get(&hash) {
@@ -469,7 +458,7 @@ impl Cache {
         (hash, self.entries.get_mut(&hash).unwrap())
     }
 
-    fn trim(&mut self) {
+    fn trim(&mut self, purpose: Purpose) {
         self.entries.retain(|key, _| {
             self.recently_measured.contains(key)
                 || self.recently_drawn.contains(key)
@@ -479,11 +468,11 @@ impl Cache {
                 || self.recently_drawn.contains(value)
         });
 
-        match self.mode {
-            Mode::Measuring => {
+        match purpose {
+            Purpose::Measuring => {
                 self.recently_measured.clear();
             }
-            Mode::Drawing => {
+            Purpose::Drawing => {
                 self.recently_drawn.clear();
             }
         }

From 4f066b516bd7c5a8a3a55f01d09d650e10567839 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 12 Jun 2023 21:04:43 -0700
Subject: [PATCH 417/440] Add scrollable alignment option

---
 examples/scrollable/src/main.rs |  52 +++++++++++++--
 widget/src/scrollable.rs        | 109 +++++++++++++++++++++++++++++---
 2 files changed, 146 insertions(+), 15 deletions(-)

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 4104871f..8c08d993 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -20,6 +20,7 @@ struct ScrollableDemo {
     scrollbar_margin: u16,
     scroller_width: u16,
     current_scroll_offset: scrollable::RelativeOffset,
+    alignment: scrollable::Alignment,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Copy)]
@@ -32,6 +33,7 @@ enum Direction {
 #[derive(Debug, Clone)]
 enum Message {
     SwitchDirection(Direction),
+    AlignmentChanged(scrollable::Alignment),
     ScrollbarWidthChanged(u16),
     ScrollbarMarginChanged(u16),
     ScrollerWidthChanged(u16),
@@ -54,6 +56,7 @@ impl Application for ScrollableDemo {
                 scrollbar_margin: 0,
                 scroller_width: 10,
                 current_scroll_offset: scrollable::RelativeOffset::START,
+                alignment: scrollable::Alignment::Start,
             },
             Command::none(),
         )
@@ -74,6 +77,15 @@ impl Application for ScrollableDemo {
                     self.current_scroll_offset,
                 )
             }
+            Message::AlignmentChanged(alignment) => {
+                self.current_scroll_offset = scrollable::RelativeOffset::START;
+                self.alignment = alignment;
+
+                scrollable::snap_to(
+                    SCROLLABLE_ID.clone(),
+                    self.current_scroll_offset,
+                )
+            }
             Message::ScrollbarWidthChanged(width) => {
                 self.scrollbar_width = width;
 
@@ -165,10 +177,33 @@ impl Application for ScrollableDemo {
         .spacing(10)
         .width(Length::Fill);
 
-        let scroll_controls =
-            row![scroll_slider_controls, scroll_orientation_controls]
-                .spacing(20)
-                .width(Length::Fill);
+        let scroll_alignment_controls = column(vec![
+            text("Scrollable alignment:").into(),
+            radio(
+                "Start",
+                scrollable::Alignment::Start,
+                Some(self.alignment),
+                Message::AlignmentChanged,
+            )
+            .into(),
+            radio(
+                "End",
+                scrollable::Alignment::End,
+                Some(self.alignment),
+                Message::AlignmentChanged,
+            )
+            .into(),
+        ])
+        .spacing(10)
+        .width(Length::Fill);
+
+        let scroll_controls = row![
+            scroll_slider_controls,
+            scroll_orientation_controls,
+            scroll_alignment_controls
+        ]
+        .spacing(20)
+        .width(Length::Fill);
 
         let scroll_to_end_button = || {
             button("Scroll to end")
@@ -204,7 +239,8 @@ impl Application for ScrollableDemo {
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
-                        .scroller_width(self.scroller_width),
+                        .scroller_width(self.scroller_width)
+                        .alignment(self.alignment),
                 ))
                 .id(SCROLLABLE_ID.clone())
                 .on_scroll(Message::Scrolled),
@@ -228,7 +264,8 @@ impl Application for ScrollableDemo {
                     Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
-                        .scroller_width(self.scroller_width),
+                        .scroller_width(self.scroller_width)
+                        .alignment(self.alignment),
                 ))
                 .style(theme::Scrollable::custom(ScrollbarCustomStyle))
                 .id(SCROLLABLE_ID.clone())
@@ -269,7 +306,8 @@ impl Application for ScrollableDemo {
                     let properties = Properties::new()
                         .width(self.scrollbar_width)
                         .margin(self.scrollbar_margin)
-                        .scroller_width(self.scroller_width);
+                        .scroller_width(self.scroller_width)
+                        .alignment(self.alignment);
 
                     scrollable::Direction::Both {
                         horizontal: properties,
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 473124ca..b6111975 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -143,6 +143,7 @@ pub struct Properties {
     width: f32,
     margin: f32,
     scroller_width: f32,
+    alignment: Alignment,
 }
 
 impl Default for Properties {
@@ -151,6 +152,7 @@ impl Default for Properties {
             width: 10.0,
             margin: 0.0,
             scroller_width: 10.0,
+            alignment: Alignment::Start,
         }
     }
 }
@@ -178,6 +180,31 @@ impl Properties {
         self.scroller_width = scroller_width.into().0.max(0.0);
         self
     }
+
+    /// Sets the alignment of the [`Scrollable`] .
+    pub fn alignment(mut self, alignment: Alignment) -> Self {
+        self.alignment = alignment;
+        self
+    }
+}
+
+/// Alignment of the scrollable's content relative to it's [`Viewport`] in one direction.
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
+pub enum Alignment {
+    /// Content is aligned to the start of the [`Viewport`].
+    #[default]
+    Start,
+    /// Content is aligned to the end of the [`Viewport`]
+    End,
+}
+
+impl Alignment {
+    fn aligned(self, offset: f32, viewport: f32, content: f32) -> f32 {
+        match self {
+            Alignment::Start => offset,
+            Alignment::End => ((content - viewport).max(0.0) - offset).max(0.0),
+        }
+    }
 }
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
@@ -485,6 +512,15 @@ pub fn update<Message>(
 
     let scrollbars = Scrollbars::new(state, direction, bounds, content_bounds);
 
+    let horizontal_alignment = direction
+        .horizontal()
+        .map(|p| p.alignment)
+        .unwrap_or_default();
+    let vertical_alignment = direction
+        .vertical()
+        .map(|p| p.alignment)
+        .unwrap_or_default();
+
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
 
@@ -535,7 +571,11 @@ pub fn update<Message>(
                 mouse::ScrollDelta::Pixels { x, y } => Vector::new(x, y),
             };
 
-            state.scroll(delta, bounds, content_bounds);
+            state.scroll(
+                aligned_delta(delta, vertical_alignment, horizontal_alignment),
+                bounds,
+                content_bounds,
+            );
 
             notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
 
@@ -566,7 +606,15 @@ pub fn update<Message>(
                             cursor_position.y - scroll_box_touched_at.y,
                         );
 
-                        state.scroll(delta, bounds, content_bounds);
+                        state.scroll(
+                            aligned_delta(
+                                delta,
+                                vertical_alignment,
+                                horizontal_alignment,
+                            ),
+                            bounds,
+                            content_bounds,
+                        );
 
                         state.scroll_area_touched_at = Some(cursor_position);
 
@@ -610,6 +658,7 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_y(
                             scroller_grabbed_at,
                             cursor_position,
+                            vertical_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -643,6 +692,7 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_y(
                             scroller_grabbed_at,
                             cursor_position,
+                            vertical_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -685,6 +735,7 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_x(
                             scroller_grabbed_at,
                             cursor_position,
+                            horizontal_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -718,6 +769,7 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_x(
                             scroller_grabbed_at,
                             cursor_position,
+                            horizontal_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -1166,13 +1218,22 @@ impl State {
         content_bounds: Rectangle,
     ) -> Vector {
         Vector::new(
-            if direction.horizontal().is_some() {
-                self.offset_x.absolute(bounds.width, content_bounds.width)
+            if let Some(horizontal) = direction.horizontal() {
+                horizontal.alignment.aligned(
+                    self.offset_x.absolute(bounds.width, content_bounds.width),
+                    bounds.width,
+                    content_bounds.width,
+                )
             } else {
                 0.0
             },
-            if direction.vertical().is_some() {
-                self.offset_y.absolute(bounds.height, content_bounds.height)
+            if let Some(vertical) = direction.vertical() {
+                vertical.alignment.aligned(
+                    self.offset_y
+                        .absolute(bounds.height, content_bounds.height),
+                    bounds.height,
+                    content_bounds.height,
+                )
             } else {
                 0.0
             },
@@ -1216,6 +1277,7 @@ impl Scrollbars {
                 width,
                 margin,
                 scroller_width,
+                ..
             } = *vertical;
 
             // Adjust the height of the vertical scrollbar if the horizontal scrollbar
@@ -1275,6 +1337,7 @@ impl Scrollbars {
                 width,
                 margin,
                 scroller_width,
+                ..
             } = *horizontal;
 
             // Need to adjust the width of the horizontal scrollbar if the vertical scrollbar
@@ -1387,9 +1450,27 @@ impl Scrollbars {
     }
 }
 
+fn aligned_delta(
+    delta: Vector,
+    vertical_alignment: Alignment,
+    horizontal_alignment: Alignment,
+) -> Vector {
+    let align = |alignment: Alignment, delta: f32| match alignment {
+        Alignment::Start => delta,
+        Alignment::End => -delta,
+    };
+
+    Vector::new(
+        align(horizontal_alignment, delta.x),
+        align(vertical_alignment, delta.y),
+    )
+}
+
 pub(super) mod internals {
     use crate::core::{Point, Rectangle};
 
+    use super::Alignment;
+
     /// The scrollbar of a [`Scrollable`].
     #[derive(Debug, Copy, Clone)]
     pub struct Scrollbar {
@@ -1415,8 +1496,9 @@ pub(super) mod internals {
             &self,
             grabbed_at: f32,
             cursor_position: Point,
+            alignment: Alignment,
         ) -> f32 {
-            if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
+            let pct = 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()
@@ -1425,6 +1507,11 @@ pub(super) mod internals {
                     - self.bounds.y
                     - self.scroller.bounds.height * grabbed_at)
                     / (self.bounds.height - self.scroller.bounds.height)
+            };
+
+            match alignment {
+                Alignment::Start => pct,
+                Alignment::End => 1.0 - pct,
             }
         }
 
@@ -1433,14 +1520,20 @@ pub(super) mod internals {
             &self,
             grabbed_at: f32,
             cursor_position: Point,
+            alignment: Alignment,
         ) -> f32 {
-            if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
+            let pct = 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)
+            };
+
+            match alignment {
+                Alignment::Start => pct,
+                Alignment::End => 1.0 - pct,
             }
         }
     }

From 905c307f0b78d9957a82a95b0ba537be23fa4035 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Tue, 13 Jun 2023 08:22:33 -0700
Subject: [PATCH 418/440] Make viewport bounds public

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

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index b6111975..79e5fe3e 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -1099,8 +1099,10 @@ impl Offset {
 pub struct Viewport {
     offset_x: Offset,
     offset_y: Offset,
-    bounds: Rectangle,
-    content_bounds: Rectangle,
+    /// The viewport bounds of the [`Scrollable`].
+    pub bounds: Rectangle,
+    /// The content bounds of the [`Scrollable`].
+    pub content_bounds: Rectangle,
 }
 
 impl Viewport {

From d79cedd8da99345947f5b9fcb1ebc3a145cc4112 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Sat, 24 Jun 2023 18:01:14 -0700
Subject: [PATCH 419/440] Add alignment to Viewport

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

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 79e5fe3e..3912f445 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -577,7 +577,15 @@ pub fn update<Message>(
                 content_bounds,
             );
 
-            notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
+            notify_on_scroll(
+                state,
+                on_scroll,
+                bounds,
+                content_bounds,
+                horizontal_alignment,
+                vertical_alignment,
+                shell,
+            );
 
             return event::Status::Captured;
         }
@@ -623,6 +631,8 @@ pub fn update<Message>(
                             on_scroll,
                             bounds,
                             content_bounds,
+                            horizontal_alignment,
+                            vertical_alignment,
                             shell,
                         );
                     }
@@ -669,6 +679,8 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
+                        horizontal_alignment,
+                        vertical_alignment,
                         shell,
                     );
 
@@ -705,6 +717,8 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
+                        horizontal_alignment,
+                        vertical_alignment,
                         shell,
                     );
                 }
@@ -746,6 +760,8 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
+                        horizontal_alignment,
+                        vertical_alignment,
                         shell,
                     );
                 }
@@ -782,6 +798,8 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
+                        horizontal_alignment,
+                        vertical_alignment,
                         shell,
                     );
 
@@ -997,6 +1015,8 @@ fn notify_on_scroll<Message>(
     on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     bounds: Rectangle,
     content_bounds: Rectangle,
+    horizontal_alignment: Alignment,
+    vertical_alignment: Alignment,
     shell: &mut Shell<'_, Message>,
 ) {
     if let Some(on_scroll) = on_scroll {
@@ -1011,6 +1031,8 @@ fn notify_on_scroll<Message>(
             offset_y: state.offset_y,
             bounds,
             content_bounds,
+            horizontal_alignment,
+            vertical_alignment,
         };
 
         // Don't publish redundant viewports to shell
@@ -1103,6 +1125,10 @@ pub struct Viewport {
     pub bounds: Rectangle,
     /// The content bounds of the [`Scrollable`].
     pub content_bounds: Rectangle,
+    /// The horizontal [`Alignment`] of the [`Scrollable`].
+    pub horizontal_alignment: Alignment,
+    /// The vertical [`Alignment`] of the [`Scrollable`].
+    pub vertical_alignment: Alignment,
 }
 
 impl Viewport {

From cc32bd4de09ee58c15d1b3f2cec4a79dc65dd035 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, 6 Jul 2023 06:41:28 +0200
Subject: [PATCH 420/440] Use `Size` in both `Resize` and `FetchSize` window
 actions

---
 runtime/src/window.rs        |  5 +++--
 runtime/src/window/action.rs | 17 +++++------------
 winit/src/application.rs     | 11 +++++++----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index d4111293..094a713d 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -6,6 +6,7 @@ pub use action::Action;
 use crate::command::{self, Command};
 use crate::core::time::Instant;
 use crate::core::window::{Event, Icon, Level, Mode, UserAttention};
+use crate::core::Size;
 use crate::futures::subscription::{self, Subscription};
 
 /// Subscribes to the frames of the window of the running application.
@@ -34,8 +35,8 @@ pub fn drag<Message>() -> Command<Message> {
 }
 
 /// Resizes the window to the given logical dimensions.
-pub fn resize<Message>(width: u32, height: u32) -> Command<Message> {
-    Command::single(command::Action::Window(Action::Resize { width, height }))
+pub fn resize<Message>(new_size: Size<u32>) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Resize(new_size)))
 }
 
 /// Maximizes the window.
diff --git a/runtime/src/window/action.rs b/runtime/src/window/action.rs
index 551d0a01..d0137895 100644
--- a/runtime/src/window/action.rs
+++ b/runtime/src/window/action.rs
@@ -1,4 +1,5 @@
 use crate::core::window::{Icon, Level, Mode, UserAttention};
+use crate::core::Size;
 use crate::futures::MaybeSend;
 
 use std::fmt;
@@ -14,14 +15,9 @@ pub enum Action<T> {
     /// button was pressed immediately before this function is called.
     Drag,
     /// Resize the window.
-    Resize {
-        /// The new logical width of the window
-        width: u32,
-        /// The new logical height of the window
-        height: u32,
-    },
+    Resize(Size<u32>),
     /// Fetch the current size of the window.
-    FetchSize(Box<dyn FnOnce((u32, u32)) -> T + 'static>),
+    FetchSize(Box<dyn FnOnce(Size<u32>) -> T + 'static>),
     /// Set the window to maximized or back
     Maximize(bool),
     /// Set the window to minimized or back
@@ -105,7 +101,7 @@ impl<T> Action<T> {
         match self {
             Self::Close => Action::Close,
             Self::Drag => Action::Drag,
-            Self::Resize { width, height } => Action::Resize { width, height },
+            Self::Resize(size) => Action::Resize(size),
             Self::FetchSize(o) => Action::FetchSize(Box::new(move |s| f(o(s)))),
             Self::Maximize(maximized) => Action::Maximize(maximized),
             Self::Minimize(minimized) => Action::Minimize(minimized),
@@ -130,10 +126,7 @@ impl<T> fmt::Debug for Action<T> {
         match self {
             Self::Close => write!(f, "Action::Close"),
             Self::Drag => write!(f, "Action::Drag"),
-            Self::Resize { width, height } => write!(
-                f,
-                "Action::Resize {{ widget: {width}, height: {height} }}"
-            ),
+            Self::Resize(size) => write!(f, "Action::Resize({size:?})"),
             Self::FetchSize(_) => write!(f, "Action::FetchSize"),
             Self::Maximize(maximized) => {
                 write!(f, "Action::Maximize({maximized})")
diff --git a/winit/src/application.rs b/winit/src/application.rs
index b0824e0e..afc523b6 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -741,17 +741,20 @@ pub fn run_command<A, E>(
                 window::Action::Drag => {
                     let _res = window.drag_window();
                 }
-                window::Action::Resize { width, height } => {
+                window::Action::Resize(size) => {
                     window.set_inner_size(winit::dpi::LogicalSize {
-                        width,
-                        height,
+                        width: size.width,
+                        height: size.height,
                     });
                 }
                 window::Action::FetchSize(callback) => {
                     let size = window.inner_size();
 
                     proxy
-                        .send_event(callback((size.width, size.height)))
+                        .send_event(callback(Size::new(
+                            size.width,
+                            size.height,
+                        )))
                         .expect("Send message to event loop")
                 }
                 window::Action::Maximize(maximized) => {

From f43a272d7d201b39553f954183362ef42b31d11c 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, 6 Jul 2023 06:42:30 +0200
Subject: [PATCH 421/440] Add missing newline in `core::window`

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

diff --git a/core/src/window.rs b/core/src/window.rs
index 4beebf9f..a6dbdfb4 100644
--- a/core/src/window.rs
+++ b/core/src/window.rs
@@ -12,4 +12,4 @@ pub use icon::Icon;
 pub use level::Level;
 pub use mode::Mode;
 pub use redraw_request::RedrawRequest;
-pub use user_attention::UserAttention;
\ No newline at end of file
+pub use user_attention::UserAttention;

From f350a2f812487af9a43c36e28d9b904e76a66474 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, 6 Jul 2023 06:44:09 +0200
Subject: [PATCH 422/440] Add `fetch_size` helper to `runtime::window`

---
 runtime/src/window.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index 094a713d..9356581a 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -39,6 +39,13 @@ pub fn resize<Message>(new_size: Size<u32>) -> Command<Message> {
     Command::single(command::Action::Window(Action::Resize(new_size)))
 }
 
+/// Fetches the current window size in logical dimensions.
+pub fn fetch_size<Message>(
+    f: impl FnOnce(Size<u32>) -> Message + 'static,
+) -> Command<Message> {
+    Command::single(command::Action::Window(Action::FetchSize(Box::new(f))))
+}
+
 /// Maximizes the window.
 pub fn maximize<Message>(maximized: bool) -> Command<Message> {
     Command::single(command::Action::Window(Action::Maximize(maximized)))

From e5c9dd54b3f51e913f39b38e8907c321c8bfd040 Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Fri, 19 May 2023 11:24:52 +0100
Subject: [PATCH 423/440] Add ability to drag pane to the pane grid edges &
 optional style for dragged pane

---
 examples/pane_grid/src/main.rs |  13 +-
 style/src/pane_grid.rs         |   2 +-
 widget/src/pane_grid.rs        | 285 +++++++++++++++++++++++----------
 widget/src/pane_grid/node.rs   |  10 ++
 widget/src/pane_grid/state.rs  |  89 ++++++++--
 5 files changed, 293 insertions(+), 106 deletions(-)

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index 54c36d69..c5652e2d 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -108,10 +108,15 @@ impl Application for Example {
             Message::Dragged(pane_grid::DragEvent::Dropped {
                 pane,
                 target,
-                region,
-            }) => {
-                self.panes.split_with(&target, &pane, region);
-            }
+            }) => match target {
+                pane_grid::Target::PaneGrid(edge) => {
+                    self.panes.move_to_edge(&pane, edge)
+                }
+                pane_grid::Target::Pane {
+                    pane: target,
+                    region,
+                } => self.panes.split_with(&target, &pane, region),
+            },
             Message::Dragged(_) => {}
             Message::TogglePin(pane) => {
                 if let Some(Pane { is_pinned, .. }) = self.panes.get_mut(&pane)
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index b99af955..dfdc9186 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -31,7 +31,7 @@ pub trait StyleSheet {
     /// The supported style of the [`StyleSheet`].
     type Style: Default;
 
-    /// The [`Region`] to draw when a pane is hovered.
+    /// The [`Appearance`] to draw when a pane is hovered.
     fn hovered_region(&self, style: &Self::Style) -> Appearance;
 
     /// The [`Line`] to draw when a split is picked.
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 040d6bb3..0a8500dc 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -581,39 +581,49 @@ pub fn update<'a, Message, T: Draggable>(
         | Event::Touch(touch::Event::FingerLost { .. }) => {
             if let Some((pane, _)) = action.picked_pane() {
                 if let Some(on_drag) = on_drag {
-                    let dropped_region =
-                        cursor.position().and_then(|cursor_position| {
-                            contents
+                    if let Some(cursor_position) = cursor.position() {
+                        let event = if let Some(edge) =
+                            in_edge(layout, cursor_position)
+                        {
+                            DragEvent::Dropped {
+                                pane,
+                                target: Target::PaneGrid(edge),
+                            }
+                        } else {
+                            let dropped_region = contents
                                 .zip(layout.children())
                                 .filter_map(|(target, layout)| {
                                     layout_region(layout, cursor_position)
                                         .map(|region| (target, region))
                                 })
-                                .next()
-                        });
+                                .next();
 
-                    let event = match dropped_region {
-                        Some(((target, _), region)) if pane != target => {
-                            DragEvent::Dropped {
-                                pane,
-                                target,
-                                region,
+                            match dropped_region {
+                                Some(((target, _), region))
+                                    if pane != target =>
+                                {
+                                    DragEvent::Dropped {
+                                        pane,
+                                        target: Target::Pane {
+                                            pane: target,
+                                            region,
+                                        },
+                                    }
+                                }
+                                _ => DragEvent::Canceled { pane },
                             }
-                        }
-                        _ => DragEvent::Canceled { pane },
-                    };
+                        };
 
-                    shell.publish(on_drag(event));
+                        shell.publish(on_drag(event));
+                    }
                 }
 
-                *action = state::Action::Idle;
-
                 event_status = event::Status::Captured;
             } else if action.picked_split().is_some() {
-                *action = state::Action::Idle;
-
                 event_status = event::Status::Captured;
             }
+
+            *action = state::Action::Idle;
         }
         Event::Mouse(mouse::Event::CursorMoved { .. })
         | Event::Touch(touch::Event::FingerMoved { .. }) => {
@@ -671,13 +681,13 @@ fn layout_region(layout: Layout<'_>, cursor_position: Point) -> Option<Region> {
     }
 
     let region = if cursor_position.x < (bounds.x + bounds.width / 3.0) {
-        Region::Left
+        Region::Edge(Edge::Left)
     } else if cursor_position.x > (bounds.x + 2.0 * bounds.width / 3.0) {
-        Region::Right
+        Region::Edge(Edge::Right)
     } else if cursor_position.y < (bounds.y + bounds.height / 3.0) {
-        Region::Top
+        Region::Edge(Edge::Top)
     } else if cursor_position.y > (bounds.y + 2.0 * bounds.height / 3.0) {
-        Region::Bottom
+        Region::Edge(Edge::Bottom)
     } else {
         Region::Center
     };
@@ -833,28 +843,32 @@ pub fn draw<Renderer, T>(
 
     let mut render_picked_pane = None;
 
-    for ((id, pane), layout) in contents.zip(layout.children()) {
+    let cursor_in_edge = cursor
+        .position()
+        .and_then(|cursor_position| in_edge(layout, cursor_position));
+
+    for ((id, pane), pane_layout) in contents.zip(layout.children()) {
         match picked_pane {
             Some((dragging, origin)) if id == dragging => {
-                render_picked_pane = Some((pane, origin, layout));
+                render_picked_pane = Some((pane, origin, pane_layout));
             }
             Some((dragging, _)) if id != dragging => {
                 draw_pane(
                     pane,
                     renderer,
                     default_style,
-                    layout,
+                    pane_layout,
                     pane_cursor,
                     viewport,
                 );
 
-                if picked_pane.is_some() {
+                if picked_pane.is_some() && cursor_in_edge.is_none() {
                     if let Some(region) =
                         cursor.position().and_then(|cursor_position| {
-                            layout_region(layout, cursor_position)
+                            layout_region(pane_layout, cursor_position)
                         })
                     {
-                        let bounds = layout_region_bounds(layout, region);
+                        let bounds = layout_region_bounds(pane_layout, region);
                         let hovered_region_style = theme.hovered_region(style);
 
                         renderer.fill_quad(
@@ -875,7 +889,7 @@ pub fn draw<Renderer, T>(
                     pane,
                     renderer,
                     default_style,
-                    layout,
+                    pane_layout,
                     pane_cursor,
                     viewport,
                 );
@@ -883,6 +897,23 @@ pub fn draw<Renderer, T>(
         }
     }
 
+    if picked_pane.is_some() {
+        if let Some(edge) = cursor_in_edge {
+            let hovered_region_style = theme.hovered_region(style);
+            let bounds = edge_bounds(layout, edge);
+
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds,
+                    border_radius: hovered_region_style.border_radius.into(),
+                    border_width: hovered_region_style.border_width,
+                    border_color: hovered_region_style.border_color,
+                },
+                theme.hovered_region(style).background,
+            );
+        }
+    }
+
     // Render picked pane last
     if let Some((pane, origin, layout)) = render_picked_pane {
         if let Some(cursor_position) = cursor.position() {
@@ -907,67 +938,127 @@ pub fn draw<Renderer, T>(
         }
     }
 
-    if let Some((axis, split_region, is_picked)) = picked_split {
-        let highlight = if is_picked {
-            theme.picked_split(style)
-        } else {
-            theme.hovered_split(style)
-        };
+    if picked_pane.is_none() {
+        if let Some((axis, split_region, is_picked)) = picked_split {
+            let highlight = if is_picked {
+                theme.picked_split(style)
+            } else {
+                theme.hovered_split(style)
+            };
 
-        if let Some(highlight) = highlight {
-            renderer.fill_quad(
-                renderer::Quad {
-                    bounds: match axis {
-                        Axis::Horizontal => Rectangle {
-                            x: split_region.x,
-                            y: (split_region.y
-                                + (split_region.height - highlight.width)
-                                    / 2.0)
-                                .round(),
-                            width: split_region.width,
-                            height: highlight.width,
-                        },
-                        Axis::Vertical => Rectangle {
-                            x: (split_region.x
-                                + (split_region.width - highlight.width) / 2.0)
-                                .round(),
-                            y: split_region.y,
-                            width: highlight.width,
-                            height: split_region.height,
+            if let Some(highlight) = highlight {
+                renderer.fill_quad(
+                    renderer::Quad {
+                        bounds: match axis {
+                            Axis::Horizontal => Rectangle {
+                                x: split_region.x,
+                                y: (split_region.y
+                                    + (split_region.height - highlight.width)
+                                        / 2.0)
+                                    .round(),
+                                width: split_region.width,
+                                height: highlight.width,
+                            },
+                            Axis::Vertical => Rectangle {
+                                x: (split_region.x
+                                    + (split_region.width - highlight.width)
+                                        / 2.0)
+                                    .round(),
+                                y: split_region.y,
+                                width: highlight.width,
+                                height: split_region.height,
+                            },
                         },
+                        border_radius: 0.0.into(),
+                        border_width: 0.0,
+                        border_color: Color::TRANSPARENT,
                     },
-                    border_radius: 0.0.into(),
-                    border_width: 0.0,
-                    border_color: Color::TRANSPARENT,
-                },
-                highlight.color,
-            );
+                    highlight.color,
+                );
+            }
         }
     }
 }
 
+const THICKNESS_RATIO: f32 = 25.0;
+
+fn in_edge(layout: Layout<'_>, cursor: Point) -> Option<Edge> {
+    let bounds = layout.bounds();
+
+    let height_thickness = bounds.height / THICKNESS_RATIO;
+    let width_thickness = bounds.width / THICKNESS_RATIO;
+    let thickness = height_thickness.min(width_thickness);
+
+    if cursor.x > bounds.x && cursor.x < bounds.x + thickness {
+        Some(Edge::Left)
+    } else if cursor.x > bounds.x + bounds.width - thickness
+        && cursor.x < bounds.x + bounds.width
+    {
+        Some(Edge::Right)
+    } else if cursor.y > bounds.y && cursor.y < bounds.y + thickness {
+        Some(Edge::Top)
+    } else if cursor.y > bounds.y + bounds.height - thickness
+        && cursor.y < bounds.y + bounds.height
+    {
+        Some(Edge::Bottom)
+    } else {
+        None
+    }
+}
+
+fn edge_bounds(layout: Layout<'_>, edge: Edge) -> Rectangle {
+    let bounds = layout.bounds();
+
+    let height_thickness = bounds.height / THICKNESS_RATIO;
+    let width_thickness = bounds.width / THICKNESS_RATIO;
+    let thickness = height_thickness.min(width_thickness);
+
+    match edge {
+        Edge::Top => Rectangle {
+            height: thickness,
+            ..bounds
+        },
+        Edge::Left => Rectangle {
+            width: thickness,
+            ..bounds
+        },
+        Edge::Right => Rectangle {
+            x: bounds.x + bounds.width - thickness,
+            width: thickness,
+            ..bounds
+        },
+        Edge::Bottom => Rectangle {
+            y: bounds.y + bounds.height - thickness,
+            height: thickness,
+            ..bounds
+        },
+    }
+}
+
 fn layout_region_bounds(layout: Layout<'_>, region: Region) -> Rectangle {
     let bounds = layout.bounds();
 
     match region {
         Region::Center => bounds,
-        Region::Top => Rectangle {
-            height: bounds.height / 2.0,
-            ..bounds
-        },
-        Region::Left => Rectangle {
-            width: bounds.width / 2.0,
-            ..bounds
-        },
-        Region::Right => Rectangle {
-            x: bounds.x + bounds.width / 2.0,
-            width: bounds.width / 2.0,
-            ..bounds
-        },
-        Region::Bottom => Rectangle {
-            y: bounds.y + bounds.height / 2.0,
-            height: bounds.height / 2.0,
-            ..bounds
+        Region::Edge(edge) => match edge {
+            Edge::Top => Rectangle {
+                height: bounds.height / 2.0,
+                ..bounds
+            },
+            Edge::Left => Rectangle {
+                width: bounds.width / 2.0,
+                ..bounds
+            },
+            Edge::Right => Rectangle {
+                x: bounds.x + bounds.width / 2.0,
+                width: bounds.width / 2.0,
+                ..bounds
+            },
+            Edge::Bottom => Rectangle {
+                y: bounds.y + bounds.height / 2.0,
+                height: bounds.height / 2.0,
+                ..bounds
+            },
         },
     }
 }
@@ -986,11 +1077,8 @@ pub enum DragEvent {
         /// The picked [`Pane`].
         pane: Pane,
 
-        /// The [`Pane`] where the picked one was dropped on.
-        target: Pane,
-
-        /// The [`Region`] of the target [`Pane`] where the picked one was dropped on.
-        region: Region,
+        /// The [`Target`] where the picked [`Pane`] was dropped on.
+        target: Target,
     },
 
     /// A [`Pane`] was picked and then dropped outside of other [`Pane`]
@@ -1001,19 +1089,40 @@ pub enum DragEvent {
     },
 }
 
+/// The [`Target`] area a pane can be dropped on.
+#[derive(Debug, Clone, Copy)]
+pub enum Target {
+    /// The [`Edge`} of the full [`PaneGrid`].
+    PaneGrid(Edge),
+    /// A single [`Pane`] of the [`PaneGrid`].
+    Pane {
+        /// The targetted [`Pane`].
+        pane: Pane,
+        /// The targetted area of the [`Pane`].
+        region: Region,
+    },
+}
+
 /// The region of a [`Pane`].
 #[derive(Debug, Clone, Copy, Default)]
 pub enum Region {
     /// Center region.
     #[default]
     Center,
-    /// Top region.
+    /// Edge region.
+    Edge(Edge),
+}
+
+/// The edges of an area.
+#[derive(Debug, Clone, Copy)]
+pub enum Edge {
+    /// Top edge.
     Top,
-    /// Left region.
+    /// Left edge.
     Left,
-    /// Right region.
+    /// Right edge.
     Right,
-    /// Bottom region.
+    /// Bottom edge.
     Bottom,
 }
 
diff --git a/widget/src/pane_grid/node.rs b/widget/src/pane_grid/node.rs
index 3976acd8..6de5920f 100644
--- a/widget/src/pane_grid/node.rs
+++ b/widget/src/pane_grid/node.rs
@@ -120,6 +120,16 @@ impl Node {
         };
     }
 
+    pub(crate) fn split_inverse(&mut self, id: Split, axis: Axis, pane: Pane) {
+        *self = Node::Split {
+            id,
+            axis,
+            ratio: 0.5,
+            a: Box::new(Node::Pane(pane)),
+            b: Box::new(self.clone()),
+        };
+    }
+
     pub(crate) fn update(&mut self, f: &impl Fn(&mut Node)) {
         if let Node::Split { a, b, .. } = self {
             a.update(f);
diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index 1f034ca3..34781a90 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -3,7 +3,7 @@
 //! [`PaneGrid`]: crate::widget::PaneGrid
 use crate::core::{Point, Size};
 use crate::pane_grid::{
-    Axis, Configuration, Direction, Node, Pane, Region, Split,
+    Axis, Configuration, Direction, Edge, Node, Pane, Region, Split,
 };
 
 use std::collections::HashMap;
@@ -173,18 +173,20 @@ impl<T> State<T> {
     pub fn split_with(&mut self, target: &Pane, pane: &Pane, region: Region) {
         match region {
             Region::Center => self.swap(pane, target),
-            Region::Top => {
-                self.split_and_swap(Axis::Horizontal, target, pane, true)
-            }
-            Region::Bottom => {
-                self.split_and_swap(Axis::Horizontal, target, pane, false)
-            }
-            Region::Left => {
-                self.split_and_swap(Axis::Vertical, target, pane, true)
-            }
-            Region::Right => {
-                self.split_and_swap(Axis::Vertical, target, pane, false)
-            }
+            Region::Edge(edge) => match edge {
+                Edge::Top => {
+                    self.split_and_swap(Axis::Horizontal, target, pane, true)
+                }
+                Edge::Bottom => {
+                    self.split_and_swap(Axis::Horizontal, target, pane, false)
+                }
+                Edge::Left => {
+                    self.split_and_swap(Axis::Vertical, target, pane, true)
+                }
+                Edge::Right => {
+                    self.split_and_swap(Axis::Vertical, target, pane, false)
+                }
+            },
         }
     }
 
@@ -204,6 +206,67 @@ impl<T> State<T> {
         }
     }
 
+    /// Move [`Pane`] to an [`Edge`] of the [`PaneGrid`].
+    pub fn move_to_edge(&mut self, pane: &Pane, edge: Edge) {
+        match edge {
+            Edge::Top => {
+                self.split_major_node_and_swap(Axis::Horizontal, pane, true)
+            }
+            Edge::Bottom => {
+                self.split_major_node_and_swap(Axis::Horizontal, pane, false)
+            }
+            Edge::Left => {
+                self.split_major_node_and_swap(Axis::Vertical, pane, true)
+            }
+            Edge::Right => {
+                self.split_major_node_and_swap(Axis::Vertical, pane, false)
+            }
+        }
+    }
+
+    fn split_major_node_and_swap(
+        &mut self,
+        axis: Axis,
+        pane: &Pane,
+        swap: bool,
+    ) {
+        if let Some((state, _)) = self.close(pane) {
+            let _ = self.split_major_node(axis, state, swap);
+        }
+    }
+
+    fn split_major_node(
+        &mut self,
+        axis: Axis,
+        state: T,
+        swap: bool,
+    ) -> Option<(Pane, Split)> {
+        let major_node = &mut self.internal.layout;
+
+        let new_pane = {
+            self.internal.last_id = self.internal.last_id.checked_add(1)?;
+
+            Pane(self.internal.last_id)
+        };
+
+        let new_split = {
+            self.internal.last_id = self.internal.last_id.checked_add(1)?;
+
+            Split(self.internal.last_id)
+        };
+
+        if swap {
+            major_node.split_inverse(new_split, axis, new_pane)
+        } else {
+            major_node.split(new_split, axis, new_pane)
+        };
+
+        let _ = self.panes.insert(new_pane, state);
+        let _ = self.maximized.take();
+
+        Some((new_pane, new_split))
+    }
+
     /// Swaps the position of the provided panes in the [`State`].
     ///
     /// If you want to swap panes on drag and drop in your [`PaneGrid`], you

From 995c7c1ca9793536ad9b9d1cac94ae7b5b9a8f0a Mon Sep 17 00:00:00 2001
From: Joao Freitas <51237625+jhff@users.noreply.github.com>
Date: Mon, 22 May 2023 13:24:48 +0100
Subject: [PATCH 424/440] Reuse code

---
 widget/src/pane_grid/state.rs | 57 ++++++++++++++---------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index 34781a90..332b6837 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -145,7 +145,22 @@ impl<T> State<T> {
         pane: &Pane,
         state: T,
     ) -> Option<(Pane, Split)> {
-        let node = self.internal.layout.find(pane)?;
+        self.split_node(axis, Some(pane), state, false)
+    }
+
+    fn split_node(
+        &mut self,
+        axis: Axis,
+        pane: Option<&Pane>,
+        state: T,
+        inverse: bool,
+    ) -> Option<(Pane, Split)> {
+        let node = if let Some(pane) = pane {
+            self.internal.layout.find(pane)?
+        } else {
+            // Major node
+            &mut self.internal.layout
+        };
 
         let new_pane = {
             self.internal.last_id = self.internal.last_id.checked_add(1)?;
@@ -159,7 +174,11 @@ impl<T> State<T> {
             Split(self.internal.last_id)
         };
 
-        node.split(new_split, axis, new_pane);
+        if inverse {
+            node.split_inverse(new_split, axis, new_pane);
+        } else {
+            node.split(new_split, axis, new_pane);
+        }
 
         let _ = self.panes.insert(new_pane, state);
         let _ = self.maximized.take();
@@ -231,42 +250,10 @@ impl<T> State<T> {
         swap: bool,
     ) {
         if let Some((state, _)) = self.close(pane) {
-            let _ = self.split_major_node(axis, state, swap);
+            let _ = self.split_node(axis, None, state, swap);
         }
     }
 
-    fn split_major_node(
-        &mut self,
-        axis: Axis,
-        state: T,
-        swap: bool,
-    ) -> Option<(Pane, Split)> {
-        let major_node = &mut self.internal.layout;
-
-        let new_pane = {
-            self.internal.last_id = self.internal.last_id.checked_add(1)?;
-
-            Pane(self.internal.last_id)
-        };
-
-        let new_split = {
-            self.internal.last_id = self.internal.last_id.checked_add(1)?;
-
-            Split(self.internal.last_id)
-        };
-
-        if swap {
-            major_node.split_inverse(new_split, axis, new_pane)
-        } else {
-            major_node.split(new_split, axis, new_pane)
-        };
-
-        let _ = self.panes.insert(new_pane, state);
-        let _ = self.maximized.take();
-
-        Some((new_pane, new_split))
-    }
-
     /// Swaps the position of the provided panes in the [`State`].
     ///
     /// If you want to swap panes on drag and drop in your [`PaneGrid`], you

From f83ee1e9f99d1ec5621b4dba35ce0d0fced95442 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, 6 Jul 2023 07:37:25 +0200
Subject: [PATCH 425/440] Call `in_edge` only when `picked_pane.is_some()`

---
 widget/src/pane_grid.rs | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 0a8500dc..213460a5 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -843,9 +843,13 @@ pub fn draw<Renderer, T>(
 
     let mut render_picked_pane = None;
 
-    let cursor_in_edge = cursor
-        .position()
-        .and_then(|cursor_position| in_edge(layout, cursor_position));
+    let pane_in_edge = if picked_pane.is_some() {
+        cursor
+            .position()
+            .and_then(|cursor_position| in_edge(layout, cursor_position))
+    } else {
+        None
+    };
 
     for ((id, pane), pane_layout) in contents.zip(layout.children()) {
         match picked_pane {
@@ -862,7 +866,7 @@ pub fn draw<Renderer, T>(
                     viewport,
                 );
 
-                if picked_pane.is_some() && cursor_in_edge.is_none() {
+                if picked_pane.is_some() && pane_in_edge.is_none() {
                     if let Some(region) =
                         cursor.position().and_then(|cursor_position| {
                             layout_region(pane_layout, cursor_position)
@@ -897,21 +901,19 @@ pub fn draw<Renderer, T>(
         }
     }
 
-    if picked_pane.is_some() {
-        if let Some(edge) = cursor_in_edge {
-            let hovered_region_style = theme.hovered_region(style);
-            let bounds = edge_bounds(layout, edge);
+    if let Some(edge) = pane_in_edge {
+        let hovered_region_style = theme.hovered_region(style);
+        let bounds = edge_bounds(layout, edge);
 
-            renderer.fill_quad(
-                renderer::Quad {
-                    bounds,
-                    border_radius: hovered_region_style.border_radius.into(),
-                    border_width: hovered_region_style.border_width,
-                    border_color: hovered_region_style.border_color,
-                },
-                theme.hovered_region(style).background,
-            );
-        }
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border_radius: hovered_region_style.border_radius.into(),
+                border_width: hovered_region_style.border_width,
+                border_color: hovered_region_style.border_color,
+            },
+            theme.hovered_region(style).background,
+        );
     }
 
     // Render picked pane last

From ecce8bbcee45dddedef8a33bf3dc086d76c27b39 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, 6 Jul 2023 07:37:51 +0200
Subject: [PATCH 426/440] Simplify `Target` enum in `widget::pane_grid`

---
 examples/pane_grid/src/main.rs |  9 ++++-----
 widget/src/pane_grid.rs        | 18 +++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index c5652e2d..1361eeb9 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -109,13 +109,12 @@ impl Application for Example {
                 pane,
                 target,
             }) => match target {
-                pane_grid::Target::PaneGrid(edge) => {
+                pane_grid::Target::Edge(edge) => {
                     self.panes.move_to_edge(&pane, edge)
                 }
-                pane_grid::Target::Pane {
-                    pane: target,
-                    region,
-                } => self.panes.split_with(&target, &pane, region),
+                pane_grid::Target::Pane(target, region) => {
+                    self.panes.split_with(&target, &pane, region)
+                }
             },
             Message::Dragged(_) => {}
             Message::TogglePin(pane) => {
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 213460a5..23ab4181 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -587,7 +587,7 @@ pub fn update<'a, Message, T: Draggable>(
                         {
                             DragEvent::Dropped {
                                 pane,
-                                target: Target::PaneGrid(edge),
+                                target: Target::Edge(edge),
                             }
                         } else {
                             let dropped_region = contents
@@ -604,10 +604,7 @@ pub fn update<'a, Message, T: Draggable>(
                                 {
                                     DragEvent::Dropped {
                                         pane,
-                                        target: Target::Pane {
-                                            pane: target,
-                                            region,
-                                        },
+                                        target: Target::Pane(target, region),
                                     }
                                 }
                                 _ => DragEvent::Canceled { pane },
@@ -1094,15 +1091,10 @@ pub enum DragEvent {
 /// The [`Target`] area a pane can be dropped on.
 #[derive(Debug, Clone, Copy)]
 pub enum Target {
-    /// The [`Edge`} of the full [`PaneGrid`].
-    PaneGrid(Edge),
+    /// An [`Edge`] of the full [`PaneGrid`].
+    Edge(Edge),
     /// A single [`Pane`] of the [`PaneGrid`].
-    Pane {
-        /// The targetted [`Pane`].
-        pane: Pane,
-        /// The targetted area of the [`Pane`].
-        region: Region,
-    },
+    Pane(Pane, Region),
 }
 
 /// The region of a [`Pane`].

From c5a623f32b3d972501bb02d87d296381b66f9481 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, 6 Jul 2023 07:45:47 +0200
Subject: [PATCH 427/440] Introduce `drop` helper to `pane_grid::State`

---
 examples/pane_grid/src/main.rs | 11 ++-----
 widget/src/pane_grid/state.rs  | 58 ++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index 1361eeb9..04896e20 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -108,14 +108,9 @@ impl Application for Example {
             Message::Dragged(pane_grid::DragEvent::Dropped {
                 pane,
                 target,
-            }) => match target {
-                pane_grid::Target::Edge(edge) => {
-                    self.panes.move_to_edge(&pane, edge)
-                }
-                pane_grid::Target::Pane(target, region) => {
-                    self.panes.split_with(&target, &pane, region)
-                }
-            },
+            }) => {
+                self.panes.drop(&pane, target);
+            }
             Message::Dragged(_) => {}
             Message::TogglePin(pane) => {
                 if let Some(Pane { is_pinned, .. }) = self.panes.get_mut(&pane)
diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index 332b6837..6fd15890 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -3,7 +3,7 @@
 //! [`PaneGrid`]: crate::widget::PaneGrid
 use crate::core::{Point, Size};
 use crate::pane_grid::{
-    Axis, Configuration, Direction, Edge, Node, Pane, Region, Split,
+    Axis, Configuration, Direction, Edge, Node, Pane, Region, Split, Target,
 };
 
 use std::collections::HashMap;
@@ -148,6 +148,39 @@ impl<T> State<T> {
         self.split_node(axis, Some(pane), state, false)
     }
 
+    /// Split a target [`Pane`] with a given [`Pane`] on a given [`Region`].
+    ///
+    /// Panes will be swapped by default for [`Region::Center`].
+    pub fn split_with(&mut self, target: &Pane, pane: &Pane, region: Region) {
+        match region {
+            Region::Center => self.swap(pane, target),
+            Region::Edge(edge) => match edge {
+                Edge::Top => {
+                    self.split_and_swap(Axis::Horizontal, target, pane, true)
+                }
+                Edge::Bottom => {
+                    self.split_and_swap(Axis::Horizontal, target, pane, false)
+                }
+                Edge::Left => {
+                    self.split_and_swap(Axis::Vertical, target, pane, true)
+                }
+                Edge::Right => {
+                    self.split_and_swap(Axis::Vertical, target, pane, false)
+                }
+            },
+        }
+    }
+
+    /// Drops the given [`Pane`] into the provided [`Target`].
+    pub fn drop(&mut self, pane: &Pane, target: Target) {
+        match target {
+            Target::Edge(edge) => self.move_to_edge(pane, edge),
+            Target::Pane(target, region) => {
+                self.split_with(&target, pane, region)
+            }
+        }
+    }
+
     fn split_node(
         &mut self,
         axis: Axis,
@@ -186,29 +219,6 @@ impl<T> State<T> {
         Some((new_pane, new_split))
     }
 
-    /// Split a target [`Pane`] with a given [`Pane`] on a given [`Region`].
-    ///
-    /// Panes will be swapped by default for [`Region::Center`].
-    pub fn split_with(&mut self, target: &Pane, pane: &Pane, region: Region) {
-        match region {
-            Region::Center => self.swap(pane, target),
-            Region::Edge(edge) => match edge {
-                Edge::Top => {
-                    self.split_and_swap(Axis::Horizontal, target, pane, true)
-                }
-                Edge::Bottom => {
-                    self.split_and_swap(Axis::Horizontal, target, pane, false)
-                }
-                Edge::Left => {
-                    self.split_and_swap(Axis::Vertical, target, pane, true)
-                }
-                Edge::Right => {
-                    self.split_and_swap(Axis::Vertical, target, pane, false)
-                }
-            },
-        }
-    }
-
     fn split_and_swap(
         &mut self,
         axis: Axis,

From 0964f12db7002f535f8eeda1791ea8962be6e71a 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, 6 Jul 2023 08:26:46 +0200
Subject: [PATCH 428/440] Remove useless conversion in `widget::pane_grid`

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

diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index 23ab4181..31bb0e86 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -905,7 +905,7 @@ pub fn draw<Renderer, T>(
         renderer.fill_quad(
             renderer::Quad {
                 bounds,
-                border_radius: hovered_region_style.border_radius.into(),
+                border_radius: hovered_region_style.border_radius,
                 border_width: hovered_region_style.border_width,
                 border_color: hovered_region_style.border_color,
             },

From 4c2aa071a09df076fb92757034c941ed2e680ba7 Mon Sep 17 00:00:00 2001
From: Nick Senger <dev@nsenger.com>
Date: Sat, 8 Jul 2023 16:06:26 -0700
Subject: [PATCH 429/440] fix: request redraw in component overlay

---
 widget/src/lazy/component.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/widget/src/lazy/component.rs b/widget/src/lazy/component.rs
index f955d9dd..c7814966 100644
--- a/widget/src/lazy/component.rs
+++ b/widget/src/lazy/component.rs
@@ -624,6 +624,10 @@ where
 
         local_shell.revalidate_layout(|| shell.invalidate_layout());
 
+        if let Some(redraw_request) = local_shell.redraw_request() {
+            shell.request_redraw(redraw_request);
+        }
+
         if !local_messages.is_empty() {
             let mut inner =
                 self.overlay.take().unwrap().0.take().unwrap().into_heads();

From 65be3f8b9622306a293984fa29332aceafce5f7b Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Thu, 2 Feb 2023 15:17:42 -0800
Subject: [PATCH 430/440] Use overlay for `Tooltip` widget

---
 widget/src/tooltip.rs | 255 ++++++++++++++++++++++++++----------------
 1 file changed, 159 insertions(+), 96 deletions(-)

diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index d425de01..e7a9e870 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -1,16 +1,15 @@
 //! Display a widget over another.
 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::widget::{self, Widget};
 use crate::core::{
-    Clipboard, Element, Length, Padding, Pixels, Rectangle, Shell, Size,
-    Vector, Widget,
+    Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Shell, Size,
+    Vector,
 };
 use crate::Text;
 
@@ -107,14 +106,22 @@ where
     Renderer: text::Renderer,
     Renderer::Theme: container::StyleSheet + crate::text::StyleSheet,
 {
-    fn children(&self) -> Vec<Tree> {
-        vec![Tree::new(&self.content)]
+    fn children(&self) -> Vec<widget::Tree> {
+        vec![widget::Tree::new(&self.content)]
     }
 
-    fn diff(&self, tree: &mut Tree) {
+    fn diff(&self, tree: &mut widget::Tree) {
         tree.diff_children(std::slice::from_ref(&self.content))
     }
 
+    fn state(&self) -> widget::tree::State {
+        widget::tree::State::new(State::default())
+    }
+
+    fn tag(&self) -> widget::tree::Tag {
+        widget::tree::Tag::of::<State>()
+    }
+
     fn width(&self) -> Length {
         self.content.as_widget().width()
     }
@@ -133,7 +140,7 @@ where
 
     fn on_event(
         &mut self,
-        tree: &mut Tree,
+        tree: &mut widget::Tree,
         event: Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
@@ -141,6 +148,13 @@ where
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
+        let state = tree.state.downcast_mut::<State>();
+
+        *state = cursor
+            .position_over(layout.bounds())
+            .map(|cursor_position| State::Hovered { cursor_position })
+            .unwrap_or_default();
+
         self.content.as_widget_mut().on_event(
             &mut tree.children[0],
             event,
@@ -154,7 +168,7 @@ where
 
     fn mouse_interaction(
         &self,
-        tree: &Tree,
+        tree: &widget::Tree,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         viewport: &Rectangle,
@@ -171,7 +185,7 @@ where
 
     fn draw(
         &self,
-        tree: &Tree,
+        tree: &widget::Tree,
         renderer: &mut Renderer,
         theme: &Renderer::Theme,
         inherited_style: &renderer::Style,
@@ -188,50 +202,50 @@ where
             cursor,
             viewport,
         );
-
-        let tooltip = &self.tooltip;
-
-        draw(
-            renderer,
-            theme,
-            inherited_style,
-            layout,
-            cursor,
-            viewport,
-            self.position,
-            self.gap,
-            self.padding,
-            self.snap_within_viewport,
-            &self.style,
-            |renderer, limits| {
-                Widget::<(), Renderer>::layout(tooltip, renderer, limits)
-            },
-            |renderer, defaults, layout, viewport| {
-                Widget::<(), Renderer>::draw(
-                    tooltip,
-                    &Tree::empty(),
-                    renderer,
-                    theme,
-                    defaults,
-                    layout,
-                    cursor,
-                    viewport,
-                );
-            },
-        );
     }
 
     fn overlay<'b>(
         &'b mut self,
-        tree: &'b mut Tree,
+        tree: &'b mut widget::Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        self.content.as_widget_mut().overlay(
+        let state = tree.state.downcast_ref::<State>();
+
+        let content = self.content.as_widget_mut().overlay(
             &mut tree.children[0],
             layout,
             renderer,
-        )
+        );
+
+        let tooltip = if let State::Hovered { cursor_position } = *state {
+            Some(overlay::Element::new(
+                layout.position(),
+                Box::new(Overlay {
+                    tooltip: &self.tooltip,
+                    cursor_position,
+                    content_bounds: layout.bounds(),
+                    snap_within_viewport: self.snap_within_viewport,
+                    position: self.position,
+                    gap: self.gap,
+                    padding: self.padding,
+                    style: &self.style,
+                }),
+            ))
+        } else {
+            None
+        };
+
+        if content.is_some() || tooltip.is_some() {
+            Some(
+                overlay::Group::with_children(
+                    content.into_iter().chain(tooltip).collect(),
+                )
+                .overlay(),
+            )
+        } else {
+            None
+        }
     }
 }
 
@@ -264,72 +278,93 @@ pub enum Position {
     Right,
 }
 
-/// Draws a [`Tooltip`].
-pub fn draw<Renderer>(
-    renderer: &mut Renderer,
-    theme: &Renderer::Theme,
-    inherited_style: &renderer::Style,
-    layout: Layout<'_>,
-    cursor: mouse::Cursor,
-    viewport: &Rectangle,
+#[derive(Debug, Clone, Copy, Default)]
+enum State {
+    #[default]
+    Idle,
+    Hovered {
+        cursor_position: Point,
+    },
+}
+
+struct Overlay<'a, 'b, Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
+{
+    tooltip: &'b Text<'a, Renderer>,
+    cursor_position: Point,
+    content_bounds: Rectangle,
+    snap_within_viewport: bool,
     position: Position,
     gap: f32,
     padding: f32,
-    snap_within_viewport: bool,
-    style: &<Renderer::Theme as container::StyleSheet>::Style,
-    layout_text: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
-    draw_text: impl FnOnce(&mut Renderer, &renderer::Style, Layout<'_>, &Rectangle),
-) where
-    Renderer: core::Renderer,
-    Renderer::Theme: container::StyleSheet,
+    style: &'b <Renderer::Theme as container::StyleSheet>::Style,
+}
+
+impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
+    for Overlay<'a, 'b, Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: container::StyleSheet + widget::text::StyleSheet,
 {
-    use container::StyleSheet;
+    fn layout(
+        &self,
+        renderer: &Renderer,
+        bounds: Size,
+        _position: Point,
+    ) -> layout::Node {
+        let viewport = Rectangle::with_size(bounds);
 
-    let bounds = layout.bounds();
+        let gap = f32::from(self.gap);
 
-    if let Some(cursor_position) = cursor.position_over(bounds) {
-        let style = theme.appearance(style);
-
-        let defaults = renderer::Style {
-            text_color: style.text_color.unwrap_or(inherited_style.text_color),
-        };
-
-        let text_layout = layout_text(
+        let text_layout = Widget::<(), Renderer>::layout(
+            self.tooltip,
             renderer,
             &layout::Limits::new(
                 Size::ZERO,
-                snap_within_viewport
+                self.snap_within_viewport
                     .then(|| viewport.size())
                     .unwrap_or(Size::INFINITY),
             )
-            .pad(Padding::new(padding)),
+            .pad(Padding::new(self.padding)),
         );
 
+        let padding = f32::from(self.padding);
+
         let text_bounds = text_layout.bounds();
-        let x_center = bounds.x + (bounds.width - text_bounds.width) / 2.0;
-        let y_center = bounds.y + (bounds.height - text_bounds.height) / 2.0;
+        let x_center = self.content_bounds.x
+            + (self.content_bounds.width - text_bounds.width) / 2.0;
+        let y_center = self.content_bounds.y
+            + (self.content_bounds.height - text_bounds.height) / 2.0;
 
         let mut tooltip_bounds = {
-            let offset = match position {
+            let offset = match self.position {
                 Position::Top => Vector::new(
                     x_center,
-                    bounds.y - text_bounds.height - gap - padding,
+                    self.content_bounds.y - text_bounds.height - gap - padding,
                 ),
                 Position::Bottom => Vector::new(
                     x_center,
-                    bounds.y + bounds.height + gap + padding,
+                    self.content_bounds.y
+                        + self.content_bounds.height
+                        + gap
+                        + padding,
                 ),
                 Position::Left => Vector::new(
-                    bounds.x - text_bounds.width - gap - padding,
+                    self.content_bounds.x - text_bounds.width - gap - padding,
                     y_center,
                 ),
                 Position::Right => Vector::new(
-                    bounds.x + bounds.width + gap + padding,
+                    self.content_bounds.x
+                        + self.content_bounds.width
+                        + gap
+                        + padding,
                     y_center,
                 ),
                 Position::FollowCursor => Vector::new(
-                    cursor_position.x,
-                    cursor_position.y - text_bounds.height,
+                    self.cursor_position.x,
+                    self.cursor_position.y - text_bounds.height,
                 ),
             };
 
@@ -341,7 +376,7 @@ pub fn draw<Renderer>(
             }
         };
 
-        if snap_within_viewport {
+        if self.snap_within_viewport {
             if tooltip_bounds.x < viewport.x {
                 tooltip_bounds.x = viewport.x;
             } else if viewport.x + viewport.width
@@ -361,21 +396,49 @@ pub fn draw<Renderer>(
             }
         }
 
-        renderer.with_layer(Rectangle::with_size(Size::INFINITY), |renderer| {
-            container::draw_background(renderer, &style, tooltip_bounds);
+        layout::Node::with_children(
+            tooltip_bounds.size(),
+            vec![text_layout.translate(Vector::new(padding, padding))],
+        )
+        .translate(Vector::new(tooltip_bounds.x, tooltip_bounds.y))
+    }
 
-            draw_text(
-                renderer,
-                &defaults,
-                Layout::with_offset(
-                    Vector::new(
-                        tooltip_bounds.x + padding,
-                        tooltip_bounds.y + padding,
-                    ),
-                    &text_layout,
-                ),
-                viewport,
-            )
-        });
+    fn draw(
+        &self,
+        renderer: &mut Renderer,
+        theme: &<Renderer as renderer::Renderer>::Theme,
+        inherited_style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor_position: mouse::Cursor,
+    ) {
+        let style = <Renderer::Theme as container::StyleSheet>::appearance(
+            theme, self.style,
+        );
+
+        container::draw_background(renderer, &style, layout.bounds());
+
+        let defaults = renderer::Style {
+            text_color: style.text_color.unwrap_or(inherited_style.text_color),
+        };
+
+        Widget::<(), Renderer>::draw(
+            self.tooltip,
+            &widget::Tree::empty(),
+            renderer,
+            theme,
+            &defaults,
+            layout.children().next().unwrap(),
+            cursor_position,
+            &Rectangle::with_size(Size::INFINITY),
+        );
+    }
+
+    fn is_over(
+        &self,
+        _layout: Layout<'_>,
+        _renderer: &Renderer,
+        _cursor_position: Point,
+    ) -> bool {
+        false
     }
 }

From 896a90decbd9ab57488620f27ae5c03ee0b9dab3 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, 12 Jul 2023 03:48:26 +0200
Subject: [PATCH 431/440] Remove useless conversions in `widget::tooltip`

---
 widget/src/tooltip.rs | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/widget/src/tooltip.rs b/widget/src/tooltip.rs
index e7a9e870..2dc3da01 100644
--- a/widget/src/tooltip.rs
+++ b/widget/src/tooltip.rs
@@ -316,8 +316,6 @@ where
     ) -> layout::Node {
         let viewport = Rectangle::with_size(bounds);
 
-        let gap = f32::from(self.gap);
-
         let text_layout = Widget::<(), Renderer>::layout(
             self.tooltip,
             renderer,
@@ -330,8 +328,6 @@ where
             .pad(Padding::new(self.padding)),
         );
 
-        let padding = f32::from(self.padding);
-
         let text_bounds = text_layout.bounds();
         let x_center = self.content_bounds.x
             + (self.content_bounds.width - text_bounds.width) / 2.0;
@@ -342,24 +338,30 @@ where
             let offset = match self.position {
                 Position::Top => Vector::new(
                     x_center,
-                    self.content_bounds.y - text_bounds.height - gap - padding,
+                    self.content_bounds.y
+                        - text_bounds.height
+                        - self.gap
+                        - self.padding,
                 ),
                 Position::Bottom => Vector::new(
                     x_center,
                     self.content_bounds.y
                         + self.content_bounds.height
-                        + gap
-                        + padding,
+                        + self.gap
+                        + self.padding,
                 ),
                 Position::Left => Vector::new(
-                    self.content_bounds.x - text_bounds.width - gap - padding,
+                    self.content_bounds.x
+                        - text_bounds.width
+                        - self.gap
+                        - self.padding,
                     y_center,
                 ),
                 Position::Right => Vector::new(
                     self.content_bounds.x
                         + self.content_bounds.width
-                        + gap
-                        + padding,
+                        + self.gap
+                        + self.padding,
                     y_center,
                 ),
                 Position::FollowCursor => Vector::new(
@@ -369,10 +371,10 @@ where
             };
 
             Rectangle {
-                x: offset.x - padding,
-                y: offset.y - padding,
-                width: text_bounds.width + padding * 2.0,
-                height: text_bounds.height + padding * 2.0,
+                x: offset.x - self.padding,
+                y: offset.y - self.padding,
+                width: text_bounds.width + self.padding * 2.0,
+                height: text_bounds.height + self.padding * 2.0,
             }
         };
 
@@ -398,7 +400,7 @@ where
 
         layout::Node::with_children(
             tooltip_bounds.size(),
-            vec![text_layout.translate(Vector::new(padding, padding))],
+            vec![text_layout.translate(Vector::new(self.padding, self.padding))],
         )
         .translate(Vector::new(tooltip_bounds.x, tooltip_bounds.y))
     }

From af386fd0a3de432337ee9cdaa4d3661e98bd4105 Mon Sep 17 00:00:00 2001
From: Alec Deason <alec@tinycountry.com>
Date: Sat, 10 Jun 2023 13:18:42 -0700
Subject: [PATCH 432/440] Upgrade resvg to 0.34 and tiny_skia to 0.10

---
 tiny_skia/Cargo.toml     |  4 ++--
 tiny_skia/src/backend.rs | 10 ++++++++-
 tiny_skia/src/raster.rs  |  6 ++---
 tiny_skia/src/text.rs    | 35 +++++++++++++++--------------
 tiny_skia/src/vector.rs  | 48 +++++++++++++++++++++++++---------------
 wgpu/Cargo.toml          |  2 +-
 wgpu/src/image/vector.rs | 31 +++++++++++++++++---------
 7 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 431f324b..0de7e4c3 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.9"
+tiny-skia = "0.10"
 bytemuck = "1"
 rustc-hash = "1.1"
 kurbo = "0.9"
@@ -34,5 +34,5 @@ version = "1.6.1"
 features = ["std"]
 
 [dependencies.resvg]
-version = "0.32"
+version = "0.34"
 optional = true
diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index e0134220..a8add70b 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -753,7 +753,15 @@ fn adjust_clip_mask(clip_mask: &mut tiny_skia::Mask, bounds: Rectangle) {
 
     let path = {
         let mut builder = tiny_skia::PathBuilder::new();
-        builder.push_rect(bounds.x, bounds.y, bounds.width, bounds.height);
+        builder.push_rect(
+            tiny_skia::Rect::from_xywh(
+                bounds.x,
+                bounds.y,
+                bounds.width,
+                bounds.height,
+            )
+            .unwrap(),
+        );
 
         builder.finish().unwrap()
     };
diff --git a/tiny_skia/src/raster.rs b/tiny_skia/src/raster.rs
index 3887ec8d..74b21d4a 100644
--- a/tiny_skia/src/raster.rs
+++ b/tiny_skia/src/raster.rs
@@ -2,6 +2,7 @@ use crate::core::image as raster;
 use crate::core::{Rectangle, Size};
 use crate::graphics;
 
+use bytemuck::cast;
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::cell::RefCell;
 use std::collections::hash_map;
@@ -80,9 +81,8 @@ impl Cache {
             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();
+                buffer[i] = cast(tiny_skia::ColorU8::from_rgba(b, g, r, a)
+                    .premultiply());
             }
 
             entry.insert(Some(Entry {
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 8f494650..58f7d145 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -3,6 +3,7 @@ use crate::core::font::{self, Font};
 use crate::core::text::{Hit, LineHeight, Shaping};
 use crate::core::{Color, Pixels, Point, Rectangle, Size};
 
+use bytemuck::cast;
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -288,14 +289,15 @@ impl GlyphCache {
 
                     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();
+                            buffer[i] = cast(
+                                tiny_skia::ColorU8::from_rgba(
+                                    b,
+                                    g,
+                                    r,
+                                    image.data[i],
+                                )
+                                .premultiply(),
+                            );
 
                             i += 1;
                         }
@@ -307,14 +309,15 @@ impl GlyphCache {
                     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();
+                            buffer[i >> 2] = cast(
+                                tiny_skia::ColorU8::from_rgba(
+                                    image.data[i + 2],
+                                    image.data[i + 1],
+                                    image.data[i],
+                                    image.data[i + 3],
+                                )
+                                .premultiply(),
+                            );
 
                             i += 4;
                         }
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index a3f3c2e3..194fc52d 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -1,6 +1,7 @@
 use crate::core::svg::{Data, Handle};
 use crate::core::{Color, Rectangle, Size};
 
+use bytemuck::cast;
 use resvg::usvg;
 use rustc_hash::{FxHashMap, FxHashSet};
 
@@ -130,30 +131,41 @@ impl Cache {
 
             let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
 
-            resvg::render(
-                tree,
-                if size.width > size.height {
-                    resvg::FitTo::Width(size.width)
-                } else {
-                    resvg::FitTo::Height(size.height)
-                },
-                tiny_skia::Transform::default(),
-                image.as_mut(),
-            )?;
+            let tree_size = tree.size.to_int_size();
+            let target_size;
+            if size.width > size.height {
+                target_size = tree_size.scale_to_width(size.width);
+            } else {
+                target_size = tree_size.scale_to_height(size.height);
+            }
+            let transform;
+            if let Some(target_size) = target_size {
+                let tree_size = tree_size.to_size();
+                let target_size = target_size.to_size();
+                transform = tiny_skia::Transform::from_scale(
+                    target_size.width() / tree_size.width(),
+                    target_size.height() / tree_size.height(),
+                );
+            } else {
+                transform = tiny_skia::Transform::default();
+            }
+
+            resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut());
 
             if let Some([r, g, b, _]) = key.color {
                 // Apply color filter
                 for pixel in
                     bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
                 {
-                    *pixel = tiny_skia::ColorU8::from_rgba(
-                        b,
-                        g,
-                        r,
-                        (*pixel >> 24) as u8,
-                    )
-                    .premultiply()
-                    .get();
+                    *pixel = cast(
+                        tiny_skia::ColorU8::from_rgba(
+                            b,
+                            g,
+                            r,
+                            (*pixel >> 24) as u8,
+                        )
+                        .premultiply(),
+                    );
                 }
             } else {
                 // Swap R and B channels for `softbuffer` presentation
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 15db5b5d..ecec7d02 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -55,7 +55,7 @@ version = "1.0"
 optional = true
 
 [dependencies.resvg]
-version = "0.32"
+version = "0.34"
 optional = true
 
 [dependencies.tracing]
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 6b9be651..5bfc1836 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -114,16 +114,27 @@ impl Cache {
                 // It would be cool to be able to smooth resize the `svg` example.
                 let mut img = tiny_skia::Pixmap::new(width, height)?;
 
-                resvg::render(
-                    tree,
-                    if width > height {
-                        resvg::FitTo::Width(width)
-                    } else {
-                        resvg::FitTo::Height(height)
-                    },
-                    tiny_skia::Transform::default(),
-                    img.as_mut(),
-                )?;
+                let tree_size = tree.size.to_int_size();
+                let target_size;
+                if width > height {
+                    target_size = tree_size.scale_to_width(width);
+                } else {
+                    target_size = tree_size.scale_to_height(height);
+                }
+                let transform;
+                if let Some(target_size) = target_size {
+                    let tree_size = tree_size.to_size();
+                    let target_size = target_size.to_size();
+                    transform = tiny_skia::Transform::from_scale(
+                        target_size.width() / tree_size.width(),
+                        target_size.height() / tree_size.height(),
+                    );
+                } else {
+                    transform = tiny_skia::Transform::default();
+                }
+
+                resvg::Tree::from_usvg(tree)
+                    .render(transform, &mut img.as_mut());
 
                 let mut rgba = img.take();
 

From 9f73ee3206c69a2db79cfb5d596b60926a829218 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, 12 Jul 2023 09:03:24 +0200
Subject: [PATCH 433/440] Fix import consistency for `bytemuck`

---
 tiny_skia/src/raster.rs | 6 +++---
 tiny_skia/src/text.rs   | 5 ++---
 tiny_skia/src/vector.rs | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tiny_skia/src/raster.rs b/tiny_skia/src/raster.rs
index 74b21d4a..dedb127c 100644
--- a/tiny_skia/src/raster.rs
+++ b/tiny_skia/src/raster.rs
@@ -2,7 +2,6 @@ use crate::core::image as raster;
 use crate::core::{Rectangle, Size};
 use crate::graphics;
 
-use bytemuck::cast;
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::cell::RefCell;
 use std::collections::hash_map;
@@ -81,8 +80,9 @@ impl Cache {
             for (i, pixel) in image.pixels().enumerate() {
                 let [r, g, b, a] = pixel.0;
 
-                buffer[i] = cast(tiny_skia::ColorU8::from_rgba(b, g, r, a)
-                    .premultiply());
+                buffer[i] = bytemuck::cast(
+                    tiny_skia::ColorU8::from_rgba(b, g, r, a).premultiply(),
+                );
             }
 
             entry.insert(Some(Entry {
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 58f7d145..15f25740 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -3,7 +3,6 @@ use crate::core::font::{self, Font};
 use crate::core::text::{Hit, LineHeight, Shaping};
 use crate::core::{Color, Pixels, Point, Rectangle, Size};
 
-use bytemuck::cast;
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -289,7 +288,7 @@ impl GlyphCache {
 
                     for _y in 0..image.placement.height {
                         for _x in 0..image.placement.width {
-                            buffer[i] = cast(
+                            buffer[i] = bytemuck::cast(
                                 tiny_skia::ColorU8::from_rgba(
                                     b,
                                     g,
@@ -309,7 +308,7 @@ impl GlyphCache {
                     for _y in 0..image.placement.height {
                         for _x in 0..image.placement.width {
                             // TODO: Blend alpha
-                            buffer[i >> 2] = cast(
+                            buffer[i >> 2] = bytemuck::cast(
                                 tiny_skia::ColorU8::from_rgba(
                                     image.data[i + 2],
                                     image.data[i + 1],
diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index 194fc52d..9836fb0a 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -1,7 +1,6 @@
 use crate::core::svg::{Data, Handle};
 use crate::core::{Color, Rectangle, Size};
 
-use bytemuck::cast;
 use resvg::usvg;
 use rustc_hash::{FxHashMap, FxHashSet};
 
@@ -157,7 +156,7 @@ impl Cache {
                 for pixel in
                     bytemuck::cast_slice_mut::<u8, u32>(image.data_mut())
                 {
-                    *pixel = cast(
+                    *pixel = bytemuck::cast(
                         tiny_skia::ColorU8::from_rgba(
                             b,
                             g,

From 6502cf1111380c66f96bf5677425a902c4662ef5 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, 12 Jul 2023 09:07:20 +0200
Subject: [PATCH 434/440] Improve code style in `vector` modules

---
 tiny_skia/src/vector.rs  | 23 ++++++++++++-----------
 wgpu/src/image/vector.rs | 23 ++++++++++++-----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/tiny_skia/src/vector.rs b/tiny_skia/src/vector.rs
index 9836fb0a..433ca0f5 100644
--- a/tiny_skia/src/vector.rs
+++ b/tiny_skia/src/vector.rs
@@ -131,23 +131,24 @@ impl Cache {
             let mut image = tiny_skia::Pixmap::new(size.width, size.height)?;
 
             let tree_size = tree.size.to_int_size();
-            let target_size;
-            if size.width > size.height {
-                target_size = tree_size.scale_to_width(size.width);
+
+            let target_size = if size.width > size.height {
+                tree_size.scale_to_width(size.width)
             } else {
-                target_size = tree_size.scale_to_height(size.height);
-            }
-            let transform;
-            if let Some(target_size) = target_size {
+                tree_size.scale_to_height(size.height)
+            };
+
+            let transform = if let Some(target_size) = target_size {
                 let tree_size = tree_size.to_size();
                 let target_size = target_size.to_size();
-                transform = tiny_skia::Transform::from_scale(
+
+                tiny_skia::Transform::from_scale(
                     target_size.width() / tree_size.width(),
                     target_size.height() / tree_size.height(),
-                );
+                )
             } else {
-                transform = tiny_skia::Transform::default();
-            }
+                tiny_skia::Transform::default()
+            };
 
             resvg::Tree::from_usvg(tree).render(transform, &mut image.as_mut());
 
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 5bfc1836..2c03d36b 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -115,23 +115,24 @@ impl Cache {
                 let mut img = tiny_skia::Pixmap::new(width, height)?;
 
                 let tree_size = tree.size.to_int_size();
-                let target_size;
-                if width > height {
-                    target_size = tree_size.scale_to_width(width);
+
+                let target_size = if width > height {
+                    tree_size.scale_to_width(width)
                 } else {
-                    target_size = tree_size.scale_to_height(height);
-                }
-                let transform;
-                if let Some(target_size) = target_size {
+                    tree_size.scale_to_height(height)
+                };
+
+                let transform = if let Some(target_size) = target_size {
                     let tree_size = tree_size.to_size();
                     let target_size = target_size.to_size();
-                    transform = tiny_skia::Transform::from_scale(
+
+                    tiny_skia::Transform::from_scale(
                         target_size.width() / tree_size.width(),
                         target_size.height() / tree_size.height(),
-                    );
+                    )
                 } else {
-                    transform = tiny_skia::Transform::default();
-                }
+                    tiny_skia::Transform::default()
+                };
 
                 resvg::Tree::from_usvg(tree)
                     .render(transform, &mut img.as_mut());

From 5dd923402e07578a0002884ac14044fe8762f8b0 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, 12 Jul 2023 09:10:58 +0200
Subject: [PATCH 435/440] Update `resvg` dependency to `0.35`

---
 tiny_skia/Cargo.toml | 2 +-
 wgpu/Cargo.toml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index 0de7e4c3..d9276ea5 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -34,5 +34,5 @@ version = "1.6.1"
 features = ["std"]
 
 [dependencies.resvg]
-version = "0.34"
+version = "0.35"
 optional = true
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index ecec7d02..22cfad55 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -55,7 +55,7 @@ version = "1.0"
 optional = true
 
 [dependencies.resvg]
-version = "0.34"
+version = "0.35"
 optional = true
 
 [dependencies.tracing]

From 44460f7b8b9e90c85bd94c19dd15d418e641f8cd 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, 12 Jul 2023 09:26:13 +0200
Subject: [PATCH 436/440] Remove public fields from `Viewport`

Let's tackle use cases directly instead!
---
 widget/src/scrollable.rs | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 3912f445..b6111975 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -577,15 +577,7 @@ pub fn update<Message>(
                 content_bounds,
             );
 
-            notify_on_scroll(
-                state,
-                on_scroll,
-                bounds,
-                content_bounds,
-                horizontal_alignment,
-                vertical_alignment,
-                shell,
-            );
+            notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
 
             return event::Status::Captured;
         }
@@ -631,8 +623,6 @@ pub fn update<Message>(
                             on_scroll,
                             bounds,
                             content_bounds,
-                            horizontal_alignment,
-                            vertical_alignment,
                             shell,
                         );
                     }
@@ -679,8 +669,6 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
-                        horizontal_alignment,
-                        vertical_alignment,
                         shell,
                     );
 
@@ -717,8 +705,6 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
-                        horizontal_alignment,
-                        vertical_alignment,
                         shell,
                     );
                 }
@@ -760,8 +746,6 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
-                        horizontal_alignment,
-                        vertical_alignment,
                         shell,
                     );
                 }
@@ -798,8 +782,6 @@ pub fn update<Message>(
                         on_scroll,
                         bounds,
                         content_bounds,
-                        horizontal_alignment,
-                        vertical_alignment,
                         shell,
                     );
 
@@ -1015,8 +997,6 @@ fn notify_on_scroll<Message>(
     on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     bounds: Rectangle,
     content_bounds: Rectangle,
-    horizontal_alignment: Alignment,
-    vertical_alignment: Alignment,
     shell: &mut Shell<'_, Message>,
 ) {
     if let Some(on_scroll) = on_scroll {
@@ -1031,8 +1011,6 @@ fn notify_on_scroll<Message>(
             offset_y: state.offset_y,
             bounds,
             content_bounds,
-            horizontal_alignment,
-            vertical_alignment,
         };
 
         // Don't publish redundant viewports to shell
@@ -1121,14 +1099,8 @@ impl Offset {
 pub struct Viewport {
     offset_x: Offset,
     offset_y: Offset,
-    /// The viewport bounds of the [`Scrollable`].
-    pub bounds: Rectangle,
-    /// The content bounds of the [`Scrollable`].
-    pub content_bounds: Rectangle,
-    /// The horizontal [`Alignment`] of the [`Scrollable`].
-    pub horizontal_alignment: Alignment,
-    /// The vertical [`Alignment`] of the [`Scrollable`].
-    pub vertical_alignment: Alignment,
+    bounds: Rectangle,
+    content_bounds: Rectangle,
 }
 
 impl Viewport {

From 2b2f9c07d8962f8a146794c2fd8f1709f104f4f5 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, 12 Jul 2023 09:49:14 +0200
Subject: [PATCH 437/440] Increase type-safety of `alignment` in `scrollable`

---
 widget/src/scrollable.rs | 100 +++++++++++++++------------------------
 1 file changed, 37 insertions(+), 63 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index b6111975..17d55e7c 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -295,7 +295,7 @@ where
             cursor,
             clipboard,
             shell,
-            &self.direction,
+            self.direction,
             &self.on_scroll,
             |event, layout, cursor, clipboard, shell| {
                 self.content.as_widget_mut().on_event(
@@ -327,7 +327,7 @@ where
             theme,
             layout,
             cursor,
-            &self.direction,
+            self.direction,
             &self.style,
             |renderer, layout, cursor, viewport| {
                 self.content.as_widget().draw(
@@ -355,7 +355,7 @@ where
             tree.state.downcast_ref::<State>(),
             layout,
             cursor,
-            &self.direction,
+            self.direction,
             |layout, cursor, viewport| {
                 self.content.as_widget().mouse_interaction(
                     &tree.children[0],
@@ -386,7 +386,7 @@ where
                 let content_layout = layout.children().next().unwrap();
                 let content_bounds = content_layout.bounds();
                 let offset = tree.state.downcast_ref::<State>().offset(
-                    &self.direction,
+                    self.direction,
                     bounds,
                     content_bounds,
                 );
@@ -494,7 +494,7 @@ pub fn update<Message>(
     cursor: mouse::Cursor,
     clipboard: &mut dyn Clipboard,
     shell: &mut Shell<'_, Message>,
-    direction: &Direction,
+    direction: Direction,
     on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
     update_content: impl FnOnce(
         Event,
@@ -512,15 +512,6 @@ pub fn update<Message>(
 
     let scrollbars = Scrollbars::new(state, direction, bounds, content_bounds);
 
-    let horizontal_alignment = direction
-        .horizontal()
-        .map(|p| p.alignment)
-        .unwrap_or_default();
-    let vertical_alignment = direction
-        .vertical()
-        .map(|p| p.alignment)
-        .unwrap_or_default();
-
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
 
@@ -571,11 +562,7 @@ pub fn update<Message>(
                 mouse::ScrollDelta::Pixels { x, y } => Vector::new(x, y),
             };
 
-            state.scroll(
-                aligned_delta(delta, vertical_alignment, horizontal_alignment),
-                bounds,
-                content_bounds,
-            );
+            state.scroll(delta, direction, bounds, content_bounds);
 
             notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
 
@@ -606,15 +593,7 @@ pub fn update<Message>(
                             cursor_position.y - scroll_box_touched_at.y,
                         );
 
-                        state.scroll(
-                            aligned_delta(
-                                delta,
-                                vertical_alignment,
-                                horizontal_alignment,
-                            ),
-                            bounds,
-                            content_bounds,
-                        );
+                        state.scroll(delta, direction, bounds, content_bounds);
 
                         state.scroll_area_touched_at = Some(cursor_position);
 
@@ -658,7 +637,6 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_y(
                             scroller_grabbed_at,
                             cursor_position,
-                            vertical_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -692,7 +670,6 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_y(
                             scroller_grabbed_at,
                             cursor_position,
-                            vertical_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -735,7 +712,6 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_x(
                             scroller_grabbed_at,
                             cursor_position,
-                            horizontal_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -769,7 +745,6 @@ pub fn update<Message>(
                         scrollbar.scroll_percentage_x(
                             scroller_grabbed_at,
                             cursor_position,
-                            horizontal_alignment,
                         ),
                         bounds,
                         content_bounds,
@@ -800,7 +775,7 @@ pub fn mouse_interaction(
     state: &State,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    direction: &Direction,
+    direction: Direction,
     content_interaction: impl FnOnce(
         Layout<'_>,
         mouse::Cursor,
@@ -853,7 +828,7 @@ pub fn draw<Renderer>(
     theme: &Renderer::Theme,
     layout: Layout<'_>,
     cursor: mouse::Cursor,
-    direction: &Direction,
+    direction: Direction,
     style: &<Renderer::Theme as StyleSheet>::Style,
     draw_content: impl FnOnce(&mut Renderer, Layout<'_>, mouse::Cursor, &Rectangle),
 ) where
@@ -1138,9 +1113,30 @@ impl State {
     pub fn scroll(
         &mut self,
         delta: Vector<f32>,
+        direction: Direction,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) {
+        let horizontal_alignment = direction
+            .horizontal()
+            .map(|p| p.alignment)
+            .unwrap_or_default();
+
+        let vertical_alignment = direction
+            .vertical()
+            .map(|p| p.alignment)
+            .unwrap_or_default();
+
+        let align = |alignment: Alignment, delta: f32| match alignment {
+            Alignment::Start => delta,
+            Alignment::End => -delta,
+        };
+
+        let delta = Vector::new(
+            align(horizontal_alignment, delta.x),
+            align(vertical_alignment, delta.y),
+        );
+
         if bounds.height < content_bounds.height {
             self.offset_y = Offset::Absolute(
                 (self.offset_y.absolute(bounds.height, content_bounds.height)
@@ -1213,7 +1209,7 @@ impl State {
     /// the bounds of the [`Scrollable`] and its contents.
     pub fn offset(
         &self,
-        direction: &Direction,
+        direction: Direction,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Vector {
@@ -1258,7 +1254,7 @@ impl Scrollbars {
     /// Create y and/or x scrollbar(s) if content is overflowing the [`Scrollable`] bounds.
     fn new(
         state: &State,
-        direction: &Direction,
+        direction: Direction,
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Self {
@@ -1327,6 +1323,7 @@ impl Scrollbars {
                 scroller: internals::Scroller {
                     bounds: scroller_bounds,
                 },
+                alignment: vertical.alignment,
             })
         } else {
             None
@@ -1387,6 +1384,7 @@ impl Scrollbars {
                 scroller: internals::Scroller {
                     bounds: scroller_bounds,
                 },
+                alignment: horizontal.alignment,
             })
         } else {
             None
@@ -1450,39 +1448,17 @@ impl Scrollbars {
     }
 }
 
-fn aligned_delta(
-    delta: Vector,
-    vertical_alignment: Alignment,
-    horizontal_alignment: Alignment,
-) -> Vector {
-    let align = |alignment: Alignment, delta: f32| match alignment {
-        Alignment::Start => delta,
-        Alignment::End => -delta,
-    };
-
-    Vector::new(
-        align(horizontal_alignment, delta.x),
-        align(vertical_alignment, delta.y),
-    )
-}
-
 pub(super) mod internals {
     use crate::core::{Point, Rectangle};
 
     use super::Alignment;
 
-    /// 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 bounds of just the [`Scrollbar`].
         pub bounds: Rectangle,
-
-        /// The state of this scrollbar's [`Scroller`].
         pub scroller: Scroller,
+        pub alignment: Alignment,
     }
 
     impl Scrollbar {
@@ -1496,7 +1472,6 @@ pub(super) mod internals {
             &self,
             grabbed_at: f32,
             cursor_position: Point,
-            alignment: Alignment,
         ) -> f32 {
             let pct = if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
                 // cursor position is unavailable! Set to either end or beginning of scrollbar depending
@@ -1509,7 +1484,7 @@ pub(super) mod internals {
                     / (self.bounds.height - self.scroller.bounds.height)
             };
 
-            match alignment {
+            match self.alignment {
                 Alignment::Start => pct,
                 Alignment::End => 1.0 - pct,
             }
@@ -1520,7 +1495,6 @@ pub(super) mod internals {
             &self,
             grabbed_at: f32,
             cursor_position: Point,
-            alignment: Alignment,
         ) -> f32 {
             let pct = if cursor_position.x < 0.0 && cursor_position.y < 0.0 {
                 (self.scroller.bounds.x / self.total_bounds.width).round()
@@ -1531,7 +1505,7 @@ pub(super) mod internals {
                     / (self.bounds.width - self.scroller.bounds.width)
             };
 
-            match alignment {
+            match self.alignment {
                 Alignment::Start => pct,
                 Alignment::End => 1.0 - pct,
             }

From ca2afb04952f177667c4431a102161be9223340f 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, 12 Jul 2023 10:04:26 +0200
Subject: [PATCH 438/440] Disambiguate `offset` from `translation` in
 `scrollable`

---
 widget/src/scrollable.rs | 77 +++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 17d55e7c..45fbd72b 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -198,15 +198,6 @@ pub enum Alignment {
     End,
 }
 
-impl Alignment {
-    fn aligned(self, offset: f32, viewport: f32, content: f32) -> f32 {
-        match self {
-            Alignment::Start => offset,
-            Alignment::End => ((content - viewport).max(0.0) - offset).max(0.0),
-        }
-    }
-}
-
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Scrollable<'a, Message, Renderer>
 where
@@ -385,13 +376,12 @@ where
                 let bounds = layout.bounds();
                 let content_layout = layout.children().next().unwrap();
                 let content_bounds = content_layout.bounds();
-                let offset = tree.state.downcast_ref::<State>().offset(
-                    self.direction,
-                    bounds,
-                    content_bounds,
-                );
+                let translation = tree
+                    .state
+                    .downcast_ref::<State>()
+                    .translation(self.direction, bounds, content_bounds);
 
-                overlay.translate(Vector::new(-offset.x, -offset.y))
+                overlay.translate(Vector::new(-translation.x, -translation.y))
             })
     }
 }
@@ -522,7 +512,7 @@ pub fn update<Message>(
             {
                 mouse::Cursor::Available(
                     cursor_position
-                        + state.offset(direction, bounds, content_bounds),
+                        + state.translation(direction, bounds, content_bounds),
                 )
             }
             _ => mouse::Cursor::Unavailable,
@@ -798,13 +788,13 @@ pub fn mouse_interaction(
     {
         mouse::Interaction::Idle
     } else {
-        let offset = state.offset(direction, bounds, content_bounds);
+        let translation = state.translation(direction, bounds, content_bounds);
 
         let cursor = match cursor_over_scrollable {
             Some(cursor_position)
                 if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
             {
-                mouse::Cursor::Available(cursor_position + offset)
+                mouse::Cursor::Available(cursor_position + translation)
             }
             _ => mouse::Cursor::Unavailable,
         };
@@ -813,8 +803,8 @@ pub fn mouse_interaction(
             content_layout,
             cursor,
             &Rectangle {
-                y: bounds.y + offset.y,
-                x: bounds.x + offset.x,
+                y: bounds.y + translation.y,
+                x: bounds.x + translation.x,
                 ..bounds
             },
         )
@@ -845,13 +835,13 @@ pub fn draw<Renderer>(
     let (mouse_over_y_scrollbar, mouse_over_x_scrollbar) =
         scrollbars.is_mouse_over(cursor);
 
-    let offset = state.offset(direction, bounds, content_bounds);
+    let translation = state.translation(direction, bounds, content_bounds);
 
     let cursor = match cursor_over_scrollable {
         Some(cursor_position)
             if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
         {
-            mouse::Cursor::Available(cursor_position + offset)
+            mouse::Cursor::Available(cursor_position + translation)
         }
         _ => mouse::Cursor::Unavailable,
     };
@@ -860,15 +850,15 @@ pub fn draw<Renderer>(
     if scrollbars.active() {
         renderer.with_layer(bounds, |renderer| {
             renderer.with_translation(
-                Vector::new(-offset.x, -offset.y),
+                Vector::new(-translation.x, -translation.y),
                 |renderer| {
                     draw_content(
                         renderer,
                         content_layout,
                         cursor,
                         &Rectangle {
-                            y: bounds.y + offset.y,
-                            x: bounds.x + offset.x,
+                            y: bounds.y + translation.y,
+                            x: bounds.x + translation.x,
                             ..bounds
                         },
                     );
@@ -959,8 +949,8 @@ pub fn draw<Renderer>(
             content_layout,
             cursor,
             &Rectangle {
-                x: bounds.x + offset.x,
-                y: bounds.y + offset.y,
+                x: bounds.x + translation.x,
+                y: bounds.y + translation.y,
                 ..bounds
             },
         );
@@ -1067,6 +1057,20 @@ impl Offset {
             }
         }
     }
+
+    fn absolute_from_start(
+        self,
+        viewport: f32,
+        content: f32,
+        alignment: Alignment,
+    ) -> f32 {
+        let offset = self.absolute(viewport, content);
+
+        match alignment {
+            Alignment::Start => offset,
+            Alignment::End => ((content - viewport).max(0.0) - offset).max(0.0),
+        }
+    }
 }
 
 /// The current [`Viewport`] of the [`Scrollable`].
@@ -1205,9 +1209,9 @@ impl State {
         );
     }
 
-    /// Returns the scrolling offset of the [`State`], given a [`Direction`],
+    /// Returns the scrolling translation of the [`State`], given a [`Direction`],
     /// the bounds of the [`Scrollable`] and its contents.
-    pub fn offset(
+    fn translation(
         &self,
         direction: Direction,
         bounds: Rectangle,
@@ -1215,20 +1219,19 @@ impl State {
     ) -> Vector {
         Vector::new(
             if let Some(horizontal) = direction.horizontal() {
-                horizontal.alignment.aligned(
-                    self.offset_x.absolute(bounds.width, content_bounds.width),
+                self.offset_x.absolute_from_start(
                     bounds.width,
                     content_bounds.width,
+                    horizontal.alignment,
                 )
             } else {
                 0.0
             },
             if let Some(vertical) = direction.vertical() {
-                vertical.alignment.aligned(
-                    self.offset_y
-                        .absolute(bounds.height, content_bounds.height),
+                self.offset_y.absolute_from_start(
                     bounds.height,
                     content_bounds.height,
+                    vertical.alignment,
                 )
             } else {
                 0.0
@@ -1258,7 +1261,7 @@ impl Scrollbars {
         bounds: Rectangle,
         content_bounds: Rectangle,
     ) -> Self {
-        let offset = state.offset(direction, bounds, content_bounds);
+        let translation = state.translation(direction, bounds, content_bounds);
 
         let show_scrollbar_x = direction
             .horizontal()
@@ -1305,7 +1308,7 @@ impl Scrollbars {
             let ratio = bounds.height / content_bounds.height;
             // min height for easier grabbing with super tall content
             let scroller_height = (bounds.height * ratio).max(2.0);
-            let scroller_offset = offset.y * ratio;
+            let scroller_offset = translation.y * ratio;
 
             let scroller_bounds = Rectangle {
                 x: bounds.x + bounds.width
@@ -1366,7 +1369,7 @@ impl Scrollbars {
             let ratio = bounds.width / content_bounds.width;
             // min width for easier grabbing with extra wide content
             let scroller_length = (bounds.width * ratio).max(2.0);
-            let scroller_offset = offset.x * ratio;
+            let scroller_offset = translation.x * ratio;
 
             let scroller_bounds = Rectangle {
                 x: (scrollbar_bounds.x + scroller_offset - scrollbar_y_width)

From d07bac36ab528ea5c3f4a09bb0ae010ae1b5c6da 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, 12 Jul 2023 10:05:46 +0200
Subject: [PATCH 439/440] Rename `absolute_from_start` to `translation` in
 `scrollable`

---
 widget/src/scrollable.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 45fbd72b..9a43a978 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -1058,7 +1058,7 @@ impl Offset {
         }
     }
 
-    fn absolute_from_start(
+    fn translation(
         self,
         viewport: f32,
         content: f32,
@@ -1219,7 +1219,7 @@ impl State {
     ) -> Vector {
         Vector::new(
             if let Some(horizontal) = direction.horizontal() {
-                self.offset_x.absolute_from_start(
+                self.offset_x.translation(
                     bounds.width,
                     content_bounds.width,
                     horizontal.alignment,
@@ -1228,7 +1228,7 @@ impl State {
                 0.0
             },
             if let Some(vertical) = direction.vertical() {
-                self.offset_y.absolute_from_start(
+                self.offset_y.translation(
                     bounds.height,
                     content_bounds.height,
                     vertical.alignment,

From ce23e08d0d921040d1e6fb693149e638d291bd16 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, 12 Jul 2023 10:13:15 +0200
Subject: [PATCH 440/440] Remove unnecessary cursor unavailability logic in
 `scrollable`

---
 widget/src/scrollable.rs | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 9a43a978..88746ac4 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -1476,20 +1476,14 @@ pub(super) mod internals {
             grabbed_at: f32,
             cursor_position: Point,
         ) -> f32 {
-            let pct = 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)
-            };
+            let percentage = (cursor_position.y
+                - self.bounds.y
+                - self.scroller.bounds.height * grabbed_at)
+                / (self.bounds.height - self.scroller.bounds.height);
 
             match self.alignment {
-                Alignment::Start => pct,
-                Alignment::End => 1.0 - pct,
+                Alignment::Start => percentage,
+                Alignment::End => 1.0 - percentage,
             }
         }
 
@@ -1499,18 +1493,14 @@ pub(super) mod internals {
             grabbed_at: f32,
             cursor_position: Point,
         ) -> f32 {
-            let pct = 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)
-            };
+            let percentage = (cursor_position.x
+                - self.bounds.x
+                - self.scroller.bounds.width * grabbed_at)
+                / (self.bounds.width - self.scroller.bounds.width);
 
             match self.alignment {
-                Alignment::Start => pct,
-                Alignment::End => 1.0 - pct,
+                Alignment::Start => percentage,
+                Alignment::End => 1.0 - percentage,
             }
         }
     }