Use ThemeColours in ElectrodeButton

Author: anjaldoshi

Source/Processors/Editors/ElectrodeButtons.cpp

@@ -22,6 +22,7 @@
 */
 
 #include "ElectrodeButtons.h"
+#include "../../UI/LookAndFeel/CustomLookAndFeel.h"
 
 ElectrodeButton::ElectrodeButton (int chan_, Colour defaultColour_) : Button ("Electrode"),
                                                                       chan (chan_),
@@ -42,27 +43,23 @@ int ElectrodeButton::getChannelNum()
 
 void ElectrodeButton::paintButton (Graphics& g, bool isMouseOver, bool isButtonDown)
 {
-    if (getToggleState() == true)
-        g.setColour (defaultColour);
-    else
-        g.setColour (Colours::darkgrey);
+    Colour bgColour = findColour (ThemeColours::widgetBackground);
 
-    if (isMouseOver)
-        g.setColour (Colours::white);
+    if (getToggleState())
+        bgColour = findColour (ThemeColours::highlightedFill);
 
-    if (! isEnabled())
-        g.setColour (Colours::black);
+    auto baseColour = bgColour.withMultipliedAlpha (isEnabled() ? 1.0f : 0.5f);
 
-    g.fillRect (0, 0, getWidth(), getHeight());
+    if (isButtonDown || isMouseOver)
+        baseColour = baseColour.contrasting (isButtonDown ? 0.2f : 0.1f);
 
-    g.setColour (Colours::black);
+    g.setColour (baseColour);
+    g.fillRect (0, 0, getWidth(), getHeight());
 
+    g.setColour (findColour (ThemeColours::outline).withAlpha (isEnabled() ? 1.0f : 0.5f));
     g.drawRect (0, 0, getWidth(), getHeight(), 1.0);
 
-    if (! isEnabled())
-    {
-        g.setColour (Colours::grey);
-    }
+    g.setColour (baseColour.contrasting().withAlpha (isEnabled() ? 1.0f : 0.5f));
 
     if (chan < 100)
         g.setFont (10.f);

Source/Processors/Editors/GenericEditor.cpp

@@ -287,7 +287,6 @@ void GenericEditor::addCustomParameterEditor (ParameterEditor* ed, int xPos_, in
 
 void GenericEditor::refreshColours()
 {
-
     if (getProcessor()->isSource())
         backgroundColour = getLookAndFeel().findColour (ProcessorColour::IDs::SOURCE_COLOUR);
     else if (getProcessor()->isSink())
@@ -674,8 +673,7 @@ void GenericEditor::update (bool isEnabled_)
 
     updateSelectedStream (getCurrentStream());
 
-    updateVisualizer(); // does nothing unless this method
-        // has been implemented
+    updateVisualizer(); // does nothing unless this method has been implemented
 }
 
 void GenericEditor::setTTLState (uint16 streamId, int bit, bool state)
@@ -897,9 +895,9 @@ void UtilityButton::paintButton (Graphics& g, bool isMouseOver, bool isButtonDow
     g.setFont (font);
 
     if (! isEnabled || isButtonDown)
-        g.setColour (findColour (ThemeColours::defaultText).withAlpha (0.4f));
+        g.setColour (baseColour.contrasting().withAlpha (0.4f));
     else
-        g.setColour (findColour (ThemeColours::defaultText));
+        g.setColour (baseColour.contrasting());
 
     g.drawFittedText (label, 1, 1, getWidth() - 2, getHeight() - 2, Justification::centred, 2, 1.0f);
 }
@@ -1168,7 +1166,6 @@ void GenericEditor::updateSelectedStream (uint16 streamId)
         {
             if (streamAvailable)
             {
-
                 auto stream = getProcessor()->getDataStream (streamId);
 
                 if (stream->hasParameter (parameterName))