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
76 lines
2.4 KiB
Rust
76 lines
2.4 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
#[cfg(target_os = "macos")]
|
|
use winit::platform::macos::{OptionAsAlt, WindowExtMacOS};
|
|
|
|
#[cfg(target_os = "macos")]
|
|
use winit::{
|
|
event::ElementState,
|
|
event::{Event, MouseButton, WindowEvent},
|
|
event_loop::EventLoop,
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
#[cfg(target_os = "macos")]
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
/// Prints the keyboard events characters received when option_is_alt is true versus false.
|
|
/// A left mouse click will toggle option_is_alt.
|
|
#[cfg(target_os = "macos")]
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("A fantastic window!")
|
|
.with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
window.set_ime_allowed(true);
|
|
|
|
let mut option_as_alt = window.option_as_alt();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
window_id,
|
|
} if window_id == window.id() => control_flow.set_exit(),
|
|
Event::WindowEvent { event, .. } => match event {
|
|
WindowEvent::MouseInput {
|
|
state: ElementState::Pressed,
|
|
button: MouseButton::Left,
|
|
..
|
|
} => {
|
|
option_as_alt = match option_as_alt {
|
|
OptionAsAlt::None => OptionAsAlt::OnlyLeft,
|
|
OptionAsAlt::OnlyLeft => OptionAsAlt::OnlyRight,
|
|
OptionAsAlt::OnlyRight => OptionAsAlt::Both,
|
|
OptionAsAlt::Both => OptionAsAlt::None,
|
|
};
|
|
|
|
println!("Received Mouse click, toggling option_as_alt to: {option_as_alt:?}");
|
|
window.set_option_as_alt(option_as_alt);
|
|
}
|
|
WindowEvent::KeyboardInput { .. } => println!("KeyboardInput: {event:?}"),
|
|
_ => (),
|
|
},
|
|
Event::MainEventsCleared => {
|
|
window.request_redraw();
|
|
}
|
|
Event::RedrawRequested(_) => {
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
fn main() {
|
|
println!("This example is only supported on MacOS");
|
|
}
|