Browse Source

Made PopupMenu avoid overwriting a custom shortcut key description with one that comes from a command manager

tags/2021-05-28
jules 9 years ago
parent
commit
8b1438a229
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      modules/juce_gui_basics/menus/juce_PopupMenu.cpp

+ 3
- 1
modules/juce_gui_basics/menus/juce_PopupMenu.cpp View File

@@ -152,7 +152,9 @@ private:
void updateShortcutKeyDescription() void updateShortcutKeyDescription()
{ {
if (item.commandManager != nullptr && item.itemID != 0)
if (item.commandManager != nullptr
&& item.itemID != 0
&& item.shortcutKeyDescription.isEmpty())
{ {
String shortcutKey; String shortcutKey;
const Array<KeyPress> keyPresses (item.commandManager->getKeyMappings() const Array<KeyPress> keyPresses (item.commandManager->getKeyMappings()


Loading…
Cancel
Save