Browse Source

tags/2021-05-28
jules 17 years ago
parent
commit
d85a6a21f1
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/juce_appframework/gui/components/controls/juce_Slider.cpp

+ 3
- 3
src/juce_appframework/gui/components/controls/juce_Slider.cpp View File

@@ -732,7 +732,7 @@ float Slider::getLinearSliderPos (const double value)
sliderPosProportional = 0.5; sliderPosProportional = 0.5;
} }


if (style == LinearVertical || style == IncDecButtons)
if (isVertical() || style == IncDecButtons)
sliderPosProportional = 1.0 - sliderPosProportional; sliderPosProportional = 1.0 - sliderPosProportional;


return (float) (sliderRegionStart + sliderPosProportional * sliderRegionSize); return (float) (sliderRegionStart + sliderPosProportional * sliderRegionSize);
@@ -1235,7 +1235,7 @@ void Slider::mouseDrag (const MouseEvent& e)
} }
else else
{ {
if (style == LinearVertical)
if (isVertical())
scaledMousePos = 1.0 - scaledMousePos; scaledMousePos = 1.0 - scaledMousePos;


valueWhenLastDragged = proportionOfLengthToValue (jlimit (0.0, 1.0, scaledMousePos)); valueWhenLastDragged = proportionOfLengthToValue (jlimit (0.0, 1.0, scaledMousePos));
@@ -1261,7 +1261,7 @@ void Slider::mouseDrag (const MouseEvent& e)
if (mouseDiff < 0) if (mouseDiff < 0)
speed = -speed; speed = -speed;


if (style == LinearVertical || style == RotaryVerticalDrag
if (isVertical() || style == RotaryVerticalDrag
|| (style == IncDecButtons && ! incDecDragDirectionIsHorizontal())) || (style == IncDecButtons && ! incDecDragDirectionIsHorizontal()))
speed = -speed; speed = -speed;




Loading…
Cancel
Save