From c2666bfe617b0e026ff44b90722f24a19d2d469a Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 18 Jul 2012 16:32:39 +0100
Subject: [PATCH] Introjucer: fix for broken colour scheme when run for the
 first time.

---
 .../Source/Application/jucer_AppearanceSettings.cpp        | 7 ++++---
 .../Source/Application/jucer_AppearanceSettings.h          | 2 +-
 .../Source/Project/jucer_ProjectContentComponent.cpp       | 4 ++--
 extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp  | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
index 6736a59b1e..b17e40e1dd 100644
--- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
+++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
@@ -51,7 +51,7 @@ namespace AppearanceColours
 }
 
 //==============================================================================
-AppearanceSettings::AppearanceSettings()
+AppearanceSettings::AppearanceSettings (bool updateAppWhenChanged)
     : settings ("COLOUR_SCHEME")
 {
     IntrojucerLookAndFeel lf;
@@ -73,7 +73,8 @@ AppearanceSettings::AppearanceSettings()
 
     getCodeFontValue() = getDefaultCodeFont().toString();
 
-    settings.addListener (this);
+    if (updateAppWhenChanged)
+        settings.addListener (this);
 }
 
 File AppearanceSettings::getSchemesFolder()
@@ -89,7 +90,7 @@ void AppearanceSettings::writeDefaultSchemeFile (const String& xmlString, const
 
     if (! file.exists())
     {
-        AppearanceSettings settings;
+        AppearanceSettings settings (false);
 
         ScopedPointer<XmlElement> xml (XmlDocument::parse (xmlString));
         if (xml != nullptr)
diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
index 568372e6bf..ad0d7cc7ed 100644
--- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
+++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
@@ -30,7 +30,7 @@
 class AppearanceSettings    : private ValueTree::Listener
 {
 public:
-    AppearanceSettings();
+    AppearanceSettings (bool updateAppWhenChanged);
 
     bool readFromFile (const File& file);
     bool readFromXML (const XmlElement&);
diff --git a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
index e99ff69c84..f0b55deb49 100644
--- a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
+++ b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
@@ -122,10 +122,10 @@ void ProjectContentComponent::paint (Graphics& g)
 
 void ProjectContentComponent::paintOverChildren (Graphics& g)
 {
-    if (contentView != nullptr)
+    if (resizerBar != nullptr)
     {
         const int shadowSize = 15;
-        const int x = contentView->getX();
+        const int x = resizerBar->getRight();
 
         ColourGradient cg (Colours::black.withAlpha (0.25f), (float) x, 0,
                            Colours::transparentBlack,        (float) (x - shadowSize), 0, false);
diff --git a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
index c329f9f040..35cece1805 100644
--- a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
@@ -40,6 +40,7 @@ PropertiesFile& getAppProperties()
 
 //==============================================================================
 StoredSettings::StoredSettings()
+    : appearance (true)
 {
 }
 
@@ -91,7 +92,7 @@ void StoredSettings::reload()
     {
         // These settings are used in defining the properties file's location.
         PropertiesFile::Options options;
-        options.applicationName     = "Introjucer";
+        options.applicationName     = "IntrojucerXXX";
         options.folderName          = "Introjucer";
         options.filenameSuffix      = "settings";
         options.osxLibrarySubFolder = "Application Support";