mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fixed a missing call to lf.preparePopupMenuWindow in PopupMenu

Browse source
This commit is contained in:
jules 2016-09-05 09:52:56 +01:00
parent 151e3f769e
commit e74849ccfb
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_gui_basics/menus/juce_PopupMenu.cpp
View file

@ -221,9 +221,11 @@ public:
setLookAndFeel (parent != nullptr ? &(parent->getLookAndFeel())
: menu.lookAndFeel.get());
parentComponent = getLookAndFeel().getParentComponentForMenuOptions (options);
LookAndFeel& lf = getLookAndFeel();
setOpaque (getLookAndFeel().findColour (PopupMenu::backgroundColourId).isOpaque()
parentComponent = lf.getParentComponentForMenuOptions (options);
setOpaque (lf.findColour (PopupMenu::backgroundColourId).isOpaque()
|| ! Desktop::canUseSemiTransparentWindows());
for (int i = 0; i < menu.items.size(); ++i)
@ -259,11 +261,13 @@ public:
{
addToDesktop (ComponentPeer::windowIsTemporary
| ComponentPeer::windowIgnoresKeyPresses
| getLookAndFeel().getMenuWindowFlags());
| lf.getMenuWindowFlags());
getActiveWindows().add (this);
Desktop::getInstance().addGlobalMouseListener (this);
}
lf.preparePopupMenuWindow (*this);
}
~MenuWindow()
@ -903,7 +907,6 @@ public:
.withTargetComponent (nullptr),
false, dismissOnMouseUp, managerOfChosenCommand);
getLookAndFeel().preparePopupMenuWindow (*activeSubMenu);
activeSubMenu->setVisible (true); // (must be called before enterModalState on Windows to avoid DropShadower confusion)
activeSubMenu->enterModalState (false);
activeSubMenu->toFront (false);