TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-07-14 03:05:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): mouse mismatch (#15339)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2026-06-19 20:50:56 +08:00
committed by GitHub
parent a658e987b7
commit 3d478c4935
1 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
flutter/lib/models/input_model.dart
View File

@@ -1307,7 +1307,8 @@ class InputModel {
} }
if (isPhysicalMouse.value) { if (isPhysicalMouse.value) {
if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) { if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) {
handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position, final canvasPosition = _pointerPositionForRemoteCanvas(e);
handleMouse(_getMouseEvent(e, _kMouseEventMove), canvasPosition,
edgeScroll: useEdgeScroll); edgeScroll: useEdgeScroll);
} }
} }
@@ -1548,7 +1549,8 @@ class InputModel {
_relativeMouse _relativeMouse
.sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventDown)); .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventDown));
} else { } else {
handleMouse(_getMouseEvent(e, _kMouseEventDown), e.position); final canvasPosition = _pointerPositionForRemoteCanvas(e);
handleMouse(_getMouseEvent(e, _kMouseEventDown), canvasPosition);
} }
} }
} }
@@ -1570,7 +1572,8 @@ class InputModel {
_relativeMouse _relativeMouse
.sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventUp)); .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventUp));
} else { } else {
handleMouse(_getMouseEvent(e, _kMouseEventUp), e.position); final canvasPosition = _pointerPositionForRemoteCanvas(e);
handleMouse(_getMouseEvent(e, _kMouseEventUp), canvasPosition);
} }
} }
} }
@@ -1592,12 +1595,40 @@ class InputModel {
} }
if (isPhysicalMouse.value) { if (isPhysicalMouse.value) {
if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) { if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) {
handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position, final canvasPosition = _pointerPositionForRemoteCanvas(e);
handleMouse(_getMouseEvent(e, _kMouseEventMove), canvasPosition,
edgeScroll: useEdgeScroll); edgeScroll: useEdgeScroll);
} }
} }
} }
/// Convert pointer coordinates into the visible remote canvas space.
///
/// On mobile, the remote page body is wrapped in `SafeArea`, but the pointer
/// listener that feeds these events sits outside that subtree. As a result,
/// `event.localPosition` still includes the top/left safe-area inset.
///
/// When the keyboard-visible path shows `KeyHelpTools`, the remote canvas is
/// also shifted downward by `CanvasModel.getAdjustY()`. The downstream mouse
/// mapping logic expects coordinates relative to the visible canvas area, so
/// we subtract both the mobile safe-area padding and the current canvas
/// adjustment before passing the position into mouse mapping.
///
/// Desktop and web desktop continue to use the global position directly
/// because their pointer mapping is window-based.
Offset _pointerPositionForRemoteCanvas(PointerEvent event) {
if (isDesktop || isWebDesktop) {
return event.position;
}
final mediaData = MediaQueryData.fromView(
WidgetsBinding.instance.platformDispatcher.views.first);
final adjustY = parent.target?.canvasModel.getAdjustY() ?? 0.0;
return Offset(
event.localPosition.dx - mediaData.padding.left,
event.localPosition.dy - mediaData.padding.top - adjustY,
);
}
static Future<Rect?> fillRemoteCoordsAndGetCurFrame( static Future<Rect?> fillRemoteCoordsAndGetCurFrame(
List<RemoteWindowCoords> remoteWindowCoords) async { List<RemoteWindowCoords> remoteWindowCoords) async {
final coords = final coords =