Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-18 19:24:11 +01:00
Code Releases Wiki Activity

fix: Some shortcuts not working correctly on macOS

Browse Source
This commit is contained in:
WerWolv 2025-02-06 15:58:18 +01:00
parent f67b78bd91
commit 930d2b4280
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libimhex/include/hex/api/shortcut_manager.hpp
View File

@ -135,6 +135,8 @@ namespace hex {
*/ */
static void processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode); static void processGlobals(bool ctrl, bool alt, bool shift, bool super, u32 keyCode);
static void runShortcut(const Shortcut &shortcut, const View *view = nullptr);
/** /**
* @brief Clear all shortcuts * @brief Clear all shortcuts
*/ */

11
lib/libimhex/source/api/shortcut_manager.cpp
View File

@ -342,12 +342,19 @@ namespace hex {
} }
} }
void ShortcutManager::runShortcut(const Shortcut &shortcut, const View *view) {
if (view == nullptr)
processShortcut(shortcut, s_globalShortcuts);
else
processShortcut(shortcut, view->m_shortcuts);
}
void ShortcutManager::process(const View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) { void ShortcutManager::process(const View *currentView, bool ctrl, bool alt, bool shift, bool super, bool focused, u32 keyCode) {
const Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, focused, keyCode); const Shortcut pressedShortcut = getShortcut(ctrl, alt, shift, super, focused, keyCode);
if (keyCode != 0) if (keyCode != 0)
s_prevShortcut = Shortcut(pressedShortcut.getKeys()); s_prevShortcut = Shortcut(pressedShortcut.getKeys());
processShortcut(pressedShortcut, currentView->m_shortcuts); runShortcut(pressedShortcut, currentView);
} }
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) {
@ -355,7 +362,7 @@ namespace hex {
if (keyCode != 0) if (keyCode != 0)
s_prevShortcut = Shortcut(pressedShortcut.getKeys()); s_prevShortcut = Shortcut(pressedShortcut.getKeys());
processShortcut(pressedShortcut, s_globalShortcuts); runShortcut(pressedShortcut);
} }
std::optional<UnlocalizedString> ShortcutManager::getLastActivatedMenu() { std::optional<UnlocalizedString> ShortcutManager::getLastActivatedMenu() {

8
plugins/builtin/source/content/window_decoration.cpp
View File

@ -48,8 +48,12 @@ namespace hex::plugin::builtin {
callback(); callback();
} }
} else if (menuItems.size() == 1) { } else if (menuItems.size() == 1) {
if (menu::menuItemEx(Lang(name), icon, shortcut, selectedCallback(), enabledCallback() && (view == nullptr || view->isFocused()))) if (menu::menuItemEx(Lang(name), icon, shortcut, selectedCallback(), enabledCallback())) {
callback(); if (shortcut == Shortcut::None)
callback();
else
ShortcutManager::runShortcut(shortcut, view);
}
} else { } else {
bool isSubmenu = (menuItems.begin() + 1)->get() == ContentRegistry::Interface::impl::SubMenuValue; bool isSubmenu = (menuItems.begin() + 1)->get() == ContentRegistry::Interface::impl::SubMenuValue;