Merge 0c0938c into 1955629

Cargo.toml

@@ -11,6 +11,8 @@ log = ["freya/log"]
 devtools = ["freya/devtools"]
 use_camera = ["freya/use_camera"]
 hot-reload = ["freya/hot-reload"]
+skia = ["freya/skia"]
+custom-tokio-rt = ["freya/custom-tokio-rt"]
 
 [patch.crates-io]
 # dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" }

crates/freya/Cargo.toml

@@ -16,12 +16,14 @@ features = ["freya-engine/mocked-engine"]
 no-default-features = true
 
 [features]
+custom-tokio-rt = []
+skia = ["freya-engine/skia-engine"]
 hot-reload = ["freya-renderer/hot-reload", "dioxus/hot-reload"]
 log = ["dep:tracing", "dep:tracing-subscriber"]
 devtools = ["dep:freya-devtools"]
 use_camera = ["freya-hooks/use_camera"]
 mocked-engine-development = ["freya-engine/mocked-engine"] # This is just for the CI
-default = ["freya-engine/skia-engine"]
+default = ["skia"]
 
 [dependencies]
 freya-devtools = { workspace = true, optional = true }

crates/freya/src/launch.rs

@@ -223,6 +223,15 @@ pub fn launch_cfg<T: 'static + Clone>(app: AppComponent, config: LaunchConfig<T>
             (vdom, None, None)
         }
     };
+    #[cfg(not(feature = "custom-tokio-rt"))]
+    {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .unwrap();
+        let _guard = rt.enter();
+    }
+
     DesktopRenderer::launch(vdom, sdom, config, devtools, hovered_node);
 }
 

crates/renderer/src/renderer.rs

@@ -80,13 +80,6 @@ impl<'a, State: Clone + 'static> DesktopRenderer<'a, 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.");

examples/custom_tokio_rt.rs

@@ -0,0 +1,17 @@
+#![cfg_attr(
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
+)]
+
+use freya::prelude::*;
+
+#[cfg(not(feature = "custom-tokio-rt"))]
+fn main() {
+    panic!("Run this example without the `custom-tokio-rt` feature.");
+}
+
+#[cfg(feature = "custom-tokio-rt")]
+#[tokio::main]
+async fn main() {
+    launch_with_title(|| rsx!(label { "Hello, World!" }), "Custom Tokio Runtime")
+}