Fix colour picker assertion at shutdown

Author: timothyschoen

Source/Components/ColourPicker.h

@@ -173,7 +173,7 @@ class Eyedropper final : public Timer
     PluginEditor* editor;
 };
 
-class ColourPicker final : public Component {
+class ColourPicker final : public Component, public DeletedAtShutdown {
     class SelectorHolder final : public Component {
     public:
         explicit SelectorHolder(ColourPicker* parent)
@@ -298,14 +298,10 @@ class ColourPicker final : public Component {
         lookAndFeelChanged();
     }
 
-    static ColourPicker& getInstance()
-    {
-        static ColourPicker instance;
-        return instance;
+    ~ColourPicker() override {
+        clearSingletonInstance();
     }
 
-    ~ColourPicker() override { }
-
     void lookAndFeelChanged() override
     {
         for (auto* slider : sliders) {
@@ -780,4 +776,6 @@ class ColourPicker final : public Component {
     std::function<void(Colour)> callback = [](Colour) { };
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ColourPicker)
+public:
+    JUCE_DECLARE_SINGLETON_INLINE(ColourPicker, false)
 };

Source/Components/PropertiesPanel.cpp

@@ -520,7 +520,7 @@ void PropertiesPanel::InspectorColourComponent::mouseDown(MouseEvent const& e)
     if (e.x > getWidth() - 28) {
         auto const pickerBounds = getScreenBounds().withTrimmedLeft(getWidth() / 2).expanded(5);
 
-        ColourPicker::getInstance().show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), false, Colour::fromString(currentColour.toString()), pickerBounds, [_this = SafePointer(this)](Colour const c) {
+        ColourPicker::getInstance()->show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), false, Colour::fromString(currentColour.toString()), pickerBounds, [_this = SafePointer(this)](Colour const c) {
             if (!_this)
                 return;
 
@@ -577,7 +577,7 @@ class SwatchComponent final : public Component {
     void mouseDown(MouseEvent const& e) override
     {
         auto const pickerBounds = getScreenBounds().expanded(5);
-        ColourPicker::getInstance().show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), false, Colour::fromString(colourValue.toString()), pickerBounds, [_this = SafePointer(this)](Colour const c) {
+        ColourPicker::getInstance()->show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), false, Colour::fromString(colourValue.toString()), pickerBounds, [_this = SafePointer(this)](Colour const c) {
             if (!_this)
                 return;
 

Source/Objects/ColourPickerObject.h

@@ -34,7 +34,7 @@ class ColourPickerObject final : public TextObjectBase {
             sscanf(colors->x_color, "#%02x%02x%02x", &red, &green, &blue);
         }
 
-        ColourPicker::getInstance().show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), true, Colour(red, green, blue), Rectangle<int>(1, 1).withPosition(Desktop::getInstance().getMousePosition()), [_this = SafePointer(this)](Colour const c) {
+        ColourPicker::getInstance()->show(findParentComponentOfClass<PluginEditor>(), getTopLevelComponent(), true, Colour(red, green, blue), Rectangle<int>(1, 1).withPosition(Desktop::getInstance().getMousePosition()), [_this = SafePointer(this)](Colour const c) {
             if (!_this)
                 return;