Merge pull request #95 from tote-bag-labs/new-fonts

New fonts
tote-bag-labs · Aug 6, 2023 · 7a57a16 · 7a57a16
2 parents e7cc458 + 426f44e
commit 7a57a16
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,7 +134,8 @@ set_target_properties("${PROJECT_NAME}" PROPERTIES FOLDER "")
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${SourceFiles})
 
 set(AssetFiles
-    src/gui/assets/fonts/Montserrat-Medium.ttf
+    src/gui/assets/fonts/Roboto-Medium.ttf
+    src/gui/assets/fonts/RobotoMono-Medium.ttf
     src/gui/assets/images/logo_218x40.svg
     src/gui/assets/images/off_button.svg
     src/gui/assets/images/on_button.svg

diff --git a/libs/tote_bag/juce_gui/components/widgets/LabelSlider.cpp b/libs/tote_bag/juce_gui/components/widgets/LabelSlider.cpp
@@ -14,11 +14,12 @@
 
 //==============================================================================
 
-LabelSlider::LabelSlider (const juce::String& parameterId,
+LabelSlider::LabelSlider (const juce::String& labelText,
+                          const juce::String& parameterId,
                           juce::AudioProcessorValueTreeState& stateToControl)
     : slider (parameterId, stateToControl)
 {
-    label.setText (stateToControl.getParameter (parameterId)->name, juce::dontSendNotification);
+    label.setText (labelText, juce::dontSendNotification);
     label.setColour (juce::Label::textColourId, juce::Colours::black);
     label.setJustificationType (juce::Justification::centredTop);
 

diff --git a/libs/tote_bag/juce_gui/components/widgets/LabelSlider.h b/libs/tote_bag/juce_gui/components/widgets/LabelSlider.h
@@ -25,7 +25,8 @@ class AudioProcessorValueTreeState;
 class LabelSlider : public juce::Component
 {
 public:
-    LabelSlider (const juce::String& parameterId,
+    LabelSlider (const juce::String& labelText,
+                 const juce::String& parameterId,
                  juce::AudioProcessorValueTreeState& stateToControl);
 
     ~LabelSlider() override;

diff --git a/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp b/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp
@@ -233,13 +233,18 @@ void LookAndFeel::drawRotarySlider (juce::Graphics& g,
 juce::Font LookAndFeel::getTextButtonFont (juce::TextButton&, int buttonHeight)
 {
     const auto fontHeight = juce::jmax (7.0f, buttonHeight * 0.8f);
-    return fontHolder.getFont ("MontserratMedium_ttf").withHeight (fontHeight);
+    return fontHolder.getFont ("RobotoMedium_ttf").withHeight (fontHeight);
 }
 
 juce::Font LookAndFeel::getLabelFont (juce::Label& l)
 {
     const auto fontHeight = static_cast<float> (l.getHeight());
-    return fontHolder.getFont ("MontserratMedium_ttf").withHeight (fontHeight);
+    // Slider value box font
+    if (dynamic_cast<juce::Slider*> (l.getParentComponent()))
+    {
+        return fontHolder.getFont ("RobotoMonoMedium_ttf").withHeight (fontHeight);
+    }
+    return fontHolder.getFont ("RobotoMedium_ttf").withHeight (fontHeight);
 }
 
 void LookAndFeel::drawButtonBackground (juce::Graphics& g,
@@ -354,7 +359,7 @@ void LookAndFeel::drawComboBox (juce::Graphics& g,
     const auto boxBounds = box.getLocalBounds();
 
     const auto fontHeight = juce::jmax (7.0f, height * 0.6f);
-    g.setFont (fontHolder.getFont ("MontserratMedium_ttf").withHeight (fontHeight));
+    g.setFont (fontHolder.getFont ("RobotoMedium_ttf").withHeight (fontHeight));
 
     g.setColour (box.findColour (juce::ComboBox::backgroundColourId));
 
@@ -387,7 +392,7 @@ void LookAndFeel::drawPopupMenuItem (juce::Graphics& g,
     g.setColour (myTextColour);
 
     auto fHeight = juce::jmax (7.0f, r.getHeight() * 0.6f);
-    g.setFont (fontHolder.getFont ("MontserratMedium_ttf").withHeight (fHeight));
+    g.setFont (fontHolder.getFont ("RobotoMedium_ttf").withHeight (fHeight));
 
     r.setLeft (10);
     r.setY (1);

diff --git a/src/gui/assets/fonts/Montserrat-Medium.ttf b/src/gui/assets/fonts/Montserrat-Medium.ttf
diff --git a/src/gui/assets/fonts/Roboto-Medium.ttf b/src/gui/assets/fonts/Roboto-Medium.ttf
diff --git a/src/gui/assets/fonts/RobotoMono-Medium.ttf b/src/gui/assets/fonts/RobotoMono-Medium.ttf
diff --git a/src/gui/panels/ValentineCenterPanel.cpp b/src/gui/panels/ValentineCenterPanel.cpp
@@ -26,24 +26,42 @@ namespace detail
 inline constexpr auto kButtonWidth = 108.1f;
 inline constexpr auto kButtonHeight = 201.84f;
 inline constexpr auto kButtonRatio = kButtonWidth / kButtonHeight;
+
+inline const juce::String kInputSliderText = "COMPRESS";
+inline const juce::String kCrushSliderText = "CRUSH";
+inline const juce::String kSaturateSliderText = "SATURATE";
+inline const juce::String kRatioSliderText = "RATIO";
+inline const juce::String kAttackSliderText = "ATTACK";
+inline const juce::String kReleaseSliderText = "RELEASE";
+inline const juce::String kMixSliderText = "MIX";
+inline const juce::String kOutputSliderText = "OUTPUT";
+
 } // namespace detail
 
 CenterPanel::CenterPanel (ValentineAudioProcessor& processor)
-    : inputSlider (FFCompParameterID()[getParameterIndex (VParameter::inputGain)],
+    : inputSlider (detail::kInputSliderText,
+                   FFCompParameterID()[getParameterIndex (VParameter::inputGain)],
                    processor.treeState)
-    , crushSlider (FFCompParameterID()[getParameterIndex (VParameter::bitCrush)],
+    , crushSlider (detail::kCrushSliderText,
+                   FFCompParameterID()[getParameterIndex (VParameter::bitCrush)],
                    processor.treeState)
-    , saturateSlider (FFCompParameterID()[getParameterIndex (VParameter::saturation)],
+    , saturateSlider (detail::kSaturateSliderText,
+                      FFCompParameterID()[getParameterIndex (VParameter::saturation)],
                       processor.treeState)
-    , ratioSlider (FFCompParameterID()[getParameterIndex (VParameter::ratio)],
+    , ratioSlider (detail::kRatioSliderText,
+                   FFCompParameterID()[getParameterIndex (VParameter::ratio)],
                    processor.treeState)
-    , attackSlider (FFCompParameterID()[getParameterIndex (VParameter::attack)],
+    , attackSlider (detail::kAttackSliderText,
+                    FFCompParameterID()[getParameterIndex (VParameter::attack)],
                     processor.treeState)
-    , releaseSlider (FFCompParameterID()[getParameterIndex (VParameter::release)],
+    , releaseSlider (detail::kReleaseSliderText,
+                     FFCompParameterID()[getParameterIndex (VParameter::release)],
                      processor.treeState)
-    , mixSlider (FFCompParameterID()[getParameterIndex (VParameter::dryWet)],
+    , mixSlider (detail::kMixSliderText,
+                 FFCompParameterID()[getParameterIndex (VParameter::dryWet)],
                  processor.treeState)
-    , outputSlider (FFCompParameterID()[getParameterIndex (VParameter::makeupGain)],
+    , outputSlider (detail::kOutputSliderText,
+                    FFCompParameterID()[getParameterIndex (VParameter::makeupGain)],
                     processor.treeState)
     // clang-format off
     , outputClipButton (