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

Tweaked the ComboBox to not keep a reference to its LookAndFeel when its popup is not active. Also improved its scroll-wheel behaviour

Browse source
This commit is contained in:
jules 2017-10-26 15:00:45 +01:00
parent eb0293a285
commit 98f37e02ae
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
modules/juce_gui_basics/widgets/juce_ComboBox.cpp
View file

@ -93,10 +93,10 @@ void ComboBox::addItem (const String& newItemText, int newItemId)
currentMenu.addItem (newItemId, newItemText, true, false);
}
void ComboBox::addItemList (const StringArray& itemsToAdd, int firstItemIdOffset)
void ComboBox::addItemList (const StringArray& itemsToAdd, int firstItemID)
{
for (int i = 0; i < itemsToAdd.size(); ++i)
currentMenu.addItem (i + firstItemIdOffset, itemsToAdd[i]);
for (auto& i : itemsToAdd)
currentMenu.addItem (firstItemID++, i);
}
void ComboBox::addSeparator()
@ -529,14 +529,13 @@ static void comboBoxPopupMenuFinishedCallback (int result, ComboBox* combo)
void ComboBox::showPopup()
{
PopupMenu noChoicesMenu;
const bool hasItems = (currentMenu.getNumItems() > 0);
auto menu = currentMenu;
if (hasItems)
if (menu.getNumItems() > 0)
{
auto selectedId = getSelectedId();
for (PopupMenu::MenuItemIterator iterator (currentMenu, true); iterator.next();)
for (PopupMenu::MenuItemIterator iterator (menu, true); iterator.next();)
{
auto& item = iterator.getItem();
@ -546,17 +545,16 @@ void ComboBox::showPopup()
}
else
{
noChoicesMenu.addItem (1, noChoicesMessage, false, false);
menu.addItem (1, noChoicesMessage, false, false);
}
auto& menuToShow = (hasItems ? currentMenu : noChoicesMenu);
menuToShow.setLookAndFeel (&getLookAndFeel());
menuToShow.showMenuAsync (PopupMenu::Options().withTargetComponent (this)
.withItemThatMustBeVisible (getSelectedId())
.withMinimumWidth (getWidth())
.withMaximumNumColumns (1)
.withStandardItemHeight (label->getHeight()),
ModalCallbackFunction::forComponent (comboBoxPopupMenuFinishedCallback, this));
menu.setLookAndFeel (&getLookAndFeel());
menu.showMenuAsync (PopupMenu::Options().withTargetComponent (this)
.withItemThatMustBeVisible (getSelectedId())
.withMinimumWidth (getWidth())
.withMaximumNumColumns (1)
.withStandardItemHeight (label->getHeight()),
ModalCallbackFunction::forComponent (comboBoxPopupMenuFinishedCallback, this));
}
//==============================================================================
@ -599,11 +597,19 @@ void ComboBox::mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& whe
{
if (! menuActive && scrollWheelEnabled && e.eventComponent == this && wheel.deltaY != 0.0f)
{
auto oldPos = (int) mouseWheelAccumulator;
mouseWheelAccumulator += wheel.deltaY * 5.0f;
if (auto delta = oldPos - (int) mouseWheelAccumulator)
nudgeSelectedItem (delta);
while (mouseWheelAccumulator > 1.0f)
{
mouseWheelAccumulator -= 1.0f;
nudgeSelectedItem (-1);
}
while (mouseWheelAccumulator < -1.0f)
{
mouseWheelAccumulator += 1.0f;
nudgeSelectedItem (1);
}
}
else
{