Make examples set control_flow in a more realistic way (#1363)

* Make examples set control_flow in a more realistic way

* Format

examples/cursor.rs

@@ -12,35 +12,39 @@ fn main() {
 
     let mut cursor_idx = 0;
 
-    event_loop.run(move |event, _, control_flow| match event {
+    event_loop.run(move |event, _, control_flow| {
-        Event::WindowEvent {
+        *control_flow = ControlFlow::Wait;
-            event:
+
-                WindowEvent::KeyboardInput {
+        match event {
-                    input:
+            Event::WindowEvent {
-                        KeyboardInput {
+                event:
-                            state: ElementState::Pressed,
+                    WindowEvent::KeyboardInput {
-                            ..
+                        input:
-                        },
+                            KeyboardInput {
-                    ..
+                                state: ElementState::Pressed,
-                },
+                                ..
-            ..
+                            },
-        } => {
+                        ..
-            println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);
+                    },
-            window.set_cursor_icon(CURSORS[cursor_idx]);
+                ..
-            if cursor_idx < CURSORS.len() - 1 {
+            } => {
-                cursor_idx += 1;
+                println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);
-            } else {
+                window.set_cursor_icon(CURSORS[cursor_idx]);
-                cursor_idx = 0;
+                if cursor_idx < CURSORS.len() - 1 {
+                    cursor_idx += 1;
+                } else {
+                    cursor_idx = 0;
+                }
             }
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            } => {
+                *control_flow = ControlFlow::Exit;
+                return;
+            }
+            _ => (),
         }
-        Event::WindowEvent {
-            event: WindowEvent::CloseRequested,
-            ..
-        } => {
-            *control_flow = ControlFlow::Exit;
-            return;
-        }
-        _ => (),
     });
 }
 

examples/cursor_grab.rs

@@ -16,6 +16,7 @@ fn main() {
 
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Wait;
+
         match event {
             Event::WindowEvent { event, .. } => match event {
                 WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,

examples/custom_events.rs

@@ -31,13 +31,17 @@ fn main() {
         }
     });
 
-    event_loop.run(move |event, _, control_flow| match event {
+    event_loop.run(move |event, _, control_flow| {
-        Event::UserEvent(event) => println!("user event: {:?}", event),
+        *control_flow = ControlFlow::Wait;
-        Event::WindowEvent {
+
-            event: WindowEvent::CloseRequested,
+        match event {
-            ..
+            Event::UserEvent(event) => println!("user event: {:?}", event),
-        } => *control_flow = ControlFlow::Exit,
+            Event::WindowEvent {
-        _ => *control_flow = ControlFlow::Wait,
+                event: WindowEvent::CloseRequested,
+                ..
+            } => *control_flow = ControlFlow::Exit,
+            _ => (),
+        }
     });
 }
 

examples/min_max_size.rs

@@ -14,6 +14,7 @@ fn main() {
     window.set_max_inner_size(Some(LogicalSize::new(800.0, 400.0)));
 
     event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
         println!("{:?}", event);
 
         match event {
@@ -21,7 +22,7 @@ fn main() {
                 event: WindowEvent::CloseRequested,
                 ..
             } => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            _ => (),
         }
     });
 }

examples/minimize.rs

@@ -12,24 +12,28 @@ fn main() {
         .build(&event_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| match event {
+    event_loop.run(move |event, _, control_flow| {
-        Event::WindowEvent {
+        *control_flow = ControlFlow::Wait;
-            event: WindowEvent::CloseRequested,
-            ..
-        } => *control_flow = ControlFlow::Exit,
 
-        // Keyboard input event to handle minimize via a hotkey
+        match event {
-        Event::WindowEvent {
+            Event::WindowEvent {
-            event: WindowEvent::KeyboardInput { input, .. },
+                event: WindowEvent::CloseRequested,
-            window_id,
+                ..
-        } => {
+            } => *control_flow = ControlFlow::Exit,
-            if window_id == window.id() {
+
-                // Pressing the 'M' key will minimize the window
+            // Keyboard input event to handle minimize via a hotkey
-                if input.virtual_keycode == Some(VirtualKeyCode::M) {
+            Event::WindowEvent {
-                    window.set_minimized(true);
+                event: WindowEvent::KeyboardInput { input, .. },
+                window_id,
+            } => {
+                if window_id == window.id() {
+                    // Pressing the 'M' key will minimize the window
+                    if input.virtual_keycode == Some(VirtualKeyCode::M) {
+                        window.set_minimized(true);
+                    }
                 }
             }
+            _ => (),
         }
-        _ => *control_flow = ControlFlow::Wait,
     });
 }

examples/multiwindow.rs

@@ -16,6 +16,7 @@ fn main() {
 
     event_loop.run(move |event, event_loop, control_flow| {
         *control_flow = ControlFlow::Wait;
+
         match event {
             Event::WindowEvent { event, window_id } => {
                 match event {

examples/request_redraw.rs

@@ -1,8 +1,5 @@
-use instant::Instant;
-use std::time::Duration;
-
 use winit::{
-    event::{Event, WindowEvent},
+    event::{ElementState, Event, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
     window::WindowBuilder,
 };
@@ -15,18 +12,26 @@ fn main() {
         .build(&event_loop)
         .unwrap();
 
-    event_loop.run(move |event, _, control_flow| match event {
+    event_loop.run(move |event, _, control_flow| {
-        Event::WindowEvent {
+        println!("{:?}", event);
-            event: WindowEvent::CloseRequested,
+
-            ..
+        *control_flow = ControlFlow::Wait;
-        } => *control_flow = ControlFlow::Exit,
+
-        Event::MainEventsCleared => {
+        match event {
-            window.request_redraw();
+            Event::WindowEvent { event, .. } => match event {
-            *control_flow = ControlFlow::WaitUntil(Instant::now() + Duration::new(1, 0))
+                WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
+                WindowEvent::MouseInput {
+                    state: ElementState::Released,
+                    ..
+                } => {
+                    window.request_redraw();
+                }
+                _ => (),
+            },
+            Event::RedrawRequested(_) => {
+                println!("\nredrawing!\n");
+            }
+            _ => (),
         }
-        Event::RedrawRequested(_) => {
-            println!("{:?}", event);
-        }
-        _ => (),
     });
 }

examples/resizable.rs

@@ -18,6 +18,7 @@ fn main() {
 
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Wait;
+
         match event {
             Event::WindowEvent { event, .. } => match event {
                 WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,

examples/transparent.rs

@@ -16,6 +16,7 @@ fn main() {
     window.set_title("A fantastic window!");
 
     event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
         println!("{:?}", event);
 
         match event {
@@ -23,7 +24,7 @@ fn main() {
                 event: WindowEvent::CloseRequested,
                 ..
             } => *control_flow = ControlFlow::Exit,
-            _ => *control_flow = ControlFlow::Wait,
+            _ => (),
         }
     });
 }

examples/web.rs

@@ -40,6 +40,8 @@ pub fn main() {
     }
 
     event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
+
         #[cfg(feature = "web-sys")]
         log::debug!("{:?}", event);
 
@@ -54,7 +56,7 @@ pub fn main() {
             Event::MainEventsCleared => {
                 window.request_redraw();
             }
-            _ => *control_flow = ControlFlow::Wait,
+            _ => (),
         }
     });
 }

examples/window.rs

@@ -13,6 +13,7 @@ fn main() {
         .unwrap();
 
     event_loop.run(move |event, _, control_flow| {
+        *control_flow = ControlFlow::Wait;
         println!("{:?}", event);
 
         match event {
@@ -23,7 +24,7 @@ fn main() {
             Event::MainEventsCleared => {
                 window.request_redraw();
             }
-            _ => *control_flow = ControlFlow::Poll,
+            _ => (),
         }
     });
 }

examples/window_icon.rs

@@ -27,6 +27,7 @@ fn main() {
 
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Wait;
+
         if let Event::WindowEvent { event, .. } = event {
             use winit::event::WindowEvent::*;
             match event {

examples/window_run_return.rs

@@ -38,7 +38,6 @@ fn main() {
                     ..
                 } => {
                     quit = true;
-                    *control_flow = ControlFlow::Exit;
                 }
                 Event::MainEventsCleared => {
                     *control_flow = ControlFlow::Exit;
@@ -48,6 +47,7 @@ fn main() {
         });
 
         // Sleep for 1/60 second to simulate rendering
+        println!("rendering");
         sleep(Duration::from_millis(16));
     }
 }