Clean up freeze button

szkkng · szkkng · commit 591882e0ffd0 · 2024-04-02T14:48:32.000+09:00
diff --git a/src/ui/EditorContent.cpp b/src/ui/EditorContent.cpp
@@ -29,7 +29,7 @@ EditorContent::EditorContent (SimpleReverbAudioProcessor& p, juce::UndoManager&
     , dampDial (*apvts.getParameter (ParamIDs::damp), &um)
     , widthDial (*apvts.getParameter (ParamIDs::width), &um)
     , mixDial (*apvts.getParameter (ParamIDs::mix), &um)
-    , freezeAttachment (*apvts.getParameter (ParamIDs::freeze), freezeButton, &um)
+    , freezeButton (*apvts.getParameter (ParamIDs::freeze), &um)
 {
     setWantsKeyboardFocus (true);
     setFocusContainerType (FocusContainerType::keyboardFocusContainer);
@@ -51,7 +51,7 @@ void EditorContent::resized()
     widthDial.setBounds (baseDialBounds.withX (342));
     mixDial.setBounds (baseDialBounds.withX (440));
 
-    freezeButton.setBounds (249, 110, 68, 32);
+    freezeButton.setBounds (259, 110, 48, 32);
 }
 
 bool EditorContent::keyPressed (const juce::KeyPress& k)
diff --git a/src/ui/EditorContent.h b/src/ui/EditorContent.h
@@ -48,7 +48,5 @@ class EditorContent : public juce::Component
 
     FreezeButton freezeButton;
 
-    juce::ButtonParameterAttachment freezeAttachment;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EditorContent)
 };
diff --git a/src/ui/FreezeButton.cpp b/src/ui/FreezeButton.cpp
@@ -22,53 +22,79 @@
 #include "FreezeButton.h"
 #include <BinaryData.h>
 
-FreezeButton::FreezeButton()
-    : juce::Button (juce::String {})
+FreezeButton::FreezeButton (juce::RangedAudioParameter& param, juce::UndoManager* um)
+    : audioParam (param)
+    , paramAttachment (audioParam, [&] (float v) { updateState (static_cast<bool> (v)); }, um)
 {
-    setOpaque (true);
+    paramAttachment.sendInitialUpdate();
+
     setWantsKeyboardFocus (true);
-    setClickingTogglesState (true);
-    onClick = [&] { freezeColour = getToggleState() ? MyColours::blue : MyColours::midGrey; };
+    setRepaintsOnMouseActivity (true);
+    setColour (onColourId, MyColours::blue);
+    setColour (offColourId, MyColours::midGrey);
+    setColour (focusColourId, MyColours::midGrey.brighter (0.25f));
 
     const auto svg = juce::Drawable::createFromImageData (BinaryData::FreezeIcon_svg, BinaryData::FreezeIcon_svgSize);
     jassert (svg != nullptr);
 
     if (svg != nullptr)
-        freezeIconPath = svg->getOutlineAsPath();
+        iconPath = svg->getOutlineAsPath();
 }
 
 void FreezeButton::resized()
 {
-    freezeIconBounds = getLocalBounds().toFloat().reduced (6.0f);
-    freezeIconPath.applyTransform (freezeIconPath.getTransformToScaleToFit (freezeIconBounds, true));
+    iconBounds = getLocalBounds().toFloat();
+    iconPath.applyTransform (iconPath.getTransformToScaleToFit (iconBounds, true));
 }
 
 void FreezeButton::paint (juce::Graphics& g)
 {
-    g.fillAll (MyColours::black);
-
-    g.setColour (freezeColour);
-    g.fillPath (freezeIconPath);
+    g.setColour (findColour (state ? onColourId : hasKeyboardFocus (true) ? focusColourId : offColourId));
+    g.fillPath (iconPath);
 }
 
 void FreezeButton::mouseDown (const juce::MouseEvent& e)
 {
-    juce::Button::mouseDown (e);
+    juce::ignoreUnused (e);
 
-    const auto centre = freezeIconBounds.getCentre();
-    const auto trans = juce::AffineTransform::scale (0.95f, 0.95f, centre.x, centre.y);
-    freezeIconPath.applyTransform (trans);
+    paramAttachment.setValueAsCompleteGesture (! state);
+
+    const auto centre = iconBounds.getCentre();
+    iconPath.applyTransform (juce::AffineTransform::scale (0.95f, 0.95f, centre.x, centre.y));
 }
 
 void FreezeButton::mouseUp (const juce::MouseEvent& e)
 {
-    juce::Button::mouseUp (e);
+    juce::ignoreUnused (e);
+
+    iconPath.applyTransform (iconPath.getTransformToScaleToFit (iconBounds, true));
+}
+
+void FreezeButton::focusGained (FocusChangeType cause)
+{
+    juce::ignoreUnused (cause);
+    repaint();
+}
+
+void FreezeButton::focusLost (FocusChangeType cause)
+{
+    juce::ignoreUnused (cause);
+    repaint();
+}
+
+bool FreezeButton::keyPressed (const juce::KeyPress& key)
+{
+    if (key == juce::KeyPress::returnKey)
+    {
+        paramAttachment.setValueAsCompleteGesture (! state);
+        return true;
+    }
 
-    const auto trans = freezeIconPath.getTransformToScaleToFit (freezeIconBounds, true);
-    freezeIconPath.applyTransform (trans);
+    return false;
 }
 
-void FreezeButton::paintButton (juce::Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown)
+void FreezeButton::updateState (bool newState)
 {
-    juce::ignoreUnused (g, shouldDrawButtonAsHighlighted, shouldDrawButtonAsDown);
+    state = newState;
+    repaint();
 }
diff --git a/src/ui/FreezeButton.h b/src/ui/FreezeButton.h
@@ -22,25 +22,42 @@
 #pragma once
 
 #include "MyColours.h"
+#include <juce_audio_processors/juce_audio_processors.h>
 #include <juce_gui_basics/juce_gui_basics.h>
 
-class FreezeButton : public juce::Button
+class FreezeButton : public juce::Component
 {
 public:
-    FreezeButton();
+    enum ColourIds
+    {
+        onColourId,
+        offColourId,
+        focusColourId
+    };
+
+    explicit FreezeButton (juce::RangedAudioParameter& param, juce::UndoManager* um = nullptr);
 
     void paint (juce::Graphics& g) override;
     void resized() override;
 
     void mouseDown (const juce::MouseEvent& event) override;
     void mouseUp (const juce::MouseEvent& event) override;
 
-    void paintButton (juce::Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override;
+    void focusGained (FocusChangeType cause) override;
+    void focusLost (FocusChangeType cause) override;
+
+    bool keyPressed (const juce::KeyPress& key) override;
 
 private:
-    juce::Path freezeIconPath;
-    juce::Rectangle<float> freezeIconBounds;
-    juce::Colour freezeColour { MyColours::midGrey };
+    void updateState (bool newState);
+
+    bool state { false };
+
+    juce::Path iconPath;
+    juce::Rectangle<float> iconBounds;
+
+    juce::RangedAudioParameter& audioParam;
+    juce::ParameterAttachment paramAttachment;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FreezeButton)
 };
