mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fixed an assertion when enabling the popup display with a two-value slider and disabled the popup display when using an IncDec slider

Browse source
This commit is contained in:
ed 2017-10-04 09:31:37 +01:00
parent 2b01c39aae
commit 1cb2d8143e
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/juce_gui_basics/widgets/juce_Slider.cpp
View file

@ -953,9 +953,12 @@ public:
void mouseMove()
{
auto isTwoValue = (style == TwoValueHorizontal || style == TwoValueVertical);
auto isThreeValue = (style == ThreeValueHorizontal || style == ThreeValueVertical);
if (showPopupOnHover
&& style != TwoValueHorizontal
&& style != TwoValueVertical)
&& ! isTwoValue
&& ! isThreeValue)
{
if (owner.isMouseOver (true))
{
@ -975,11 +978,23 @@ public:
void showPopupDisplay()
{
if (style == IncDecButtons)
return;
if (popupDisplay == nullptr)
{
popupDisplay = new PopupDisplayComponent (owner);
updatePopupDisplay (getValue());
if (style == SliderStyle::TwoValueHorizontal
|| style == SliderStyle::TwoValueVertical)
{
updatePopupDisplay (sliderBeingDragged == 2 ? getMaxValue()
: getMinValue());
}
else
{
updatePopupDisplay (getValue());
}
if (parentForPopupDisplay != nullptr)
parentForPopupDisplay->addChildComponent (popupDisplay);