|
|
|
@@ -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
|
|
|
|
|