Provide HotkeyState on Global Shortcut Events (#3822)
* Only react to hotkeys that are pressed The global shortcuts are otherwise also triggering when the hotkey is being released. This affects at least Windows. * Provide `HotkeyState` on Global Shortcut Events Instead of ignoring the events where the shortcut is released, the state is now provided as an argument to the event handler.
This commit is contained in:
1 parent
e0ecf0eb49
commit
3da821d184
7 files changed
+34
-15
No files matched your search
@@ -2,7 +2,7 @@ use std::rc::Rc;
|
||||
|
||||
use crate::{
|
||||
assets::*, ipc::UserWindowEvent, shortcut::IntoAccelerator, window, DesktopContext,
|
||||
ShortcutHandle, ShortcutRegistryError, WryEventHandler,
|
||||
HotKeyState, ShortcutHandle, ShortcutRegistryError, WryEventHandler,
|
||||
};
|
||||
use dioxus_core::{
|
||||
prelude::{consume_context, use_hook_with_cleanup},
|
||||
@@ -116,13 +116,14 @@ pub fn use_asset_handler(
|
||||
/// Get a closure that executes any JavaScript in the WebView context.
|
||||
pub fn use_global_shortcut(
|
||||
accelerator: impl IntoAccelerator,
|
||||
mut handler: impl FnMut() + 'static,
|
||||
handler: impl FnMut(HotKeyState) + 'static,
|
||||
) -> Result<ShortcutHandle, ShortcutRegistryError> {
|
||||
// wrap the user's handler in something that keeps it up to date
|
||||
let cb = use_callback(move |_| handler());
|
||||
let cb = use_callback(handler);
|
||||
|
||||
use_hook_with_cleanup(
|
||||
move || window().create_shortcut(accelerator.accelerator(), move || cb(())),
|
||||
#[allow(clippy::redundant_closure)]
|
||||
move || window().create_shortcut(accelerator.accelerator(), move |state| cb(state)),
|
||||
|handle| {
|
||||
if let Ok(handle) = handle {
|
||||
handle.remove();
|
||||
|
||||
Reference in new issue
Block a user