diff --git a/Source/LookAndFeel.cpp b/Source/LookAndFeel.cpp index 3e06f9f5..321013d8 100644 --- a/Source/LookAndFeel.cpp +++ b/Source/LookAndFeel.cpp @@ -12,11 +12,10 @@ OscirenderLookAndFeel::OscirenderLookAndFeel() { setColour(sliderThumbOutlineColourId, juce::Colours::white); // buttons - setColour(juce::ToggleButton::tickDisabledColourId, juce::Colours::white); setColour(juce::TextButton::buttonColourId, Colours::veryDark); setColour(jux::SwitchButton::switchColour, juce::Colours::white); setColour(jux::SwitchButton::switchOnBackgroundColour, Colours::accentColor); - setColour(jux::SwitchButton::switchOffBackgroundColour, Colours::dark); + setColour(jux::SwitchButton::switchOffBackgroundColour, Colours::grey); // windows & menus setColour(juce::ResizableWindow::backgroundColourId, Colours::grey); @@ -200,9 +199,7 @@ void OscirenderLookAndFeel::drawTickBox(juce::Graphics& g, juce::Component& comp juce::Rectangle tickBounds(x, y, w, h); g.setColour(component.findColour(juce::TextButton::buttonColourId)); - g.fillRect(tickBounds); - g.setColour(component.findColour(juce::ToggleButton::tickDisabledColourId)); - g.drawRect(tickBounds, 1.0f); + g.fillRoundedRectangle(tickBounds, RECT_RADIUS); if (ticked) { g.setColour(component.findColour(juce::ToggleButton::tickColourId)); @@ -314,6 +311,10 @@ void OscirenderLookAndFeel::drawCornerResizer(juce::Graphics&, int w, int h, boo } +void OscirenderLookAndFeel::drawToggleButton (juce::Graphics& g, juce::ToggleButton& button, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) { + LookAndFeel_V4::drawToggleButton(g, button, shouldDrawButtonAsHighlighted, shouldDrawButtonAsDown); +} + juce::CodeEditorComponent::ColourScheme OscirenderLookAndFeel::getDefaultColourScheme() { juce::CodeEditorComponent::ColourScheme cs; diff --git a/Source/LookAndFeel.h b/Source/LookAndFeel.h index 26192ba4..041e056f 100644 --- a/Source/LookAndFeel.h +++ b/Source/LookAndFeel.h @@ -94,4 +94,5 @@ class OscirenderLookAndFeel : public juce::LookAndFeel_V4 { juce::CodeEditorComponent::ColourScheme getDefaultColourScheme(); void drawTooltip(juce::Graphics& g, const juce::String& text, int width, int height) override; void drawCornerResizer(juce::Graphics&, int w, int h, bool isMouseOver, bool isMouseDragging) override; + void drawToggleButton(juce::Graphics&, juce::ToggleButton&, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override; }; diff --git a/Source/audio/EffectParameter.h b/Source/audio/EffectParameter.h index 254ba4ea..d2657829 100644 --- a/Source/audio/EffectParameter.h +++ b/Source/audio/EffectParameter.h @@ -328,7 +328,7 @@ class EffectParameter : public FloatParameter { public: std::atomic smoothValueChange = true; LfoTypeParameter* lfo = new LfoTypeParameter(name + " LFO", paramID + "Lfo", getVersionHint(), 1); - FloatParameter* lfoRate = new FloatParameter(name + " LFO Rate", paramID + "LfoRate", getVersionHint(), 1.0f, 0.0f, 1000.0f, 0.1f, "Hz"); + FloatParameter* lfoRate = new FloatParameter(name + " LFO Rate", paramID + "LfoRate", getVersionHint(), 1.0f, 0.0f, 1000.0f, 0.01f, "Hz"); BooleanParameter* sidechain = new BooleanParameter(name + " Sidechain Enabled", paramID + "Sidechain", getVersionHint(), false); std::atomic phase = 0.0f; juce::String description; diff --git a/osci-render.jucer b/osci-render.jucer index 247cebb4..38007558 100644 --- a/osci-render.jucer +++ b/osci-render.jucer @@ -2,10 +2,10 @@