From d53ccc857da4d4cda769904342aeb5a82a64f146 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 12 Jul 2023 19:21:05 -0700
Subject: refactored window storage; new helper window events (Destroyed,
 Created); clippy + fmt;

---
 renderer/src/compositor.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 8b17a4b0..b5da31bf 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -46,6 +46,22 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         Err(error)
     }
 
+    fn renderer(&self) -> Self::Renderer {
+        match self {
+            Compositor::TinySkia(compositor) => {
+                Renderer::TinySkia(compositor.renderer())
+            }
+            #[cfg(feature = "wgpu")]
+            Compositor::Wgpu(compositor) => {
+                Renderer::Wgpu(compositor.renderer())
+            }
+            #[cfg(not(feature = "wgpu"))]
+            Self::Wgpu => {
+                panic!("`wgpu` feature was not enabled in `iced_renderer`")
+            }
+        }
+    }
+
     fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
         &mut self,
         window: &W,
-- 
cgit 


From 346af3f8b0baa418fd37b878bc2930ff0bd57cc0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 11 Sep 2023 02:47:24 +0200
Subject: Make `FontSystem` global and simplify `Paragraph` API

---
 renderer/src/lib.rs | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 8bdf231d..73e56890 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -173,22 +173,6 @@ impl<T> text::Renderer for Renderer<T> {
         delegate!(self, renderer, renderer.default_size())
     }
 
-    fn create_paragraph(&self, text: Text<'_, Self::Font>) -> Self::Paragraph {
-        delegate!(self, renderer, renderer.create_paragraph(text))
-    }
-
-    fn resize_paragraph(
-        &self,
-        paragraph: &mut Self::Paragraph,
-        new_bounds: Size,
-    ) {
-        delegate!(
-            self,
-            renderer,
-            renderer.resize_paragraph(paragraph, new_bounds)
-        );
-    }
-
     fn load_font(&mut self, bytes: Cow<'static, [u8]>) {
         delegate!(self, renderer, renderer.load_font(bytes));
     }
-- 
cgit 


From 6448429103c9c82b90040ac5a5a097bdded23f82 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 12 Sep 2023 14:51:00 +0200
Subject: Draft `Editor` API and `TextEditor` widget

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

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 73e56890..6f044af6 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -32,6 +32,7 @@ use crate::core::text::{self, Text};
 use crate::core::{
     Background, Color, Font, Pixels, Point, Rectangle, Size, Vector,
 };
+use crate::graphics::text::Editor;
 use crate::graphics::text::Paragraph;
 use crate::graphics::Mesh;
 
@@ -159,6 +160,7 @@ impl<T> core::Renderer for Renderer<T> {
 impl<T> text::Renderer for Renderer<T> {
     type Font = Font;
     type Paragraph = Paragraph;
+    type Editor = Editor;
 
     const ICON_FONT: Font = iced_tiny_skia::Renderer::<T>::ICON_FONT;
     const CHECKMARK_ICON: char = iced_tiny_skia::Renderer::<T>::CHECKMARK_ICON;
@@ -179,14 +181,27 @@ impl<T> text::Renderer for Renderer<T> {
 
     fn fill_paragraph(
         &mut self,
-        text: &Self::Paragraph,
+        paragraph: &Self::Paragraph,
         position: Point,
         color: Color,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_paragraph(text, position, color)
+            renderer.fill_paragraph(paragraph, position, color)
+        );
+    }
+
+    fn fill_editor(
+        &mut self,
+        editor: &Self::Editor,
+        position: Point,
+        color: Color,
+    ) {
+        delegate!(
+            self,
+            renderer,
+            renderer.fill_editor(editor, position, color)
         );
     }
 
-- 
cgit 


From c829b4b04e1274f157ea7bb3adf832c4c53ce3e8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 13 Sep 2023 17:55:33 +0200
Subject: Fix unused import in `iced_renderer`

---
 renderer/src/lib.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 6f044af6..81f60886 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -29,9 +29,7 @@ pub use geometry::Geometry;
 
 use crate::core::renderer;
 use crate::core::text::{self, Text};
-use crate::core::{
-    Background, Color, Font, Pixels, Point, Rectangle, Size, Vector,
-};
+use crate::core::{Background, Color, Font, Pixels, Point, Rectangle, Vector};
 use crate::graphics::text::Editor;
 use crate::graphics::text::Paragraph;
 use crate::graphics::Mesh;
@@ -219,7 +217,10 @@ impl<T> text::Renderer for Renderer<T> {
 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> {
+    fn dimensions(
+        &self,
+        handle: &crate::core::image::Handle,
+    ) -> core::Size<u32> {
         delegate!(self, renderer, renderer.dimensions(handle))
     }
 
@@ -230,7 +231,7 @@ impl<T> crate::core::image::Renderer for Renderer<T> {
 
 #[cfg(feature = "svg")]
 impl<T> crate::core::svg::Renderer for Renderer<T> {
-    fn dimensions(&self, handle: &crate::core::svg::Handle) -> Size<u32> {
+    fn dimensions(&self, handle: &crate::core::svg::Handle) -> core::Size<u32> {
         delegate!(self, renderer, renderer.dimensions(handle))
     }
 
-- 
cgit 


From a5125d6fea824df1191777fe3eb53a2f748208b9 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 11 Nov 2023 07:02:01 +0100
Subject: Refactor texture image filtering

- Support only `Linear` or `Nearest`
- Simplify `Layer` groups
- Move `FilterMethod` to `Image` and `image::Viewer`
---
 renderer/src/lib.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index cc81c6e2..43f9794b 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -214,8 +214,13 @@ impl<T> crate::core::image::Renderer for Renderer<T> {
         delegate!(self, renderer, renderer.dimensions(handle))
     }
 
-    fn draw(&mut self, handle: crate::core::image::Handle, bounds: Rectangle) {
-        delegate!(self, renderer, renderer.draw(handle, bounds));
+    fn draw(
+        &mut self,
+        handle: crate::core::image::Handle,
+        filter_method: crate::core::image::FilterMethod,
+        bounds: Rectangle,
+    ) {
+        delegate!(self, renderer, renderer.draw(handle, filter_method, bounds));
     }
 }
 
-- 
cgit 


From 9d5ff12063e05158ede74f1aec4167bf910c8730 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 12 Nov 2023 03:22:43 +0100
Subject: Fix conditional compilation in `iced_renderer`

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

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 43f9794b..78dec847 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -252,6 +252,7 @@ impl<T> crate::graphics::geometry::Renderer for Renderer<T> {
                         crate::Geometry::TinySkia(primitive) => {
                             renderer.draw_primitive(primitive);
                         }
+                        #[cfg(feature = "wgpu")]
                         crate::Geometry::Wgpu(_) => unreachable!(),
                     }
                 }
-- 
cgit 


From 781ef1f94c4859aeeb852f801b72be095b8ff82b Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 14 Sep 2023 13:58:36 -0700
Subject: Added support for custom shader widget for iced_wgpu backend.

---
 renderer/src/lib.rs                   |  21 ++++
 renderer/src/widget.rs                |   3 +
 renderer/src/widget/shader.rs         | 215 ++++++++++++++++++++++++++++++++++
 renderer/src/widget/shader/event.rs   |  21 ++++
 renderer/src/widget/shader/program.rs |  60 ++++++++++
 5 files changed, 320 insertions(+)
 create mode 100644 renderer/src/widget/shader.rs
 create mode 100644 renderer/src/widget/shader/event.rs
 create mode 100644 renderer/src/widget/shader/program.rs

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 78dec847..8c5ee2f0 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -7,6 +7,7 @@ pub mod compositor;
 pub mod geometry;
 
 mod settings;
+pub mod widget;
 
 pub use iced_graphics as graphics;
 pub use iced_graphics::core;
@@ -59,6 +60,26 @@ impl<T> Renderer<T> {
             }
         }
     }
+
+    pub fn draw_custom<P: widget::shader::Primitive>(
+        &mut self,
+        bounds: Rectangle,
+        primitive: P,
+    ) {
+        match self {
+            Renderer::TinySkia(_) => {
+                log::warn!(
+                    "Custom shader primitive is unavailable with tiny-skia."
+                );
+            }
+            #[cfg(feature = "wgpu")]
+            Renderer::Wgpu(renderer) => {
+                renderer.draw_primitive(iced_wgpu::Primitive::Custom(
+                    iced_wgpu::primitive::Custom::shader(bounds, primitive),
+                ))
+            }
+        }
+    }
 }
 
 impl<T> core::Renderer for Renderer<T> {
diff --git a/renderer/src/widget.rs b/renderer/src/widget.rs
index 6c0c2a83..0422c99c 100644
--- a/renderer/src/widget.rs
+++ b/renderer/src/widget.rs
@@ -9,3 +9,6 @@ pub mod qr_code;
 
 #[cfg(feature = "qr_code")]
 pub use qr_code::QRCode;
+
+#[cfg(feature = "wgpu")]
+pub mod shader;
diff --git a/renderer/src/widget/shader.rs b/renderer/src/widget/shader.rs
new file mode 100644
index 00000000..da42a7dd
--- /dev/null
+++ b/renderer/src/widget/shader.rs
@@ -0,0 +1,215 @@
+//! A custom shader widget for wgpu applications.
+use crate::core::event::Status;
+use crate::core::layout::{Limits, Node};
+use crate::core::mouse::{Cursor, Interaction};
+use crate::core::renderer::Style;
+use crate::core::widget::tree::{State, Tag};
+use crate::core::widget::{tree, Tree};
+use crate::core::{
+    self, layout, mouse, widget, Clipboard, Element, Layout, Length, Rectangle,
+    Shell, Size, Widget,
+};
+use std::marker::PhantomData;
+
+mod event;
+mod program;
+
+pub use event::Event;
+pub use iced_wgpu::custom::Primitive;
+pub use iced_wgpu::custom::Storage;
+pub use program::Program;
+
+/// A widget which can render custom shaders with Iced's `wgpu` backend.
+///
+/// Must be initialized with a [`Program`], which describes the internal widget state & how
+/// its [`Program::Primitive`]s are drawn.
+#[allow(missing_debug_implementations)]
+pub struct Shader<Message, P: Program<Message>> {
+    width: Length,
+    height: Length,
+    program: P,
+    _message: PhantomData<Message>,
+}
+
+impl<Message, P: Program<Message>> Shader<Message, P> {
+    /// Create a new custom [`Shader`].
+    pub fn new(program: P) -> Self {
+        Self {
+            width: Length::Fixed(100.0),
+            height: Length::Fixed(100.0),
+            program,
+            _message: PhantomData,
+        }
+    }
+
+    /// Set the `width` of the custom [`Shader`].
+    pub fn width(mut self, width: impl Into<Length>) -> Self {
+        self.width = width.into();
+        self
+    }
+
+    /// Set the `height` of the custom [`Shader`].
+    pub fn height(mut self, height: impl Into<Length>) -> Self {
+        self.height = height.into();
+        self
+    }
+}
+
+impl<P, Message, Theme> Widget<Message, crate::Renderer<Theme>>
+    for Shader<Message, P>
+where
+    P: Program<Message>,
+{
+    fn tag(&self) -> Tag {
+        struct Tag<T>(T);
+        tree::Tag::of::<Tag<P::State>>()
+    }
+
+    fn state(&self) -> State {
+        tree::State::new(P::State::default())
+    }
+
+    fn width(&self) -> Length {
+        self.width
+    }
+
+    fn height(&self) -> Length {
+        self.height
+    }
+
+    fn layout(
+        &self,
+        _tree: &mut Tree,
+        _renderer: &crate::Renderer<Theme>,
+        limits: &Limits,
+    ) -> 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: crate::core::Event,
+        layout: Layout<'_>,
+        cursor: Cursor,
+        _renderer: &crate::Renderer<Theme>,
+        _clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+        _viewport: &Rectangle,
+    ) -> Status {
+        let bounds = layout.bounds();
+
+        let custom_shader_event = match event {
+            core::Event::Mouse(mouse_event) => Some(Event::Mouse(mouse_event)),
+            core::Event::Keyboard(keyboard_event) => {
+                Some(Event::Keyboard(keyboard_event))
+            }
+            core::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
+            _ => None,
+        };
+
+        if let Some(custom_shader_event) = custom_shader_event {
+            let state = tree.state.downcast_mut::<P::State>();
+
+            let (event_status, message) = self.program.update(
+                state,
+                custom_shader_event,
+                bounds,
+                cursor,
+                shell,
+            );
+
+            if let Some(message) = message {
+                shell.publish(message);
+            }
+
+            return event_status;
+        }
+
+        event::Status::Ignored
+    }
+
+    fn mouse_interaction(
+        &self,
+        tree: &Tree,
+        layout: Layout<'_>,
+        cursor: Cursor,
+        _viewport: &Rectangle,
+        _renderer: &crate::Renderer<Theme>,
+    ) -> mouse::Interaction {
+        let bounds = layout.bounds();
+        let state = tree.state.downcast_ref::<P::State>();
+
+        self.program.mouse_interaction(state, bounds, cursor)
+    }
+
+    fn draw(
+        &self,
+        tree: &widget::Tree,
+        renderer: &mut crate::Renderer<Theme>,
+        _theme: &Theme,
+        _style: &Style,
+        layout: Layout<'_>,
+        cursor_position: mouse::Cursor,
+        _viewport: &Rectangle,
+    ) {
+        let bounds = layout.bounds();
+        let state = tree.state.downcast_ref::<P::State>();
+
+        renderer.draw_custom(
+            bounds,
+            self.program.draw(state, cursor_position, bounds),
+        );
+    }
+}
+
+impl<'a, M, P, Theme> From<Shader<M, P>>
+    for Element<'a, M, crate::Renderer<Theme>>
+where
+    M: 'a,
+    P: Program<M> + 'a,
+{
+    fn from(custom: Shader<M, P>) -> Element<'a, M, crate::Renderer<Theme>> {
+        Element::new(custom)
+    }
+}
+
+impl<Message, T> Program<Message> for &T
+where
+    T: Program<Message>,
+{
+    type State = T::State;
+    type Primitive = T::Primitive;
+
+    fn update(
+        &self,
+        state: &mut Self::State,
+        event: Event,
+        bounds: Rectangle,
+        cursor: Cursor,
+        shell: &mut Shell<'_, Message>,
+    ) -> (Status, Option<Message>) {
+        T::update(self, state, event, bounds, cursor, shell)
+    }
+
+    fn draw(
+        &self,
+        state: &Self::State,
+        cursor: Cursor,
+        bounds: Rectangle,
+    ) -> Self::Primitive {
+        T::draw(self, state, cursor, bounds)
+    }
+
+    fn mouse_interaction(
+        &self,
+        state: &Self::State,
+        bounds: Rectangle,
+        cursor: Cursor,
+    ) -> Interaction {
+        T::mouse_interaction(self, state, bounds, cursor)
+    }
+}
diff --git a/renderer/src/widget/shader/event.rs b/renderer/src/widget/shader/event.rs
new file mode 100644
index 00000000..981b30d7
--- /dev/null
+++ b/renderer/src/widget/shader/event.rs
@@ -0,0 +1,21 @@
+//! Handle events of a custom shader widget.
+use crate::core::keyboard;
+use crate::core::mouse;
+use crate::core::touch;
+
+pub use crate::core::event::Status;
+
+/// A [`Shader`] event.
+///
+/// [`Shader`]: crate::widget::shader::Shader;
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Event {
+    /// A mouse event.
+    Mouse(mouse::Event),
+
+    /// A touch event.
+    Touch(touch::Event),
+
+    /// A keyboard event.
+    Keyboard(keyboard::Event),
+}
diff --git a/renderer/src/widget/shader/program.rs b/renderer/src/widget/shader/program.rs
new file mode 100644
index 00000000..b8871688
--- /dev/null
+++ b/renderer/src/widget/shader/program.rs
@@ -0,0 +1,60 @@
+use crate::core::{event, mouse, Rectangle, Shell};
+use crate::widget;
+use widget::shader;
+
+/// The state and logic of a [`Shader`] widget.
+///
+/// A [`Program`] can mutate the internal state of a [`Shader`] widget
+/// and produce messages for an application.
+///
+/// [`Shader`]: crate::widget::shader::Shader
+pub trait Program<Message> {
+    /// The internal state of the [`Program`].
+    type State: Default + 'static;
+
+    /// The type of primitive this [`Program`] can draw.
+    type Primitive: shader::Primitive + 'static;
+
+    /// Update the internal [`State`] of the [`Program`]. This can be used to reflect state changes
+    /// based on mouse & other events. You can use the [`Shell`] to publish messages, request a
+    /// redraw for the window, etc.
+    ///
+    /// By default, this method does and returns nothing.
+    ///
+    /// [`State`]: Self::State
+    fn update(
+        &self,
+        _state: &mut Self::State,
+        _event: shader::Event,
+        _bounds: Rectangle,
+        _cursor: mouse::Cursor,
+        _shell: &mut Shell<'_, Message>,
+    ) -> (event::Status, Option<Message>) {
+        (event::Status::Ignored, None)
+    }
+
+    /// Draws the [`Primitive`].
+    ///
+    /// [`Primitive`]: Self::Primitive
+    fn draw(
+        &self,
+        state: &Self::State,
+        cursor: mouse::Cursor,
+        bounds: Rectangle,
+    ) -> Self::Primitive;
+
+    /// Returns the current mouse interaction of the [`Program`].
+    ///
+    /// The interaction returned will be in effect even if the cursor position is out of
+    /// bounds of the [`Shader`]'s program.
+    ///
+    /// [`Shader`]: crate::widget::shader::Shader
+    fn mouse_interaction(
+        &self,
+        _state: &Self::State,
+        _bounds: Rectangle,
+        _cursor: mouse::Cursor,
+    ) -> mouse::Interaction {
+        mouse::Interaction::default()
+    }
+}
-- 
cgit 


From 91fca024b629b7ddf4de533a75f01593954362f6 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 21 Sep 2023 13:24:54 -0700
Subject: Reexport Transformation from widget::shader

---
 renderer/src/widget/shader.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'renderer/src')

diff --git a/renderer/src/widget/shader.rs b/renderer/src/widget/shader.rs
index da42a7dd..85fc13c8 100644
--- a/renderer/src/widget/shader.rs
+++ b/renderer/src/widget/shader.rs
@@ -18,6 +18,7 @@ pub use event::Event;
 pub use iced_wgpu::custom::Primitive;
 pub use iced_wgpu::custom::Storage;
 pub use program::Program;
+pub use iced_graphics::Transformation;
 
 /// A widget which can render custom shaders with Iced's `wgpu` backend.
 ///
-- 
cgit 


From 65f4ff060a36c6dc3afea20d75f541d72460d333 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Thu, 28 Sep 2023 09:48:38 -0700
Subject: Added redraw request handling to widget events.

---
 renderer/src/widget/shader.rs       | 8 ++++----
 renderer/src/widget/shader/event.rs | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/widget/shader.rs b/renderer/src/widget/shader.rs
index 85fc13c8..385fa981 100644
--- a/renderer/src/widget/shader.rs
+++ b/renderer/src/widget/shader.rs
@@ -5,10 +5,7 @@ use crate::core::mouse::{Cursor, Interaction};
 use crate::core::renderer::Style;
 use crate::core::widget::tree::{State, Tag};
 use crate::core::widget::{tree, Tree};
-use crate::core::{
-    self, layout, mouse, widget, Clipboard, Element, Layout, Length, Rectangle,
-    Shell, Size, Widget,
-};
+use crate::core::{self, layout, mouse, widget, Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget, window};
 use std::marker::PhantomData;
 
 mod event;
@@ -109,6 +106,9 @@ where
                 Some(Event::Keyboard(keyboard_event))
             }
             core::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
+            core::Event::Window(window::Event::RedrawRequested(instant)) => {
+                Some(Event::RedrawRequested(instant))
+            }
             _ => None,
         };
 
diff --git a/renderer/src/widget/shader/event.rs b/renderer/src/widget/shader/event.rs
index 981b30d7..c1696580 100644
--- a/renderer/src/widget/shader/event.rs
+++ b/renderer/src/widget/shader/event.rs
@@ -1,4 +1,5 @@
 //! Handle events of a custom shader widget.
+use std::time::Instant;
 use crate::core::keyboard;
 use crate::core::mouse;
 use crate::core::touch;
@@ -18,4 +19,7 @@ pub enum Event {
 
     /// A keyboard event.
     Keyboard(keyboard::Event),
+
+    /// A window requested a redraw.
+    RedrawRequested(Instant),
 }
-- 
cgit 


From 33f626294452aefd1cd04f455fa1d1dfcb7f549e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 11:43:38 +0100
Subject: Fix `clippy` lints :crab:

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

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 8c5ee2f0..e4b1eda9 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -76,7 +76,7 @@ impl<T> Renderer<T> {
             Renderer::Wgpu(renderer) => {
                 renderer.draw_primitive(iced_wgpu::Primitive::Custom(
                     iced_wgpu::primitive::Custom::shader(bounds, primitive),
-                ))
+                ));
             }
         }
     }
-- 
cgit 


From 226eac35c3fa35be328f6390fdf2a52a38ed2b0f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 11:51:04 +0100
Subject: Remove old `widget` modules in `iced_renderer`

---
 renderer/src/widget.rs | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/widget.rs b/renderer/src/widget.rs
index 0422c99c..4b7dad5d 100644
--- a/renderer/src/widget.rs
+++ b/renderer/src/widget.rs
@@ -1,14 +1,2 @@
-#[cfg(feature = "canvas")]
-pub mod canvas;
-
-#[cfg(feature = "canvas")]
-pub use canvas::Canvas;
-
-#[cfg(feature = "qr_code")]
-pub mod qr_code;
-
-#[cfg(feature = "qr_code")]
-pub use qr_code::QRCode;
-
 #[cfg(feature = "wgpu")]
 pub mod shader;
-- 
cgit 


From 2dda9132cda6d2a2279759f3447bae4e1c277555 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 11:52:34 +0100
Subject: Run `cargo fmt`

---
 renderer/src/widget/shader.rs       | 7 +++++--
 renderer/src/widget/shader/event.rs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/widget/shader.rs b/renderer/src/widget/shader.rs
index 385fa981..e218f35a 100644
--- a/renderer/src/widget/shader.rs
+++ b/renderer/src/widget/shader.rs
@@ -5,17 +5,20 @@ use crate::core::mouse::{Cursor, Interaction};
 use crate::core::renderer::Style;
 use crate::core::widget::tree::{State, Tag};
 use crate::core::widget::{tree, Tree};
-use crate::core::{self, layout, mouse, widget, Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Widget, window};
+use crate::core::{
+    self, layout, mouse, widget, window, Clipboard, Element, Layout, Length,
+    Rectangle, Shell, Size, Widget,
+};
 use std::marker::PhantomData;
 
 mod event;
 mod program;
 
 pub use event::Event;
+pub use iced_graphics::Transformation;
 pub use iced_wgpu::custom::Primitive;
 pub use iced_wgpu::custom::Storage;
 pub use program::Program;
-pub use iced_graphics::Transformation;
 
 /// A widget which can render custom shaders with Iced's `wgpu` backend.
 ///
diff --git a/renderer/src/widget/shader/event.rs b/renderer/src/widget/shader/event.rs
index c1696580..8901fb31 100644
--- a/renderer/src/widget/shader/event.rs
+++ b/renderer/src/widget/shader/event.rs
@@ -1,8 +1,8 @@
 //! Handle events of a custom shader widget.
-use std::time::Instant;
 use crate::core::keyboard;
 use crate::core::mouse;
 use crate::core::touch;
+use std::time::Instant;
 
 pub use crate::core::event::Status;
 
-- 
cgit 


From 9489e29e6619b14ed9f41a8887c4b34158266f71 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 12:49:49 +0100
Subject: Re-organize `custom` module as `pipeline` module

... and move `Shader` widget to `iced_widget` crate
---
 renderer/src/lib.rs                   |  44 +++----
 renderer/src/widget.rs                |   2 -
 renderer/src/widget/shader.rs         | 219 ----------------------------------
 renderer/src/widget/shader/event.rs   |  25 ----
 renderer/src/widget/shader/program.rs |  60 ----------
 5 files changed, 23 insertions(+), 327 deletions(-)
 delete mode 100644 renderer/src/widget.rs
 delete mode 100644 renderer/src/widget/shader.rs
 delete mode 100644 renderer/src/widget/shader/event.rs
 delete mode 100644 renderer/src/widget/shader/program.rs

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index e4b1eda9..1fc4c86b 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -1,13 +1,15 @@
 #![forbid(rust_2018_idioms)]
 #![deny(unsafe_code, unused_results, rustdoc::broken_intra_doc_links)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#[cfg(feature = "wgpu")]
+pub use iced_wgpu as wgpu;
+
 pub mod compositor;
 
 #[cfg(feature = "geometry")]
 pub mod geometry;
 
 mod settings;
-pub mod widget;
 
 pub use iced_graphics as graphics;
 pub use iced_graphics::core;
@@ -60,26 +62,6 @@ impl<T> Renderer<T> {
             }
         }
     }
-
-    pub fn draw_custom<P: widget::shader::Primitive>(
-        &mut self,
-        bounds: Rectangle,
-        primitive: P,
-    ) {
-        match self {
-            Renderer::TinySkia(_) => {
-                log::warn!(
-                    "Custom shader primitive is unavailable with tiny-skia."
-                );
-            }
-            #[cfg(feature = "wgpu")]
-            Renderer::Wgpu(renderer) => {
-                renderer.draw_primitive(iced_wgpu::Primitive::Custom(
-                    iced_wgpu::primitive::Custom::shader(bounds, primitive),
-                ));
-            }
-        }
-    }
 }
 
 impl<T> core::Renderer for Renderer<T> {
@@ -292,3 +274,23 @@ impl<T> crate::graphics::geometry::Renderer for Renderer<T> {
         }
     }
 }
+
+#[cfg(feature = "wgpu")]
+impl<T> iced_wgpu::primitive::pipeline::Renderer for Renderer<T> {
+    fn draw_pipeline_primitive(
+        &mut self,
+        bounds: Rectangle,
+        primitive: impl wgpu::primitive::pipeline::Primitive,
+    ) {
+        match self {
+            Self::TinySkia(_renderer) => {
+                log::warn!(
+                    "Custom shader primitive is unavailable with tiny-skia."
+                );
+            }
+            Self::Wgpu(renderer) => {
+                renderer.draw_pipeline_primitive(bounds, primitive);
+            }
+        }
+    }
+}
diff --git a/renderer/src/widget.rs b/renderer/src/widget.rs
deleted file mode 100644
index 4b7dad5d..00000000
--- a/renderer/src/widget.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(feature = "wgpu")]
-pub mod shader;
diff --git a/renderer/src/widget/shader.rs b/renderer/src/widget/shader.rs
deleted file mode 100644
index e218f35a..00000000
--- a/renderer/src/widget/shader.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-//! A custom shader widget for wgpu applications.
-use crate::core::event::Status;
-use crate::core::layout::{Limits, Node};
-use crate::core::mouse::{Cursor, Interaction};
-use crate::core::renderer::Style;
-use crate::core::widget::tree::{State, Tag};
-use crate::core::widget::{tree, Tree};
-use crate::core::{
-    self, layout, mouse, widget, window, Clipboard, Element, Layout, Length,
-    Rectangle, Shell, Size, Widget,
-};
-use std::marker::PhantomData;
-
-mod event;
-mod program;
-
-pub use event::Event;
-pub use iced_graphics::Transformation;
-pub use iced_wgpu::custom::Primitive;
-pub use iced_wgpu::custom::Storage;
-pub use program::Program;
-
-/// A widget which can render custom shaders with Iced's `wgpu` backend.
-///
-/// Must be initialized with a [`Program`], which describes the internal widget state & how
-/// its [`Program::Primitive`]s are drawn.
-#[allow(missing_debug_implementations)]
-pub struct Shader<Message, P: Program<Message>> {
-    width: Length,
-    height: Length,
-    program: P,
-    _message: PhantomData<Message>,
-}
-
-impl<Message, P: Program<Message>> Shader<Message, P> {
-    /// Create a new custom [`Shader`].
-    pub fn new(program: P) -> Self {
-        Self {
-            width: Length::Fixed(100.0),
-            height: Length::Fixed(100.0),
-            program,
-            _message: PhantomData,
-        }
-    }
-
-    /// Set the `width` of the custom [`Shader`].
-    pub fn width(mut self, width: impl Into<Length>) -> Self {
-        self.width = width.into();
-        self
-    }
-
-    /// Set the `height` of the custom [`Shader`].
-    pub fn height(mut self, height: impl Into<Length>) -> Self {
-        self.height = height.into();
-        self
-    }
-}
-
-impl<P, Message, Theme> Widget<Message, crate::Renderer<Theme>>
-    for Shader<Message, P>
-where
-    P: Program<Message>,
-{
-    fn tag(&self) -> Tag {
-        struct Tag<T>(T);
-        tree::Tag::of::<Tag<P::State>>()
-    }
-
-    fn state(&self) -> State {
-        tree::State::new(P::State::default())
-    }
-
-    fn width(&self) -> Length {
-        self.width
-    }
-
-    fn height(&self) -> Length {
-        self.height
-    }
-
-    fn layout(
-        &self,
-        _tree: &mut Tree,
-        _renderer: &crate::Renderer<Theme>,
-        limits: &Limits,
-    ) -> 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: crate::core::Event,
-        layout: Layout<'_>,
-        cursor: Cursor,
-        _renderer: &crate::Renderer<Theme>,
-        _clipboard: &mut dyn Clipboard,
-        shell: &mut Shell<'_, Message>,
-        _viewport: &Rectangle,
-    ) -> Status {
-        let bounds = layout.bounds();
-
-        let custom_shader_event = match event {
-            core::Event::Mouse(mouse_event) => Some(Event::Mouse(mouse_event)),
-            core::Event::Keyboard(keyboard_event) => {
-                Some(Event::Keyboard(keyboard_event))
-            }
-            core::Event::Touch(touch_event) => Some(Event::Touch(touch_event)),
-            core::Event::Window(window::Event::RedrawRequested(instant)) => {
-                Some(Event::RedrawRequested(instant))
-            }
-            _ => None,
-        };
-
-        if let Some(custom_shader_event) = custom_shader_event {
-            let state = tree.state.downcast_mut::<P::State>();
-
-            let (event_status, message) = self.program.update(
-                state,
-                custom_shader_event,
-                bounds,
-                cursor,
-                shell,
-            );
-
-            if let Some(message) = message {
-                shell.publish(message);
-            }
-
-            return event_status;
-        }
-
-        event::Status::Ignored
-    }
-
-    fn mouse_interaction(
-        &self,
-        tree: &Tree,
-        layout: Layout<'_>,
-        cursor: Cursor,
-        _viewport: &Rectangle,
-        _renderer: &crate::Renderer<Theme>,
-    ) -> mouse::Interaction {
-        let bounds = layout.bounds();
-        let state = tree.state.downcast_ref::<P::State>();
-
-        self.program.mouse_interaction(state, bounds, cursor)
-    }
-
-    fn draw(
-        &self,
-        tree: &widget::Tree,
-        renderer: &mut crate::Renderer<Theme>,
-        _theme: &Theme,
-        _style: &Style,
-        layout: Layout<'_>,
-        cursor_position: mouse::Cursor,
-        _viewport: &Rectangle,
-    ) {
-        let bounds = layout.bounds();
-        let state = tree.state.downcast_ref::<P::State>();
-
-        renderer.draw_custom(
-            bounds,
-            self.program.draw(state, cursor_position, bounds),
-        );
-    }
-}
-
-impl<'a, M, P, Theme> From<Shader<M, P>>
-    for Element<'a, M, crate::Renderer<Theme>>
-where
-    M: 'a,
-    P: Program<M> + 'a,
-{
-    fn from(custom: Shader<M, P>) -> Element<'a, M, crate::Renderer<Theme>> {
-        Element::new(custom)
-    }
-}
-
-impl<Message, T> Program<Message> for &T
-where
-    T: Program<Message>,
-{
-    type State = T::State;
-    type Primitive = T::Primitive;
-
-    fn update(
-        &self,
-        state: &mut Self::State,
-        event: Event,
-        bounds: Rectangle,
-        cursor: Cursor,
-        shell: &mut Shell<'_, Message>,
-    ) -> (Status, Option<Message>) {
-        T::update(self, state, event, bounds, cursor, shell)
-    }
-
-    fn draw(
-        &self,
-        state: &Self::State,
-        cursor: Cursor,
-        bounds: Rectangle,
-    ) -> Self::Primitive {
-        T::draw(self, state, cursor, bounds)
-    }
-
-    fn mouse_interaction(
-        &self,
-        state: &Self::State,
-        bounds: Rectangle,
-        cursor: Cursor,
-    ) -> Interaction {
-        T::mouse_interaction(self, state, bounds, cursor)
-    }
-}
diff --git a/renderer/src/widget/shader/event.rs b/renderer/src/widget/shader/event.rs
deleted file mode 100644
index 8901fb31..00000000
--- a/renderer/src/widget/shader/event.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-//! Handle events of a custom shader widget.
-use crate::core::keyboard;
-use crate::core::mouse;
-use crate::core::touch;
-use std::time::Instant;
-
-pub use crate::core::event::Status;
-
-/// A [`Shader`] event.
-///
-/// [`Shader`]: crate::widget::shader::Shader;
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Event {
-    /// A mouse event.
-    Mouse(mouse::Event),
-
-    /// A touch event.
-    Touch(touch::Event),
-
-    /// A keyboard event.
-    Keyboard(keyboard::Event),
-
-    /// A window requested a redraw.
-    RedrawRequested(Instant),
-}
diff --git a/renderer/src/widget/shader/program.rs b/renderer/src/widget/shader/program.rs
deleted file mode 100644
index b8871688..00000000
--- a/renderer/src/widget/shader/program.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use crate::core::{event, mouse, Rectangle, Shell};
-use crate::widget;
-use widget::shader;
-
-/// The state and logic of a [`Shader`] widget.
-///
-/// A [`Program`] can mutate the internal state of a [`Shader`] widget
-/// and produce messages for an application.
-///
-/// [`Shader`]: crate::widget::shader::Shader
-pub trait Program<Message> {
-    /// The internal state of the [`Program`].
-    type State: Default + 'static;
-
-    /// The type of primitive this [`Program`] can draw.
-    type Primitive: shader::Primitive + 'static;
-
-    /// Update the internal [`State`] of the [`Program`]. This can be used to reflect state changes
-    /// based on mouse & other events. You can use the [`Shell`] to publish messages, request a
-    /// redraw for the window, etc.
-    ///
-    /// By default, this method does and returns nothing.
-    ///
-    /// [`State`]: Self::State
-    fn update(
-        &self,
-        _state: &mut Self::State,
-        _event: shader::Event,
-        _bounds: Rectangle,
-        _cursor: mouse::Cursor,
-        _shell: &mut Shell<'_, Message>,
-    ) -> (event::Status, Option<Message>) {
-        (event::Status::Ignored, None)
-    }
-
-    /// Draws the [`Primitive`].
-    ///
-    /// [`Primitive`]: Self::Primitive
-    fn draw(
-        &self,
-        state: &Self::State,
-        cursor: mouse::Cursor,
-        bounds: Rectangle,
-    ) -> Self::Primitive;
-
-    /// Returns the current mouse interaction of the [`Program`].
-    ///
-    /// The interaction returned will be in effect even if the cursor position is out of
-    /// bounds of the [`Shader`]'s program.
-    ///
-    /// [`Shader`]: crate::widget::shader::Shader
-    fn mouse_interaction(
-        &self,
-        _state: &Self::State,
-        _bounds: Rectangle,
-        _cursor: mouse::Cursor,
-    ) -> mouse::Interaction {
-        mouse::Interaction::default()
-    }
-}
-- 
cgit 


From 8c4e7d80a1ba128864ee82770a4670b8dbba619a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 29 Nov 2023 22:47:46 +0100
Subject: Fix `renderer` method in `iced_renderer::Compositor`

---
 renderer/src/compositor.rs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 5fc5a459..5bec1639 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -55,10 +55,6 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             Compositor::Wgpu(compositor) => {
                 Renderer::Wgpu(compositor.renderer())
             }
-            #[cfg(not(feature = "wgpu"))]
-            Self::Wgpu => {
-                panic!("`wgpu` feature was not enabled in `iced_renderer`")
-            }
         }
     }
 
-- 
cgit 


From 936d480267578d7e80675e78ec1880aaaaab72d6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 1 Dec 2023 16:04:27 +0100
Subject: Clip text to `viewport` bounds instead of layout bounds

---
 renderer/src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 1fc4c86b..90a7262b 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -175,11 +175,12 @@ impl<T> text::Renderer for Renderer<T> {
         paragraph: &Self::Paragraph,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_paragraph(paragraph, position, color)
+            renderer.fill_paragraph(paragraph, position, color, viewport)
         );
     }
 
@@ -188,11 +189,12 @@ impl<T> text::Renderer for Renderer<T> {
         editor: &Self::Editor,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_editor(editor, position, color)
+            renderer.fill_editor(editor, position, color, viewport)
         );
     }
 
@@ -201,8 +203,13 @@ impl<T> text::Renderer for Renderer<T> {
         text: Text<'_, Self::Font>,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     ) {
-        delegate!(self, renderer, renderer.fill_text(text, position, color));
+        delegate!(
+            self,
+            renderer,
+            renderer.fill_text(text, position, color, viewport)
+        );
     }
 }
 
-- 
cgit 


From b526ce4958b28208395276dd4078ffe0d780e1d7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 2 Dec 2023 15:53:02 +0100
Subject: Rename `viewport` to `clip_bounds`

---
 renderer/src/lib.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/lib.rs b/renderer/src/lib.rs
index 90a7262b..f2acfa00 100644
--- a/renderer/src/lib.rs
+++ b/renderer/src/lib.rs
@@ -175,12 +175,12 @@ impl<T> text::Renderer for Renderer<T> {
         paragraph: &Self::Paragraph,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_paragraph(paragraph, position, color, viewport)
+            renderer.fill_paragraph(paragraph, position, color, clip_bounds)
         );
     }
 
@@ -189,12 +189,12 @@ impl<T> text::Renderer for Renderer<T> {
         editor: &Self::Editor,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_editor(editor, position, color, viewport)
+            renderer.fill_editor(editor, position, color, clip_bounds)
         );
     }
 
@@ -203,12 +203,12 @@ impl<T> text::Renderer for Renderer<T> {
         text: Text<'_, Self::Font>,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     ) {
         delegate!(
             self,
             renderer,
-            renderer.fill_text(text, position, color, viewport)
+            renderer.fill_text(text, position, color, clip_bounds)
         );
     }
 }
-- 
cgit 


From b152ecda63238136f77b6eda3c582fa1eff99737 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 2 Dec 2023 20:49:47 +0100
Subject: Separate `Compositor::new` from `Compositor::create_renderer`

---
 renderer/src/compositor.rs | 47 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 5bec1639..9d0ff9ab 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -26,7 +26,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
         settings: Self::Settings,
         compatible_window: Option<&W>,
-    ) -> Result<(Self, Self::Renderer), Error> {
+    ) -> Result<Self, Error> {
         let candidates =
             Candidate::list_from_env().unwrap_or(Candidate::default_list());
 
@@ -34,9 +34,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
 
         for candidate in candidates {
             match candidate.build(settings, compatible_window) {
-                Ok((compositor, renderer)) => {
-                    return Ok((compositor, renderer))
-                }
+                Ok(compositor) => return Ok(compositor),
                 Err(new_error) => {
                     error = new_error;
                 }
@@ -46,14 +44,14 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         Err(error)
     }
 
-    fn renderer(&self) -> Self::Renderer {
+    fn create_renderer(&self) -> Self::Renderer {
         match self {
             Compositor::TinySkia(compositor) => {
-                Renderer::TinySkia(compositor.renderer())
+                Renderer::TinySkia(compositor.create_renderer())
             }
             #[cfg(feature = "wgpu")]
             Compositor::Wgpu(compositor) => {
-                Renderer::Wgpu(compositor.renderer())
+                Renderer::Wgpu(compositor.create_renderer())
             }
         }
     }
@@ -232,29 +230,21 @@ impl Candidate {
         self,
         settings: Settings,
         _compatible_window: Option<&W>,
-    ) -> Result<(Compositor<Theme>, Renderer<Theme>), Error> {
+    ) -> Result<Compositor<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,
-                        },
-                    );
+                let compositor = 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::TinySkia(iced_tiny_skia::Renderer::new(
-                        backend,
-                        settings.default_font,
-                        settings.default_text_size,
-                    )),
-                ))
+                Ok(Compositor::TinySkia(compositor))
             }
             #[cfg(feature = "wgpu")]
             Self::Wgpu => {
-                let (compositor, backend) = iced_wgpu::window::compositor::new(
+                let compositor = iced_wgpu::window::compositor::new(
                     iced_wgpu::Settings {
                         default_font: settings.default_font,
                         default_text_size: settings.default_text_size,
@@ -264,14 +254,7 @@ impl Candidate {
                     _compatible_window,
                 )?;
 
-                Ok((
-                    Compositor::Wgpu(compositor),
-                    Renderer::Wgpu(iced_wgpu::Renderer::new(
-                        backend,
-                        settings.default_font,
-                        settings.default_text_size,
-                    )),
-                ))
+                Ok(Compositor::Wgpu(compositor))
             }
             #[cfg(not(feature = "wgpu"))]
             Self::Wgpu => {
-- 
cgit 


From b37f8f3e85962d19f18b72044efca95709aa8ee2 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 4 Jan 2024 21:36:45 -0500
Subject: Remove backend module in renderer crate that has been unused since
 https://github.com/iced-rs/iced/pull/1932

---
 renderer/src/backend.rs | 100 ------------------------------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 renderer/src/backend.rs

(limited to 'renderer/src')

diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
deleted file mode 100644
index 3f229b52..00000000
--- a/renderer/src/backend.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::core::text;
-use crate::core::{Font, Point, Size};
-use crate::graphics::backend;
-
-use std::borrow::Cow;
-
-#[allow(clippy::large_enum_variant)]
-pub enum Backend {
-    TinySkia(iced_tiny_skia::Backend),
-    #[cfg(feature = "wgpu")]
-    Wgpu(iced_wgpu::Backend),
-}
-
-macro_rules! delegate {
-    ($backend:expr, $name:ident, $body:expr) => {
-        match $backend {
-            Self::TinySkia($name) => $body,
-            #[cfg(feature = "wgpu")]
-            Self::Wgpu($name) => $body,
-        }
-    };
-}
-
-impl backend::Text for Backend {
-    const ICON_FONT: Font = Font::with_name("Iced-Icons");
-    const CHECKMARK_ICON: char = '\u{f00c}';
-    const ARROW_DOWN_ICON: char = '\u{e800}';
-
-    fn default_font(&self) -> Font {
-        delegate!(self, backend, backend.default_font())
-    }
-
-    fn default_size(&self) -> f32 {
-        delegate!(self, backend, backend.default_size())
-    }
-
-    fn measure(
-        &self,
-        contents: &str,
-        size: f32,
-        line_height: text::LineHeight,
-        font: Font,
-        bounds: Size,
-        shaping: text::Shaping,
-    ) -> Size {
-        delegate!(
-            self,
-            backend,
-            backend.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,
-        position: Point,
-        nearest_only: bool,
-    ) -> Option<text::Hit> {
-        delegate!(
-            self,
-            backend,
-            backend.hit_test(
-                contents,
-                size,
-                line_height,
-                font,
-                bounds,
-                shaping,
-                position,
-                nearest_only,
-            )
-        )
-    }
-
-    fn load_font(&mut self, font: Cow<'static, [u8]>) {
-        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> {
-        delegate!(self, backend, backend.dimensions(handle))
-    }
-}
-
-#[cfg(feature = "svg")]
-impl backend::Svg for Backend {
-    fn viewport_dimensions(
-        &self,
-        handle: &crate::core::svg::Handle,
-    ) -> Size<u32> {
-        delegate!(self, backend, backend.viewport_dimensions(handle))
-    }
-}
-- 
cgit 


From ff268c8c4268d930fc337636302175d44e201448 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Tue, 9 Jan 2024 12:25:53 -0800
Subject: Update to `softbuffer` 0.3, tracking up to `age` sets of primitives

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

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 9d0ff9ab..f9afdea4 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -238,6 +238,7 @@ impl Candidate {
                         default_font: settings.default_font,
                         default_text_size: settings.default_text_size,
                     },
+                    _compatible_window,
                 );
 
                 Ok(Compositor::TinySkia(compositor))
-- 
cgit 


From 7289b6091b61b0aa448a756cfe32211c78a4cce0 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Tue, 9 Jan 2024 07:19:15 -0800
Subject: WIP raw-window-handle 0.6

---
 renderer/src/compositor.rs | 51 ++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index f9afdea4..17157c66 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -3,29 +3,36 @@ use crate::graphics::compositor::{Information, SurfaceError};
 use crate::graphics::{Error, Viewport};
 use crate::{Renderer, Settings};
 
-use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle};
+use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use std::env;
 
-pub enum Compositor<Theme> {
-    TinySkia(iced_tiny_skia::window::Compositor<Theme>),
+pub enum Compositor<W: HasWindowHandle + HasDisplayHandle, Theme> {
+    TinySkia(iced_tiny_skia::window::Compositor<W, Theme>),
     #[cfg(feature = "wgpu")]
-    Wgpu(iced_wgpu::window::Compositor<Theme>),
+    Wgpu(iced_wgpu::window::Compositor<W, Theme>),
 }
 
-pub enum Surface {
-    TinySkia(iced_tiny_skia::window::Surface),
+pub enum Surface<W: HasWindowHandle + HasDisplayHandle> {
+    TinySkia(iced_tiny_skia::window::Surface<W>),
     #[cfg(feature = "wgpu")]
-    Wgpu(iced_wgpu::window::Surface),
+    Wgpu(iced_wgpu::window::Surface<'static>),
 }
 
-impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
+// XXX Clone bound
+// XXX Send/Sync?
+// 'static?
+impl<
+        W: Clone + Send + Sync + HasWindowHandle + HasDisplayHandle + 'static,
+        Theme,
+    > crate::graphics::Compositor<W> for Compositor<W, Theme>
+{
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
-    type Surface = Surface;
+    type Surface = Surface<W>;
 
-    fn new<W: HasRawWindowHandle + HasRawDisplayHandle>(
+    fn new(
         settings: Self::Settings,
-        compatible_window: Option<&W>,
+        compatible_window: Option<W>,
     ) -> Result<Self, Error> {
         let candidates =
             Candidate::list_from_env().unwrap_or(Candidate::default_list());
@@ -33,7 +40,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         let mut error = Error::GraphicsAdapterNotFound;
 
         for candidate in candidates {
-            match candidate.build(settings, compatible_window) {
+            match candidate.build(settings, compatible_window.clone()) {
                 Ok(compositor) => return Ok(compositor),
                 Err(new_error) => {
                     error = new_error;
@@ -56,12 +63,12 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         }
     }
 
-    fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>(
+    fn create_surface(
         &mut self,
-        window: &W,
+        window: W,
         width: u32,
         height: u32,
-    ) -> Surface {
+    ) -> Surface<W> {
         match self {
             Self::TinySkia(compositor) => Surface::TinySkia(
                 compositor.create_surface(window, width, height),
@@ -75,7 +82,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
 
     fn configure_surface(
         &mut self,
-        surface: &mut Surface,
+        surface: &mut Surface<W>,
         width: u32,
         height: u32,
     ) {
@@ -114,7 +121,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::TinySkia(_compositor),
                 crate::Renderer::TinySkia(renderer),
-                Surface::TinySkia(surface),
+                Surface::TinySkia(ref mut surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_tiny_skia::window::compositor::present(
                     backend,
@@ -129,7 +136,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::Wgpu(compositor),
                 crate::Renderer::Wgpu(renderer),
-                Surface::Wgpu(surface),
+                Surface::Wgpu(ref mut surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_wgpu::window::compositor::present(
                     compositor,
@@ -161,7 +168,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::TinySkia(_compositor),
                 Renderer::TinySkia(renderer),
-                Surface::TinySkia(surface),
+                Surface::TinySkia(ref mut surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_tiny_skia::window::compositor::screenshot(
                     surface,
@@ -226,11 +233,11 @@ impl Candidate {
         )
     }
 
-    fn build<Theme, W: HasRawWindowHandle + HasRawDisplayHandle>(
+    fn build<Theme, W: HasWindowHandle + HasDisplayHandle + Send + Sync>(
         self,
         settings: Settings,
-        _compatible_window: Option<&W>,
-    ) -> Result<Compositor<Theme>, Error> {
+        _compatible_window: Option<W>,
+    ) -> Result<Compositor<W, Theme>, Error> {
         match self {
             Self::TinySkia => {
                 let compositor = iced_tiny_skia::window::compositor::new(
-- 
cgit 


From 8bf238697226e827dc983f9d89afbd0e252c5254 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 18 Jan 2024 09:55:27 +0100
Subject: Remove `Compositor` window generic

And update `glyphon` and `window_clipboard`
---
 renderer/src/compositor.rs | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 17157c66..a7c63444 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -1,36 +1,28 @@
 use crate::core::Color;
-use crate::graphics::compositor::{Information, SurfaceError};
+use crate::graphics::compositor::{Information, SurfaceError, Window};
 use crate::graphics::{Error, Viewport};
 use crate::{Renderer, Settings};
 
-use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use std::env;
 
-pub enum Compositor<W: HasWindowHandle + HasDisplayHandle, Theme> {
-    TinySkia(iced_tiny_skia::window::Compositor<W, Theme>),
+pub enum Compositor<Theme> {
+    TinySkia(iced_tiny_skia::window::Compositor<Theme>),
     #[cfg(feature = "wgpu")]
-    Wgpu(iced_wgpu::window::Compositor<W, Theme>),
+    Wgpu(iced_wgpu::window::Compositor<Theme>),
 }
 
-pub enum Surface<W: HasWindowHandle + HasDisplayHandle> {
-    TinySkia(iced_tiny_skia::window::Surface<W>),
+pub enum Surface {
+    TinySkia(iced_tiny_skia::window::Surface),
     #[cfg(feature = "wgpu")]
     Wgpu(iced_wgpu::window::Surface<'static>),
 }
 
-// XXX Clone bound
-// XXX Send/Sync?
-// 'static?
-impl<
-        W: Clone + Send + Sync + HasWindowHandle + HasDisplayHandle + 'static,
-        Theme,
-    > crate::graphics::Compositor<W> for Compositor<W, Theme>
-{
+impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
     type Settings = Settings;
     type Renderer = Renderer<Theme>;
-    type Surface = Surface<W>;
+    type Surface = Surface;
 
-    fn new(
+    fn new<W: Window + Clone>(
         settings: Self::Settings,
         compatible_window: Option<W>,
     ) -> Result<Self, Error> {
@@ -63,12 +55,12 @@ impl<
         }
     }
 
-    fn create_surface(
+    fn create_surface<W: Window + Clone>(
         &mut self,
         window: W,
         width: u32,
         height: u32,
-    ) -> Surface<W> {
+    ) -> Surface {
         match self {
             Self::TinySkia(compositor) => Surface::TinySkia(
                 compositor.create_surface(window, width, height),
@@ -82,7 +74,7 @@ impl<
 
     fn configure_surface(
         &mut self,
-        surface: &mut Surface<W>,
+        surface: &mut Surface,
         width: u32,
         height: u32,
     ) {
@@ -233,11 +225,11 @@ impl Candidate {
         )
     }
 
-    fn build<Theme, W: HasWindowHandle + HasDisplayHandle + Send + Sync>(
+    fn build<Theme, W: Window>(
         self,
         settings: Settings,
         _compatible_window: Option<W>,
-    ) -> Result<Compositor<W, Theme>, Error> {
+    ) -> Result<Compositor<Theme>, Error> {
         match self {
             Self::TinySkia => {
                 let compositor = iced_tiny_skia::window::compositor::new(
-- 
cgit 


From 1701ec815d3f25ea8097e806081e7a3ac9ba4d82 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 18 Jan 2024 10:02:50 +0100
Subject: Remove redundant `ref mut` in `iced_renderer::compositor`

---
 renderer/src/compositor.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index a7c63444..0b56f101 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -113,7 +113,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::TinySkia(_compositor),
                 crate::Renderer::TinySkia(renderer),
-                Surface::TinySkia(ref mut surface),
+                Surface::TinySkia(surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_tiny_skia::window::compositor::present(
                     backend,
@@ -128,7 +128,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::Wgpu(compositor),
                 crate::Renderer::Wgpu(renderer),
-                Surface::Wgpu(ref mut surface),
+                Surface::Wgpu(surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_wgpu::window::compositor::present(
                     compositor,
@@ -160,7 +160,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
             (
                 Self::TinySkia(_compositor),
                 Renderer::TinySkia(renderer),
-                Surface::TinySkia(ref mut surface),
+                Surface::TinySkia(surface),
             ) => renderer.with_primitives(|backend, primitives| {
                 iced_tiny_skia::window::compositor::screenshot(
                     surface,
-- 
cgit 


From 5fc49edc55a0e64c4c46ca55eddafe9d4e8232e1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 18 Jan 2024 10:06:30 +0100
Subject: Make `compatible_window` mandatory in `Compositor`

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

(limited to 'renderer/src')

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index 0b56f101..f10ed048 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -24,7 +24,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
 
     fn new<W: Window + Clone>(
         settings: Self::Settings,
-        compatible_window: Option<W>,
+        compatible_window: W,
     ) -> Result<Self, Error> {
         let candidates =
             Candidate::list_from_env().unwrap_or(Candidate::default_list());
@@ -228,7 +228,7 @@ impl Candidate {
     fn build<Theme, W: Window>(
         self,
         settings: Settings,
-        _compatible_window: Option<W>,
+        _compatible_window: W,
     ) -> Result<Compositor<Theme>, Error> {
         match self {
             Self::TinySkia => {
-- 
cgit