Added a stretch-to-fit option to DrawableButton.

modules/juce_gui_basics/buttons/juce_DrawableButton.cpp

@@ -23,8 +23,7 @@
   ==============================================================================
 */
 
-DrawableButton::DrawableButton (const String& name,
-                                const DrawableButton::ButtonStyle buttonStyle)
+DrawableButton::DrawableButton (const String& name, const DrawableButton::ButtonStyle buttonStyle)
     : Button (name),
       style (buttonStyle),
       currentImage (nullptr),
@@ -37,6 +36,11 @@ DrawableButton::~DrawableButton()
 }
 
 //==============================================================================
+static Drawable* copyDrawableIfNotNull (const Drawable* const d)
+{
+    return d != nullptr ? d->createCopy() : nullptr;
+}
+
 void DrawableButton::setImages (const Drawable* normal,
                                 const Drawable* over,
                                 const Drawable* down,
@@ -48,14 +52,14 @@ void DrawableButton::setImages (const Drawable* normal,
 {
     jassert (normal != nullptr); // you really need to give it at least a normal image..
 
-    if (normal != nullptr)        normalImage = normal->createCopy();
-    if (over != nullptr)          overImage = over->createCopy();
-    if (down != nullptr)          downImage = down->createCopy();
-    if (disabled != nullptr)      disabledImage = disabled->createCopy();
-    if (normalOn != nullptr)      normalImageOn = normalOn->createCopy();
-    if (overOn != nullptr)        overImageOn = overOn->createCopy();
-    if (downOn != nullptr)        downImageOn = downOn->createCopy();
-    if (disabledOn != nullptr)    disabledImageOn = disabledOn->createCopy();
+    normalImage     = copyDrawableIfNotNull (normal);
+    overImage       = copyDrawableIfNotNull (over);
+    downImage       = copyDrawableIfNotNull (down);
+    disabledImage   = copyDrawableIfNotNull (disabled);
+    normalImageOn   = copyDrawableIfNotNull (normalOn);
+    overImageOn     = copyDrawableIfNotNull (overOn);
+    downImageOn     = copyDrawableIfNotNull (downOn);
+    disabledImageOn = copyDrawableIfNotNull (disabledOn);
 
     buttonStateChanged();
 }
@@ -87,6 +91,10 @@ void DrawableButton::resized()
         {
             currentImage->setOriginWithOriginalSize (Point<float>());
         }
+        else if (style == ImageStretched)
+        {
+            currentImage->setTransformToFit (getLocalBounds().toFloat(), RectanglePlacement::stretchToFit);
+        }
         else
         {
             Rectangle<int> imageSpace;

modules/juce_gui_basics/buttons/juce_DrawableButton.h

@@ -49,9 +49,10 @@ public:
         ImageRaw,                   /**< The button will just display the images in their normal size and position.
                                          This leaves it up to the caller to make sure the images are the correct size and position for the button. */
         ImageAboveTextLabel,        /**< Draws the button as a text label across the bottom with the image resized and scaled to fit above it. */
-        ImageOnButtonBackground     /**< Draws the button as a standard rounded-rectangle button with the image on top.
+        ImageOnButtonBackground,    /**< Draws the button as a standard rounded-rectangle button with the image on top.
                                          Note that if you use this style, the colour IDs that control the button colour are
                                          TextButton::buttonColourId and TextButton::buttonOnColourId. */
+        ImageStretched              /**< Fills the button with a stretched version of the image. */
     };
 
     //==============================================================================