pull/324/head
Lucas Nogueira 2 years ago
parent fcff8a195f
commit e207fa1c68
No known key found for this signature in database
GPG Key ID: FFEA6C72E73482F1

@ -17,6 +17,7 @@ mod error;
pub use error::Error; pub use error::Error;
type Result<T> = std::result::Result<T, Error>; type Result<T> = std::result::Result<T, Error>;
type HotKeyId = u32; type HotKeyId = u32;
type HandlerFn = Box<dyn Fn(&Shortcut) + Send + Sync + 'static>;
enum ShortcutSource<R: Runtime> { enum ShortcutSource<R: Runtime> {
Ipc { Ipc {
@ -72,7 +73,7 @@ impl<R: Runtime> GlobalShortcut<R> {
source: ShortcutSource<R>, source: ShortcutSource<R>,
) -> Result<()> { ) -> Result<()> {
let id = shortcut.0.id(); let id = shortcut.0.id();
acquire_manager(&self.manager)?.register(shortcut.0.clone())?; acquire_manager(&self.manager)?.register(shortcut.0)?;
self.shortcuts self.shortcuts
.lock() .lock()
.unwrap() .unwrap()
@ -92,7 +93,7 @@ impl<R: Runtime> GlobalShortcut<R> {
let manager = acquire_manager(&self.manager)?; let manager = acquire_manager(&self.manager)?;
let mut shortcuts = self.shortcuts.lock().unwrap(); let mut shortcuts = self.shortcuts.lock().unwrap();
for hotkey in hotkeys { for hotkey in hotkeys {
manager.register(hotkey.0.clone())?; manager.register(hotkey.0)?;
shortcuts.insert( shortcuts.insert(
hotkey.0.id(), hotkey.0.id(),
@ -256,7 +257,7 @@ fn is_registered<R: Runtime>(
#[derive(Default)] #[derive(Default)]
pub struct Builder { pub struct Builder {
handler: Option<Box<dyn Fn(&Shortcut) + Send + Sync + 'static>>, handler: Option<HandlerFn>,
} }
impl Builder { impl Builder {

Loading…
Cancel
Save