mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-24 06:11:30 +11:00
bfbcab3a01
* feat: add macos simple fullscreen * move impl to WindowExt * feedback: remove warning, unused file and rename param * feedback: combine fullscreen examples into one example * fix: ensure decorations and maximize do not toggle while in fullscreen * fix: prevent warning on non-macos platforms * feedback: make changelog more explicit * fix: prevent unconditional construction of NSRect * fix: don't try to set_simple_fullscreen if already using native fullscreen * fix: ensure set_simple_fullscreen plays nicely with set_fullscreen * fix: do not enter native fullscreen if simple fullscreen is active
122 lines
4.2 KiB
Rust
122 lines
4.2 KiB
Rust
extern crate winit;
|
|
|
|
use std::io::{self, Write};
|
|
use winit::{ControlFlow, Event, WindowEvent};
|
|
|
|
fn main() {
|
|
let mut events_loop = winit::EventsLoop::new();
|
|
|
|
#[cfg(target_os = "macos")]
|
|
let mut macos_use_simple_fullscreen = false;
|
|
|
|
let monitor = {
|
|
// On macOS there are two fullscreen modes "native" and "simple"
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
print!("Please choose the fullscreen mode: (1) native, (2) simple: ");
|
|
io::stdout().flush().unwrap();
|
|
|
|
let mut num = String::new();
|
|
io::stdin().read_line(&mut num).unwrap();
|
|
let num = num.trim().parse().ok().expect("Please enter a number");
|
|
match num {
|
|
2 => macos_use_simple_fullscreen = true,
|
|
_ => {}
|
|
}
|
|
|
|
// Prompt for monitor when using native fullscreen
|
|
if !macos_use_simple_fullscreen {
|
|
Some(prompt_for_monitor(&events_loop))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
Some(prompt_for_monitor(&events_loop))
|
|
};
|
|
|
|
let mut is_fullscreen = monitor.is_some();
|
|
let mut is_maximized = false;
|
|
let mut decorations = true;
|
|
|
|
let window = winit::WindowBuilder::new()
|
|
.with_title("Hello world!")
|
|
.with_fullscreen(monitor)
|
|
.build(&events_loop)
|
|
.unwrap();
|
|
|
|
events_loop.run_forever(|event| {
|
|
println!("{:?}", event);
|
|
|
|
match event {
|
|
Event::WindowEvent { event, .. } => match event {
|
|
WindowEvent::CloseRequested => return ControlFlow::Break,
|
|
WindowEvent::KeyboardInput {
|
|
input:
|
|
winit::KeyboardInput {
|
|
virtual_keycode: Some(virtual_code),
|
|
state,
|
|
..
|
|
},
|
|
..
|
|
} => match (virtual_code, state) {
|
|
(winit::VirtualKeyCode::Escape, _) => return ControlFlow::Break,
|
|
(winit::VirtualKeyCode::F, winit::ElementState::Pressed) => {
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
if macos_use_simple_fullscreen {
|
|
use winit::os::macos::WindowExt;
|
|
if WindowExt::set_simple_fullscreen(&window, !is_fullscreen) {
|
|
is_fullscreen = !is_fullscreen;
|
|
}
|
|
|
|
return ControlFlow::Continue;
|
|
}
|
|
}
|
|
|
|
is_fullscreen = !is_fullscreen;
|
|
if !is_fullscreen {
|
|
window.set_fullscreen(None);
|
|
} else {
|
|
window.set_fullscreen(Some(window.get_current_monitor()));
|
|
}
|
|
}
|
|
(winit::VirtualKeyCode::M, winit::ElementState::Pressed) => {
|
|
is_maximized = !is_maximized;
|
|
window.set_maximized(is_maximized);
|
|
}
|
|
(winit::VirtualKeyCode::D, winit::ElementState::Pressed) => {
|
|
decorations = !decorations;
|
|
window.set_decorations(decorations);
|
|
}
|
|
_ => (),
|
|
},
|
|
_ => (),
|
|
},
|
|
_ => {}
|
|
}
|
|
|
|
ControlFlow::Continue
|
|
});
|
|
}
|
|
|
|
// Enumerate monitors and prompt user to choose one
|
|
fn prompt_for_monitor(events_loop: &winit::EventsLoop) -> winit::MonitorId {
|
|
for (num, monitor) in events_loop.get_available_monitors().enumerate() {
|
|
println!("Monitor #{}: {:?}", num, monitor.get_name());
|
|
}
|
|
|
|
print!("Please write the number of the monitor to use: ");
|
|
io::stdout().flush().unwrap();
|
|
|
|
let mut num = String::new();
|
|
io::stdin().read_line(&mut num).unwrap();
|
|
let num = num.trim().parse().ok().expect("Please enter a number");
|
|
let monitor = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
|
|
|
|
println!("Using {:?}", monitor.get_name());
|
|
|
|
monitor
|
|
}
|