diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp index d93b859e36..2aa2c1da40 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp @@ -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; } diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h index 41261d89df..8b977bc959 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h @@ -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; diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp index f19863b473..43fc85b5e2 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp @@ -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 diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h index d0d3119b41..430c90dcbf 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h @@ -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; diff --git a/modules/juce_gui_basics/widgets/juce_Slider.cpp b/modules/juce_gui_basics/widgets/juce_Slider.cpp index 802c4ea612..29c15db45e 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.cpp +++ b/modules/juce_gui_basics/widgets/juce_Slider.cpp @@ -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) diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h index cec0e35181..f3c2f45b66 100644 --- a/modules/juce_gui_basics/widgets/juce_Slider.h +++ b/modules/juce_gui_basics/widgets/juce_Slider.h @@ -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: