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
---
 widget/src/shader/event.rs   | 26 +++++++++++++++++++
 widget/src/shader/program.rs | 62 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 widget/src/shader/event.rs
 create mode 100644 widget/src/shader/program.rs

(limited to 'widget/src/shader')

diff --git a/widget/src/shader/event.rs b/widget/src/shader/event.rs
new file mode 100644
index 00000000..e4d2b03d
--- /dev/null
+++ b/widget/src/shader/event.rs
@@ -0,0 +1,26 @@
+//! 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/widget/src/shader/program.rs b/widget/src/shader/program.rs
new file mode 100644
index 00000000..0319844d
--- /dev/null
+++ b/widget/src/shader/program.rs
@@ -0,0 +1,62 @@
+use crate::core::event;
+use crate::core::mouse;
+use crate::core::{Rectangle, Shell};
+use crate::renderer::wgpu::primitive::pipeline;
+use crate::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: pipeline::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 c2baf18cbff721e25c3103b6235292530b419c54 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 12:52:03 +0100
Subject: Use `Instant` from `iced_core` instead of `std`

This is needed for Wasm compatibility.
---
 widget/src/shader/event.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'widget/src/shader')

diff --git a/widget/src/shader/event.rs b/widget/src/shader/event.rs
index e4d2b03d..a5a7acaa 100644
--- a/widget/src/shader/event.rs
+++ b/widget/src/shader/event.rs
@@ -1,10 +1,9 @@
 //! Handle events of a custom shader widget.
 use crate::core::keyboard;
 use crate::core::mouse;
+use crate::core::time::Instant;
 use crate::core::touch;
 
-use std::time::Instant;
-
 pub use crate::core::event::Status;
 
 /// A [`Shader`] event.
-- 
cgit 


From 280d3736d59b62c4087fe980c187953cc2be83d2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 14 Nov 2023 13:23:28 +0100
Subject: Fix broken intra-doc links

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

(limited to 'widget/src/shader')

diff --git a/widget/src/shader/event.rs b/widget/src/shader/event.rs
index a5a7acaa..1cc484fb 100644
--- a/widget/src/shader/event.rs
+++ b/widget/src/shader/event.rs
@@ -8,7 +8,7 @@ pub use crate::core::event::Status;
 
 /// A [`Shader`] event.
 ///
-/// [`Shader`]: crate::widget::shader::Shader;
+/// [`Shader`]: crate::Shader
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Event {
     /// A mouse event.
diff --git a/widget/src/shader/program.rs b/widget/src/shader/program.rs
index 0319844d..6dd50404 100644
--- a/widget/src/shader/program.rs
+++ b/widget/src/shader/program.rs
@@ -9,7 +9,7 @@ use crate::shader;
 /// A [`Program`] can mutate the internal state of a [`Shader`] widget
 /// and produce messages for an application.
 ///
-/// [`Shader`]: crate::widget::shader::Shader
+/// [`Shader`]: crate::Shader
 pub trait Program<Message> {
     /// The internal state of the [`Program`].
     type State: Default + 'static;
@@ -50,7 +50,7 @@ pub trait Program<Message> {
     /// 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
+    /// [`Shader`]: crate::Shader
     fn mouse_interaction(
         &self,
         _state: &Self::State,
-- 
cgit