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

Refactoring: moved isValidPath() check to the DependencyPathValueSource, to make the DependencyPathPropertyComponent responsible for GUI only.

Browse source
This commit is contained in:
Timur Doumler 2015-08-13 12:53:22 +01:00
parent d9cd459032
commit af9762885b
2 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

38
extras/Introjucer/Source/Project/jucer_DependencyPathPropertyComponent.cpp
View file

@ -20,16 +20,28 @@ const String DependencyPath::aaxKeyName = "aaxPath";
const String DependencyPath::androidSdkKeyName = "androidSdkPath";
const String DependencyPath::androidNdkKeyName = "androidNdkPath";
//==============================================================================
bool DependencyPathValueSource::isValidPath() const
{
// if we are on another OS than the one which this path setting is for,
// we have no way of knowing whether the path is valid - so just assume it is:
if (! appliesToThisOS())
return true;
return PathSettingsTab::checkPathByKey (globalKey, getValue().toString());
}
//==============================================================================
DependencyPathPropertyComponent::DependencyPathPropertyComponent (const Value& value,
const String& propertyName,
const String& globalKeyName,
const String& globalKey,
DependencyPathOS os)
: TextPropertyComponent (propertyName, 1024, false),
globalKey (globalKeyName),
pathValueSource (new DependencyPathValueSource (value,
PathSettingsTab::getPathByKey (globalKeyName, os),
PathSettingsTab::getFallbackPathByKey (globalKeyName, os),
PathSettingsTab::getPathByKey (globalKey, os),
PathSettingsTab::getFallbackPathByKey (globalKey, os),
globalKey,
os)),
pathValue (pathValueSource)
{
@ -66,21 +78,11 @@ void DependencyPathPropertyComponent::textWasEdited()
Colour DependencyPathPropertyComponent::getTextColourToDisplay() const
{
if (! pathValueSource->isUsingProjectSettings())
return isValidPath() ? Colours::grey
: Colours::lightpink;
return pathValueSource->isValidPath() ? Colours::grey
: Colours::lightpink;
return isValidPath() ? Colours::black
: Colours::red;
}
bool DependencyPathPropertyComponent::isValidPath() const
{
// if we are on another OS than the one which this path setting is for,
// we have no way of knowing whether the path is valid - so just assume it is:
if (! pathValueSource->appliesToThisOS())
return true;
return PathSettingsTab::checkPathByKey (globalKey, getValue().toString());
return pathValueSource->isValidPath() ? Colours::black
: Colours::red;
}
void DependencyPathPropertyComponent::labelTextChanged (Label*)