1 files changed, 52 insertions, 47 deletions

diff --git a/runtime/src/window.rs b/runtime/src/window.rs
index f46ac1b8..f9d943f6 100644
--- a/runtime/src/window.rs
+++ b/runtime/src/window.rs
@@ -3,13 +3,14 @@ mod action;
 
 pub mod screenshot;
 
-pub use crate::core::window::Id;
 pub use action::Action;
 pub use screenshot::Screenshot;
 
 use crate::command::{self, Command};
 use crate::core::time::Instant;
-use crate::core::window::{self, Event, Icon, Level, Mode, UserAttention};
+use crate::core::window::{
+    Event, Icon, Id, Level, Mode, Settings, UserAttention,
+};
 use crate::core::{Point, Size};
 use crate::futures::event;
 use crate::futures::Subscription;
@@ -29,73 +30,77 @@ pub fn frames() -> Subscription<Instant> {
     })
 }
 
-/// Spawns a new window with the given `id` and `settings`.
-pub fn spawn<Message>(
-    id: window::Id,
-    settings: window::Settings,
-) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Spawn { settings }))
+/// Spawns a new window with the given `settings`.
+///
+/// Returns the new window [`Id`] alongside the [`Command`].
+pub fn spawn<Message>(settings: Settings) -> (Id, Command<Message>) {
+    let id = Id::unique();
+
+    (
+        id,
+        Command::single(command::Action::Window(Action::Spawn(id, settings))),
+    )
 }
 
 /// Closes the window with `id`.
-pub fn close<Message>(id: window::Id) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Close))
+pub fn close<Message>(id: Id) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Close(id)))
 }
 
 /// Begins dragging the window while the left mouse button is held.
-pub fn drag<Message>(id: window::Id) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Drag))
+pub fn drag<Message>(id: Id) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Drag(id)))
 }
 
 /// Resizes the window to the given logical dimensions.
-pub fn resize<Message>(id: window::Id, new_size: Size) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Resize(new_size)))
+pub fn resize<Message>(id: Id, new_size: Size) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Resize(id, new_size)))
 }
 
 /// Fetches the window's size in logical dimensions.
 pub fn fetch_size<Message>(
-    id: window::Id,
+    id: Id,
     f: impl FnOnce(Size) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::FetchSize(Box::new(f))))
+    Command::single(command::Action::Window(Action::FetchSize(id, Box::new(f))))
 }
 
 /// Maximizes the window.
-pub fn maximize<Message>(id: window::Id, maximized: bool) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Maximize(maximized)))
+pub fn maximize<Message>(id: Id, maximized: bool) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Maximize(id, maximized)))
 }
 
 /// Minimizes the window.
-pub fn minimize<Message>(id: window::Id, minimized: bool) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Minimize(minimized)))
+pub fn minimize<Message>(id: Id, minimized: bool) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Minimize(id, minimized)))
 }
 
 /// Moves the window to the given logical coordinates.
-pub fn move_to<Message>(id: window::Id, position: Point) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::Move(position)))
+pub fn move_to<Message>(id: Id, position: Point) -> Command<Message> {
+    Command::single(command::Action::Window(Action::Move(id, position)))
 }
 
 /// Changes the [`Mode`] of the window.
-pub fn change_mode<Message>(id: window::Id, mode: Mode) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::ChangeMode(mode)))
+pub fn change_mode<Message>(id: Id, mode: Mode) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ChangeMode(id, mode)))
 }
 
 /// Fetches the current [`Mode`] of the window.
 pub fn fetch_mode<Message>(
-    id: window::Id,
+    id: Id,
     f: impl FnOnce(Mode) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::FetchMode(Box::new(f))))
+    Command::single(command::Action::Window(Action::FetchMode(id, Box::new(f))))
 }
 
 /// Toggles the window to maximized or back.
-pub fn toggle_maximize<Message>(id: window::Id) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::ToggleMaximize))
+pub fn toggle_maximize<Message>(id: Id) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ToggleMaximize(id)))
 }
 
 /// Toggles the window decorations.
-pub fn toggle_decorations<Message>(id: window::Id) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::ToggleDecorations))
+pub fn toggle_decorations<Message>(id: Id) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ToggleDecorations(id)))
 }
 
 /// Request user attention to the window. This has no effect if the application
@@ -105,13 +110,13 @@ pub fn toggle_decorations<Message>(id: window::Id) -> Command<Message> {
 /// Providing `None` will unset the request for user attention. Unsetting the request for
 /// user attention might not be done automatically by the WM when the window receives input.
 pub fn request_user_attention<Message>(
-    id: window::Id,
+    id: Id,
     user_attention: Option<UserAttention>,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(
+    Command::single(command::Action::Window(Action::RequestUserAttention(
         id,
-        Action::RequestUserAttention(user_attention),
-    ))
+        user_attention,
+    )))
 }
 
 /// Brings the window to the front and sets input focus. Has no effect if the window is
@@ -120,36 +125,36 @@ pub fn request_user_attention<Message>(
 /// This [`Command`] steals input focus from other applications. Do not use this method unless
 /// you are certain that's what the user wants. Focus stealing can cause an extremely disruptive
 /// user experience.
-pub fn gain_focus<Message>(id: window::Id) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::GainFocus))
+pub fn gain_focus<Message>(id: Id) -> Command<Message> {
+    Command::single(command::Action::Window(Action::GainFocus(id)))
 }
 
 /// Changes the window [`Level`].
-pub fn change_level<Message>(id: window::Id, level: Level) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::ChangeLevel(level)))
+pub fn change_level<Message>(id: Id, level: Level) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ChangeLevel(id, level)))
 }
 
 /// Fetches an identifier unique to the window, provided by the underlying windowing system. This is
-/// not to be confused with [`window::Id`].
+/// not to be confused with [`Id`].
 pub fn fetch_id<Message>(
-    id: window::Id,
+    id: Id,
     f: impl FnOnce(u64) -> Message + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::FetchId(Box::new(f))))
+    Command::single(command::Action::Window(Action::FetchId(id, Box::new(f))))
 }
 
 /// Changes the [`Icon`] of the window.
-pub fn change_icon<Message>(id: window::Id, icon: Icon) -> Command<Message> {
-    Command::single(command::Action::Window(id, Action::ChangeIcon(icon)))
+pub fn change_icon<Message>(id: Id, icon: Icon) -> Command<Message> {
+    Command::single(command::Action::Window(Action::ChangeIcon(id, icon)))
 }
 
 /// Captures a [`Screenshot`] from the window.
 pub fn screenshot<Message>(
-    id: window::Id,
+    id: Id,
     f: impl FnOnce(Screenshot) -> Message + Send + 'static,
 ) -> Command<Message> {
-    Command::single(command::Action::Window(
+    Command::single(command::Action::Window(Action::Screenshot(
         id,
-        Action::Screenshot(Box::new(f)),
-    ))
+        Box::new(f),
+    )))
 }