From f7734e3bc13e1021c9047b1f049b6740da3f47b0 Mon Sep 17 00:00:00 2001 From: Hayden Setlik Date: Sun, 11 Apr 2021 16:09:34 -0600 Subject: [PATCH] changed more font screaming audio issue --- Source/CustomLnF.h | 15 +++++++++++++++ Source/OperatorComponent.cpp | 5 +++++ Source/OperatorComponent.h | 1 + Source/SliderSubclasses.h | 1 - 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Source/CustomLnF.h b/Source/CustomLnF.h index 0b42b39..e742340 100644 --- a/Source/CustomLnF.h +++ b/Source/CustomLnF.h @@ -28,3 +28,18 @@ class LnF2 : public juce::LookAndFeel_V4 setDefaultSansSerifTypefaceName("Roboto Light Italic"); } }; + + +class OutputButtonLnF : public juce::LookAndFeel_V4 +{ +public: + OutputButtonLnF() + { + setDefaultSansSerifTypefaceName(""); + } + + juce::Font getTextButtonFont(juce::TextButton &, int buttonHeight) override + { + return juce::Font("Bebas Neue", 15.0f, 0); + } +}; diff --git a/Source/OperatorComponent.cpp b/Source/OperatorComponent.cpp index 545343b..c39f0e6 100644 --- a/Source/OperatorComponent.cpp +++ b/Source/OperatorComponent.cpp @@ -85,6 +85,8 @@ panLabel(&panSlider, "") panLabel.setVisible(false); panLabel.setEnabled(false); + outputButton.setLookAndFeel(&outputLnF); + outputButton.triggerClick(); outputButton.triggerClick(); } @@ -108,6 +110,8 @@ OperatorComponent::~OperatorComponent() decayLabel.setLookAndFeel(nullptr); sustainLabel.setLookAndFeel(nullptr); releaseLabel.setLookAndFeel(nullptr); + + outputButton.setLookAndFeel(nullptr); } void OperatorComponent::buttonClicked(juce::Button *b) @@ -152,6 +156,7 @@ void OperatorComponent::resized() envGraph.setBounds(n, 13 * n, 15 * n, 10 * n); outputButton.setBounds(16 * n, 1.5 * n, 5.5 * n, 2.5 * n); + outputButton.changeWidthToFitText(); levelSlider.setBounds(19 * n, 13 * n, 4 * n, 10 * n); diff --git a/Source/OperatorComponent.h b/Source/OperatorComponent.h index b8bf405..6724bdb 100644 --- a/Source/OperatorComponent.h +++ b/Source/OperatorComponent.h @@ -71,6 +71,7 @@ class OperatorComponent : public juce::Component, public juce::Button::Listener LnF1 look1; LnF2 look2; + OutputButtonLnF outputLnF; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OperatorComponent) }; diff --git a/Source/SliderSubclasses.h b/Source/SliderSubclasses.h index a92d424..1877909 100644 --- a/Source/SliderSubclasses.h +++ b/Source/SliderSubclasses.h @@ -10,7 +10,6 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener public: EnvLabel(juce::Slider* sliderToAttach, juce::String suff) : attachSlider(sliderToAttach), suffix(suff) { - auto vcrFont = juce::Font("WW Digital", 8.0f, 0); auto robotoLightItalic = juce::Font("Roboto Light", 8.0f, 0).withStyle(juce::Font::FontStyleFlags::italic); setEditable(true); setFont(robotoLightItalic);