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

Added another PopupMenu::addItem method for coloured items with drawables

Browse source
This commit is contained in:
jules 2016-02-05 09:51:51 +00:00
parent 08b853ee35
commit 6f19816cf4
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,8 +61,8 @@ public:
{
String shortcutKey;
const Array <KeyPress> keyPresses (commandManager->getKeyMappings()
->getKeyPressesAssignedToCommand (itemID));
const Array<KeyPress> keyPresses (commandManager->getKeyMappings()
->getKeyPressesAssignedToCommand (itemID));
for (int i = 0; i < keyPresses.size(); ++i)
{
@ -1351,16 +1351,22 @@ void PopupMenu::addCommandItem (ApplicationCommandManager* commandManager,
}
void PopupMenu::addColouredItem (int itemResultID, const String& itemText, Colour itemTextColour,
bool isActive, bool isTicked, const Image& iconToUse)
bool isActive, bool isTicked, Drawable* iconToUse)
{
jassert (itemResultID != 0); // 0 is used as a return value to indicate that the user
// didn't pick anything, so you shouldn't use it as the id
// for an item..
items.add (new Item (itemResultID, itemText, isActive, isTicked, createDrawableFromImage (iconToUse),
items.add (new Item (itemResultID, itemText, isActive, isTicked, iconToUse,
itemTextColour, true, nullptr, nullptr, nullptr));
}
void PopupMenu::addColouredItem (int itemResultID, const String& itemText, Colour itemTextColour,
bool isActive, bool isTicked, const Image& iconToUse)
{
addColouredItem (itemResultID, itemText, itemTextColour, isActive, isTicked, createDrawableFromImage (iconToUse));
}
void PopupMenu::addCustomItem (int itemID, CustomComponent* cc, const PopupMenu* subMenu)
{
jassert (itemID != 0); // 0 is used as a return value to indicate that the user

15
modules/juce_gui_basics/menus/juce_PopupMenu.h
View file

@ -189,7 +189,20 @@ public:
Colour itemTextColour,
bool isEnabled = true,
bool isTicked = false,
const Image& iconToUse = Image::null);
const Image& iconToUse = Image());
/** Appends a text item with a special colour.
This is the same as addItem(), but specifies a colour to use for the
text, which will override the default colours that are used by the
current look-and-feel. See addItem() for a description of the parameters.
*/
void addColouredItem (int itemResultID,
const String& itemText,
Colour itemTextColour,
bool isEnabled,
bool isTicked,
Drawable* iconToUse);
/** Appends a custom menu item.