From f9ee3229c1e641b451f18d6f1b0a75a608a6b023 Mon Sep 17 00:00:00 2001
From: mtkennerly <mtkennerly@gmail.com>
Date: Wed, 18 Sep 2024 01:27:35 -0400
Subject: Allow specifying a custom executor

---
 src/program.rs | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

(limited to 'src/program.rs')

diff --git a/src/program.rs b/src/program.rs
index 2b697fbe..68efab88 100644
--- a/src/program.rs
+++ b/src/program.rs
@@ -550,6 +550,80 @@ pub fn with_scale_factor<P: Program>(
     }
 }
 
+pub fn with_executor<P: Program, E: Executor>(
+    program: P,
+) -> impl Program<State = P::State, Message = P::Message, Theme = P::Theme> {
+    use std::marker::PhantomData;
+
+    struct WithExecutor<P, E> {
+        program: P,
+        executor: PhantomData<E>,
+    }
+
+    impl<P: Program, E> Program for WithExecutor<P, E>
+    where
+        E: Executor,
+    {
+        type State = P::State;
+        type Message = P::Message;
+        type Theme = P::Theme;
+        type Renderer = P::Renderer;
+        type Executor = E;
+
+        fn theme(
+            &self,
+            state: &Self::State,
+            window: window::Id,
+        ) -> Self::Theme {
+            self.program.theme(state, window)
+        }
+
+        fn title(&self, state: &Self::State, window: window::Id) -> String {
+            self.program.title(state, window)
+        }
+
+        fn update(
+            &self,
+            state: &mut Self::State,
+            message: Self::Message,
+        ) -> Task<Self::Message> {
+            self.program.update(state, message)
+        }
+
+        fn view<'a>(
+            &self,
+            state: &'a Self::State,
+            window: window::Id,
+        ) -> Element<'a, Self::Message, Self::Theme, Self::Renderer> {
+            self.program.view(state, window)
+        }
+
+        fn subscription(
+            &self,
+            state: &Self::State,
+        ) -> Subscription<Self::Message> {
+            self.program.subscription(state)
+        }
+
+        fn style(
+            &self,
+            state: &Self::State,
+            theme: &Self::Theme,
+        ) -> Appearance {
+            self.program.style(state, theme)
+        }
+
+        fn scale_factor(&self, state: &Self::State, window: window::Id) -> f64 {
+            self.program.scale_factor(state, window)
+        }
+    }
+
+    WithExecutor {
+        program,
+        executor: PhantomData::<E>,
+    }
+}
+
 /// The renderer of some [`Program`].
 pub trait Renderer: text::Renderer + compositor::Default {}
 
-- 
cgit 


From 93068836182cb2a6527a267453f280eb5c0d34a3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 18 Sep 2024 21:19:33 +0200
Subject: Fix order of `Program::theme` implementation

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

(limited to 'src/program.rs')

diff --git a/src/program.rs b/src/program.rs
index 68efab88..94cb9a7d 100644
--- a/src/program.rs
+++ b/src/program.rs
@@ -570,14 +570,6 @@ pub fn with_executor<P: Program, E: Executor>(
         type Renderer = P::Renderer;
         type Executor = E;
 
-        fn theme(
-            &self,
-            state: &Self::State,
-            window: window::Id,
-        ) -> Self::Theme {
-            self.program.theme(state, window)
-        }
-
         fn title(&self, state: &Self::State, window: window::Id) -> String {
             self.program.title(state, window)
         }
@@ -605,6 +597,14 @@ pub fn with_executor<P: Program, E: Executor>(
             self.program.subscription(state)
         }
 
+        fn theme(
+            &self,
+            state: &Self::State,
+            window: window::Id,
+        ) -> Self::Theme {
+            self.program.theme(state, window)
+        }
+
         fn style(
             &self,
             state: &Self::State,
-- 
cgit