Skip to content

Commit

Permalink
More UI improvements (#1193)
Browse files Browse the repository at this point in the history
* DraggableTextEditableValue colour improvement

* fix header toggle button fill_hover colour, increase BaseLabel font by 1, and make mod shape in lfo pane a menu button

* update sst-jucegui
  • Loading branch information
luismrguimaraes authored Aug 26, 2024
1 parent c9d31d6 commit 2efb3b9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion libs/sst/sst-jucegui
2 changes: 1 addition & 1 deletion src-ui/app/edit-screen/components/LFOPane.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct LfoPane : sst::jucegui::components::NamedPanel, app::HasEditor
void repositionContentAreaComponents();

std::unique_ptr<shapeAttachment_t> modulatorShapeA;
std::unique_ptr<sst::jucegui::components::JogUpDownButton> modulatorShape;
std::unique_ptr<sst::jucegui::components::MenuButtonDiscreteEditor> modulatorShape;

std::unique_ptr<triggerAttachment_t> triggerModeA;
std::unique_ptr<sst::jucegui::components::MultiSwitch> triggerMode;
Expand Down
12 changes: 7 additions & 5 deletions src-ui/theme/ThemeApplier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ void populateSharedGroupZoneMultiModulation(jstl::CustomTypeMap &map)
map.addCustomClass<jcmp::JogUpDownButton>(detail::edit::ModulationJogButon);
map.addCustomClass<jcmp::ToggleButton>(detail::edit::ModulationToggle);
map.addCustomClass<jcmp::MenuButton>(detail::edit::ModulationMenu);
map.addCustomClass<jcmp::MenuButtonDiscreteEditor>(detail::edit::ModulationMenu);
}
void ThemeApplier::applyZoneMultiScreenModulationTheme(juce::Component *toThis)
{
Expand Down Expand Up @@ -308,7 +309,7 @@ void applyColors(const sheet_t::ptr_t &base, const ColorMap &cols)
base->setColour(Base::styleClass, Base::background, cols.get(ColorMap::bg_2));
base->setColour(Base::styleClass, Base::background_hover, cols.getHover(ColorMap::bg_2));

base->setFont(BaseLabel::styleClass, BaseLabel::labelfont, juce::Font(11, juce::Font::plain));
base->setFont(BaseLabel::styleClass, BaseLabel::labelfont, juce::Font(12, juce::Font::plain));
base->setColour(BaseLabel::styleClass, jcmp::NamedPanel::Styles::labelcolor,
cols.get(ColorMap::generic_content_medium));
base->setColour(BaseLabel::styleClass, jcmp::NamedPanel::Styles::labelcolor_hover,
Expand Down Expand Up @@ -368,7 +369,7 @@ void applyColors(const sheet_t::ptr_t &base, const ColorMap &cols)
cols.get(ColorMap::accent_1b_alpha_a));
base->setColour(jcmp::DraggableTextEditableValue::Styles::styleClass,
jcmp::DraggableTextEditableValue::Styles::background_hover,
cols.getHover(ColorMap::accent_1b_alpha_a));
cols.get(ColorMap::accent_1b_alpha_b));

base->setColour(jcmp::MultiSwitch::Styles::styleClass, jcmp::MultiSwitch::Styles::background,
cols.get(ColorMap::bg_2));
Expand Down Expand Up @@ -485,7 +486,7 @@ void applyColors(const sheet_t::ptr_t &base, const ColorMap &cols)
cols.get(ColorMap::accent_2a_alpha_a));
base->setColour(ModulationDraggableTextEditableValue,
jcmp::DraggableTextEditableValue::Styles::background_hover,
cols.getHover(ColorMap::accent_2a_alpha_a));
cols.get(ColorMap::accent_2a_alpha_b));

base->setColour(jcmp::MultiSwitch::Styles::styleClass, jcmp::MultiSwitch::Styles::valuebg,
cols.get(ColorMap::accent_1b_alpha_a));
Expand Down Expand Up @@ -563,7 +564,7 @@ void applyColors(const sheet_t::ptr_t &base, const ColorMap &cols)
cols.get(ColorMap::accent_2a_alpha_a));
base->setColour(ModulationDraggableTextEditableValue,
jcmp::DraggableTextEditableValue::Styles::background_hover,
cols.getHover(ColorMap::accent_2a_alpha_a));
cols.get(ColorMap::accent_2a_alpha_b));
}
} // namespace group
} // namespace edit
Expand All @@ -576,7 +577,8 @@ void applyColorsAndFonts(const sheet_t::ptr_t &base, const ColorMap &cols, const
cols.get(ColorMap::bg_3));
base->setFont(TextPushButton, jcmp::TextPushButton::Styles::labelfont, t.interMediumFor(14));
base->setColour(ToggleButton, jcmp::ToggleButton::Styles::fill, cols.get(ColorMap::bg_2));
base->setColour(ToggleButton, jcmp::ToggleButton::Styles::fill_hover, cols.get(ColorMap::bg_3));
base->setColour(ToggleButton, jcmp::ToggleButton::Styles::fill_hover,
cols.getHover(ColorMap::bg_2));
base->setFont(ToggleButton, jcmp::ToggleButton::Styles::labelfont, t.interMediumFor(14));
base->setColour(MenuButton, jcmp::MenuButton::Styles::fill, cols.get(ColorMap::bg_2));
base->setFont(MenuButton, jcmp::MenuButton::Styles::labelfont, t.interMediumFor(14));
Expand Down

0 comments on commit 2efb3b9

Please sign in to comment.