Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Routing Glyphs for Channel Strip committed and integrated #97

Merged
merged 1 commit into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ cmrc_add_resource_library(sst-jucegui-resources NAMESPACE sst::jucegui::resource
res/glyphs/step_count.svg
res/glyphs/metronome.svg
res/glyphs/mute.svg
res/glyphs/routing-post-fader.svg
res/glyphs/routing-pre-fader.svg
res/glyphs/routing-pre-fx.svg
)

add_library(${PROJECT_NAME} STATIC
Expand Down
5 changes: 5 additions & 0 deletions include/sst/jucegui/components/GlyphPainter.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ struct GlyphPainter : public juce::Component,
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,

MONO,
Expand Down
3 changes: 3 additions & 0 deletions res/glyphs/routing-post-fader.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions res/glyphs/routing-pre-fader.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions res/glyphs/routing-pre-fx.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/sst/jucegui/components/GlyphPainter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,18 @@ void GlyphPainter::paintGlyph(juce::Graphics &g, const juce::Rectangle<int> &int
paintFromSvg(g, into, "res/glyphs/mute.svg", 0xFFAFAFAF, 1400, 1400, as);
return;

case ROUTING_PRE_FX:
paintFromSvg(g, into, "res/glyphs/routing-pre-fx.svg", 0xFFAFAFAF, 24, 24, as);
return;

case ROUTING_PRE_FADER:
paintFromSvg(g, into, "res/glyphs/routing-pre-fader.svg", 0xFFAFAFAF, 24, 24, as);
return;

case ROUTING_POST_FADER:
paintFromSvg(g, into, "res/glyphs/routing-post-fader.svg", 0xFFAFAFAF, 24, 24, as);
return;

case KEYBOARD:
paintKeyboardGlyph(g, into);
return;
Expand Down
Loading