diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/servoshell/Cargo.toml | 2 | ||||
| -rw-r--r-- | ports/servoshell/desktop/headed_window.rs | 8 | ||||
| -rw-r--r-- | ports/servoshell/egl/app_state.rs | 32 |
3 files changed, 21 insertions, 21 deletions
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml index 967d72f171b..eee077f33ec 100644 --- a/ports/servoshell/Cargo.toml +++ b/ports/servoshell/Cargo.toml @@ -121,7 +121,7 @@ serde_json = { workspace = true } servo_allocator = { path = "../../components/allocator" } shellwords = "1.0.0" surfman = { workspace = true, features = ["sm-raw-window-handle-06", "sm-x11"] } -winit = "0.30.10" +winit = "0.30.11" [target.'cfg(any(all(target_os = "linux", not(target_env = "ohos")), target_os = "macos"))'.dependencies] sig = "1.0" diff --git a/ports/servoshell/desktop/headed_window.rs b/ports/servoshell/desktop/headed_window.rs index 8efb16954d8..eac8d72331d 100644 --- a/ports/servoshell/desktop/headed_window.rs +++ b/ports/servoshell/desktop/headed_window.rs @@ -262,11 +262,11 @@ impl Window { ElementState::Released => MouseButtonAction::Up, }; - webview.notify_input_event(InputEvent::MouseButton(MouseButtonEvent { + webview.notify_input_event(InputEvent::MouseButton(MouseButtonEvent::new( action, - button: mouse_button, + mouse_button, point, - })); + ))); } /// Handle key events before sending them to Servo. @@ -563,7 +563,7 @@ impl WindowPortsMethods for Window { point.y -= (self.toolbar_height() * self.hidpi_scale_factor()).0; self.webview_relative_mouse_point.set(point); - webview.notify_input_event(InputEvent::MouseMove(MouseMoveEvent { point })); + webview.notify_input_event(InputEvent::MouseMove(MouseMoveEvent::new(point))); }, WindowEvent::MouseWheel { delta, phase, .. } => { let (mut dx, mut dy, mode) = match delta { diff --git a/ports/servoshell/egl/app_state.rs b/ports/servoshell/egl/app_state.rs index 737a2f23b7d..486b01060e8 100644 --- a/ports/servoshell/egl/app_state.rs +++ b/ports/servoshell/egl/app_state.rs @@ -537,31 +537,31 @@ impl RunningAppState { /// Register a mouse movement. pub fn mouse_move(&self, x: f32, y: f32) { self.active_webview() - .notify_input_event(InputEvent::MouseMove(MouseMoveEvent { - point: Point2D::new(x, y), - })); + .notify_input_event(InputEvent::MouseMove(MouseMoveEvent::new(Point2D::new( + x, y, + )))); self.perform_updates(); } /// Register a mouse button press. pub fn mouse_down(&self, x: f32, y: f32, button: MouseButton) { self.active_webview() - .notify_input_event(InputEvent::MouseButton(MouseButtonEvent { - action: MouseButtonAction::Down, + .notify_input_event(InputEvent::MouseButton(MouseButtonEvent::new( + MouseButtonAction::Down, button, - point: Point2D::new(x, y), - })); + Point2D::new(x, y), + ))); self.perform_updates(); } /// Register a mouse button release. pub fn mouse_up(&self, x: f32, y: f32, button: MouseButton) { self.active_webview() - .notify_input_event(InputEvent::MouseButton(MouseButtonEvent { - action: MouseButtonAction::Up, + .notify_input_event(InputEvent::MouseButton(MouseButtonEvent::new( + MouseButtonAction::Up, button, - point: Point2D::new(x, y), - })); + Point2D::new(x, y), + ))); self.perform_updates(); } @@ -589,11 +589,11 @@ impl RunningAppState { /// Perform a click. pub fn click(&self, x: f32, y: f32) { self.active_webview() - .notify_input_event(InputEvent::MouseButton(MouseButtonEvent { - action: MouseButtonAction::Click, - button: MouseButton::Left, - point: Point2D::new(x, y), - })); + .notify_input_event(InputEvent::MouseButton(MouseButtonEvent::new( + MouseButtonAction::Click, + MouseButton::Left, + Point2D::new(x, y), + ))); self.perform_updates(); } |