FIXME Use Roboto regular instead of medium

I think this looks more like the spec. But I'll hold off on deleting the now unused fonts
tote-bag-labs · Jan 13, 2024 · 7b60bf5 · 7b60bf5
1 parent 29fb1c9
commit 7b60bf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,7 +141,9 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${SourceFiles})
 
 set(AssetFiles
     src/gui/assets/fonts/Roboto-Medium.ttf
+    src/gui/assets/fonts/Roboto-Regular.ttf
     src/gui/assets/fonts/RobotoMono-Medium.ttf
+    src/gui/assets/fonts/RobotoMono-Regular.ttf
     src/gui/assets/logos/val_totebag_logo.svg
    )
 

diff --git a/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp b/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp
@@ -199,7 +199,7 @@ 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 ("RobotoMedium_ttf").withHeight (fontHeight);
+    return fontHolder.getFont ("RobotoMonoRegular_ttf").withHeight (fontHeight);
 }
 
 juce::Font LookAndFeel::getLabelFont (juce::Label& l)
@@ -208,9 +208,9 @@ juce::Font LookAndFeel::getLabelFont (juce::Label& l)
     // Slider value box font
     if (dynamic_cast<juce::Slider*> (l.getParentComponent()))
     {
-        return fontHolder.getFont ("RobotoMonoMedium_ttf").withHeight (fontHeight);
+        return fontHolder.getFont ("RobotoMonoRegular_ttf").withHeight (fontHeight);
     }
-    return fontHolder.getFont ("RobotoMedium_ttf")
+    return fontHolder.getFont ("RobotoRegular_ttf")
         .withHeight (fontHeight)
         .withExtraKerningFactor (.05f);
 }