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

Keep rounded Retina cursor hotspots inside the bitmap

Browse Source
This commit is contained in:
fufesou
2026-09-13 15:01:18 +08:00
parent 16088cfc80
commit bb06f54070
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/platform/macos/cursor.rs
View File

@@ -110,8 +110,13 @@ pub(super) unsafe fn data(cursor: id, id: u64, scale: f64) -> ResultType<CursorD
Ok(CursorData {
id,
colors: straight_rgba(slice::from_raw_parts(pixels, length)).into(),
hotx: (hotspot.x * size.width / logical.width).round() as _,
hoty: (hotspot.y * size.height / logical.height).round() as _,
// A valid fractional hotspot near an edge can round past the last pixel.
hotx: (hotspot.x * size.width / logical.width)
.round()
.min(size.width - 1.0) as _,
hoty: (hotspot.y * size.height / logical.height)
.round()
.min(size.height - 1.0) as _,
width: size.width as _,
height: size.height as _,
scale,
@@ -185,9 +190,28 @@ mod tests {
(18, 36, 8, 18)
);
assert_eq!(result.colors.as_ref(), expected.as_slice());
assert_retina_hotspots(*image, &expected);
});
}
unsafe fn assert_retina_hotspots(image: id, expected: &[u8]) {
for (point, pixels) in [
((8.8, 17.8), (17, 35)),
((8.8, 9.0), (17, 18)),
((4.0, 17.8), (8, 35)),
((0.0, 0.0), (0, 0)),
] {
let c: id = msg_send![class!(NSCursor), alloc];
let c = StrongPtr::new(msg_send![c,
initWithImage: image hotSpot: NSPoint::new(point.0, point.1)]);
let actual: NSPoint = msg_send![*c, hotSpot];
assert_eq!((actual.x, actual.y), point);
let result = data(*c, 1, 2.0).unwrap();
assert_eq!((result.hotx, result.hoty), pixels);
assert_eq!(result.colors.as_ref(), expected);
}
}
#[test]
fn retina_cursor_keeps_straight_alpha_for_legacy_receivers() {
const SIDE: usize = 4;