Fimeg/smithay
Watch
1
0
Fork
You've already forked smithay
 0
Code Releases Activity

winit: Make window field of WinitEventLoopInner

Browse source 
This will allow initializing this field later, with window creation in
`resumed`.
This commit is contained in:
Ian Douglas Scott 2026-06-10 12:24:41 -07:00 • committed by Ian Douglas Scott
commit f1c29704f1
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/backend/winit/mod.rs
View file

@ -203,7 +203,7 @@ where
scale_factor: window.scale_factor(),
clock: Clock::<Monotonic>::new(),
key_counter: 0,
window,
window: Some(window),
is_x11,
},
fake_token: None,
@ -356,7 +356,7 @@ where
#[derive(Debug)]
struct WinitEventLoopInner {
window: Arc<WinitWindow>,
window: Option<Arc<WinitWindow>>,
clock: Clock<Monotonic>,
key_counter: u32,
is_x11: bool,
@ -427,6 +427,10 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
}
fn window_event(&mut self, _event_loop: &ActiveEventLoop, _window_id: WindowId, event: WindowEvent) {
let Some(window) = self.inner.window.as_ref() else {
return;
};
match event {
WindowEvent::Resized(size) => {
trace!("Resizing window to {size:?}");
@ -443,7 +447,7 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
} => {
trace!("Scale factor changed to {new_scale_factor}");
self.inner.scale_factor = new_scale_factor;
let (w, h): (i32, i32) = self.inner.window.inner_size().into();
let (w, h): (i32, i32) = window.inner_size().into();
(self.callback)(WinitEvent::Resized {
size: (w, h).into(),
scale_factor: self.inner.scale_factor,
@ -480,7 +484,7 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
(self.callback)(WinitEvent::Input(event));
}
WindowEvent::CursorMoved { position, .. } => {
let size = self.inner.window.inner_size();
let size = window.inner_size();
let x = position.x / size.width as f64;
let y = position.y / size.height as f64;
let event = InputEvent::PointerMotionAbsolute {
@ -518,7 +522,7 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
id,
..
}) => {
let size = self.inner.window.inner_size();
let size = window.inner_size();
let x = location.x / size.width as f64;
let y = location.y / size.width as f64;
let event = InputEvent::TouchDown {
@ -538,7 +542,7 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
id,
..
}) => {
let size = self.inner.window.inner_size();
let size = window.inner_size();
let x = location.x / size.width as f64;
let y = location.y / size.width as f64;
let event = InputEvent::TouchMotion {
@ -559,7 +563,7 @@ impl<F: FnMut(WinitEvent)> ApplicationHandler for WinitEventLoopApp<'_, F> {
id,
..
}) => {
let size = self.inner.window.inner_size();
let size = window.inner_size();
let x = location.x / size.width as f64;
let y = location.y / size.width as f64;
let event = InputEvent::TouchMotion {