mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +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
80 lines
2.5 KiB
Rust
80 lines
2.5 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{ElementState, Event, KeyEvent, WindowEvent},
|
|
event_loop::{ControlFlow, EventLoop},
|
|
keyboard::Key,
|
|
window::{Theme, 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("A fantastic window!")
|
|
.with_theme(Some(Theme::Dark))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
println!("Initial theme: {:?}", window.theme());
|
|
println!("debugging keys:");
|
|
println!(" (A) Automatic theme");
|
|
println!(" (L) Light theme");
|
|
println!(" (D) Dark theme");
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
*control_flow = ControlFlow::Wait;
|
|
|
|
match event {
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
..
|
|
} => *control_flow = ControlFlow::Exit,
|
|
Event::WindowEvent {
|
|
event: WindowEvent::ThemeChanged(theme),
|
|
window_id,
|
|
..
|
|
} if window_id == window.id() => {
|
|
println!("Theme is changed: {theme:?}")
|
|
}
|
|
Event::WindowEvent {
|
|
event:
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
logical_key: key,
|
|
state: ElementState::Pressed,
|
|
..
|
|
},
|
|
..
|
|
},
|
|
..
|
|
} => match key.as_ref() {
|
|
Key::Character("A" | "a") => {
|
|
println!("Theme was: {:?}", window.theme());
|
|
window.set_theme(None);
|
|
}
|
|
Key::Character("L" | "l") => {
|
|
println!("Theme was: {:?}", window.theme());
|
|
window.set_theme(Some(Theme::Light));
|
|
}
|
|
Key::Character("D" | "d") => {
|
|
println!("Theme was: {:?}", window.theme());
|
|
window.set_theme(Some(Theme::Dark));
|
|
}
|
|
_ => (),
|
|
},
|
|
Event::RedrawRequested(_) => {
|
|
println!("\nredrawing!\n");
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|