leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update examples and tests to addition of ControlFlow

Browse source
This commit is contained in:
mitchmindtree 2017-06-08 00:12:41 +10:00
parent f2dd2f0752
commit db9e80bdb6
9 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/cursor.rs
View file

@ -1,9 +1,9 @@
extern crate winit;
use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput};
use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
window.set_title("A fantastic window!");
@ -23,9 +23,10 @@ fn main() {
}
},
Event::WindowEvent { event: WindowEvent::Closed, .. } => {
events_loop.interrupt()
return ControlFlow::Complete;
},
_ => ()
}
ControlFlow::Continue
});
}

13
examples/fullscreen.rs
View file

@ -1,6 +1,7 @@
extern crate winit;
use std::io::{self, Write};
use winit::{ControlFlow, Event, WindowEvent};
fn main() {
// enumerating monitors
@ -22,7 +23,7 @@ fn main() {
monitor
};
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let _window = winit::WindowBuilder::new()
.with_title("Hello world!")
@ -34,16 +35,18 @@ fn main() {
println!("{:?}", event);
match event {
winit::Event::WindowEvent { event, .. } => {
Event::WindowEvent { event, .. } => {
match event {
winit::WindowEvent::Closed => events_loop.interrupt(),
winit::WindowEvent::KeyboardInput {
WindowEvent::Closed => return ControlFlow::Complete,
WindowEvent::KeyboardInput {
input: winit::KeyboardInput { virtual_keycode: Some(winit::VirtualKeyCode::Escape), .. }, ..
} => events_loop.interrupt(),
} => return ControlFlow::Complete,
_ => ()
}
},
_ => {}
}
ControlFlow::Continue
});
}

8
examples/grabbing.rs
View file

@ -1,9 +1,9 @@
extern crate winit;
use winit::{WindowEvent, ElementState, KeyboardInput};
use winit::{ControlFlow, WindowEvent, ElementState, KeyboardInput};
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
window.set_title("winit - Cursor grabbing test");
@ -28,7 +28,7 @@ fn main() {
}
},
WindowEvent::Closed => events_loop.interrupt(),
WindowEvent::Closed => return ControlFlow::Complete,
a @ WindowEvent::MouseMoved { .. } => {
println!("{:?}", a);
@ -39,5 +39,7 @@ fn main() {
}
_ => {}
}
ControlFlow::Continue
});
}

6
examples/min_max_size.rs
View file

@ -1,7 +1,7 @@
extern crate winit;
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let _window = winit::WindowBuilder::new()
.with_min_dimensions(400, 200)
@ -13,8 +13,8 @@ fn main() {
println!("{:?}", event);
match event {
winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
_ => ()
winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => winit::ControlFlow::Complete,
_ => winit::ControlFlow::Continue,
}
});
}

5
examples/multiwindow.rs
View file

@ -1,7 +1,7 @@
extern crate winit;
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window1 = winit::Window::new(&events_loop).unwrap();
let window2 = winit::Window::new(&events_loop).unwrap();
@ -24,10 +24,11 @@ fn main() {
num_windows -= 1;
if num_windows == 0 {
events_loop.interrupt();
return winit::ControlFlow::Complete;
}
},
_ => (),
}
winit::ControlFlow::Continue
})
}

8
examples/proxy.rs
View file

@ -1,9 +1,9 @@
extern crate winit;
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window = winit::WindowBuilder::new()
let _window = winit::WindowBuilder::new()
.with_title("A fantastic window!")
.build(&events_loop)
.unwrap();
@ -22,8 +22,8 @@ fn main() {
println!("{:?}", event);
match event {
winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } =>
events_loop.interrupt(),
_ => ()
winit::ControlFlow::Complete,
_ => winit::ControlFlow::Continue,
}
});
}

6
examples/transparent.rs
View file

@ -1,7 +1,7 @@
extern crate winit;
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window = winit::WindowBuilder::new().with_decorations(false)
.with_transparency(true)
@ -13,8 +13,8 @@ fn main() {
println!("{:?}", event);
match event {
winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
_ => ()
winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => winit::ControlFlow::Complete,
_ => winit::ControlFlow::Continue,
}
});
}

4
examples/window.rs
View file

@ -1,9 +1,9 @@
extern crate winit;
fn main() {
let events_loop = winit::EventsLoop::new();
let mut events_loop = winit::EventsLoop::new();
let window = winit::WindowBuilder::new()
let _window = winit::WindowBuilder::new()
.with_title("A fantastic window!")
.build(&events_loop)
.unwrap();