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

Added a LookAndFeel method to customise the options of a ComboBox's PopupMenu

Browse source
This commit is contained in:
hogliux 2018-06-26 18:07:31 +01:00
parent fefbbc89b4
commit 64be913fa2
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
View file

@ -1199,6 +1199,15 @@ void LookAndFeel_V2::positionComboBoxText (ComboBox& box, Label& label)
label.setFont (getComboBoxFont (box));
}
PopupMenu::Options LookAndFeel_V2::getOptionsForComboBoxPopupMenu (ComboBox& box, Label& label)
{
return PopupMenu::Options().withTargetComponent (&box)
.withItemThatMustBeVisible (box.getSelectedId())
.withMinimumWidth (box.getWidth())
.withMaximumNumColumns (1)
.withStandardItemHeight (label.getHeight());
}
//==============================================================================
Font LookAndFeel_V2::getLabelFont (Label& label)
{

1
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h
View file

@ -193,6 +193,7 @@ public:
Font getComboBoxFont (ComboBox&) override;
Label* createComboBoxTextBox (ComboBox&) override;
void positionComboBoxText (ComboBox&, Label&) override;
PopupMenu::Options getOptionsForComboBoxPopupMenu (ComboBox&, Label&) override;
//==============================================================================
void drawLabel (Graphics&, Label&) override;

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

@ -545,12 +545,10 @@ void ComboBox::showPopup()
menu.addItem (1, noChoicesMessage, false, false);
}
menu.setLookAndFeel (&getLookAndFeel());
menu.showMenuAsync (PopupMenu::Options().withTargetComponent (this)
.withItemThatMustBeVisible (getSelectedId())
.withMinimumWidth (getWidth())
.withMaximumNumColumns (1)
.withStandardItemHeight (label->getHeight()),
auto& lookAndFeel = getLookAndFeel();
menu.setLookAndFeel (&lookAndFeel);
menu.showMenuAsync (lookAndFeel.getOptionsForComboBoxPopupMenu (*this, *label),
ModalCallbackFunction::forComponent (comboBoxPopupMenuFinishedCallback, this));
}

2
modules/juce_gui_basics/widgets/juce_ComboBox.h
View file

@ -376,6 +376,8 @@ public:
virtual Label* createComboBoxTextBox (ComboBox&) = 0;
virtual void positionComboBoxText (ComboBox&, Label& labelToPosition) = 0;
virtual PopupMenu::Options getOptionsForComboBoxPopupMenu (ComboBox&, Label&) = 0;
};
//==============================================================================