mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-10-25 10:39:01 -06:00
* Issue #324: vendor winit 0.30.13 as published The crate as released on crates.io, without its asset files (docs/res/*.svg and examples/data/*.png, AGENTS.md §1). Not used yet: the next commit patches it and adds it to [patch.crates-io]. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Issue #324: on Windows 11, a window dragged to another monitor takes its scale winit 0.30.13 handles WM_DPICHANGED by checking that the new window rect is on the monitor `MonitorFromWindow` names. During a drag that is still the monitor being left, so winit nudged the window back onto it, which sent another WM_DPICHANGED: the window grew and stayed on the wrong monitor at the wrong scale. From Windows 11 (build 22000) on, apply the rect Windows suggests, as winit master does since 488c036a (rust-windowing/winit#4341); no 0.30 release has it. Windows 10 keeps the old adjustment, as on winit master. The vendored copy goes in [patch.crates-io]; a test fails if winit resolves from crates.io again or the vendored copy loses the patch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
149 lines
4.5 KiB
Rust
149 lines
4.5 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use std::thread;
|
|
#[cfg(not(web_platform))]
|
|
use std::time;
|
|
|
|
use ::tracing::{info, warn};
|
|
#[cfg(web_platform)]
|
|
use web_time as time;
|
|
|
|
use winit::application::ApplicationHandler;
|
|
use winit::event::{ElementState, KeyEvent, StartCause, WindowEvent};
|
|
use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
|
|
use winit::keyboard::{Key, NamedKey};
|
|
use winit::window::{Window, WindowId};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
#[path = "util/tracing.rs"]
|
|
mod tracing;
|
|
|
|
const WAIT_TIME: time::Duration = time::Duration::from_millis(100);
|
|
const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(100);
|
|
|
|
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
|
|
enum Mode {
|
|
#[default]
|
|
Wait,
|
|
WaitUntil,
|
|
Poll,
|
|
}
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
#[cfg(web_platform)]
|
|
console_error_panic_hook::set_once();
|
|
|
|
tracing::init();
|
|
|
|
info!("Press '1' to switch to Wait mode.");
|
|
info!("Press '2' to switch to WaitUntil mode.");
|
|
info!("Press '3' to switch to Poll mode.");
|
|
info!("Press 'R' to toggle request_redraw() calls.");
|
|
info!("Press 'Esc' to close the window.");
|
|
|
|
let event_loop = EventLoop::new().unwrap();
|
|
|
|
let mut app = ControlFlowDemo::default();
|
|
event_loop.run_app(&mut app)
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct ControlFlowDemo {
|
|
mode: Mode,
|
|
request_redraw: bool,
|
|
wait_cancelled: bool,
|
|
close_requested: bool,
|
|
window: Option<Window>,
|
|
}
|
|
|
|
impl ApplicationHandler for ControlFlowDemo {
|
|
fn new_events(&mut self, _event_loop: &ActiveEventLoop, cause: StartCause) {
|
|
info!("new_events: {cause:?}");
|
|
|
|
self.wait_cancelled = match cause {
|
|
StartCause::WaitCancelled { .. } => self.mode == Mode::WaitUntil,
|
|
_ => false,
|
|
}
|
|
}
|
|
|
|
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
|
let window_attributes = Window::default_attributes().with_title(
|
|
"Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.",
|
|
);
|
|
self.window = Some(event_loop.create_window(window_attributes).unwrap());
|
|
}
|
|
|
|
fn window_event(
|
|
&mut self,
|
|
_event_loop: &ActiveEventLoop,
|
|
_window_id: WindowId,
|
|
event: WindowEvent,
|
|
) {
|
|
info!("{event:?}");
|
|
|
|
match event {
|
|
WindowEvent::CloseRequested => {
|
|
self.close_requested = true;
|
|
},
|
|
WindowEvent::KeyboardInput {
|
|
event: KeyEvent { logical_key: key, state: ElementState::Pressed, .. },
|
|
..
|
|
} => match key.as_ref() {
|
|
// WARNING: Consider using `key_without_modifiers()` if available on your platform.
|
|
// See the `key_binding` example
|
|
Key::Character("1") => {
|
|
self.mode = Mode::Wait;
|
|
warn!("mode: {:?}", self.mode);
|
|
},
|
|
Key::Character("2") => {
|
|
self.mode = Mode::WaitUntil;
|
|
warn!("mode: {:?}", self.mode);
|
|
},
|
|
Key::Character("3") => {
|
|
self.mode = Mode::Poll;
|
|
warn!("mode: {:?}", self.mode);
|
|
},
|
|
Key::Character("r") => {
|
|
self.request_redraw = !self.request_redraw;
|
|
warn!("request_redraw: {}", self.request_redraw);
|
|
},
|
|
Key::Named(NamedKey::Escape) => {
|
|
self.close_requested = true;
|
|
},
|
|
_ => (),
|
|
},
|
|
WindowEvent::RedrawRequested => {
|
|
let window = self.window.as_ref().unwrap();
|
|
window.pre_present_notify();
|
|
fill::fill_window(window);
|
|
},
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
|
|
if self.request_redraw && !self.wait_cancelled && !self.close_requested {
|
|
self.window.as_ref().unwrap().request_redraw();
|
|
}
|
|
|
|
match self.mode {
|
|
Mode::Wait => event_loop.set_control_flow(ControlFlow::Wait),
|
|
Mode::WaitUntil => {
|
|
if !self.wait_cancelled {
|
|
event_loop
|
|
.set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
|
|
}
|
|
},
|
|
Mode::Poll => {
|
|
thread::sleep(POLL_SLEEP_TIME);
|
|
event_loop.set_control_flow(ControlFlow::Poll);
|
|
},
|
|
};
|
|
|
|
if self.close_requested {
|
|
event_loop.exit();
|
|
}
|
|
}
|
|
}
|