From 55af8e4cf998a32a8d7f8ccb4ef8883c259543e2 Mon Sep 17 00:00:00 2001
From: Paul <baconpaul@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:25:55 -0500
Subject: [PATCH] Add a couple of glyphs from flowbite (#134)

an MIT licensed SVG vector set
---
 CMakeLists.txt                                | 2 ++
 README.md                                     | 4 ++++
 include/sst/jucegui/components/GlyphPainter.h | 4 ++++
 res/glyphs/file-music.svg                     | 4 ++++
 res/glyphs/folder.svg                         | 4 ++++
 src/sst/jucegui/components/GlyphPainter.cpp   | 8 +++++++-
 6 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 res/glyphs/file-music.svg
 create mode 100644 res/glyphs/folder.svg

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13e19d..fb518ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,8 @@ cmrc_add_resource_library(sst-jucegui-resources NAMESPACE sst::jucegui::resource
         res/glyphs/ellipsis-v.svg
         res/glyphs/favorite.svg
         res/glyphs/forward-backward.svg
+        res/glyphs/folder.svg
+        res/glyphs/file-music.svg
         res/glyphs/freeze.svg
         res/glyphs/left-right.svg
         res/glyphs/left.svg
diff --git a/README.md b/README.md
index 59b9fd4..7a33539 100644
--- a/README.md
+++ b/README.md
@@ -69,3 +69,7 @@ AND THEN
 - Squash it, Ship it, hack SC
 
 https://www.figma.com/file/Acyp9F2ymRC2K8ltF3liaT/ED-Surge-XT-Wireframes-2.0.3?node-id=2299%3A45726
+
+Several of the icons in res/glyphs are from the MIT flowbrite icon collection 
+https://github.com/themesberg/flowbite-icons
+
diff --git a/include/sst/jucegui/components/GlyphPainter.h b/include/sst/jucegui/components/GlyphPainter.h
index cf972a8..385f1cd 100644
--- a/include/sst/jucegui/components/GlyphPainter.h
+++ b/include/sst/jucegui/components/GlyphPainter.h
@@ -91,6 +91,10 @@ struct GlyphPainter : public juce::Component,
         ROUTING_PRE_FADER,
         ROUTING_POST_FADER,
 
+        // FileSystem
+        FOLDER,
+        FILE_MUSIC,
+
         FAVORITE,
         SAVE,
         SEARCH,
diff --git a/res/glyphs/file-music.svg b/res/glyphs/file-music.svg
new file mode 100644
index 0000000..6411ab2
--- /dev/null
+++ b/res/glyphs/file-music.svg
@@ -0,0 +1,4 @@
+<svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#AFAFAF" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" d="M9 7V2.221a2 2 0 0 0-.5.365L4.586 6.5a2 2 0 0 0-.365.5H9Zm2 0V2h7a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V9h5a2 2 0 0 0 2-2Zm2.318.052h-.002A1 1 0 0 0 12 8v5.293A4.033 4.033 0 0 0 10.5 13C8.787 13 7 14.146 7 16s1.787 3 3.5 3 3.5-1.146 3.5-3c0-.107-.006-.211-.017-.313A1.04 1.04 0 0 0 14 15.5V9.766c.538.493 1 1.204 1 2.234a1 1 0 1 0 2 0c0-1.881-.956-3.14-1.86-3.893a6.4 6.4 0 0 0-1.636-.985 4.009 4.009 0 0 0-.165-.063l-.014-.005-.005-.001-.002-.001ZM9 16c0-.356.452-1 1.5-1s1.5.644 1.5 1-.452 1-1.5 1S9 16.356 9 16Z" clip-rule="evenodd"/>
+</svg>
+
diff --git a/res/glyphs/folder.svg b/res/glyphs/folder.svg
new file mode 100644
index 0000000..02525c4
--- /dev/null
+++ b/res/glyphs/folder.svg
@@ -0,0 +1,4 @@
+<svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#AFAFAF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.5 8H4m0-2v13a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1h-5.032a1 1 0 0 1-.768-.36l-1.9-2.28a1 1 0 0 0-.768-.36H5a1 1 0 0 0-1 1Z"/>
+</svg>
+
diff --git a/src/sst/jucegui/components/GlyphPainter.cpp b/src/sst/jucegui/components/GlyphPainter.cpp
index a12dc2d..4c3fcfc 100644
--- a/src/sst/jucegui/components/GlyphPainter.cpp
+++ b/src/sst/jucegui/components/GlyphPainter.cpp
@@ -102,6 +102,8 @@ void paintFromSvg(juce::Graphics &g, const juce::Rectangle<int> &into, const std
         }
         catch (std::exception &e)
         {
+            g.setColour(juce::Colours::red);
+            g.fillRect(into);
             // oh well
         }
     }
@@ -127,7 +129,8 @@ void paintFromSvg(juce::Graphics &g, const juce::Rectangle<int> &into, const std
         }
         else
         {
-            g.fillAll(juce::Colours::orchid);
+            g.setColour(juce::Colours::orchid);
+            g.fillRect(into);
         }
     }
 }
@@ -238,6 +241,9 @@ void GlyphPainter::paintGlyph(juce::Graphics &g, const juce::Rectangle<int> &int
         SVG24(NOTE_PRIORITY, "note-priority");
         SVG24(ARROW_L_TO_R, "arrow-ltor");
 
+        SVG24(FOLDER, "folder");
+        SVG24(FILE_MUSIC, "file-music");
+
     case SHOW_INFO:
         paintFromSvg(g, into, "res/glyphs/show-info.svg", 0xFFAFAFAF, 16, 16, as);
         return;