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

Merge pull request #1697 from Kingtous/master

Browse Source 
fix: use rawRGBa cursor workaround on windows
This commit is contained in:
RustDesk 2022-10-10 22:36:59 +08:00 committed by GitHub
commit 171e516bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,7 +404,9 @@ class ImagePaint extends StatelessWidget {
controller: _horizontal, controller: _horizontal,
thumbVisibility: false, thumbVisibility: false,
trackVisibility: false, trackVisibility: false,
notificationPredicate: (notification) => notification.depth == 1, notificationPredicate: layoutSize.height < size.height
? (notification) => notification.depth == 1
: defaultScrollNotificationPredicate,
child: widget, child: widget,
), ),
); );

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

@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io';
import 'dart:math'; import 'dart:math';
import 'dart:typed_data'; import 'dart:typed_data';
import 'dart:ui' as ui; import 'dart:ui' as ui;
@ -848,7 +849,12 @@ class CursorModel with ChangeNotifier {
} }
_updateCacheLinux(ui.Image image, int id, int w, int h) async { _updateCacheLinux(ui.Image image, int id, int w, int h) async {
final data = await image.toByteData(format: ui.ImageByteFormat.png); ByteData? data;
if (Platform.isWindows) {
data = await image.toByteData(format: ui.ImageByteFormat.rawRgba);
} else {
data = await image.toByteData(format: ui.ImageByteFormat.png);
}
_cacheLinux = CursorData( _cacheLinux = CursorData(
peerId: this.id, peerId: this.id,
data: data?.buffer.asUint8List(), data: data?.buffer.asUint8List(),

2
flutter/pubspec.yaml
View File

@ -73,7 +73,7 @@ dependencies:
flutter_custom_cursor: flutter_custom_cursor:
git: git:
url: https://github.com/Kingtous/rustdesk_flutter_custom_cursor url: https://github.com/Kingtous/rustdesk_flutter_custom_cursor
ref: 4a950fd3a5a228bf5381070a4c803919d5787c07 ref: dec2166e881c47d922e1edc484d10d2cd5c2103b
window_size: window_size:
git: git:
url: https://github.com/google/flutter-desktop-embedding.git url: https://github.com/google/flutter-desktop-embedding.git