From 70a32ac2f35ead82713f76f22d1868f9c1ca3cb9 Mon Sep 17 00:00:00 2001 From: Hayden Setlik Date: Sun, 11 Apr 2021 15:58:50 -0600 Subject: [PATCH] changed out some fonts --- Source/CustomLnF.h | 9 +++++++++ Source/OperatorComponent.cpp | 38 ++++++++++++++++++++++++++---------- Source/OperatorComponent.h | 5 +++-- Source/PluginEditor.cpp | 2 ++ Source/SliderSubclasses.h | 12 ++++++++++-- 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/Source/CustomLnF.h b/Source/CustomLnF.h index 5e6bcb3..0b42b39 100644 --- a/Source/CustomLnF.h +++ b/Source/CustomLnF.h @@ -19,3 +19,12 @@ class LnF1 : public juce::LookAndFeel_V4 void drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, float sliderPos, const float rotaryStartAngle, const float rotaryEndAngle, juce::Slider& s) override; }; + +class LnF2 : public juce::LookAndFeel_V4 +{ +public: + LnF2() + { + setDefaultSansSerifTypefaceName("Roboto Light Italic"); + } +}; diff --git a/Source/OperatorComponent.cpp b/Source/OperatorComponent.cpp index 7689fd6..545343b 100644 --- a/Source/OperatorComponent.cpp +++ b/Source/OperatorComponent.cpp @@ -38,27 +38,27 @@ panLabel(&panSlider, "") { attachAll(pTree); addAndMakeVisible(&levelSlider); - levelSlider.setLookAndFeel(&look); //override the vertical bar draw method next + levelSlider.setLookAndFeel(&look1); //override the vertical bar draw method next addAndMakeVisible(&ratioSlider); - ratioSlider.setLookAndFeel(&look); + ratioSlider.setLookAndFeel(&look1); addAndMakeVisible(&modIndexSlider); - modIndexSlider.slider.setLookAndFeel(&look); + modIndexSlider.slider.setLookAndFeel(&look1); addAndMakeVisible(&outputButton); outputButton.addListener(this); addAndMakeVisible(&delaySlider); - delaySlider.setLookAndFeel(&look); + delaySlider.setLookAndFeel(&look1); addAndMakeVisible(&attackSlider); - attackSlider.setLookAndFeel(&look); + attackSlider.setLookAndFeel(&look1); addAndMakeVisible(&holdSlider); - holdSlider.setLookAndFeel(&look); + holdSlider.setLookAndFeel(&look1); addAndMakeVisible(&decaySlider); - decaySlider.setLookAndFeel(&look); + decaySlider.setLookAndFeel(&look1); addAndMakeVisible(&sustainSlider); - sustainSlider.setLookAndFeel(&look); + sustainSlider.setLookAndFeel(&look1); addAndMakeVisible(&releaseSlider); - releaseSlider.setLookAndFeel(&look); + releaseSlider.setLookAndFeel(&look1); addAndMakeVisible(&panSlider); - panSlider.setLookAndFeel(&look); + panSlider.setLookAndFeel(&look1); addAndMakeVisible(&ratioLabel); addAndMakeVisible(&indexLabel); @@ -73,6 +73,13 @@ panLabel(&panSlider, "") addAndMakeVisible(&sustainLabel); addAndMakeVisible(&releaseLabel); + delayLabel.setLookAndFeel(&look2); + attackLabel.setLookAndFeel(&look2); + holdLabel.setLookAndFeel(&look2); + decayLabel.setLookAndFeel(&look2); + sustainLabel.setLookAndFeel(&look2); + releaseLabel.setLookAndFeel(&look2); + panSlider.setVisible(false); panSlider.setEnabled(false); panLabel.setVisible(false); @@ -94,6 +101,13 @@ OperatorComponent::~OperatorComponent() sustainSlider.setLookAndFeel(nullptr); releaseSlider.setLookAndFeel(nullptr); panSlider.setLookAndFeel(nullptr); + + delayLabel.setLookAndFeel(nullptr); + attackLabel.setLookAndFeel(nullptr); + holdLabel.setLookAndFeel(nullptr); + decayLabel.setLookAndFeel(nullptr); + sustainLabel.setLookAndFeel(nullptr); + releaseLabel.setLookAndFeel(nullptr); } void OperatorComponent::buttonClicked(juce::Button *b) @@ -149,6 +163,10 @@ void OperatorComponent::resized() panSlider.setBounds(18 * n, 6 * n, 5 * n, 5 * n); panLabel.setBounds(17.5 * n, 11 * n, 6 * n, 2 * n); + + panLabel.setFontSize(3 * dN); + ratioLabel.setFontSize(3 * dN); + indexLabel.setFontSize(3 * dN); } void OperatorComponent::paint(juce::Graphics &g) diff --git a/Source/OperatorComponent.h b/Source/OperatorComponent.h index c1c3299..b8bf405 100644 --- a/Source/OperatorComponent.h +++ b/Source/OperatorComponent.h @@ -69,7 +69,8 @@ class OperatorComponent : public juce::Component, public juce::Button::Listener PanSlider panSlider; EnvLabel panLabel; - LnF1 look; + LnF1 look1; + LnF2 look2; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OperatorComponent) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OperatorComponent) }; diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index 06613be..0581c24 100644 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -24,6 +24,8 @@ audioProcessor (p) addAndMakeVisible(*allOps.getLast()); } + juce::LookAndFeel::getDefaultLookAndFeel().setDefaultSansSerifTypefaceName("Founders Grotesk Light"); + addAndMakeVisible(&algGraph); addAndMakeVisible(&patchLoader); diff --git a/Source/SliderSubclasses.h b/Source/SliderSubclasses.h index 8d9cbc4..a92d424 100644 --- a/Source/SliderSubclasses.h +++ b/Source/SliderSubclasses.h @@ -11,8 +11,9 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener 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); - getLookAndFeel().setDefaultSansSerifTypeface(getLookAndFeel().getTypefaceForFont(vcrFont)); + setFont(robotoLightItalic); attachSlider->addListener(this); setJustificationType(juce::Justification::centred); setMinimumHorizontalScale(0.25); @@ -29,13 +30,18 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener setText(labelText, juce::dontSendNotification); } ~EnvLabel() {} + void setFontSize(float size) + { + auto robotoLightItalic = juce::Font("Roboto Light", size, 0).withStyle(juce::Font::FontStyleFlags::italic); + setFont(robotoLightItalic); + } void sliderValueChanged(juce::Slider* slider) override { juce::String tempText; juce::String labelText; auto valueToDraw = attachSlider->getValue(); auto fullString = juce::String(valueToDraw); - if(suffix == " ") + if(suffix == "") { labelText = fullString; } @@ -49,6 +55,8 @@ class EnvLabel : public juce::Label, public juce::Slider::Listener tempText = fullString.substring(0, 5); labelText = tempText + suffix; } + if(fullString.length() > 6) + labelText = labelText.substring(0, 7); setText(labelText, juce::dontSendNotification); } void textWasEdited() override