From 26b4fa5880991549962e33c89b31531977687180 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Thu, 12 Aug 2021 03:46:13 -0700 Subject: [PATCH] Fix scale_factor_override with cursor position. Sometimes the wrong scale factor was used (not accounting for overrides). Fixes #2501 --- crates/bevy_winit/src/lib.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index af072b7a60f9f..aa83728bc785b 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -303,10 +303,10 @@ pub fn winit_runner_with(mut app: App, mut event_loop: EventLoop<()>) { let mut cursor_moved_events = world.get_resource_mut::>().unwrap(); let winit_window = winit_windows.get_window(window_id).unwrap(); - let position = position.to_logical(winit_window.scale_factor()); + let position = position.to_logical(window.scale_factor()); let inner_size = winit_window .inner_size() - .to_logical::(winit_window.scale_factor()); + .to_logical::(window.scale_factor()); // move origin to bottom left let y_position = inner_size.height - position.y; @@ -363,8 +363,7 @@ pub fn winit_runner_with(mut app: App, mut event_loop: EventLoop<()>) { let mut touch_input_events = world.get_resource_mut::>().unwrap(); - let winit_window = winit_windows.get_window(window_id).unwrap(); - let mut location = touch.location.to_logical(winit_window.scale_factor()); + let mut location = touch.location.to_logical(window.scale_factor()); // On a mobile window, the start is from the top while on PC/Linux/OSX from // bottom