remove mouse position scaling

Author: timon-schelling

desktop/src/cef.rs

@@ -77,9 +77,6 @@ impl ViewInfo {
 			_ => {}
 		}
 	}
-	pub(crate) fn scale(&self) -> f64 {
-		self.scale
-	}
 	pub(crate) fn zoom(&self) -> f64 {
 		self.scale.ln() / 1.2_f64.ln()
 	}

desktop/src/cef/context/singlethreaded.rs

@@ -20,7 +20,7 @@ impl CefContext for SingleThreadedCefContext {
 	}
 
 	fn handle_window_event(&mut self, event: &WindowEvent) {
-		input::handle_window_event(&self.browser, &mut self.input_state, event, self.event_handler.as_ref());
+		input::handle_window_event(&self.browser, &mut self.input_state, event);
 	}
 
 	fn notify_view_info_changed(&self) {

desktop/src/cef/input.rs

@@ -1,29 +1,25 @@
 use cef::sys::{cef_event_flags_t, cef_key_event_type_t, cef_mouse_button_type_t};
 use cef::{Browser, ImplBrowser, ImplBrowserHost, KeyEvent, KeyEventType, MouseEvent};
 use std::time::Instant;
-use winit::dpi::LogicalPosition;
+use winit::dpi::PhysicalPosition;
 use winit::event::{ButtonSource, ElementState, MouseButton, MouseScrollDelta, WindowEvent};
 
 mod keymap;
 use keymap::{ToNativeKeycode, ToVKBits};
 
-use crate::cef::CefEventHandler;
-
 use super::consts::{MULTICLICK_ALLOWED_TRAVEL, MULTICLICK_TIMEOUT, PINCH_ZOOM_SPEED, SCROLL_LINE_HEIGHT, SCROLL_LINE_WIDTH, SCROLL_SPEED_X, SCROLL_SPEED_Y};
 
-pub(crate) fn handle_window_event(browser: &Browser, input_state: &mut InputState, event: &WindowEvent, event_handler: &dyn CefEventHandler) {
+pub(crate) fn handle_window_event(browser: &Browser, input_state: &mut InputState, event: &WindowEvent) {
 	match event {
 		WindowEvent::PointerMoved { position, .. } | WindowEvent::PointerEntered { position, .. } => {
-			let scale = event_handler.view_info().scale();
-			input_state.cursor_move(&position.to_logical(scale));
+			input_state.cursor_move(&position);
 
 			let Some(host) = browser.host() else { return };
 			host.send_mouse_move_event(Some(&input_state.into()), 0);
 		}
 		WindowEvent::PointerLeft { position, .. } => {
 			if let Some(position) = position {
-				let scale = event_handler.view_info().scale();
-				input_state.cursor_move(&position.to_logical(scale));
+				input_state.cursor_move(&position);
 			}
 
 			let Some(host) = browser.host() else { return };
@@ -163,7 +159,7 @@ impl InputState {
 		self.modifiers = *modifiers;
 	}
 
-	fn cursor_move(&mut self, position: &LogicalPosition<f64>) {
+	fn cursor_move(&mut self, position: &PhysicalPosition<f64>) {
 		self.mouse_position = position.into();
 	}
 
@@ -210,8 +206,8 @@ pub(crate) struct MousePosition {
 	x: usize,
 	y: usize,
 }
-impl From<&LogicalPosition<f64>> for MousePosition {
-	fn from(position: &LogicalPosition<f64>) -> Self {
+impl From<&PhysicalPosition<f64>> for MousePosition {
+	fn from(position: &PhysicalPosition<f64>) -> Self {
 		Self {
 			x: position.x as usize,
 			y: position.y as usize,