From 61e2e8058173ec1f02bae1925dfcf90c532db216 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Tue, 30 Oct 2018 11:00:45 +0000 Subject: [PATCH] APVTS: Fixed a bug setting the SliderAttachment text for unchanged default values --- .../juce_AudioProcessorValueTreeState.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp index 01bc0e777c..ce05c163ed 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp +++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp @@ -535,6 +535,13 @@ struct AudioProcessorValueTreeState::SliderAttachment::Pimpl : private Attached { NormalisableRange range (state.getParameterRange (paramID)); + if (auto* param = state.getParameterAdapter (paramID)) + { + slider.valueFromTextFunction = [param](const String& text) { return (double) param->getDenormalisedValueForText (text); }; + slider.textFromValueFunction = [param](double value) { return param->getTextForDenormalisedValue ((float) value); }; + slider.setDoubleClickReturnValue (true, range.convertFrom0to1 (param->getParameter().getDefaultValue())); + } + if (range.interval != 0.0f || range.skew != 1.0f) { slider.setRange (range.start, range.end, range.interval); @@ -576,13 +583,6 @@ struct AudioProcessorValueTreeState::SliderAttachment::Pimpl : private Attached snapToLegalValueFunction }); } - if (auto* param = state.getParameterAdapter (paramID)) - { - slider.valueFromTextFunction = [param](const String& text) { return (double) param->getDenormalisedValueForText (text); }; - slider.textFromValueFunction = [param](double value) { return param->getTextForDenormalisedValue ((float) value); }; - slider.setDoubleClickReturnValue (true, range.convertFrom0to1 (param->getParameter().getDefaultValue())); - } - sendInitialUpdate(); slider.addListener (this); }