diff --git a/JuceOPLVSTi.jucer b/JuceOPLVSTi.jucer index b26abbb..278abee 100644 --- a/JuceOPLVSTi.jucer +++ b/JuceOPLVSTi.jucer @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -120,20 +93,20 @@ warningsAreErrors="1" headerPath=""/> - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Source/OPLLookAndFeel.cpp b/Source/OPLLookAndFeel.cpp index 8776ca8..5304c47 100644 --- a/Source/OPLLookAndFeel.cpp +++ b/Source/OPLLookAndFeel.cpp @@ -17,7 +17,9 @@ OPLLookAndFeel::OPLLookAndFeel() toggleOn = ImageCache::getFromMemory(PluginGui::toggle_on_sq_png, PluginGui::toggle_on_sq_pngSize), 1.000f, Colour(0x00000000); toggleRect = Rectangle((float)toggleOff.getWidth(), (float)toggleOn.getHeight()); - setColour(Label::ColourIds::outlineWhenEditingColourId, Colours::black); + // Prevents an ugly white border from being drawn around a component with keyboard focus. + setColour(TextEditor::ColourIds::focusedOutlineColourId, Colours::black); + setColour(Slider::ColourIds::textBoxOutlineColourId, Colour(0xff007f00)); } void OPLLookAndFeel::drawTickBox(Graphics &g, diff --git a/Source/PluginGui.cpp b/Source/PluginGui.cpp index eb6f563..ce99d28 100644 --- a/Source/PluginGui.cpp +++ b/Source/PluginGui.cpp @@ -7,7 +7,7 @@ the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded and re-saved. - Created with Projucer version: 4.2.4 + Created with Projucer version: 4.3.1 ------------------------------------------------------------------------------ @@ -102,15 +102,15 @@ void PluginGui::updateFromParameters() sendNotificationAsync); - if (processor->getEnumParameter("Modulator Tremolo")) tremoloButton->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Modulator Vibrato")) vibratoButton->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Modulator Sustain")) sustainButton->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Modulator Keyscale Rate")) keyscaleEnvButton->setToggleState(true, dontSendNotification); + tremoloButton->setToggleState(processor->getBoolParameter("Modulator Tremolo"), dontSendNotification); + vibratoButton->setToggleState(processor->getBoolParameter("Modulator Vibrato"), dontSendNotification); + sustainButton->setToggleState(processor->getBoolParameter("Modulator Sustain"), dontSendNotification); + keyscaleEnvButton->setToggleState(processor->getBoolParameter("Modulator Keyscale Rate"), dontSendNotification); - if (processor->getEnumParameter("Carrier Tremolo")) tremoloButton2->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Carrier Vibrato")) vibratoButton2->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, dontSendNotification); - if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, dontSendNotification); + tremoloButton2->setToggleState(processor->getBoolParameter("Carrier Tremolo"), dontSendNotification); + vibratoButton2->setToggleState(processor->getBoolParameter("Carrier Vibrato"), dontSendNotification); + sustainButton2->setToggleState(processor->getBoolParameter("Carrier Sustain"), dontSendNotification); + keyscaleEnvButton2->setToggleState(processor->getBoolParameter("Carrier Keyscale Rate"), dontSendNotification); vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification); tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification); @@ -183,7 +183,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) aSlider->setTooltip (TRANS("Envelope attack rate")); aSlider->setRange (0, 15, 1); aSlider->setSliderStyle (Slider::LinearVertical); - aSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); + aSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); aSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); aSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -205,7 +205,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) dSlider->setTooltip (TRANS("Envelope decay rate")); dSlider->setRange (0, 15, 1); dSlider->setSliderStyle (Slider::LinearVertical); - dSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); + dSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); dSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); dSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -227,7 +227,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) sSlider->setTooltip (TRANS("Envelope sustain level")); sSlider->setRange (0, 15, 1); sSlider->setSliderStyle (Slider::LinearVertical); - sSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); + sSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); sSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); sSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -249,7 +249,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) rSlider->setTooltip (TRANS("Envelope release rate")); rSlider->setRange (0, 15, 1); rSlider->setSliderStyle (Slider::LinearVertical); - rSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); + rSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); rSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); rSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -270,7 +270,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (attenuationSlider = new Slider ("attenuation slider")); attenuationSlider->setRange (-47.25, 0, 0.75); attenuationSlider->setSliderStyle (Slider::LinearHorizontal); - attenuationSlider->setTextBoxStyle (Slider::TextBoxRight, false, 64, 20); + attenuationSlider->setTextBoxStyle (Slider::TextBoxRight, true, 64, 20); attenuationSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); attenuationSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -403,7 +403,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (aSlider2 = new Slider ("a slider")); aSlider2->setRange (0, 15, 1); aSlider2->setSliderStyle (Slider::LinearVertical); - aSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); + aSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); aSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); aSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -424,7 +424,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (dSlider2 = new Slider ("d slider")); dSlider2->setRange (0, 15, 1); dSlider2->setSliderStyle (Slider::LinearVertical); - dSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); + dSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); dSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); dSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -445,7 +445,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (sSlider2 = new Slider ("s slider")); sSlider2->setRange (0, 15, 1); sSlider2->setSliderStyle (Slider::LinearVertical); - sSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); + sSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); sSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); sSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -466,7 +466,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (rSlider2 = new Slider ("r slider")); rSlider2->setRange (0, 15, 1); rSlider2->setSliderStyle (Slider::LinearVertical); - rSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); + rSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); rSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); rSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -487,7 +487,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (attenuationSlider2 = new Slider ("attenuation slider")); attenuationSlider2->setRange (-47.25, 0, 0.75); attenuationSlider2->setSliderStyle (Slider::LinearHorizontal); - attenuationSlider2->setTextBoxStyle (Slider::TextBoxRight, false, 64, 20); + attenuationSlider2->setTextBoxStyle (Slider::TextBoxRight, true, 64, 20); attenuationSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); attenuationSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -603,7 +603,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (tremoloSlider = new Slider ("tremolo slider")); tremoloSlider->setRange (1, 4.8, 3.8); tremoloSlider->setSliderStyle (Slider::LinearHorizontal); - tremoloSlider->setTextBoxStyle (Slider::TextBoxRight, false, 32, 20); + tremoloSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20); tremoloSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); tremoloSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); tremoloSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -634,7 +634,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (vibratoSlider = new Slider ("vibrato slider")); vibratoSlider->setRange (7, 14, 7); vibratoSlider->setSliderStyle (Slider::LinearHorizontal); - vibratoSlider->setTextBoxStyle (Slider::TextBoxRight, false, 32, 20); + vibratoSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20); vibratoSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); vibratoSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); vibratoSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -666,7 +666,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (feedbackSlider = new Slider ("feedback slider")); feedbackSlider->setRange (0, 7, 1); feedbackSlider->setSliderStyle (Slider::LinearVertical); - feedbackSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); + feedbackSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); feedbackSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); feedbackSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); feedbackSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); @@ -2489,7 +2489,7 @@ BEGIN_JUCER_METADATA explicitFocusOrder="0" pos="30 203 30 88" tooltip="Envelope attack rate" thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15" - int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="1" + int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/>