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

Introduce close_requested for multi-window

Browse source
This commit is contained in:
Richard 2022-07-27 15:37:48 -03:00 • committed by bungoboingo
parent 35331d0a41
commit dc86bd0373
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
winit/src/multi_window.rs
View file

@ -147,6 +147,9 @@ where
fn should_exit(&self) -> bool {
false
}
/// TODO(derezzedex)
fn close_requested(&self, window: window::Id) -> Self::Message;
}
/// Runs an [`Application`] with an executor, compositor, and the provided
@ -296,7 +299,7 @@ async fn run_instance<A, E, C>(
>,
init_command: Command<A::Message>,
mut windows: HashMap<window::Id, winit::window::Window>,
exit_on_close_request: bool,
_exit_on_close_request: bool,
) where
A: Application + 'static,
E: Executor + 'static,
@ -684,9 +687,13 @@ async fn run_instance<A, E, C>(
if requests_exit(
&window_event,
window_state.state.modifiers(),
) && exit_on_close_request
{
break;
) {
if let Some(id) =
window_ids.get(&window_id).cloned()
{
let message = application.close_requested(id);
messages.push(message);
}
}
window_state.state.update(

4
winit/src/settings.rs
View file

@ -46,6 +46,10 @@ pub struct Settings<Flags> {
/// Whether the [`Application`] should exit when the user requests the
/// window to close (e.g. the user presses the close button).
///
/// NOTE: This is not used for `multi-window`, instead check [`Application::close_requested`].
///
/// [`close_requested`]: crate::multi_window::Application::close_requested
///
/// [`Application`]: crate::Application
pub exit_on_close_request: bool,