Merge pull request #127 from tote-bag-labs/update-to-juce8

Update to JUCE 8
tote-bag-labs · May 1, 2024 · 85f11b7 · 85f11b7
2 parents 147caaa + 36360d0
commit 85f11b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "JUCE"]
 	path = libs/JUCE
 	url = https://github.com/juce-framework/JUCE/
-	branch = develop
+	branch = juce8
 [submodule "ff_meters"]
 	path = libs/ff_meters
 	url = https://github.com/ffAudio/ff_meters.git
diff --git a/libs/JUCE b/libs/JUCE
diff --git a/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp b/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp
@@ -80,6 +80,11 @@ void LookAndFeel::drawDrawableKnob (juce::Graphics& g,
     sliderImage.drawAt (g, cX, cY, 1.0f);
 }
 
+juce::TypefaceMetricsKind LookAndFeel::getDefaultMetricsKind() const
+{
+    return juce::TypefaceMetricsKind::legacy;
+}
+
 void LookAndFeel::drawRotarySliderMeter (juce::Graphics& g,
                                          const juce::Rectangle<float> bounds,
                                          const float lineWidth,

diff --git a/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.h b/libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.h
@@ -109,6 +109,8 @@ class LookAndFeel : public juce::LookAndFeel_V4,
 
     juce::Font getInfoTextFont();
 
+    juce::TypefaceMetricsKind getDefaultMetricsKind() const override;
+
 private:
     void drawRotarySliderMeter (juce::Graphics& g,
                                 const juce::Rectangle<float> bounds,