Fix audio input being disabled, improve checkbox lookandfeel, allow l…

…fo sliders to be more granular
jameshball · Apr 4, 2024 · 4052788 · 4052788
1 parent 937f599
commit 4052788
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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<float> 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
@@ -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
@@ -328,7 +328,7 @@ class EffectParameter : public FloatParameter {
 public:
 	std::atomic<bool> 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<float> phase = 0.0f;
 	juce::String description;

diff --git a/osci-render.jucer b/osci-render.jucer
@@ -2,10 +2,10 @@
 
 <JUCERPROJECT id="HH2E72" name="osci-render" projectType="audioplug" useAppConfig="0"
               addUsingNamespaceToJuceHeader="0" displaySplashScreen="0" jucerFormatVersion="1"
-              pluginCharacteristicsValue="pluginIsSynth,pluginProducesMidiOut,pluginWantsMidiIn"
+              pluginCharacteristicsValue="pluginProducesMidiOut,pluginWantsMidiIn"
               pluginManufacturer="jameshball" aaxIdentifier="sh.ball.oscirender"
               cppLanguageStandard="20" projectLineFeed="&#10;" headerPath="./include"
-              version="2.1.4" companyName="James H Ball" companyWebsite="https://osci-render.com"
+              version="2.1.5" companyName="James H Ball" companyWebsite="https://osci-render.com"
               companyEmail="[email protected]" defines="NOMINMAX=1">
   <MAINGROUP id="j5Ge2T" name="osci-render">
     <GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources">