Browse Source

macOS: Fixed a bug which would prevent a SystemTrayIconComponent from creating a native popup window

tags/2021-05-28
hogliux 7 years ago
parent
commit
5b0b97473c
1 changed files with 8 additions and 5 deletions
  1. +8
    -5
      modules/juce_gui_basics/native/juce_mac_MainMenu.mm

+ 8
- 5
modules/juce_gui_basics/native/juce_mac_MainMenu.mm View File

@@ -143,14 +143,17 @@ public:
auto menuNames = currentModel->getMenuBarNames();
auto indexOfMenu = (int) [superMenu indexOfItemWithSubmenu: menu] - 1;
removeItemRecursive (menu);
if (indexOfMenu >= 0)
{
removeItemRecursive (menu);
auto updatedPopup = currentModel->getMenuForIndex (indexOfMenu, menuNames[indexOfMenu]);
auto updatedPopup = currentModel->getMenuForIndex (indexOfMenu, menuNames[indexOfMenu]);
for (PopupMenu::MenuItemIterator iter (updatedPopup); iter.next();)
addMenuItem (iter, menu, 1, indexOfMenu);
for (PopupMenu::MenuItemIterator iter (updatedPopup); iter.next();)
addMenuItem (iter, menu, 1, indexOfMenu);
[menu update];
[menu update];
}
}
void menuBarItemsChanged (MenuBarModel*) override


Loading…
Cancel
Save