Add a power-off button and clang-format (#95)

The toggle button uses a non-filled pwoer button for off state basically
surge-synthesizer · Jun 30, 2024 · e700be8 · e700be8
1 parent f1db6a5
commit e700be8
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/include/sst/jucegui/components/ButtonPainter.h b/include/sst/jucegui/components/ButtonPainter.h
@@ -56,7 +56,6 @@ template <typename T> void paintButtonBG(T *that, juce::Graphics &g)
                                         bg.withAlpha(0.f), that->getHeight() * 0.1);
     g.setGradientFill(gr);
     g.fillRoundedRectangle(b, rectCorner);
-
 }
 
 // Only call this in the 'on' state

diff --git a/include/sst/jucegui/components/GlyphPainter.h b/include/sst/jucegui/components/GlyphPainter.h
@@ -74,6 +74,8 @@ struct GlyphPainter : public juce::Component,
 
         STEP_COUNT,
         POWER_LIGHT,
+        POWER_LIGHT_OFF, // a special case of an off power light which isn't the
+        // grayed out filled power light
 
         MUTE,
 

diff --git a/src/sst/jucegui/components/GlyphPainter.cpp b/src/sst/jucegui/components/GlyphPainter.cpp
@@ -305,13 +305,20 @@ void paintStereoGlyph(juce::Graphics &g, const juce::Rectangle<int> &into)
     }
 }
 
-void paintPowerLight(juce::Graphics &g, const juce::Rectangle<int> &into)
+void paintPowerLight(juce::Graphics &g, const juce::Rectangle<int> &into, bool doFill)
 {
     auto rad = std::min(into.getWidth(), into.getHeight()) * 0.7 * 0.5;
     auto bx = into.getCentreX();
     auto by = into.getCentreY();
 
-    g.fillEllipse(bx - rad, by - rad, rad * 2, rad * 2);
+    if (doFill)
+    {
+        g.fillEllipse(bx - rad, by - rad, rad * 2, rad * 2);
+    }
+    else
+    {
+        g.drawEllipse(bx - rad, by - rad, rad * 2, rad * 2, 1);
+    }
 }
 
 void GlyphPainter::paint(juce::Graphics &g)
@@ -390,7 +397,8 @@ void GlyphPainter::paintGlyph(juce::Graphics &g, const juce::Rectangle<int> &int
         return;
 
     case POWER_LIGHT:
-        paintPowerLight(g, into);
+    case POWER_LIGHT_OFF:
+        paintPowerLight(g, into, glyph == POWER_LIGHT);
         return;
 
     default:

diff --git a/src/sst/jucegui/components/HSlider.cpp b/src/sst/jucegui/components/HSlider.cpp
@@ -79,7 +79,7 @@ void HSlider::paint(juce::Graphics &g)
         if (r.getY() > newY)
             r = r.withY(newY);
     }
-    
+
     if (isHovered)
         g.setColour(getColour(Styles::gutter_hover));
     else

diff --git a/src/sst/jucegui/components/JogUpDownButton.cpp b/src/sst/jucegui/components/JogUpDownButton.cpp
@@ -35,7 +35,7 @@ void JogUpDownButton::paint(juce::Graphics &g)
 
     auto b = getLocalBounds().reduced(1).toFloat();
 
-    //auto ol = getColour(Styles::brightoutline);
+    // auto ol = getColour(Styles::brightoutline);
     auto bg = getColour(Styles::fill);
     auto tx = getColour(Styles::labelcolor);
     auto ar = tx;

diff --git a/src/sst/jucegui/components/MultiSwitch.cpp b/src/sst/jucegui/components/MultiSwitch.cpp
@@ -85,33 +85,34 @@ void MultiSwitch::paint(juce::Graphics &g)
                 // Selected option
                 g.setColour(getColour(Styles::valuebg));
                 g.fillRoundedRectangle(txtbg, rectCorner);
-                
+
                 // Text
                 g.setColour(getColour(Styles::value));
             }
-            else{
+            else
+            {
                 if (isH)
                 {
                     g.setColour(getColour(Styles::unselected_hover));
                     g.fillRoundedRectangle(txtbg, rectCorner);
                     g.setColour(getColour(Styles::labelcolor_hover));
                 }
-                else{
-                    //g.setColour(getColour(Styles::background));
-                    //g.fillRoundedRectangle(txtbg, rectCorner);
+                else
+                {
+                    // g.setColour(getColour(Styles::background));
+                    // g.fillRoundedRectangle(txtbg, rectCorner);
                     g.setColour(getColour(Styles::labelcolor));
                 }
-
             }
             g.setFont(getFont(Styles::labelfont));
             g.drawText(data->getValueAsStringFor(i + data->getMin()), txt,
-                    juce::Justification::centred);
+                       juce::Justification::centred);
         }
 
         for (int i = 1; i < nItems; ++i)
         {
             break;
-            
+
             juce::Rectangle<float> rule;
             if (direction == VERTICAL)
                 rule = b.toFloat().withY(h * i + 0.5).withHeight(1);
@@ -124,7 +125,7 @@ void MultiSwitch::paint(juce::Graphics &g)
 
         // background outline
         g.setColour(getColour(Styles::outline));
-        g.drawRoundedRectangle(bgb, rectCorner -1, 1);
+        g.drawRoundedRectangle(bgb, rectCorner - 1, 1);
     }
 }
 

diff --git a/src/sst/jucegui/components/ToggleButton.cpp b/src/sst/jucegui/components/ToggleButton.cpp
@@ -89,7 +89,12 @@ void ToggleButton::paint(juce::Graphics &g)
             }
         }
 
-        GlyphPainter::paintGlyph(g, getLocalBounds(), type, col);
+        auto paintType = type;
+        if (type == GlyphPainter::POWER_LIGHT && !v && !isHovered)
+        {
+            paintType = GlyphPainter::POWER_LIGHT_OFF;
+        }
+        GlyphPainter::paintGlyph(g, getLocalBounds(), paintType, col);
         return;
     }