From b17c6983cec819ff58d25b093100e481269c21fc Mon Sep 17 00:00:00 2001 From: dignow Date: Wed, 19 Jul 2023 01:26:43 +0800 Subject: [PATCH] win, touch scale, debug Signed-off-by: dignow --- flutter/lib/common/widgets/remote_input.dart | 23 +++++++++++++++----- flutter/lib/models/input_model.dart | 2 -- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/flutter/lib/common/widgets/remote_input.dart b/flutter/lib/common/widgets/remote_input.dart index 8c14bf26c..49c8879f3 100644 --- a/flutter/lib/common/widgets/remote_input.dart +++ b/flutter/lib/common/widgets/remote_input.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/gestures.dart'; @@ -230,10 +232,18 @@ class _RawTouchGestureDetectorRegionState return; } if (isDesktop) { - // to-do + final scale = ((d.scale - _scale) * 1000).toInt(); + _scale = d.scale; + + if (scale != 0) { + bind.sessionSendPointer( + sessionId: sessionId, + msg: json.encode({ + 'touch': {'scale': scale} + })); + } } else { // mobile - // to-do: Is this correct? ffi.canvasModel.updateScale(d.scale / _scale); _scale = d.scale; ffi.canvasModel.panX(d.focalPointDelta.dx); @@ -246,14 +256,17 @@ class _RawTouchGestureDetectorRegionState return; } if (isDesktop) { - // to-do + bind.sessionSendPointer( + sessionId: sessionId, + msg: json.encode({ + 'touch': {'scale': 0} + })); } else { // mobile - // to-do: Is this correct? _scale = 1; bind.sessionSetViewStyle(sessionId: sessionId, value: ""); } - inputModel.sendMouse('up', MouseButtons.left); + inputModel.sendMouse('up', MouseButtons.left); } get onHoldDragCancel => null; diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart index 8fa4d1caf..6b50aa37f 100644 --- a/flutter/lib/models/input_model.dart +++ b/flutter/lib/models/input_model.dart @@ -345,8 +345,6 @@ class InputModel { // https://docs.flutter.dev/release/breaking-changes/trackpad-gestures void onPointerPanZoomUpdate(PointerPanZoomUpdateEvent e) { - debugPrint( - 'REMOVE ME =============================== onPointerPanZoomUpdate ${e.scale}'); final scale = ((e.scale - _lastScale) * 1000).toInt(); _lastScale = e.scale;