TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-19 10:51:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix native cursor display selection during local movement

Browse Source
This commit is contained in:
fufesou
2026-09-12 21:46:28 +08:00
parent 4d064a8445
commit 371e5e8f2d
3 changed files with 285 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flutter/lib/desktop/pages/remote_page.dart
View File

@@ -1120,7 +1120,8 @@ class _ImagePaintState extends State<ImagePaint> {
// Density metadata is optional. Keep the legacy path for hosts that
// omit it so capture-backend upgrades are not a client prerequisite.
final imageScale = isViewScaled() && zoomCursor.value
? _cursorImageScale(widget.ffi, cursor) : s;
? _cursorImageScale(widget.ffi, cursor, useLocalPointer: true)
: s;
var cursorScale = 1.0;
if (isWindows) {
// debug win10
@@ -1477,7 +1478,8 @@ class CursorPaint extends StatelessWidget {
// Match physical video pixels, independently of the cursor's density metadata:
// a single DRM output keeps physical desktop coordinates even at high DPI.
double _cursorImageScale(FFI ffi, CursorModel cursor) {
double _cursorImageScale(FFI ffi, CursorModel cursor,
{bool useLocalPointer = false}) {
final canvas = ffi.canvasModel;
final peer = ffi.ffiModel;
if (!peer.isPeerLinux) return canvas.scale;
@@ -1491,7 +1493,11 @@ double _cursorImageScale(FFI ffi, CursorModel cursor) {
if (displays.length == 1) return canvas.scale / displays.first.scale;
final rect = peer.rect;
if (rect != null) {
final position = Offset(cursor.x + rect.left, cursor.y + rect.top);
// Local input drives native sizing; host positions still drive the overlay.
// Before the first local movement, retain the existing position source.
final position =
(useLocalPointer ? ffi.inputModel.remotePointerPosition.value : null) ??
Offset(cursor.x + rect.left, cursor.y + rect.top);
for (final display in displays) {
if (Rect.fromLTWH(display.x, display.y, display.width / display.scale,
display.height / display.scale).contains(position)) {