From ad8cc4b69376ebf24e77e8a907e4f8456987d41e Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 27 Jan 2015 17:05:31 +0000 Subject: [PATCH] Changed the very old and strangely written Slider::getDoubleClickReturnValue method into two separate methods. --- modules/juce_gui_basics/widgets/juce_Slider.cpp | 7 ++----- modules/juce_gui_basics/widgets/juce_Slider.h | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp index 1c1e7766b6..2a4c4e5c6a 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.cpp +++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp @@ -1497,11 +1497,8 @@ void Slider::setDoubleClickReturnValue (bool isDoubleClickEnabled, double value pimpl->doubleClickReturnValue = valueToSetOnDoubleClick; } -double Slider::getDoubleClickReturnValue (bool& isEnabledResult) const -{ - isEnabledResult = pimpl->doubleClickToValue; - return pimpl->doubleClickReturnValue; -} +double Slider::getDoubleClickReturnValue() const noexcept { return pimpl->doubleClickReturnValue; } +bool Slider::isDoubleClickReturnEnabled() const noexcept { return pimpl->doubleClickToValue; } void Slider::updateText() { diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h index c9814edf08..8d3e912b65 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.h +++ b/modules/juce_gui_basics/widgets/juce_Slider.h @@ -551,17 +551,18 @@ public: @see getDoubleClickReturnValue */ - void setDoubleClickReturnValue (bool isDoubleClickEnabled, + void setDoubleClickReturnValue (bool shouldDoubleClickBeEnabled, double valueToSetOnDoubleClick); /** Returns the values last set by setDoubleClickReturnValue() method. + @see setDoubleClickReturnValue + */ + double getDoubleClickReturnValue() const noexcept; - Sets isEnabled to true if double-click is enabled, and returns the value - that was set. - + /** Returns true if double-clicking to reset to a default value is enabled. @see setDoubleClickReturnValue */ - double getDoubleClickReturnValue (bool& isEnabled) const; + bool isDoubleClickReturnEnabled() const noexcept; //============================================================================== /** Tells the slider whether to keep sending change messages while the user