Merge branch 'main' into feat/use-system-fonts

marc2332 · Jun 17, 2024 · 037d159 · 037d159
2 parents 44cd057 + 14ca744
commit 037d159
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 98 deletions.
diff --git a/.github/workflows/build_example.yml b/.github/workflows/build_example.yml
@@ -43,6 +43,6 @@ jobs:
         run: cargo build --example ${{inputs.example_name}} --release
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: target/release/examples/*
diff --git a/crates/renderer/src/renderer.rs b/crates/renderer/src/renderer.rs
@@ -70,10 +70,109 @@ pub struct DesktopRenderer<'a, State: Clone + 'static> {
     pub(crate) dropped_file_path: Option<PathBuf>,
 }
 
+impl<'a, State: Clone + 'static> DesktopRenderer<'a, State> {
+    /// Run the Desktop Renderer.
+    pub fn launch(
+        vdom: VirtualDom,
+        sdom: SafeDOM,
+        config: LaunchConfig<State>,
+        devtools: Option<Devtools>,
+        hovered_node: HoveredNode,
+    ) {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .unwrap();
+
+        let _guard = rt.enter();
+
+        let event_loop = EventLoop::<EventMessage>::with_user_event()
+            .build()
+            .expect("Failed to create event loop.");
+        let proxy = event_loop.create_proxy();
+
+        // Hotreload support for Dioxus
+        #[cfg(feature = "hot-reload")]
+        {
+            use std::process::exit;
+            let proxy = proxy.clone();
+            dioxus_hot_reload::connect(move |msg| match msg {
+                dioxus_hot_reload::HotReloadMsg::UpdateTemplate(template) => {
+                    let _ = proxy.send_event(EventMessage::UpdateTemplate(template));
+                }
+                dioxus_hot_reload::HotReloadMsg::Shutdown => exit(0),
+                dioxus_hot_reload::HotReloadMsg::UpdateAsset(_) => {}
+            });
+        }
+
+        let mut desktop_renderer =
+            DesktopRenderer::new(vdom, sdom, config, devtools, hovered_node, proxy);
+
+        event_loop.run_app(&mut desktop_renderer).unwrap();
+    }
+
+    pub fn new(
+        vdom: VirtualDom,
+        sdom: SafeDOM,
+        config: LaunchConfig<'a, State>,
+        devtools: Option<Devtools>,
+        hovered_node: HoveredNode,
+        proxy: EventLoopProxy<EventMessage>,
+    ) -> Self {
+        DesktopRenderer {
+            state: WindowState::NotCreated(NotCreatedState {
+                sdom,
+                devtools,
+                vdom,
+                config,
+            }),
+            hovered_node,
+            event_loop_proxy: proxy,
+            cursor_pos: CursorPoint::default(),
+            modifiers_state: ModifiersState::default(),
+            dropped_file_path: None,
+        }
+    }
+
+    // Send and process an event
+    fn send_event(&mut self, event: PlatformEvent) {
+        let scale_factor = self.scale_factor();
+        self.state
+            .created_state()
+            .app
+            .send_event(event, scale_factor);
+    }
+
+    /// Get the current scale factor of the Window
+    fn scale_factor(&self) -> f32 {
+        match &self.state {
+            WindowState::Created(CreatedState { window, .. }) => window.scale_factor() as f32,
+            _ => 0.0,
+        }
+    }
+
+    /// Run the `on_setup` callback that was passed to the launch function
+    pub fn run_on_setup(&mut self) {
+        let state = self.state.created_state();
+        if let Some(on_setup) = &state.window_config.on_setup {
+            (on_setup)(&mut state.window)
+        }
+    }
+
+    /// Run the `on_exit` callback that was passed to the launch function
+    pub fn run_on_exit(&mut self) {
+        let state = self.state.created_state();
+        if let Some(on_exit) = &state.window_config.on_exit {
+            (on_exit)(&mut state.window)
+        }
+    }
+}
+
 impl<'a, State: Clone> ApplicationHandler<EventMessage> for DesktopRenderer<'a, State> {
     fn resumed(&mut self, event_loop: &winit::event_loop::ActiveEventLoop) {
         if !self.state.has_been_created() {
-            self.state.create(event_loop, &self.event_loop_proxy)
+            self.state.create(event_loop, &self.event_loop_proxy);
+            self.run_on_setup();
         }
     }
 
@@ -373,99 +472,3 @@ impl<T: Clone> Drop for DesktopRenderer<'_, T> {
         }
     }
 }
-
-impl<'a, State: Clone + 'static> DesktopRenderer<'a, State> {
-    /// Run the Desktop Renderer.
-    pub fn launch(
-        vdom: VirtualDom,
-        sdom: SafeDOM,
-        config: LaunchConfig<State>,
-        devtools: Option<Devtools>,
-        hovered_node: HoveredNode,
-    ) {
-        let rt = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .unwrap();
-
-        let _guard = rt.enter();
-
-        let event_loop = EventLoop::<EventMessage>::with_user_event()
-            .build()
-            .expect("Failed to create event loop.");
-        let proxy = event_loop.create_proxy();
-
-        // Hotreload support for Dioxus
-        #[cfg(feature = "hot-reload")]
-        {
-            use std::process::exit;
-            let proxy = proxy.clone();
-            dioxus_hot_reload::connect(move |msg| match msg {
-                dioxus_hot_reload::HotReloadMsg::UpdateTemplate(template) => {
-                    let _ = proxy.send_event(EventMessage::UpdateTemplate(template));
-                }
-                dioxus_hot_reload::HotReloadMsg::Shutdown => exit(0),
-                dioxus_hot_reload::HotReloadMsg::UpdateAsset(_) => {}
-            });
-        }
-
-        let mut desktop_renderer =
-            DesktopRenderer::new(vdom, sdom, config, devtools, hovered_node, proxy);
-
-        event_loop.run_app(&mut desktop_renderer).unwrap();
-    }
-
-    pub fn new(
-        vdom: VirtualDom,
-        sdom: SafeDOM,
-        config: LaunchConfig<'a, State>,
-        devtools: Option<Devtools>,
-        hovered_node: HoveredNode,
-        proxy: EventLoopProxy<EventMessage>,
-    ) -> Self {
-        DesktopRenderer {
-            state: WindowState::NotCreated(NotCreatedState {
-                sdom,
-                devtools,
-                vdom,
-                config,
-            }),
-            hovered_node,
-            event_loop_proxy: proxy,
-            cursor_pos: CursorPoint::default(),
-            modifiers_state: ModifiersState::default(),
-            dropped_file_path: None,
-        }
-    }
-
-    fn send_event(&mut self, event: PlatformEvent) {
-        let scale_factor = self.scale_factor();
-        self.state
-            .created_state()
-            .app
-            .send_event(event, scale_factor);
-    }
-
-    fn scale_factor(&self) -> f32 {
-        match &self.state {
-            WindowState::Created(CreatedState { window, .. }) => window.scale_factor() as f32,
-            _ => 0.0,
-        }
-    }
-
-    /// Run the `on_setup` callback that was passed to the launch function
-    pub fn run_on_setup(&mut self) {
-        let state = self.state.created_state();
-        if let Some(on_setup) = &state.window_config.on_setup {
-            (on_setup)(&mut state.window)
-        }
-    }
-
-    /// Run the `on_exit` callback that was passed to the launch function
-    pub fn run_on_exit(&mut self) {
-        let state = self.state.created_state();
-        if let Some(on_exit) = &state.window_config.on_exit {
-            (on_exit)(&mut state.window)
-        }
-    }
-}