From 206610dfd0cb6200309dfbf1c686cc7c80dc4e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20M=2E=20R=2E=20Guimar=C3=A3es?= <100025288+luismrguimaraes@users.noreply.github.com> Date: Mon, 12 Aug 2024 22:30:47 +0100 Subject: [PATCH] add background_hover to Base style, and some small fixes (#1093) --- libs/sst/sst-jucegui | 2 +- src-ui/components/WelcomeScreen.cpp | 2 +- src-ui/theme/ThemeApplier.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui index e4e29e72..294e13c0 160000 --- a/libs/sst/sst-jucegui +++ b/libs/sst/sst-jucegui @@ -1 +1 @@ -Subproject commit e4e29e72dc31c89c65a78c3929332fff7c1d8d73 +Subproject commit 294e13c0dab10c46c267d1fd686f8236da31d3ae diff --git a/src-ui/components/WelcomeScreen.cpp b/src-ui/components/WelcomeScreen.cpp index a77ffd84..364dff5c 100644 --- a/src-ui/components/WelcomeScreen.cpp +++ b/src-ui/components/WelcomeScreen.cpp @@ -75,7 +75,7 @@ auto txt = "\n" "We love early testers, documenters, and designers on all our projects. The best way to " - "chat with the Surge Synth Team devs about ShortcircutiXT is to join the Surge Synth Team " + "chat with the Surge Synth Team devs about ShortcircuitXT is to join the Surge Synth Team " "discord and hop into the #using-shortcircuit or #sc-development channels.\n\n" "Finally, we love developers too! If you want to join the team and help sling some code on the " "project, please get in touch.\n\n" diff --git a/src-ui/theme/ThemeApplier.cpp b/src-ui/theme/ThemeApplier.cpp index 6752b220..90f88cb6 100644 --- a/src-ui/theme/ThemeApplier.cpp +++ b/src-ui/theme/ThemeApplier.cpp @@ -283,12 +283,13 @@ void applyColors(const sheet_t::ptr_t &base, const ColorMap &cols) * Set up base classes */ 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->setColour(BaseLabel::styleClass, jcmp::NamedPanel::Styles::labelcolor, cols.get(ColorMap::generic_content_medium)); base->setColour(BaseLabel::styleClass, jcmp::NamedPanel::Styles::labelcolor_hover, - cols.get(ColorMap::generic_content_medium).brighter(0.1)); + cols.getHover(ColorMap::generic_content_medium)); base->setColour(Outlined::styleClass, Outlined::outline, cols.get(ColorMap::bg_1)); base->setColour(Outlined::styleClass, Outlined::brightoutline,