From 9c17e6172a3be90135948a222d04480215d51faa Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 19 Apr 2018 14:33:55 +0100 Subject: [PATCH] Ensure that MultiChoicePropertyComponent colours are visible --- .../properties/juce_MultiChoicePropertyComponent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp index 0d1526a6cf..d9c314bda0 100644 --- a/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp @@ -273,7 +273,7 @@ void MultiChoicePropertyComponent::paint (Graphics& g) if (! expanded) { - g.setColour (findColour (PropertyComponent::labelTextColourId).withAlpha (0.4f)); + g.setColour (findColour (TextEditor::backgroundColourId).contrasting().withAlpha (0.4f)); g.drawFittedText ("+ " + String (numHidden) + " more", getLookAndFeel().getPropertyComponentContentPosition (*this) .removeFromBottom (20).withTrimmedLeft (10), Justification::centredLeft, 1); @@ -333,7 +333,7 @@ void MultiChoicePropertyComponent::setExpanded (bool isExpanded) noexcept //============================================================================== void MultiChoicePropertyComponent::lookAndFeelChanged() { - auto iconColour = findColour (PropertyComponent::labelTextColourId); + auto iconColour = findColour (TextEditor::backgroundColourId).contrasting(); expandButton.setColours (iconColour, iconColour.darker(), iconColour.darker()); }