hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: android, touch mode, correct cursor input, on soft keyboard shows (#8426)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-06-20 22:18:57 +08:00 committed by GitHub
parent a679e4a5e3
commit 82bf04da81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/mobile/pages/remote_page.dart
View File

@ -721,8 +721,8 @@ class _KeyHelpToolsState extends State<KeyHelpTools> {
if (renderObject is RenderBox) { if (renderObject is RenderBox) {
final size = renderObject.size; final size = renderObject.size;
Offset pos = renderObject.localToGlobal(Offset.zero); Offset pos = renderObject.localToGlobal(Offset.zero);
gFFI.cursorModel.keyHelpToolsRect = gFFI.cursorModel.keyHelpToolsVisibilityChanged(
Rect.fromLTWH(pos.dx, pos.dy, size.width, size.height); Rect.fromLTWH(pos.dx, pos.dy, size.width, size.height));
} }
} }
@ -734,7 +734,7 @@ class _KeyHelpToolsState extends State<KeyHelpTools> {
inputModel.command; inputModel.command;
if (!_pin && !hasModifierOn && !widget.requestShow) { if (!_pin && !hasModifierOn && !widget.requestShow) {
gFFI.cursorModel.keyHelpToolsRect = null; gFFI.cursorModel.keyHelpToolsVisibilityChanged(null);
return Offstage(); return Offstage();
} }
final size = MediaQuery.of(context).size; final size = MediaQuery.of(context).size;

28
flutter/lib/models/model.dart
View File

@ -1807,21 +1807,22 @@ class CursorModel with ChangeNotifier {
// But we're now using a Container(child: Stack(...)) to wrap the KeyHelpTools, // But we're now using a Container(child: Stack(...)) to wrap the KeyHelpTools,
// and the listener is on the Container. // and the listener is on the Container.
Rect? _keyHelpToolsRect; Rect? _keyHelpToolsRect;
// `lastIsBlocked` is only used in common/widgets/remote_input.dart -> _RawTouchGestureDetectorRegionState -> onDoubleTap()
// Because onDoubleTap() doesn't have the `event` parameter, we can't get the touch event's position.
bool _lastIsBlocked = false; bool _lastIsBlocked = false;
double _yForKeyboardAdjust = 0;
set keyHelpToolsRect(Rect? r) { keyHelpToolsVisibilityChanged(Rect? r) {
_keyHelpToolsRect = r; _keyHelpToolsRect = r;
if (r == null) { if (r == null) {
_lastIsBlocked = false; _lastIsBlocked = false;
} else { } else {
// `lastIsBlocked` is only used in common/widgets/remote_input.dart -> _RawTouchGestureDetectorRegionState -> onDoubleTap()
// Because onDoubleTap() doesn't have the `event` parameter, we can't get the touch event's position.
//
// Block the touch event is safe here. // Block the touch event is safe here.
// `lastIsBlocked` is only used in onDoubleTap() to block the touch event from the KeyHelpTools. // `lastIsBlocked` is only used in onDoubleTap() to block the touch event from the KeyHelpTools.
// `lastIsBlocked` will be set when the cursor is moving or touch somewhere else. // `lastIsBlocked` will be set when the cursor is moving or touch somewhere else.
_lastIsBlocked = true; _lastIsBlocked = true;
} }
_yForKeyboardAdjust = _y;
} }
get lastIsBlocked => _lastIsBlocked; get lastIsBlocked => _lastIsBlocked;
@ -1871,14 +1872,18 @@ class CursorModel with ChangeNotifier {
} }
get keyboardHeight => MediaQueryData.fromWindow(ui.window).viewInsets.bottom; get keyboardHeight => MediaQueryData.fromWindow(ui.window).viewInsets.bottom;
get scale => parent.target?.canvasModel.scale ?? 1.0;
double adjustForKeyboard() { double adjustForKeyboard() {
if (keyboardHeight < 100) {
return 0.0;
}
final m = MediaQueryData.fromWindow(ui.window); final m = MediaQueryData.fromWindow(ui.window);
final size = m.size; final size = m.size;
if (keyboardHeight < 100) return 0;
final s = parent.target?.canvasModel.scale ?? 1.0;
final thresh = (size.height - keyboardHeight) / 2; final thresh = (size.height - keyboardHeight) / 2;
var h = (_y - getVisibleRect().top) * s; // local physical display height final h = (_yForKeyboardAdjust - getVisibleRect().top) *
scale; // local physical display height
return h - thresh; return h - thresh;
} }
@ -1902,17 +1907,16 @@ class CursorModel with ChangeNotifier {
return false; return false;
} }
_lastIsBlocked = false; _lastIsBlocked = false;
moveLocal(x, y); moveLocal(x, y, adjust: adjustForKeyboard());
parent.target?.inputModel.moveMouse(_x, _y); parent.target?.inputModel.moveMouse(_x, _y);
return true; return true;
} }
moveLocal(double x, double y) { moveLocal(double x, double y, {double adjust = 0}) {
final scale = parent.target?.canvasModel.scale ?? 1.0;
final xoffset = parent.target?.canvasModel.x ?? 0; final xoffset = parent.target?.canvasModel.x ?? 0;
final yoffset = parent.target?.canvasModel.y ?? 0; final yoffset = parent.target?.canvasModel.y ?? 0;
_x = (x - xoffset) / scale + _displayOriginX; _x = (x - xoffset) / scale + _displayOriginX;
_y = (y - yoffset) / scale + _displayOriginY; _y = (y - yoffset + adjust) / scale + _displayOriginY;
notifyListeners(); notifyListeners();
} }