Use RobotoMedium for all non Value Label text

tote-bag-labs · Aug 6, 2023 · b0f07e2 · b0f07e2
1 parent 6bcf63b
commit b0f07e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,7 +134,6 @@ 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

diff --git a/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp b/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp
@@ -233,7 +233,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 ("MontserratMedium_ttf").withHeight (fontHeight);
+    return fontHolder.getFont ("RobotoMedium_ttf").withHeight (fontHeight);
 }
 
 juce::Font LookAndFeel::getLabelFont (juce::Label& l)
@@ -359,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));
 
@@ -392,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