From d15eb04f9eb27e34a7914aaf262666b65f476fe4 Mon Sep 17 00:00:00 2001 From: Murarth Date: Tue, 7 Jan 2020 20:55:18 -0700 Subject: [PATCH] Make docs set control_flow in a more realistic way (#1376) --- README.md | 4 +++- examples/window_run_return.rs | 4 +++- src/window.rs | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b4c673a1..38bf8502 100644 --- a/README.md +++ b/README.md @@ -46,12 +46,14 @@ fn main() { let window = WindowBuilder::new().build(&event_loop).unwrap(); event_loop.run(move |event, _, control_flow| { + *control_flow = ControlFlow::Wait; + match event { Event::WindowEvent { event: WindowEvent::CloseRequested, window_id, } if window_id == window.id() => *control_flow = ControlFlow::Exit, - _ => *control_flow = ControlFlow::Wait, + _ => (), } }); } diff --git a/examples/window_run_return.rs b/examples/window_run_return.rs index bde7f6a1..0112eb3e 100644 --- a/examples/window_run_return.rs +++ b/examples/window_run_return.rs @@ -28,6 +28,8 @@ fn main() { while !quit { event_loop.run_return(|event, _, control_flow| { + *control_flow = ControlFlow::Wait; + if let Event::WindowEvent { event, .. } = &event { // Print only Window events to reduce noise println!("{:?}", event); @@ -43,7 +45,7 @@ fn main() { Event::MainEventsCleared => { *control_flow = ControlFlow::Exit; } - _ => *control_flow = ControlFlow::Wait, + _ => (), } }); diff --git a/src/window.rs b/src/window.rs index 78de9fd4..0cb7c203 100644 --- a/src/window.rs +++ b/src/window.rs @@ -26,12 +26,14 @@ pub use crate::icon::*; /// let window = Window::new(&event_loop).unwrap(); /// /// event_loop.run(move |event, _, control_flow| { +/// *control_flow = ControlFlow::Wait; +/// /// match event { /// Event::WindowEvent { /// event: WindowEvent::CloseRequested, /// .. /// } => *control_flow = ControlFlow::Exit, -/// _ => *control_flow = ControlFlow::Wait, +/// _ => (), /// } /// }); /// ```