feat: window refactor

Author: JakkuSakura

examples/multi_window.rs

@@ -1,8 +1,9 @@
 //! Demonstrate opening additional windows from a pure Dioxus app.
 
+use blitz_traits::shell::ShellProvider;
 use dioxus::prelude::*;
-use dioxus_native::{DioxusWindowHandle, DioxusWindowInfo};
-use std::time::Duration;
+use dioxus_native::DioxusNativeProvider;
+use std::sync::Arc;
 use winit::window::{WindowAttributes, WindowButtons};
 
 fn main() {
@@ -15,153 +16,42 @@ fn main() {
 }
 
 fn app() -> Element {
-    let window_handle = use_context::<DioxusWindowHandle>();
-    let mut counter = use_signal(|| 1u32);
-    let open_simple = window_handle.clone();
-    let open_with_props = window_handle.clone();
-    let refresh_handle = window_handle.clone();
-    let base_focus_handle = window_handle.clone();
-    let base_rename_handle = window_handle.clone();
-    let mut known_windows: Signal<Vec<DioxusWindowInfo>> =
-        use_signal(|| window_handle.list_windows());
-    let known_windows_signal = known_windows.clone();
-    let refresh_handle_for_list = refresh_handle.clone();
-    let rename_counter = use_signal(|| 1u32);
-
-    {
-        let refresh_handle = window_handle.clone();
-        let mut known_windows_signal = known_windows.clone();
-        use_future(move || {
-            let refresh_handle = refresh_handle.clone();
-            async move {
-                loop {
-                    tokio::time::sleep(Duration::from_millis(100)).await;
-                    known_windows_signal.set(refresh_handle.list_windows());
-                }
-            }
-        });
-    }
-
-    let windows_snapshot = known_windows();
-
+    let provider = use_context::<DioxusNativeProvider>();
+    let mut counter = use_signal(|| 0);
     rsx! {
         main {
-            style { {PRIMARY_STYLES} }
             h1 { "Blitz multi-window" }
             p { "Click the button to open another RSX window." }
             div {
                 button {
                     onclick: move |_| {
-                        open_simple.open_window_with_attributes(
-                            secondary_window,
-                            Some(
-                                WindowAttributes::default()
-                                    .with_title("Secondary window")
-                                    .with_inner_size(winit::dpi::LogicalSize::new(400.0, 300.0)),
-                            ),
-                        );
-                        known_windows.set(open_simple.list_windows());
-                    },
-                    "Open secondary window"
-                }
-                button {
-                    onclick: move |_| {
-                        let idx = counter();
-                        open_with_props.open_window_with_props_and_attributes(
-                            message_window,
-                            MessageWindowProps {
-                                message: format!("Window #{idx}"),
-                            },
-                            Some(
-                                WindowAttributes::default()
-                                    .with_title(format!("Window #{idx}"))
-                                    .with_inner_size(winit::dpi::LogicalSize::new(320.0, 240.0)),
-                            ),
-                        );
+                        let vdom = VirtualDom::new(secondary_window);
+                        let attributes = WindowAttributes::default()
+                            .with_title(format!("window#{}", counter))
+                            .with_inner_size(winit::dpi::LogicalSize::new(400.0, 300.0));
+                        provider.create_document_window(vdom, attributes);
                         counter += 1;
-                        known_windows.set(open_with_props.list_windows());
                     },
-                    "Open window with props"
-                }
-                button {
-                    onclick: move |_| known_windows.set(refresh_handle.list_windows()),
-                    "Refresh list"
+                    "Open secondary window"
                 }
             }
-            ul {
-                {windows_snapshot.into_iter().map(|info| {
-                    let focus_handle = base_focus_handle.clone();
-                    let rename_handle = base_rename_handle.clone();
-                    let mut rename_counter_signal = rename_counter.clone();
-                    let mut update_list_signal = known_windows_signal.clone();
-                    let update_source = refresh_handle_for_list.clone();
-                    let id = info.id;
-                    let title = info.title;
-                    rsx! {
-                        li {
-                            "{title} (ID: {id:?})"
-                            button {
-                                onclick: move |_| focus_handle.focus_window(id),
-                                "Focus"
-                            }
-                            button {
-                                onclick: move |_| {
-                                    let idx = rename_counter_signal();
-                                    rename_handle.set_window_title(id, format!("Renamed {idx}"));
-                                    rename_counter_signal += 1;
-                                    update_list_signal.set(update_source.list_windows());
-                                },
-                                "Rename"
-                            }
-                        }
-                    }
-                })}
-            }
         }
     }
 }
 
 fn secondary_window() -> Element {
+    let shell_provider = use_context::<Arc<dyn ShellProvider>>();
+
     rsx! {
         main {
-            style { {SECONDARY_STYLES} }
             h1 { "Secondary window" }
             p { "This content comes from another RSX function." }
+            button {
+                onclick: move |_| {
+                    shell_provider.set_window_title(format!("Time: {:?}", std::time::SystemTime::now()))
+                },
+                "click to update title",
+            }
         }
     }
 }
-
-#[derive(Props, Clone, PartialEq)]
-struct MessageWindowProps {
-    message: String,
-}
-
-fn message_window(props: MessageWindowProps) -> Element {
-    rsx! {
-        main {
-            style { {SECONDARY_STYLES} }
-            h1 { "Message window" }
-            p { {props.message} }
-        }
-    }
-}
-
-const PRIMARY_STYLES: &str = r#"
-    font-family: system-ui, sans-serif;
-    min-height: 100vh;
-    padding: 40px;
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-    background: radial-gradient(circle, #f8fafc, #dbeafe);
-"#;
-
-const SECONDARY_STYLES: &str = r#"
-    font-family: system-ui, sans-serif;
-    min-height: 100vh;
-    padding: 56px;
-    margin: 0;
-    background: #0f172a;
-    color: white;
-"#;

packages/blitz-shell/src/event.rs

@@ -23,7 +23,7 @@ pub enum BlitzShellEvent {
         data: Arc<AccessKitWindowEvent>,
     },
 
-    /// An arbitary event from the Blitz embedder
+    /// An arbitrary event from the Blitz embedder
     Embedder(Arc<dyn Any + Send + Sync>),
 
     /// Navigate to another URL (triggered by e.g. clicking a link)