From 03fc9c6bf347d58998a4cbfc46077874b9a9df5f Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Thu, 1 Aug 2024 15:43:21 -0400 Subject: [PATCH] Some glyph fixes 1. add arrowltor 2. fix colors on mod+ and mod* --- CMakeLists.txt | 1 + include/sst/jucegui/components/GlyphPainter.h | 2 ++ res/glyphs/add-mod.svg | 2 +- res/glyphs/arrow-ltor.svg | 5 +++++ res/glyphs/mul-mod.svg | 2 +- src/sst/jucegui/components/GlyphPainter.cpp | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 res/glyphs/arrow-ltor.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b45370..8fb9e80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ include(cmake/CmakeRC.cmake) cmrc_add_resource_library(sst-jucegui-resources NAMESPACE sst::jucegui::resources res/glyphs/add-mod.svg + res/glyphs/arrow-ltor.svg res/glyphs/close.svg res/glyphs/curve.svg res/glyphs/down.svg diff --git a/include/sst/jucegui/components/GlyphPainter.h b/include/sst/jucegui/components/GlyphPainter.h index 0bfb6db..2bac17b 100644 --- a/include/sst/jucegui/components/GlyphPainter.h +++ b/include/sst/jucegui/components/GlyphPainter.h @@ -76,6 +76,8 @@ struct GlyphPainter : public juce::Component, METRONOME, KEYBOARD, + ARROW_L_TO_R, + MODULATION_ADDITIVE, MODULATION_MULTIPLICATIVE, diff --git a/res/glyphs/add-mod.svg b/res/glyphs/add-mod.svg index 0f807cb..492fb04 100644 --- a/res/glyphs/add-mod.svg +++ b/res/glyphs/add-mod.svg @@ -1,4 +1,4 @@ - + diff --git a/res/glyphs/arrow-ltor.svg b/res/glyphs/arrow-ltor.svg new file mode 100644 index 0000000..82004f6 --- /dev/null +++ b/res/glyphs/arrow-ltor.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/glyphs/mul-mod.svg b/res/glyphs/mul-mod.svg index 00f8e35..e3080d6 100644 --- a/res/glyphs/mul-mod.svg +++ b/res/glyphs/mul-mod.svg @@ -1,4 +1,4 @@ - + diff --git a/src/sst/jucegui/components/GlyphPainter.cpp b/src/sst/jucegui/components/GlyphPainter.cpp index b7a6f3a..92c6996 100644 --- a/src/sst/jucegui/components/GlyphPainter.cpp +++ b/src/sst/jucegui/components/GlyphPainter.cpp @@ -236,6 +236,7 @@ void GlyphPainter::paintGlyph(juce::Graphics &g, const juce::Rectangle &int SVG24(ELLIPSIS_H, "ellipsis-h"); SVG24(ELLIPSIS_V, "ellipsis-v"); SVG24(NOTE_PRIORITY, "note-priority"); + SVG24(ARROW_L_TO_R, "arrow-ltor"); case KEYBOARD: paintKeyboardGlyph(g, into);