Revert "fix(iPad): keep touch gestures with external mouse (#14652)" (#15288)

This reverts commit 5b7ad339b8.
This commit is contained in:
RustDesk
2026-06-15 15:13:54 +08:00
committed by GitHub
parent b73e5bbfa0
commit 1fc33218dc
3 changed files with 19 additions and 27 deletions

View File

@@ -532,9 +532,7 @@ class _RawTouchGestureDetectorRegionState
// Official // Official
TapGestureRecognizer: TapGestureRecognizer:
GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>( GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
() => TapGestureRecognizer( () => TapGestureRecognizer(), (instance) {
supportedDevices: kTouchBasedDeviceKinds,
), (instance) {
instance instance
..onTapDown = onTapDown ..onTapDown = onTapDown
..onTapUp = onTapUp ..onTapUp = onTapUp
@@ -542,18 +540,14 @@ class _RawTouchGestureDetectorRegionState
}), }),
DoubleTapGestureRecognizer: DoubleTapGestureRecognizer:
GestureRecognizerFactoryWithHandlers<DoubleTapGestureRecognizer>( GestureRecognizerFactoryWithHandlers<DoubleTapGestureRecognizer>(
() => DoubleTapGestureRecognizer( () => DoubleTapGestureRecognizer(), (instance) {
supportedDevices: kTouchBasedDeviceKinds,
), (instance) {
instance instance
..onDoubleTapDown = onDoubleTapDown ..onDoubleTapDown = onDoubleTapDown
..onDoubleTap = onDoubleTap; ..onDoubleTap = onDoubleTap;
}), }),
LongPressGestureRecognizer: LongPressGestureRecognizer:
GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>( GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
() => LongPressGestureRecognizer( () => LongPressGestureRecognizer(), (instance) {
supportedDevices: kTouchBasedDeviceKinds,
), (instance) {
instance instance
..onLongPressDown = onLongPressDown ..onLongPressDown = onLongPressDown
..onLongPressUp = onLongPressUp ..onLongPressUp = onLongPressUp
@@ -563,9 +557,7 @@ class _RawTouchGestureDetectorRegionState
// Customized // Customized
HoldTapMoveGestureRecognizer: HoldTapMoveGestureRecognizer:
GestureRecognizerFactoryWithHandlers<HoldTapMoveGestureRecognizer>( GestureRecognizerFactoryWithHandlers<HoldTapMoveGestureRecognizer>(
() => HoldTapMoveGestureRecognizer( () => HoldTapMoveGestureRecognizer(),
supportedDevices: kTouchBasedDeviceKinds,
),
(instance) => instance (instance) => instance
..onHoldDragStart = onHoldDragStart ..onHoldDragStart = onHoldDragStart
..onHoldDragUpdate = onHoldDragUpdate ..onHoldDragUpdate = onHoldDragUpdate
@@ -573,18 +565,14 @@ class _RawTouchGestureDetectorRegionState
..onHoldDragEnd = onHoldDragEnd), ..onHoldDragEnd = onHoldDragEnd),
DoubleFinerTapGestureRecognizer: DoubleFinerTapGestureRecognizer:
GestureRecognizerFactoryWithHandlers<DoubleFinerTapGestureRecognizer>( GestureRecognizerFactoryWithHandlers<DoubleFinerTapGestureRecognizer>(
() => DoubleFinerTapGestureRecognizer( () => DoubleFinerTapGestureRecognizer(), (instance) {
supportedDevices: kTouchBasedDeviceKinds,
), (instance) {
instance instance
..onDoubleFinerTap = onDoubleFinerTap ..onDoubleFinerTap = onDoubleFinerTap
..onDoubleFinerTapDown = onDoubleFinerTapDown; ..onDoubleFinerTapDown = onDoubleFinerTapDown;
}), }),
CustomTouchGestureRecognizer: CustomTouchGestureRecognizer:
GestureRecognizerFactoryWithHandlers<CustomTouchGestureRecognizer>( GestureRecognizerFactoryWithHandlers<CustomTouchGestureRecognizer>(
() => CustomTouchGestureRecognizer( () => CustomTouchGestureRecognizer(), (instance) {
supportedDevices: kTouchBasedDeviceKinds,
), (instance) {
instance.onOneFingerPanStart = instance.onOneFingerPanStart =
(DragStartDetails d) => onOneFingerPanStart(context, d); (DragStartDetails d) => onOneFingerPanStart(context, d);
instance instance

View File

@@ -517,10 +517,12 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
} }
return Container( return Container(
color: MyTheme.canvasColor, color: MyTheme.canvasColor,
child: RawTouchGestureDetectorRegion( child: inputModel.isPhysicalMouse.value
child: getBodyForMobile(), ? getBodyForMobile()
ffi: gFFI, : RawTouchGestureDetectorRegion(
), child: getBodyForMobile(),
ffi: gFFI,
),
); );
}), }),
), ),

View File

@@ -259,11 +259,13 @@ class _ViewCameraPageState extends State<ViewCameraPage>
} }
return Container( return Container(
color: MyTheme.canvasColor, color: MyTheme.canvasColor,
child: RawTouchGestureDetectorRegion( child: inputModel.isPhysicalMouse.value
child: getBodyForMobile(), ? getBodyForMobile()
ffi: gFFI, : RawTouchGestureDetectorRegion(
isCamera: true, child: getBodyForMobile(),
), ffi: gFFI,
isCamera: true,
),
); );
}), }),
), ),