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 keyboard control fix.

Browse source
This commit is contained in:
jules 2013-05-25 11:06:08 -07:00
parent 3f7b7f055e
commit 2dc2109876
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1054,26 +1054,22 @@ private:
void selectNextItem (const int delta)
{
disableTimerUntilMouseMoves();
PopupMenu::ItemComponent* mic = nullptr;
bool wasLastOne = (currentChild == nullptr);
const int numItems = items.size();
for (int i = 0; i < numItems + 1; ++i)
int start = jmax (0, items.indexOf (currentChild));
for (int i = items.size(); --i >= 0;)
{
int index = (delta > 0) ? i : (numItems - 1 - i);
index = (index + numItems) % numItems;
start += delta;
mic = items.getUnchecked (index);
if (mic != nullptr && (mic->itemInfo.canBeTriggered() || mic->itemInfo.hasActiveSubMenu())
&& wasLastOne)
break;
if (mic == currentChild)
wasLastOne = true;
if (PopupMenu::ItemComponent* mic = items.getUnchecked (jlimit (0, items.size() - 1, start)))
{
if (mic->itemInfo.canBeTriggered() || mic->itemInfo.hasActiveSubMenu())
{
setCurrentlyHighlightedChild (mic);
break;
}
}
}
setCurrentlyHighlightedChild (mic);
}
void disableTimerUntilMouseMoves()