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

PopupMenu: made submenus inherit look+feel

Browse source
This commit is contained in:
jules 2012-09-26 13:49:09 +01:00
parent 53784490b2
commit eea5e74af4
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

@ -215,13 +215,13 @@ class PopupMenu::Window : public Component,
private Timer
{
public:
Window (const PopupMenu& menu, Window* const window,
Window (const PopupMenu& menu, Window* const parentWindow,
const Options& opts,
const bool alignToRectangle,
const bool shouldDismissOnMouseUp,
ApplicationCommandManager** const manager)
: Component ("menu"),
owner (window),
owner (parentWindow),
options (opts),
activeSubMenu (nullptr),
managerOfChosenCommand (manager),
@ -247,8 +247,11 @@ public:
setMouseClickGrabsKeyboardFocus (false);
setAlwaysOnTop (true);
setLookAndFeel (menu.lookAndFeel);
setOpaque (getLookAndFeel().findColour (PopupMenu::backgroundColourId).isOpaque() || ! Desktop::canUseSemiTransparentWindows());
setLookAndFeel (owner != nullptr ? &(owner->getLookAndFeel())
: menu.lookAndFeel);
setOpaque (getLookAndFeel().findColour (PopupMenu::backgroundColourId).isOpaque()
|| ! Desktop::canUseSemiTransparentWindows());
for (int i = 0; i < menu.items.size(); ++i)
{