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

Updated a few Slider lookandfeel methods to take a Slider& as a parameter.

Browse source
This commit is contained in:
jules 2013-11-10 18:08:42 +00:00
parent 1113e17186
commit 4e61bdb9e4
6 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp
View file

@ -449,15 +449,15 @@ void LookAndFeel_V1::drawLinearSlider (Graphics& g,
}
}
Button* LookAndFeel_V1::createSliderButton (const bool isIncrement)
Button* LookAndFeel_V1::createSliderButton (Slider&, const bool isIncrement)
{
if (isIncrement)
return new ArrowButton ("u", 0.75f, Colours::white.withAlpha (0.8f));
else
return new ArrowButton ("d", 0.25f, Colours::white.withAlpha (0.8f));
return new ArrowButton ("d", 0.25f, Colours::white.withAlpha (0.8f));
}
ImageEffectFilter* LookAndFeel_V1::getSliderEffect()
ImageEffectFilter* LookAndFeel_V1::getSliderEffect (Slider&)
{
return &scrollbarShadow;
}

4
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h
View file

@ -78,8 +78,8 @@ public:
const Slider::SliderStyle, Slider&) override;
int getSliderThumbRadius (Slider&) override;
Button* createSliderButton (bool isIncrement) override;
ImageEffectFilter* getSliderEffect() override;
Button* createSliderButton (Slider&, bool isIncrement) override;
ImageEffectFilter* getSliderEffect (Slider&) override;
//==============================================================================
void drawCornerResizer (Graphics&, int w, int h, bool isMouseOver, bool isMouseDragging) override;

8
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp
View file

@ -1425,7 +1425,7 @@ void LookAndFeel_V2::drawRotarySlider (Graphics& g, int x, int y, int width, int
}
}
Button* LookAndFeel_V2::createSliderButton (const bool isIncrement)
Button* LookAndFeel_V2::createSliderButton (Slider&, const bool isIncrement)
{
return new TextButton (isIncrement ? "+" : "-", String::empty);
}
@ -1464,17 +1464,17 @@ Label* LookAndFeel_V2::createSliderTextBox (Slider& slider)
return l;
}
ImageEffectFilter* LookAndFeel_V2::getSliderEffect()
ImageEffectFilter* LookAndFeel_V2::getSliderEffect (Slider&)
{
return nullptr;
}
Font LookAndFeel_V2::getSliderPopupFont()
Font LookAndFeel_V2::getSliderPopupFont (Slider&)
{
return Font (15.0f, Font::bold);
}
int LookAndFeel_V2::getSliderPopupPlacement()
int LookAndFeel_V2::getSliderPopupPlacement (Slider&)
{
return BubbleComponent::above
| BubbleComponent::below

8
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h
View file

@ -186,11 +186,11 @@ public:
Slider&) override;
int getSliderThumbRadius (Slider&) override;
Button* createSliderButton (bool isIncrement) override;
Button* createSliderButton (Slider&, bool isIncrement) override;
Label* createSliderTextBox (Slider&) override;
ImageEffectFilter* getSliderEffect() override;
Font getSliderPopupFont() override;
int getSliderPopupPlacement() override;
ImageEffectFilter* getSliderEffect (Slider&) override;
Font getSliderPopupFont (Slider&) override;
int getSliderPopupPlacement (Slider&) override;
//==============================================================================
void getTooltipSize (const String& tipText, int& width, int& height) override;

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

@ -584,10 +584,10 @@ public:
if (style == IncDecButtons)
{
owner.addAndMakeVisible (incButton = lf.createSliderButton (true));
owner.addAndMakeVisible (incButton = lf.createSliderButton (owner, true));
incButton->addListener (this);
owner.addAndMakeVisible (decButton = lf.createSliderButton (false));
owner.addAndMakeVisible (decButton = lf.createSliderButton (owner, false));
decButton->addListener (this);
if (incDecButtonMode != incDecButtonsNotDraggable)
@ -611,7 +611,7 @@ public:
decButton = nullptr;
}
owner.setComponentEffect (lf.getSliderEffect());
owner.setComponentEffect (lf.getSliderEffect (owner));
owner.resized();
owner.repaint();
@ -1255,10 +1255,10 @@ public:
public:
PopupDisplayComponent (Slider& s)
: owner (s),
font (s.getLookAndFeel().getSliderPopupFont())
font (s.getLookAndFeel().getSliderPopupFont (s))
{
setAlwaysOnTop (true);
setAllowedPlacement (owner.getLookAndFeel().getSliderPopupPlacement());
setAllowedPlacement (owner.getLookAndFeel().getSliderPopupPlacement (s));
}
void paintContent (Graphics& g, int w, int h)

16
modules/juce_gui_basics/widgets/juce_Slider.h
View file

@ -804,13 +804,21 @@ public:
float rotaryEndAngle,
Slider&) = 0;
virtual Button* createSliderButton (bool isIncrement) = 0;
virtual Button* createSliderButton (Slider&, bool isIncrement) = 0;
virtual Label* createSliderTextBox (Slider&) = 0;
virtual ImageEffectFilter* getSliderEffect() = 0;
virtual ImageEffectFilter* getSliderEffect (Slider&) = 0;
virtual Font getSliderPopupFont() = 0;
virtual int getSliderPopupPlacement() = 0;
virtual Font getSliderPopupFont (Slider&) = 0;
virtual int getSliderPopupPlacement (Slider&) = 0;
#if JUCE_CATCH_DEPRECATED_CODE_MISUSE
// These methods' parameters have changed: see the new method signatures.
virtual void createSliderButton (bool) {}
virtual void getSliderEffect() {}
virtual void getSliderPopupFont() {}
virtual void getSliderPopupPlacement() {}
#endif
};
protected: