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

Ensured that the "textWhenNothingSelected" takes the label font of label's lookandfeel into account

Browse source
This commit is contained in:
hogliux 2017-09-14 12:17:01 +01:00
parent 2fed2af669
commit 8e9edeff8b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -387,7 +387,7 @@ void ComboBox::paint (Graphics& g)
&& ! label->isBeingEdited())
{
g.setColour (findColour (textColourId).withMultipliedAlpha (0.5f));
g.setFont (label->getFont());
g.setFont (label->getLookAndFeel().getLabelFont (*label));
g.drawFittedText (textWhenNothingSelected, label->getBounds().reduced (2, 1),
label->getJustificationType(),
jmax (1, (int) (label->getHeight() / label->getFont().getHeight())));