Full glyph set from figma imported and loading

CMakeLists.txt

@@ -29,16 +29,50 @@ endif ()
 include(cmake/CmakeRC.cmake)
 
 cmrc_add_resource_library(sst-jucegui-resources NAMESPACE sst::jucegui::resources
-        res/glyphs/step_count.svg
+        res/glyphs/add-mod.svg
+        res/glyphs/close.svg
+        res/glyphs/curve.svg
+        res/glyphs/down.svg
+        res/glyphs/edit.svg
+        res/glyphs/ellipsis-h.svg
+        res/glyphs/ellipsis-v.svg
+        res/glyphs/favorite.svg
+        res/glyphs/forward-backward.svg
+        res/glyphs/freeze.svg
+        res/glyphs/left-right.svg
+        res/glyphs/left.svg
+        res/glyphs/link.svg
+        res/glyphs/lock.svg
+        res/glyphs/memory.svg
         res/glyphs/metronome.svg
-        res/glyphs/mute.svg
+        res/glyphs/midi.svg
+        res/glyphs/mul-mod.svg
+        res/glyphs/note-priority.svg
+        res/glyphs/pan.svg
+        res/glyphs/pin.svg
+        res/glyphs/plus-minus.svg
+        res/glyphs/plus.svg
+        res/glyphs/polyphony.svg
+        res/glyphs/portamento.svg
+        res/glyphs/power.svg
+        res/glyphs/reverse.svg
+        res/glyphs/right.svg
         res/glyphs/routing-post-fader.svg
         res/glyphs/routing-pre-fader.svg
         res/glyphs/routing-pre-fx.svg
-        res/glyphs/heart.svg
-        res/glyphs/chip.svg
-        res/glyphs/save-as.svg
-        )
+        res/glyphs/save.svg
+        res/glyphs/search.svg
+        res/glyphs/settings.svg
+        res/glyphs/shortcircuit-logo.svg
+        res/glyphs/speaker.svg
+        res/glyphs/step-count.svg
+        res/glyphs/surge-logo.svg
+        res/glyphs/tuning.svg
+        res/glyphs/unpin.svg
+        res/glyphs/up-down.svg
+        res/glyphs/up.svg
+        res/glyphs/volume.svg
+)
 
 add_library(${PROJECT_NAME} STATIC
         src/sst/jucegui/components/ComponentBase.cpp

examples/component-demo/GlyphDemo.h

@@ -44,8 +44,8 @@ struct GlyphDemo : public sst::jucegui::components::WindowPanel
             for (const auto &col :
                  {juce::Colours::white, juce::Colours::orange, juce::Colours::red})
             {
-                for (int i = sst::jucegui::components::GlyphPainter::PAN;
-                     i <= sst::jucegui::components::GlyphPainter::STEREO; ++i)
+                for (int i = (sst::jucegui::components::GlyphPainter::GlyphType)0;
+                     i <= sst::jucegui::components::GlyphPainter::SHORTCIRCUIT_LOGO; ++i)
                 {
                     sst::jucegui::components::GlyphPainter::paintGlyph(
                         g, r, (sst::jucegui::components::GlyphPainter::GlyphType)i, col);

include/sst/jucegui/components/GlyphPainter.h

@@ -53,43 +53,73 @@ struct GlyphPainter : public juce::Component,
      */
     enum GlyphType
     {
-        PAN,
-        VOLUME,
-        TUNING,
-        CROSS,
-        ARROW_L_TO_R,
-        ARROW_L_TO_R_WITH_MUL,
-        METRONOME,
-
         JOG_UP,
         JOG_DOWN,
         JOG_LEFT,
         JOG_RIGHT,
 
-        BIG_PLUS,
+        ELLIPSIS_H,
+        ELLIPSIS_V,
 
-        HAMBURGER,
+        UP_DOWN,
+        LEFT_RIGHT,
 
+        PLUS,
+        PLUS_MINUS,
+
+        REVERSE,
+        FORWARD_BACKWARD,
+
+        PAN,
+        VOLUME,
+        TUNING,
+        METRONOME,
         KEYBOARD,
 
+        MODULATION_ADDITIVE,
+        MODULATION_MULTIPLICATIVE,
+
         STEP_COUNT,
-        POWER_LIGHT,
-        POWER_LIGHT_OFF, // a special case of an off power light which isn't the
+        SMALL_POWER_LIGHT,
+        SMALL_POWER_LIGHT_OFF, // a special case of an off power light which isn't the
         // grayed out filled power light
 
         // Channel Strip routing icons
         ROUTING_PRE_FX,
         ROUTING_PRE_FADER,
         ROUTING_POST_FADER,
 
-        MUTE,
-        HEART,
-        CHIP,
-        SAVE_AS,
+        FAVORITE,
+        SAVE,
+        SEARCH,
+        SETTINGS,
+        CLOSE,
+        EDIT,
+
+        LINK,
+        LOCK,
+        PIN,
+        UNPIN,
+        POWER,
+
+        MEMORY, // a chip-like glyph
+        MIDI,
+
+        SPEAKER,
+        PORTAMENTO,
+        CURVE,
+        POLYPHONY,
+
+        FREEZE,
+        NOTE_PRIORITY,
 
         MONO,
-        STEREO // the order doesn't matter but we iterate in the demo so
-               // lets leave stereo last
+        STEREO,
+
+        SURGE_LOGO,
+        SHORTCIRCUIT_LOGO
+        // the order doesn't matter but we iterate in the demo so
+        // lets leave shortcircuit logo last
     } glyph;
 
     // The glyph acts like a label so uses hte label color

include/sst/jucegui/components/ToggleButton.h

@@ -68,7 +68,8 @@ struct ToggleButton : DiscreteParamEditor,
     }
     void setLabel(const std::string &l) { label = l; }
 
-    GlyphPainter::GlyphType type{GlyphPainter::CROSS}, offType{GlyphPainter::BIG_PLUS};
+    GlyphPainter::GlyphType type{GlyphPainter::SMALL_POWER_LIGHT},
+        offType{GlyphPainter::SMALL_POWER_LIGHT_OFF};
     void setGlyph(GlyphPainter::GlyphType gt)
     {
         if (drawMode != DrawMode::GLYPH && drawMode != DrawMode::DUAL_GLYPH)