Browse Source

Slider LinearBarVertical fixes.

tags/2021-05-28
jules 12 years ago
parent
commit
60fe89c1aa
2 changed files with 17 additions and 2 deletions
  1. +7
    -1
      modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
  2. +10
    -1
      modules/juce_gui_basics/widgets/juce_Slider.cpp

+ 7
- 1
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp View File

@@ -1466,7 +1466,13 @@ void LookAndFeel::drawLinearSlider (Graphics& g,
isMouseOver || slider.isMouseButtonDown())); isMouseOver || slider.isMouseButtonDown()));
drawShinyButtonShape (g, drawShinyButtonShape (g,
(float) x, (float) y, sliderPos - (float) x, (float) height, 0.0f,
(float) x,
style == Slider::LinearBarVertical ? sliderPos
: (float) y,
style == Slider::LinearBarVertical ? (float) width
: (sliderPos - x),
style == Slider::LinearBarVertical ? (height - sliderPos)
: (float) height, 0.0f,
baseColour, baseColour,
slider.isEnabled() ? 0.9f : 0.3f, slider.isEnabled() ? 0.9f : 0.3f,
true, true, true, true); true, true, true, true);


+ 10
- 1
modules/juce_gui_basics/widgets/juce_Slider.cpp View File

@@ -1146,7 +1146,7 @@ public:
const int indent = lf.getSliderThumbRadius (owner); const int indent = lf.getSliderThumbRadius (owner);
if (style == LinearBar || style == LinearBarVertical)
if (style == LinearBar)
{ {
const int barIndent = 1; const int barIndent = 1;
sliderRegionStart = barIndent; sliderRegionStart = barIndent;
@@ -1155,6 +1155,15 @@ public:
sliderRect.setBounds (sliderRegionStart, barIndent, sliderRect.setBounds (sliderRegionStart, barIndent,
sliderRegionSize, localBounds.getHeight() - barIndent * 2); sliderRegionSize, localBounds.getHeight() - barIndent * 2);
} }
else if (style == LinearBarVertical)
{
const int barIndent = 1;
sliderRegionStart = barIndent;
sliderRegionSize = localBounds.getHeight() - barIndent * 2;
sliderRect.setBounds (barIndent, sliderRegionStart,
localBounds.getWidth() - barIndent * 2, sliderRegionSize);
}
else if (isHorizontal()) else if (isHorizontal())
{ {
sliderRegionStart = sliderRect.getX() + indent; sliderRegionStart = sliderRect.getX() + indent;


Loading…
Cancel
Save