|
|
@@ -1451,7 +1451,7 @@ void LookAndFeel::drawLinearSlider (Graphics& g, |
|
|
|
{
|
|
|
|
g.fillAll (slider.findColour (Slider::backgroundColourId));
|
|
|
|
|
|
|
|
if (style == Slider::LinearBar)
|
|
|
|
if (style == Slider::LinearBar || style == Slider::LinearBarVertical)
|
|
|
|
{
|
|
|
|
const bool isMouseOver = slider.isMouseOverOrDragging() && slider.isEnabled();
|
|
|
|
|
|
|
@@ -1579,15 +1579,17 @@ Label* LookAndFeel::createSliderTextBox (Slider& slider) |
|
|
|
l->setColour (Label::textColourId, slider.findColour (Slider::textBoxTextColourId));
|
|
|
|
|
|
|
|
l->setColour (Label::backgroundColourId,
|
|
|
|
(slider.getSliderStyle() == Slider::LinearBar) ? Colours::transparentBlack
|
|
|
|
: slider.findColour (Slider::textBoxBackgroundColourId));
|
|
|
|
(slider.getSliderStyle() == Slider::LinearBar || slider.getSliderStyle() == Slider::LinearBarVertical)
|
|
|
|
? Colours::transparentBlack
|
|
|
|
: slider.findColour (Slider::textBoxBackgroundColourId));
|
|
|
|
l->setColour (Label::outlineColourId, slider.findColour (Slider::textBoxOutlineColourId));
|
|
|
|
|
|
|
|
l->setColour (TextEditor::textColourId, slider.findColour (Slider::textBoxTextColourId));
|
|
|
|
|
|
|
|
l->setColour (TextEditor::backgroundColourId,
|
|
|
|
slider.findColour (Slider::textBoxBackgroundColourId)
|
|
|
|
.withAlpha (slider.getSliderStyle() == Slider::LinearBar ? 0.7f : 1.0f));
|
|
|
|
.withAlpha ((slider.getSliderStyle() == Slider::LinearBar || slider.getSliderStyle() == Slider::LinearBarVertical)
|
|
|
|
? 0.7f : 1.0f));
|
|
|
|
|
|
|
|
l->setColour (TextEditor::outlineColourId, slider.findColour (Slider::textBoxOutlineColourId));
|
|
|
|
|
|
|
|