me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return window::Id in window::open

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-07-30 22:26:55 +02:00
parent 8f33575719
commit fd593f8fb0
No known key found for this signature in database
GPG key ID: 4C07CEC81AFA161F
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
examples/multi_window/src/main.rs
View file

@ -40,12 +40,13 @@ enum Message {
impl Example {
fn new() -> (Self, Task<Message>) {
let (_id, open) = window::open(window::Settings::default());
(
Self {
windows: BTreeMap::new(),
},
window::open(window::Settings::default())
.map(Message::WindowOpened),
open.map(Message::WindowOpened),
)
}
@ -74,10 +75,12 @@ impl Example {
},
);
window::open(window::Settings {
let (_id, open) = window::open(window::Settings {
position,
..window::Settings::default()
})
});
open
})
.map(Message::WindowOpened)
}

11
runtime/src/window.rs
View file

@ -218,12 +218,15 @@ pub fn close_requests() -> Subscription<Id> {
/// Opens a new window with the given [`Settings`]; producing the [`Id`]
/// of the new window on completion.
pub fn open(settings: Settings) -> Task<Id> {
pub fn open(settings: Settings) -> (Id, Task<Id>) {
let id = Id::unique();
task::oneshot(|channel| {
crate::Action::Window(Action::Open(id, settings, channel))
})
(
id,
task::oneshot(|channel| {
crate::Action::Window(Action::Open(id, settings, channel))
}),
)
}
/// Closes the window with `id`.

5
winit/src/program.rs
View file

@ -207,8 +207,9 @@ where
let task = if let Some(window_settings) = window_settings {
let mut task = Some(task);
runtime::window::open(window_settings)
.then(move |_| task.take().unwrap_or(Task::none()))
let (_id, open) = runtime::window::open(window_settings);
open.then(move |_| task.take().unwrap_or(Task::none()))
} else {
task
};