From 182b0e4cb00fafae506684fe5f089bd0b3a4c992 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 3 Mar 2017 12:37:45 +0000 Subject: [PATCH] Added isProgressBarOpaque() method to ProgressBar::LookAndFeelMethods --- modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp | 5 +++++ modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h | 1 + modules/juce_gui_basics/widgets/juce_ProgressBar.cpp | 2 +- modules/juce_gui_basics/widgets/juce_ProgressBar.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp index 426b672b07..ad4f1bc25c 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp @@ -607,6 +607,11 @@ void LookAndFeel_V2::drawSpinningWaitAnimation (Graphics& g, const Colour& colou } } +bool LookAndFeel_V2::isProgressBarOpaque (ProgressBar& progressBar) +{ + return progressBar.findColour (ProgressBar::backgroundColourId).isOpaque(); +} + bool LookAndFeel_V2::areScrollbarButtonsVisible() { return true; diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h index 8abb2a77d0..9eeb7d84b7 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h @@ -89,6 +89,7 @@ public: //============================================================================== void drawProgressBar (Graphics&, ProgressBar&, int width, int height, double progress, const String& textToShow) override; void drawSpinningWaitAnimation (Graphics&, const Colour& colour, int x, int y, int w, int h) override; + bool isProgressBarOpaque (ProgressBar&) override; //============================================================================== bool areScrollbarButtonsVisible() override; diff --git a/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp b/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp index bd91e28b7d..ec607eee82 100644 --- a/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp +++ b/modules/juce_gui_basics/widgets/juce_ProgressBar.cpp @@ -49,7 +49,7 @@ void ProgressBar::setTextToDisplay (const String& text) void ProgressBar::lookAndFeelChanged() { - setOpaque (findColour (backgroundColourId).isOpaque()); + setOpaque (getLookAndFeel().isProgressBarOpaque (*this)); } void ProgressBar::colourChanged() diff --git a/modules/juce_gui_basics/widgets/juce_ProgressBar.h b/modules/juce_gui_basics/widgets/juce_ProgressBar.h index afd9e67e2c..fffda61987 100644 --- a/modules/juce_gui_basics/widgets/juce_ProgressBar.h +++ b/modules/juce_gui_basics/widgets/juce_ProgressBar.h @@ -105,6 +105,8 @@ public: */ virtual void drawProgressBar (Graphics&, ProgressBar&, int width, int height, double progress, const String& textToShow) = 0; + + virtual bool isProgressBarOpaque (ProgressBar&) = 0; }; protected: