fixing global shortcuts

wkjarosz · Dec 10, 2024 · 915584e · 915584e
1 parent e97b706
commit 915584e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/app.cpp b/src/app.cpp
@@ -1877,8 +1877,8 @@ void HDRViewApp::draw_command_palette()
 
         ImCmd::CommandPalette("Command palette", "Filter commands...");
 
-        if (ImCmd::IsAnyItemSelected() || ImGui::GlobalChordPressed(ImGuiKey_Escape) ||
-            ImGui::GlobalChordPressed(ImGuiMod_Ctrl | ImGuiKey_Period, ImGuiInputFlags_Repeat) ||
+        if (ImCmd::IsAnyItemSelected() || ImGui::GlobalShortcut(ImGuiKey_Escape) ||
+            ImGui::GlobalShortcut(ImGuiMod_Ctrl | ImGuiKey_Period, ImGuiInputFlags_Repeat) ||
             !ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows))
             // Close window when user selects an item, hits escape, or unfocuses the command palette window
             // (clicking elsewhere)
@@ -1928,7 +1928,7 @@ void HDRViewApp::process_hotkeys()
 
     for (auto &a : m_actions)
         if (a.second.chord)
-            if (a.second.enabled() && ImGui::GlobalChordPressed(a.second.chord, a.second.flags))
+            if (a.second.enabled() && ImGui::GlobalShortcut(a.second.chord, a.second.flags))
             {
                 spdlog::trace("Processing hotkey for action '{}' (frame: {})", a.first, ImGui::GetFrameCount());
                 a.second.callback();

diff --git a/src/imgui_ext.cpp b/src/imgui_ext.cpp
@@ -716,10 +716,9 @@ const char *GetKeyChordNameTranslated(ImGuiKeyChord key_chord)
     return g.TempKeychordName;
 }
 
-bool GlobalChordPressed(const ImGuiKeyChord &chord, ImGuiInputFlags flags)
+bool GlobalShortcut(const ImGuiKeyChord &chord, ImGuiInputFlags flags)
 {
-    return ImGui::GetShortcutRoutingData(chord)->RoutingCurr == ImGuiKeyOwner_NoOwner &&
-           ImGui::IsKeyChordPressed(chord, flags);
+    return ImGui::Shortcut(chord, flags | ImGuiInputFlags_RouteGlobal);
 }
 
 } // namespace ImGui
diff --git a/src/imgui_ext.h b/src/imgui_ext.h
@@ -156,6 +156,6 @@ void TextWithHoverColor(ImVec4 col, const char *fmt, ...);
 // Like ImGui::GetKeyChordName, but returns the translated name of the key chord.
 const char *GetKeyChordNameTranslated(ImGuiKeyChord key_chord);
 // Used for global key chords, e.g. for menu shortcuts.
-bool GlobalChordPressed(const ImGuiKeyChord &chord, ImGuiInputFlags flags = 0);
+bool GlobalShortcut(const ImGuiKeyChord &chord, ImGuiInputFlags flags = 0);
 
 } // namespace ImGui