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

new keyboard offset and scroll

Browse Source
This commit is contained in:
open-trade 2020-12-21 17:26:23 +08:00
parent 0388e51299
commit 1acb64c35d
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter_hbb/lib/model.dart
View File

@ -319,10 +319,12 @@ class CursorModel with ChangeNotifier {
} }
double adjustForKeyboard() { double adjustForKeyboard() {
var keyboardHeight = MediaQueryData.fromWindow(ui.window).viewInsets.bottom; final m = MediaQueryData.fromWindow(ui.window);
var keyboardHeight = m.viewInsets.bottom;
final size = m.size;
if (keyboardHeight < 100) return 0; if (keyboardHeight < 100) return 0;
final s = FFI.canvasModel.scale; final s = FFI.canvasModel.scale;
final thresh = 120; final thresh = (size.height - keyboardHeight) / 2;
var h = (_y - getVisibleRect().top) * s; // local physical display height var h = (_y - getVisibleRect().top) * s; // local physical display height
return h - thresh; return h - thresh;
} }

17
flutter_hbb/lib/remote_page.dart
View File

@ -28,6 +28,8 @@ class _RemotePageState extends State<RemotePage> {
String _value = ''; String _value = '';
double _xOffset = 0; double _xOffset = 0;
double _yOffset = 0; double _yOffset = 0;
double _xOffset0 = 0;
double _yOffset0 = 0;
double _scale = 1; double _scale = 1;
bool _mouseTools = false; bool _mouseTools = false;
var _drag = false; var _drag = false;
@ -258,8 +260,8 @@ class _RemotePageState extends State<RemotePage> {
}, },
onScaleStart: (details) { onScaleStart: (details) {
_scale = 1; _scale = 1;
_xOffset = details.focalPoint.dx; _xOffset = _xOffset0 = details.focalPoint.dx;
_yOffset = details.focalPoint.dy; _yOffset = _yOffset0 = details.focalPoint.dy;
if (_drag) { if (_drag) {
FFI.sendMouse('down', 'left'); FFI.sendMouse('down', 'left');
} }
@ -275,6 +277,9 @@ class _RemotePageState extends State<RemotePage> {
FFI.cursorModel.updatePan(dx, dy); FFI.cursorModel.updatePan(dx, dy);
_xOffset = x; _xOffset = x;
_yOffset = y; _yOffset = y;
} else {
_xOffset = details.focalPoint.dx;
_yOffset = details.focalPoint.dy;
} }
} else if (!_drag && !_scroll) { } else if (!_drag && !_scroll) {
FFI.canvasModel.updateScale(scale / _scale); FFI.canvasModel.updateScale(scale / _scale);
@ -285,8 +290,12 @@ class _RemotePageState extends State<RemotePage> {
if (_drag) { if (_drag) {
FFI.sendMouse('up', 'left'); FFI.sendMouse('up', 'left');
} else if (_scroll) { } else if (_scroll) {
FFI.scroll( var dy = (_yOffset - _yOffset0) / 10;
details.velocity.pixelsPerSecond.dy > 0 ? -1 : 1); if (dy.abs() > 0.1) {
if (dy > 0 && dy < 1) dy = 1;
if (dy < 0 && dy > -1) dy = -1;
FFI.scroll(dy);
}
} }
}, },
child: Container( child: Container(