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
65 lines
2.1 KiB
Rust
65 lines
2.1 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use std::path::Path;
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::Event,
|
|
event_loop::EventLoop,
|
|
window::{Icon, WindowBuilder},
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
SimpleLogger::new().init().unwrap();
|
|
|
|
// You'll have to choose an icon size at your own discretion. On X11, the desired size varies
|
|
// by WM, and on Windows, you still have to account for screen scaling. Here we use 32px,
|
|
// since it seems to work well enough in most cases. Be careful about going too high, or
|
|
// you'll be bitten by the low-quality downscaling built into the WM.
|
|
let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/icon.png");
|
|
|
|
let icon = load_icon(Path::new(path));
|
|
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("An iconic window!")
|
|
// At present, this only does anything on Windows and X11, so if you want to save load
|
|
// time, you can put icon loading behind a function that returns `None` on other platforms.
|
|
.with_window_icon(Some(icon))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
if let Event::WindowEvent { event, .. } = event {
|
|
use winit::event::WindowEvent::*;
|
|
match event {
|
|
CloseRequested => control_flow.set_exit(),
|
|
DroppedFile(path) => {
|
|
window.set_window_icon(Some(load_icon(&path)));
|
|
}
|
|
_ => (),
|
|
}
|
|
} else if let Event::RedrawRequested(_) = event {
|
|
fill::fill_window(&window);
|
|
}
|
|
})
|
|
}
|
|
|
|
fn load_icon(path: &Path) -> Icon {
|
|
let (icon_rgba, icon_width, icon_height) = {
|
|
let image = image::open(path)
|
|
.expect("Failed to open icon path")
|
|
.into_rgba8();
|
|
let (width, height) = image.dimensions();
|
|
let rgba = image.into_raw();
|
|
(rgba, width, height)
|
|
};
|
|
Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
|
|
}
|