Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-30 19:43:43 +01:00
Code Releases Wiki Activity

fix: Local keybindings not working correctly

Browse Source
This commit is contained in:
WerWolv 2023-05-21 10:28:55 +02:00
parent c02465b892
commit 180a27fdc9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libimhex/source/api/keybinding.cpp
View File

@ -15,7 +15,7 @@ namespace hex {
view->m_shortcuts.insert({ shortcut, callback }); view->m_shortcuts.insert({ shortcut, callback });
} }
static Shortcut getShortcut(bool ctrl, bool alt, bool shift, bool super, u32 keyCode) { static Shortcut getShortcut(bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) {
Shortcut pressedShortcut; Shortcut pressedShortcut;
if (ctrl) if (ctrl)
@ -26,6 +26,8 @@ namespace hex {
pressedShortcut += SHIFT; pressedShortcut += SHIFT;
if (super) if (super)
pressedShortcut += SUPER; pressedShortcut += SUPER;
if (focused)
pressedShortcut += CurrentView;
pressedShortcut += static_cast<Keys>(keyCode); pressedShortcut += static_cast<Keys>(keyCode);
@ -33,14 +35,14 @@ namespace hex {
} }
void ShortcutManager::process(const std::unique_ptr<View> &currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) { void ShortcutManager::process(const std::unique_ptr<View> &currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) {
Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, keyCode); Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, focused, keyCode);
if (focused && currentView->m_shortcuts.contains(pressedShortcut)) if (currentView->m_shortcuts.contains(pressedShortcut))
currentView->m_shortcuts[pressedShortcut](); currentView->m_shortcuts[pressedShortcut]();
} }
void ShortcutManager::processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode) { void ShortcutManager::processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode) {
Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, keyCode); Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, false, keyCode);
if (ShortcutManager::s_globalShortcuts.contains(pressedShortcut)) if (ShortcutManager::s_globalShortcuts.contains(pressedShortcut))
ShortcutManager::s_globalShortcuts[pressedShortcut](); ShortcutManager::s_globalShortcuts[pressedShortcut]();