From 3c3ab1b1bac5e5bf2de637b3f352d21a5ca88e7f Mon Sep 17 00:00:00 2001 From: AlexKnauth Date: Tue, 22 Oct 2024 16:34:54 -0400 Subject: [PATCH 1/2] UnicodeInfo: Serialize, Deserialize --- src/rdev.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rdev.rs b/src/rdev.rs index 7c98c6c7..db3d0628 100644 --- a/src/rdev.rs +++ b/src/rdev.rs @@ -328,6 +328,7 @@ pub enum EventType { /// The Unicode information of input. #[derive(Debug, Clone, PartialEq, Default)] +#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))] pub struct UnicodeInfo { pub name: Option, pub unicode: Vec, From 5f37c65a799d72224f3ad549598875f41bd6a5f6 Mon Sep 17 00:00:00 2001 From: AlexKnauth Date: Tue, 22 Oct 2024 16:37:45 -0400 Subject: [PATCH 2/2] test_usb_hid_code_to_macos_code: CGKeyCode --- src/codes_conv.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codes_conv.rs b/src/codes_conv.rs index 8e1367e3..68e978aa 100644 --- a/src/codes_conv.rs +++ b/src/codes_conv.rs @@ -155,7 +155,7 @@ mod test { continue; } if let Some(code2) = super::usb_hid_code_to_macos_code(usb_hid) { - assert_eq!(code, code2 as u32) + assert_eq!(code, code2 as crate::keycodes::macos_virtual_keycodes::CGKeyCode) } else { assert!(false, "We could not convert back code: {:?}", code); }