From 8ee40273f236989cfdfd97ef5048e22ffa303b8e Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 12 Feb 2014 14:50:24 +0000
Subject: [PATCH] Added method Drawable::replaceColour

---
 .../drawables/juce_Drawable.cpp                | 12 ++++++++++++
 .../juce_gui_basics/drawables/juce_Drawable.h  |  5 +++++
 .../drawables/juce_DrawableShape.cpp           | 18 ++++++++++++++++++
 .../drawables/juce_DrawableShape.h             |  2 ++
 4 files changed, 37 insertions(+)

diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.cpp b/modules/juce_gui_basics/drawables/juce_Drawable.cpp
index bd7e19d29b..3e88318804 100644
--- a/modules/juce_gui_basics/drawables/juce_Drawable.cpp
+++ b/modules/juce_gui_basics/drawables/juce_Drawable.cpp
@@ -107,6 +107,18 @@ void Drawable::setBoundsToEnclose (const Rectangle<float>& area)
     setBounds (newBounds);
 }
 
+//==============================================================================
+bool Drawable::replaceColour (Colour original, Colour replacement)
+{
+    bool changed = false;
+
+    for (int i = getNumChildComponents(); --i >= 0;)
+        if (Drawable* d = dynamic_cast<Drawable*> (getChildComponent(i)))
+            changed = d->replaceColour (original, replacement) || changed;
+
+    return changed;
+}
+
 //==============================================================================
 void Drawable::setOriginWithOriginalSize (Point<float> originWithinParent)
 {
diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.h b/modules/juce_gui_basics/drawables/juce_Drawable.h
index 6a59c59c52..b8956d5a0f 100644
--- a/modules/juce_gui_basics/drawables/juce_Drawable.h
+++ b/modules/juce_gui_basics/drawables/juce_Drawable.h
@@ -175,6 +175,11 @@ public:
     */
     virtual Rectangle<float> getDrawableBounds() const = 0;
 
+    /** Recursively replaces a colour that might be used for filling or stroking.
+        return true if any instances of this colour were found.
+    */
+    virtual bool replaceColour (Colour originalColour, Colour replacementColour);
+
     //==============================================================================
     /** Internal class used to manage ValueTrees that represent Drawables. */
     class ValueTreeWrapperBase
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
index 308ac1cbbc..5813493c81 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
+++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.cpp
@@ -452,3 +452,21 @@ void DrawableShape::FillAndStrokeState::setStrokeType (const PathStrokeType& new
     state.setProperty (capStyle, newStrokeType.getEndStyle() == PathStrokeType::butt
                                      ? "butt" : (newStrokeType.getEndStyle() == PathStrokeType::square ? "square" : "round"), undoManager);
 }
+
+static bool replaceColourInFill (DrawableShape::RelativeFillType& fill, Colour original, Colour replacement)
+{
+    if (fill.fill.colour == original && fill.fill.isColour())
+    {
+        fill = FillType (replacement);
+        return true;
+    }
+
+    return false;
+}
+
+bool DrawableShape::replaceColour (Colour original, Colour replacement)
+{
+    bool changed1 = replaceColourInFill (mainFill,   original, replacement);
+    bool changed2 = replaceColourInFill (strokeFill, original, replacement);
+    return changed1 || changed2;
+}
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.h b/modules/juce_gui_basics/drawables/juce_DrawableShape.h
index 14278d2dd2..ed893f14ca 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableShape.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.h
@@ -147,6 +147,8 @@ public:
     void paint (Graphics&) override;
     /** @internal */
     bool hitTest (int x, int y) override;
+    /** @internal */
+    bool replaceColour (Colour originalColour, Colour replacementColour) override;
 
 protected:
     //==============================================================================