mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 13:51:30 +11:00
0d366ffbda
This re-works the portable `run()` API that consumes the `EventLoop` and runs the loop on the calling thread until the app exits. This can be supported across _all_ platforms and compared to the previous `run() -> !` API is now able to return a `Result` status on all platforms except iOS and Web. Fixes: #2709 By moving away from `run() -> !` we stop calling `std::process::exit()` internally as a means to kill the process without returning which means it's possible to return an exit status and applications can return from their `main()` function normally. This also fixes Android support where an Activity runs in a thread but we can't assume to have full ownership of the process (other services could be running in separate threads). Additionally all examples have generally been updated so that `main()` returns a `Result` from `run()` Fixes: #2709
52 lines
1.6 KiB
Rust
52 lines
1.6 KiB
Rust
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{Event, WindowEvent},
|
|
event_loop::{ControlFlow, EventLoop},
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("Touchpad gestures")
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
println!("Only supported on macOS at the moment.");
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
*control_flow = ControlFlow::Wait;
|
|
|
|
if let Event::WindowEvent { event, .. } = event {
|
|
match event {
|
|
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
|
|
WindowEvent::TouchpadMagnify { delta, .. } => {
|
|
if delta > 0.0 {
|
|
println!("Zoomed in {delta}");
|
|
} else {
|
|
println!("Zoomed out {delta}");
|
|
}
|
|
}
|
|
WindowEvent::SmartMagnify { .. } => {
|
|
println!("Smart zoom");
|
|
}
|
|
WindowEvent::TouchpadRotate { delta, .. } => {
|
|
if delta > 0.0 {
|
|
println!("Rotated counterclockwise {delta}");
|
|
} else {
|
|
println!("Rotated clockwise {delta}");
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
} else if let Event::RedrawRequested(_) = event {
|
|
fill::fill_window(&window);
|
|
}
|
|
})
|
|
}
|