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
85 lines
2.7 KiB
Rust
85 lines
2.7 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{ElementState, Event, KeyEvent, MouseButton, StartCause, WindowEvent},
|
|
event_loop::EventLoop,
|
|
keyboard::Key,
|
|
window::{Window, WindowBuilder, WindowId},
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window_1 = WindowBuilder::new().build(&event_loop).unwrap();
|
|
let window_2 = WindowBuilder::new().build(&event_loop).unwrap();
|
|
|
|
let mut switched = false;
|
|
let mut entered_id = window_2.id();
|
|
|
|
event_loop.run(move |event, _, control_flow| match event {
|
|
Event::NewEvents(StartCause::Init) => {
|
|
eprintln!("Switch which window is to be dragged by pressing \"x\".")
|
|
}
|
|
Event::WindowEvent { event, window_id } => match event {
|
|
WindowEvent::CloseRequested => control_flow.set_exit(),
|
|
WindowEvent::MouseInput {
|
|
state: ElementState::Pressed,
|
|
button: MouseButton::Left,
|
|
..
|
|
} => {
|
|
let window = if (window_id == window_1.id() && switched)
|
|
|| (window_id == window_2.id() && !switched)
|
|
{
|
|
&window_2
|
|
} else {
|
|
&window_1
|
|
};
|
|
|
|
window.drag_window().unwrap()
|
|
}
|
|
WindowEvent::CursorEntered { .. } => {
|
|
entered_id = window_id;
|
|
name_windows(entered_id, switched, &window_1, &window_2)
|
|
}
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
state: ElementState::Released,
|
|
logical_key: Key::Character(c),
|
|
..
|
|
},
|
|
..
|
|
} if c == "x" => {
|
|
switched = !switched;
|
|
name_windows(entered_id, switched, &window_1, &window_2);
|
|
println!("Switched!")
|
|
}
|
|
_ => (),
|
|
},
|
|
Event::RedrawRequested(wid) => {
|
|
if wid == window_1.id() {
|
|
fill::fill_window(&window_1);
|
|
} else if wid == window_2.id() {
|
|
fill::fill_window(&window_2);
|
|
}
|
|
}
|
|
_ => (),
|
|
})
|
|
}
|
|
|
|
fn name_windows(window_id: WindowId, switched: bool, window_1: &Window, window_2: &Window) {
|
|
let (drag_target, other) =
|
|
if (window_id == window_1.id() && switched) || (window_id == window_2.id() && !switched) {
|
|
(&window_2, &window_1)
|
|
} else {
|
|
(&window_1, &window_2)
|
|
};
|
|
drag_target.set_title("drag target");
|
|
other.set_title("winit window");
|
|
}
|