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

flutter_desktop: debug win cursor 2

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-10-30 14:38:35 +08:00
parent 2c34112492
commit b321dff158
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ class ImagePaint extends StatelessWidget {
? keyboardEnabled.isTrue
? (remoteCursorMoved.isTrue
? SystemMouseCursors.none
: _buildCustomCursorLinux(context, s))
: _buildCustomCursor(context, s))
: _buildDisabledCursor(context, s)
: MouseCursor.defer,
onHover: (evt) {},
@ -333,31 +333,31 @@ class ImagePaint extends StatelessWidget {
}
}
MouseCursor _buildCustomCursorLinux(BuildContext context, double scale) {
MouseCursor _buildCustomCursor(BuildContext context, double scale) {
final cursor = Provider.of<CursorModel>(context);
final cacheLinux = cursor.cacheLinux;
if (cacheLinux == null) {
final cache = cursor.cache ?? cursor.defaultCache;
if (cache == null) {
return MouseCursor.defer;
} else {
final key = cacheLinux.updateGetKey(scale);
final key = cache.updateGetKey(scale);
cursor.addKey(key);
return FlutterCustomMemoryImageCursor(
pixbuf: cacheLinux.data,
pixbuf: cache.data,
key: key,
// hotx: cacheLinux.hotx,
// hoty: cacheLinux.hoty,
// hotx: cache.hotx,
// hoty: cache.hoty,
hotx: 0,
hoty: 0,
imageWidth: (cacheLinux.width * cacheLinux.scale).toInt(),
imageHeight: (cacheLinux.height * cacheLinux.scale).toInt(),
imageWidth: (cache.width * cache.scale).toInt(),
imageHeight: (cache.height * cache.scale).toInt(),
);
}
}
MouseCursor _buildDisabledCursor(BuildContext context, double scale) {
final cursor = Provider.of<CursorModel>(context);
final cacheLinux = cursor.cacheLinux;
if (cacheLinux == null) {
final cache = cursor.cache;
if (cache == null) {
return MouseCursor.defer;
} else {
if (cursor.cachedForbidmemoryCursorData == null) {
@ -368,8 +368,8 @@ class ImagePaint extends StatelessWidget {
return FlutterCustomMemoryImageCursor(
pixbuf: cursor.cachedForbidmemoryCursorData,
key: key,
hotx: cacheLinux.hotx,
hoty: cacheLinux.hoty,
hotx: 0,
hoty: 0,
imageWidth: 32,
imageHeight: 32,
);

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

@ -724,6 +724,8 @@ class CursorModel with ChangeNotifier {
ui.Image? _image;
final _images = <int, Tuple3<ui.Image, double, double>>{};
CursorData? _cache;
final _defaultCacheId = -1;
CursorData? _defaultCache;
final _cacheMap = <int, CursorData>{};
final _cacheKeys = <String>{};
double _x = -10000;
@ -736,7 +738,8 @@ class CursorModel with ChangeNotifier {
WeakReference<FFI> parent;
ui.Image? get image => _image;
CursorData? get cacheLinux => _cache;
CursorData? get cache => _cache;
CursorData? get defaultCache => _getDefaultCache();
double get x => _x - _displayOriginX;
@ -753,6 +756,29 @@ class CursorModel with ChangeNotifier {
Set<String> get cachedKeys => _cacheKeys;
addKey(String key) => _cacheKeys.add(key);
CursorData? _getDefaultCache() {
if (_defaultCache == null) {
if (Platform.isWindows) {
Uint8List data = defaultCursorImage!.getBytes(format: img2.Format.bgra);
_hotx = defaultCursorImage!.width / 2;
_hoty = defaultCursorImage!.height / 2;
_defaultCache = CursorData(
peerId: id,
id: _defaultCacheId,
image: defaultCursorImage?.clone(),
scale: 1.0,
data: data,
hotx: _hotx,
hoty: _hoty,
width: defaultCursorImage!.width,
height: defaultCursorImage!.height,
);
}
}
return _defaultCache;
}
// remote physical display coordinate
Rect getVisibleRect() {
final size = MediaQueryData.fromWindow(ui.window).size;