mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Added quality options to FlacAudioFormat. Fixed a positioning error in embedded NSViewComponents. Fixes to KnownPluginList, ResizableCornerComponent. Component findColour tweak.

Browse source
This commit is contained in:
Julian Storer 2011-05-17 18:56:39 +01:00
parent 2ecb4d3419
commit 94b07cb09b
11 changed files with 276 additions and 460 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gui/components/juce_Component.cpp
View file

@ -2043,7 +2043,8 @@ const Colour Component::findColour (const int colourId, const bool inheritFromPa
if (v != nullptr)
return Colour ((int) *v);
if (inheritFromParent && parentComponent != nullptr)
if (inheritFromParent && parentComponent != nullptr
&& (lookAndFeel == nullptr || ! lookAndFeel->isColourSpecified (colourId)))
return parentComponent->findColour (colourId, true);
return getLookAndFeel().findColour (colourId);