diff --git a/Source/LfoComponent.cpp b/Source/LfoComponent.cpp index 5a7e7af..44a9250 100644 --- a/Source/LfoComponent.cpp +++ b/Source/LfoComponent.cpp @@ -82,11 +82,13 @@ LfoComponent::LfoComponent(int index) : lfoIndex(index), selector(index) rateSlider.setRange(0.0f, 20.0f); rateSlider.setSliderStyle(juce::Slider::Rotary); rateSlider.setTextBoxStyle(juce::Slider::TextBoxBelow, false, 45, 15); + rateSlider.setLookAndFeel(&look); addAndMakeVisible(&levelSlider); levelSlider.setRange(0.0f, 1.0f); levelSlider.setSliderStyle(juce::Slider::Rotary); levelSlider.setTextBoxStyle(juce::Slider::TextBoxBelow, false, 45, 15); + levelSlider.setLookAndFeel(&look); addAndMakeVisible(&waveSelector); addAndMakeVisible(&targetSelector); @@ -155,12 +157,12 @@ void LfoComponent::resized() { int n = getWidth() / 24; levelSlider.setBounds(2 * n, 2 * n, 5 * n, 7 * n); - rateSlider.setBounds(2 * n, 13 * n, 5 * n, 7 * n); + rateSlider.setBounds(2 * n, 14 * n, 5 * n, 7 * n); selector.setBounds(8 * n, 8 * n, 97, 33); - waveSelector.setBounds(7 * n, 4.5 * n, 10 * n, 2 * n); - targetSelector.setBounds(8 * n, 12 * n, 14 * n, 2 * n); + waveSelector.setBounds(8 * n, 4.5 * n, 10 * n, 2 * n); + targetSelector.setBounds(8 * n, 16.5 * n, 14 * n, 2 * n); } void LfoComponent::paint(juce::Graphics &g) diff --git a/Source/LfoComponent.h b/Source/LfoComponent.h index 9201008..73655af 100644 --- a/Source/LfoComponent.h +++ b/Source/LfoComponent.h @@ -13,6 +13,7 @@ #include "maximilian.h" #include "RGBColor.h" #include "GlobalColor.h" +#include "CustomLnF.h" class LfoModeSelector : public juce::Component, juce::Button::Listener { public: @@ -51,7 +52,11 @@ class LfoComponent : public juce::Component, juce::ComboBox::Listener public: //functions LfoComponent(int index); - ~LfoComponent() {} + ~LfoComponent() + { + rateSlider.setLookAndFeel(nullptr); + levelSlider.setLookAndFeel(nullptr); + } void attachAll(juce::AudioProcessorValueTreeState* tree); void comboBoxChanged(juce::ComboBox* c) override; void paint(juce::Graphics& g) override; @@ -65,7 +70,7 @@ class LfoComponent : public juce::Component, juce::ComboBox::Listener juce::Slider levelSlider; LfoModeSelector selector; - + LnF1 look; std::unique_ptr targetAttach; std::unique_ptr waveTypeAttach; std::unique_ptr rateAttach;