From 8e9edeff8b2ad7991374aab868b99091f5b9662b Mon Sep 17 00:00:00 2001 From: hogliux Date: Thu, 14 Sep 2017 12:17:01 +0100 Subject: [PATCH] Ensured that the "textWhenNothingSelected" takes the label font of label's lookandfeel into account --- modules/juce_gui_basics/widgets/juce_ComboBox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp index a3f5dd6485..2100c123b8 100644 --- a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp @@ -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())));