TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-19 10:51:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cursor): preserve macOS alpha through Web decode and resize

Browse Source
This commit is contained in:
fufesou
2026-09-12 15:51:22 +08:00
parent d65faca21f
commit aea8e2a4a6
2 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3456,9 +3456,18 @@ class CursorModel with ChangeNotifier {
throw FormatException('Invalid cursor pixel ratio: $pixelRatio');
}
List<dynamic> colors = json.decode(evt['colors']);
final rgba = Uint8List.fromList(colors.map((s) => s as int).toList());
final image = await img.decodeImageFromPixels(
rgba, width, height, ui.PixelFormat.rgba8888);
var rgba = Uint8List.fromList(colors.map((s) => s as int).toList());
final ui.Image? image;
if (isWeb &&
pixelRatio > 0 &&
parent.target?.ffiModel.pi.platform == kPeerPlatformMacOS) {
// macOS cursors with density metadata use premultiplied alpha; older
// hosts send straight alpha. Keep native decoding and old hosts unchanged.
(rgba, image) = await _decodeWebMacCursor(rgba, width, height);
} else {
image = await img.decodeImageFromPixels(
rgba, width, height, ui.PixelFormat.rgba8888);
}
if (image == null) {
return;
}
@@ -3475,6 +3484,30 @@ class CursorModel with ChangeNotifier {
_updateCurData();
}
Future<(Uint8List, ui.Image)> _decodeWebMacCursor(
Uint8List rgba, int width, int height) async {
final source = img2.Image.fromBytes(
width: width, height: height, bytes: rgba.buffer, order: img2.ChannelOrder.rgba);
for (final pixel in source) {
final alpha = pixel.a;
if (alpha == 0) continue;
final maxChannel = pixel.maxChannelValue;
// RGB and alpha rounding in capture can differ by one channel value.
pixel.r = min(maxChannel, (pixel.r * maxChannel / alpha).round());
pixel.g = min(maxChannel, (pixel.g * maxChannel / alpha).round());
pixel.b = min(maxChannel, (pixel.b * maxChannel / alpha).round());
}
// Web ImageDescriptor.raw treats RGBA as straight alpha. Decode a PNG so
// both the painted cursor and the resize source use the correct colors.
final codec = await ui.instantiateImageCodec(
Uint8List.fromList(img2.encodePng(source)));
try {
return (source.getBytes(), (await codec.getNextFrame()).image);
} finally {
codec.dispose();
}
}
Future<bool> _updateCache(
Uint8List rgba,
ui.Image image,