From d1be2ff2145d6a725d5eb577d186e86bb20e63e3 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 8 Oct 2015 23:14:18 +1100
Subject: [PATCH] Fix hardcoded border for raster legend items (fix #13540)

Previously raster legend items always had a fixed black border.
Now there's options to change the color/width of this border or
disable it entirely.
---
 .../core/composer/qgscomposeritemcommand.sip  |   1 +
 python/core/composer/qgscomposerlegend.sip    |  55 +++++++++
 python/core/qgslegendsettings.sip             |  55 +++++++++
 src/app/composer/qgscomposerlegendwidget.cpp  |  53 +++++++++
 src/app/composer/qgscomposerlegendwidget.h    |   4 +
 src/core/composer/qgscomposeritemcommand.h    |   1 +
 src/core/composer/qgscomposerlegend.cpp       |  18 +++
 src/core/composer/qgscomposerlegend.h         |  55 +++++++++
 .../layertree/qgslayertreemodellegendnode.cpp |  15 ++-
 src/core/qgslegendsettings.cpp                |   3 +
 src/core/qgslegendsettings.h                  |  59 ++++++++++
 .../composer/qgscomposerlegendwidgetbase.ui   | 111 +++++++++++++++++-
 tests/src/core/testqgslegendrenderer.cpp      |  18 +++
 .../expected_legend_raster_border.png         | Bin 0 -> 4569 bytes
 .../expected_legend_raster_border_mask.png    | Bin 0 -> 808 bytes
 15 files changed, 444 insertions(+), 4 deletions(-)
 create mode 100644 tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border.png
 create mode 100644 tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png

diff --git a/python/core/composer/qgscomposeritemcommand.sip b/python/core/composer/qgscomposeritemcommand.sip
index 15bb4be07f7..664408b7f7c 100644
--- a/python/core/composer/qgscomposeritemcommand.sip
+++ b/python/core/composer/qgscomposeritemcommand.sip
@@ -68,6 +68,7 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
       LegendIconSymbolSpace,
       LegendBoxSpace,
       LegendColumnSpace,
+      LegendRasterBorderWidth,
       //composer picture
       ComposerPictureRotation,
       // composer scalebar
diff --git a/python/core/composer/qgscomposerlegend.sip b/python/core/composer/qgscomposerlegend.sip
index 7e482ec5312..8dca1ce8d1d 100644
--- a/python/core/composer/qgscomposerlegend.sip
+++ b/python/core/composer/qgscomposerlegend.sip
@@ -129,6 +129,61 @@ class QgsComposerLegend : QgsComposerItem
     int equalColumnWidth() const;
     void setEqualColumnWidth( bool s );
 
+    /** Returns whether a border will be drawn around raster symbol items.
+     * @see setDrawRasterBorder()
+     * @see rasterBorderColor()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    bool drawRasterBorder() const;
+
+    /** Sets whether a border will be drawn around raster symbol items.
+     * @param enabled set to true to draw borders
+     * @see drawRasterBorder()
+     * @see setRasterBorderColor()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setDrawRasterBorder( bool enabled );
+
+    /** Returns the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderColor()
+     * @see drawRasterBorder()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    QColor rasterBorderColor() const;
+
+    /** Sets the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param color border color
+     * @see rasterBorderColor()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderColor( const QColor& color );
+
+    /** Returns the border width (in millimeters) for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderWidth()
+     * @see drawRasterBorder()
+     * @see rasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    double rasterBorderWidth() const;
+
+    /** Sets the border width for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param width border width in millimeters
+     * @see rasterBorderWidth()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderWidth( double width );
+
     void setComposerMap( const QgsComposerMap* map );
     const QgsComposerMap* composerMap() const;
 
diff --git a/python/core/qgslegendsettings.sip b/python/core/qgslegendsettings.sip
index 5bd81f1881b..bd2e1747004 100644
--- a/python/core/qgslegendsettings.sip
+++ b/python/core/qgslegendsettings.sip
@@ -59,6 +59,61 @@ class QgsLegendSettings
     QSizeF symbolSize() const;
     void setSymbolSize( QSizeF s );
 
+    /** Returns whether a border will be drawn around raster symbol items.
+     * @see setDrawRasterBorder()
+     * @see rasterBorderColor()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    bool drawRasterBorder() const;
+
+    /** Sets whether a border will be drawn around raster symbol items.
+     * @param enabled set to true to draw borders
+     * @see drawRasterBorder()
+     * @see setRasterBorderColor()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setDrawRasterBorder( bool enabled );
+
+    /** Returns the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderColor()
+     * @see drawRasterBorder()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    QColor rasterBorderColor() const;
+
+    /** Sets the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param color border color
+     * @see rasterBorderColor()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderColor( const QColor& color );
+
+    /** Returns the border width (in millimeters) for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderWidth()
+     * @see drawRasterBorder()
+     * @see rasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    double rasterBorderWidth() const;
+
+    /** Sets the border width for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param width border width in millimeters
+     * @see rasterBorderWidth()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderWidth( double width );
+
     QSizeF wmsLegendSize() const;
     void setWmsLegendSize( QSizeF s );
 
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
index aeeabc14b4d..197ceff45b6 100644
--- a/src/app/composer/qgscomposerlegendwidget.cpp
+++ b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -103,6 +103,10 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
   mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );
   mFontColorButton->setContext( "composer" );
 
+  mRasterBorderColorButton->setColorDialogTitle( tr( "Select border color" ) );
+  mRasterBorderColorButton->setAllowAlpha( true );
+  mRasterBorderColorButton->setContext( "composer " );
+
   //add widget for item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
   mainLayout->addWidget( itemPropertiesWidget );
@@ -161,6 +165,11 @@ void QgsComposerLegendWidget::setGuiElements()
   mIconLabelSpaceSpinBox->setValue( mLegend->style( QgsComposerLegendStyle::SymbolLabel ).margin( QgsComposerLegendStyle::Left ) );
   mBoxSpaceSpinBox->setValue( mLegend->boxSpace() );
   mColumnSpaceSpinBox->setValue( mLegend->columnSpace() );
+
+  mRasterBorderGroupBox->setChecked( mLegend->drawRasterBorder() );
+  mRasterBorderWidthSpinBox->setValue( mLegend->rasterBorderWidth() );
+  mRasterBorderColorButton->setColor( mLegend->rasterBorderColor() );
+
   mCheckBoxAutoUpdate->setChecked( mLegend->autoUpdateModel() );
   refreshMapComboBox();
 
@@ -613,6 +622,47 @@ void QgsComposerLegendWidget::on_mMapComboBox_currentIndexChanged( int index )
   }
 }
 
+void QgsComposerLegendWidget::on_mRasterBorderGroupBox_toggled( bool state )
+{
+  if ( !mLegend )
+  {
+    return;
+  }
+
+  mLegend->beginCommand( tr( "Legend raster borders" ) );
+  mLegend->setDrawRasterBorder( state );
+  mLegend->adjustBoxSize();
+  mLegend->update();
+  mLegend->endCommand();
+}
+
+void QgsComposerLegendWidget::on_mRasterBorderWidthSpinBox_valueChanged( double d )
+{
+  if ( !mLegend )
+  {
+    return;
+  }
+
+  mLegend->beginCommand( tr( "Legend raster border width" ), QgsComposerMergeCommand::LegendRasterBorderWidth );
+  mLegend->setRasterBorderWidth( d );
+  mLegend->adjustBoxSize();
+  mLegend->update();
+  mLegend->endCommand();
+}
+
+void QgsComposerLegendWidget::on_mRasterBorderColorButton_colorChanged( const QColor& newColor )
+{
+  if ( !mLegend )
+  {
+    return;
+  }
+
+  mLegend->beginCommand( tr( "Legend raster border color" ) );
+  mLegend->setRasterBorderColor( newColor );
+  mLegend->update();
+  mLegend->endCommand();
+}
+
 void QgsComposerLegendWidget::on_mAddToolButton_clicked()
 {
   if ( !mLegend )
@@ -894,6 +944,9 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mBoxSpaceSpinBox->blockSignals( b );
   mColumnSpaceSpinBox->blockSignals( b );
   mFontColorButton->blockSignals( b );
+  mRasterBorderGroupBox->blockSignals( b );
+  mRasterBorderColorButton->blockSignals( b );
+  mRasterBorderWidthSpinBox->blockSignals( b );
 }
 
 void QgsComposerLegendWidget::refreshMapComboBox()
diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h
index fdb833cf865..8f252fc594d 100644
--- a/src/app/composer/qgscomposerlegendwidget.h
+++ b/src/app/composer/qgscomposerlegendwidget.h
@@ -69,6 +69,10 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
     void on_mCheckBoxAutoUpdate_stateChanged( int state );
     void on_mMapComboBox_currentIndexChanged( int index );
 
+    void on_mRasterBorderGroupBox_toggled( bool state );
+    void on_mRasterBorderWidthSpinBox_valueChanged( double d );
+    void on_mRasterBorderColorButton_colorChanged( const QColor& newColor );
+
     //item manipulation
     void on_mMoveDownToolButton_clicked();
     void on_mMoveUpToolButton_clicked();
diff --git a/src/core/composer/qgscomposeritemcommand.h b/src/core/composer/qgscomposeritemcommand.h
index 07117399702..bea9ddffdbb 100644
--- a/src/core/composer/qgscomposeritemcommand.h
+++ b/src/core/composer/qgscomposeritemcommand.h
@@ -102,6 +102,7 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
       LegendIconSymbolSpace,
       LegendBoxSpace,
       LegendColumnSpace,
+      LegendRasterBorderWidth,
       //composer picture
       ComposerPictureRotation,
       // composer scalebar
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
index 15799668f90..9cbaf1b64ca 100644
--- a/src/core/composer/qgscomposerlegend.cpp
+++ b/src/core/composer/qgscomposerlegend.cpp
@@ -28,6 +28,7 @@
 #include "qgslegendrenderer.h"
 #include "qgslogger.h"
 #include "qgsproject.h"
+#include "qgssymbollayerv2utils.h"
 #include <QDomDocument>
 #include <QDomElement>
 #include <QPainter>
@@ -241,6 +242,14 @@ void QgsComposerLegend::setSplitLayer( bool s ) { mSettings.setSplitLayer( s );
 bool QgsComposerLegend::equalColumnWidth() const { return mSettings.equalColumnWidth(); }
 void QgsComposerLegend::setEqualColumnWidth( bool s ) { mSettings.setEqualColumnWidth( s ); }
 
+bool QgsComposerLegend::drawRasterBorder() const { return mSettings.drawRasterBorder(); }
+void QgsComposerLegend::setDrawRasterBorder( bool enabled ) { mSettings.setDrawRasterBorder( enabled ); }
+
+QColor QgsComposerLegend::rasterBorderColor() const { return mSettings.rasterBorderColor(); }
+void QgsComposerLegend::setRasterBorderColor( const QColor& color ) { mSettings.setRasterBorderColor( color ); }
+
+double QgsComposerLegend::rasterBorderWidth() const { return mSettings.rasterBorderWidth(); }
+void QgsComposerLegend::setRasterBorderWidth( double width ) { mSettings.setRasterBorderWidth( width ); }
 
 void QgsComposerLegend::synchronizeWithModel()
 {
@@ -279,6 +288,11 @@ bool QgsComposerLegend::writeXML( QDomElement& elem, QDomDocument & doc ) const
 
   composerLegendElem.setAttribute( "symbolWidth", QString::number( mSettings.symbolSize().width() ) );
   composerLegendElem.setAttribute( "symbolHeight", QString::number( mSettings.symbolSize().height() ) );
+
+  composerLegendElem.setAttribute( "rasterBorder", mSettings.drawRasterBorder() );
+  composerLegendElem.setAttribute( "rasterBorderColor", QgsSymbolLayerV2Utils::encodeColor( mSettings.rasterBorderColor() ) );
+  composerLegendElem.setAttribute( "rasterBorderWidth", QString::number( mSettings.rasterBorderWidth() ) );
+
   composerLegendElem.setAttribute( "wmsLegendWidth", QString::number( mSettings.wmsLegendSize().width() ) );
   composerLegendElem.setAttribute( "wmsLegendHeight", QString::number( mSettings.wmsLegendSize().height() ) );
   composerLegendElem.setAttribute( "wrapChar", mSettings.wrapChar() );
@@ -402,6 +416,10 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   mSettings.setSymbolSize( QSizeF( itemElem.attribute( "symbolWidth", "7.0" ).toDouble(), itemElem.attribute( "symbolHeight", "14.0" ).toDouble() ) );
   mSettings.setWmsLegendSize( QSizeF( itemElem.attribute( "wmsLegendWidth", "50" ).toDouble(), itemElem.attribute( "wmsLegendHeight", "25" ).toDouble() ) );
 
+  mSettings.setDrawRasterBorder( itemElem.attribute( "rasterBorder", "1" ) != "0" );
+  mSettings.setRasterBorderColor( QgsSymbolLayerV2Utils::decodeColor( itemElem.attribute( "rasterBorderColor", "0,0,0" ) ) );
+  mSettings.setRasterBorderWidth( itemElem.attribute( "rasterBorderWidth", "0" ).toDouble() );
+
   mSettings.setWrapChar( itemElem.attribute( "wrapChar" ) );
 
   //composer map
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
index 5f074ec9fbe..057659a5a9a 100644
--- a/src/core/composer/qgscomposerlegend.h
+++ b/src/core/composer/qgscomposerlegend.h
@@ -156,6 +156,61 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     bool equalColumnWidth() const;
     void setEqualColumnWidth( bool s );
 
+    /** Returns whether a border will be drawn around raster symbol items.
+     * @see setDrawRasterBorder()
+     * @see rasterBorderColor()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    bool drawRasterBorder() const;
+
+    /** Sets whether a border will be drawn around raster symbol items.
+     * @param enabled set to true to draw borders
+     * @see drawRasterBorder()
+     * @see setRasterBorderColor()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setDrawRasterBorder( bool enabled );
+
+    /** Returns the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderColor()
+     * @see drawRasterBorder()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    QColor rasterBorderColor() const;
+
+    /** Sets the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param color border color
+     * @see rasterBorderColor()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderColor( const QColor& color );
+
+    /** Returns the border width (in millimeters) for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderWidth()
+     * @see drawRasterBorder()
+     * @see rasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    double rasterBorderWidth() const;
+
+    /** Sets the border width for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param width border width in millimeters
+     * @see rasterBorderWidth()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderWidth( double width );
+
     void setComposerMap( const QgsComposerMap* map );
     const QgsComposerMap* composerMap() const { return mComposerMap;}
 
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
index 6cc18acaece..f646d73196a 100644
--- a/src/core/layertree/qgslayertreemodellegendnode.cpp
+++ b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -515,8 +515,21 @@ QSizeF QgsRasterSymbolLegendNode::drawSymbol( const QgsLegendSettings& settings,
       if ( QgsRasterRenderer* rasterRenderer = rasterLayer->renderer() )
         itemColor.setAlpha( rasterRenderer->opacity() * 255.0 );
     }
-
     ctx->painter->setBrush( itemColor );
+
+    if ( settings.drawRasterBorder() )
+    {
+      QPen pen;
+      pen.setColor( settings.rasterBorderColor() );
+      pen.setWidthF( settings.rasterBorderWidth() );
+      pen.setJoinStyle( Qt::MiterJoin );
+      ctx->painter->setPen( pen );
+    }
+    else
+    {
+      ctx->painter->setPen( Qt::NoPen );
+    }
+
     ctx->painter->drawRect( QRectF( ctx->point.x(), ctx->point.y() + ( itemHeight - settings.symbolSize().height() ) / 2,
                                     settings.symbolSize().width(), settings.symbolSize().height() ) );
   }
diff --git a/src/core/qgslegendsettings.cpp b/src/core/qgslegendsettings.cpp
index a04dbe3101b..6e332f9bab2 100644
--- a/src/core/qgslegendsettings.cpp
+++ b/src/core/qgslegendsettings.cpp
@@ -30,6 +30,9 @@ QgsLegendSettings::QgsLegendSettings()
     , mColumnCount( 1 )
     , mSplitLayer( false )
     , mEqualColumnWidth( false )
+    , mRasterSymbolBorder( true )
+    , mRasterBorderColor( Qt::black )
+    , mRasterBorderWidth( 0.0 )
     , mMmPerMapUnit( 1 )
     , mUseAdvancedEffects( true )
     , mMapScale( 1 )
diff --git a/src/core/qgslegendsettings.h b/src/core/qgslegendsettings.h
index 4cf9820194b..5291d6be9cc 100644
--- a/src/core/qgslegendsettings.h
+++ b/src/core/qgslegendsettings.h
@@ -82,6 +82,61 @@ class CORE_EXPORT QgsLegendSettings
     QSizeF symbolSize() const {return mSymbolSize;}
     void setSymbolSize( QSizeF s ) {mSymbolSize = s;}
 
+    /** Returns whether a border will be drawn around raster symbol items.
+     * @see setDrawRasterBorder()
+     * @see rasterBorderColor()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    bool drawRasterBorder() const { return mRasterSymbolBorder; }
+
+    /** Sets whether a border will be drawn around raster symbol items.
+     * @param enabled set to true to draw borders
+     * @see drawRasterBorder()
+     * @see setRasterBorderColor()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setDrawRasterBorder( bool enabled ) { mRasterSymbolBorder = enabled; }
+
+    /** Returns the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderColor()
+     * @see drawRasterBorder()
+     * @see rasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    QColor rasterBorderColor() const { return mRasterBorderColor; }
+
+    /** Sets the border color for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param color border color
+     * @see rasterBorderColor()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderWidth()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderColor( const QColor& color ) { mRasterBorderColor = color; }
+
+    /** Returns the border width (in millimeters) for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @see setRasterBorderWidth()
+     * @see drawRasterBorder()
+     * @see rasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    double rasterBorderWidth() const { return mRasterBorderWidth; }
+
+    /** Sets the border width for the border drawn around raster symbol items. The border is
+     * only drawn if drawRasterBorder() is true.
+     * @param width border width in millimeters
+     * @see rasterBorderWidth()
+     * @see setDrawRasterBorder()
+     * @see setRasterBorderColor()
+     * @note added in QGIS 2.12
+     */
+    void setRasterBorderWidth( double width ) { mRasterBorderWidth = width; }
+
     QSizeF wmsLegendSize() const {return mWmsLegendSize;}
     void setWmsLegendSize( QSizeF s ) {mWmsLegendSize = s;}
 
@@ -174,6 +229,10 @@ class CORE_EXPORT QgsLegendSettings
     /** Use the same width (maximum) for all columns */
     bool mEqualColumnWidth;
 
+    bool mRasterSymbolBorder;
+    QColor mRasterBorderColor;
+    double mRasterBorderWidth;
+
     QMap<QgsComposerLegendStyle::Style, QgsComposerLegendStyle> mStyleMap;
 
     /** Conversion ratio between millimeters and map units - for symbols with size given in map units */
diff --git a/src/ui/composer/qgscomposerlegendwidgetbase.ui b/src/ui/composer/qgscomposerlegendwidgetbase.ui
index 5ebbb126912..449d221a375 100644
--- a/src/ui/composer/qgscomposerlegendwidgetbase.ui
+++ b/src/ui/composer/qgscomposerlegendwidgetbase.ui
@@ -63,9 +63,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
+        <y>-420</y>
         <width>375</width>
-        <height>1291</height>
+        <height>1392</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
@@ -226,7 +226,7 @@
              <bool>false</bool>
             </property>
             <property name="headerHidden">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <attribute name="headerVisible">
              <bool>false</bool>
@@ -636,6 +636,108 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QgsCollapsibleGroupBoxBasic" name="mRasterBorderGroupBox">
+            <property name="title">
+             <string>Draw border for raster symbols</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="syncGroup" stdset="0">
+             <string notr="true">composeritem</string>
+            </property>
+            <property name="collapsed" stdset="0">
+             <bool>true</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_17">
+               <property name="text">
+                <string>Border color</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <layout class="QHBoxLayout" name="horizontalLayout_6">
+               <item>
+                <widget class="QgsColorButtonV2" name="mRasterBorderColorButton">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>120</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>120</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_2">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="mOutlineWidthLabel">
+               <property name="text">
+                <string>Thickness</string>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+               <property name="buddy">
+                <cstring>mRasterBorderWidthSpinBox</cstring>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QgsDoubleSpinBox" name="mRasterBorderWidthSpinBox">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="specialValueText">
+                <string>Hairline</string>
+               </property>
+               <property name="suffix">
+                <string> mm</string>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="showClearButton" stdset="0">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -956,6 +1058,9 @@
   <tabstop>mSymbolsColGroupBox</tabstop>
   <tabstop>mSymbolWidthSpinBox</tabstop>
   <tabstop>mSymbolHeightSpinBox</tabstop>
+  <tabstop>mRasterBorderGroupBox</tabstop>
+  <tabstop>mRasterBorderColorButton</tabstop>
+  <tabstop>mRasterBorderWidthSpinBox</tabstop>
   <tabstop>mSymbolsColGroupBox_2</tabstop>
   <tabstop>mWmsLegendWidthSpinBox</tabstop>
   <tabstop>mWmsLegendHeightSpinBox</tabstop>
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
index 93371a208c3..d2a96f4ff1d 100644
--- a/tests/src/core/testqgslegendrenderer.cpp
+++ b/tests/src/core/testqgslegendrenderer.cpp
@@ -98,6 +98,7 @@ class TestQgsLegendRenderer : public QObject
     void testLongSymbolText();
     void testThreeColumns();
     void testFilterByMap();
+    void testRasterBorder();
 
   private:
     QgsLayerTreeGroup* mRoot;
@@ -327,5 +328,22 @@ void TestQgsLegendRenderer::testFilterByMap()
   QVERIFY( _verifyImage( testName, mReport ) );
 }
 
+void TestQgsLegendRenderer::testRasterBorder()
+{
+  QString testName = "legend_raster_border";
+
+  QgsLayerTreeGroup* root = new QgsLayerTreeGroup();
+  root->addLayer( mRL );
+
+  QgsLayerTreeModel legendModel( root );
+
+  QgsLegendSettings settings;
+  _setStandardTestFont( settings );
+  settings.setRasterBorderWidth( 2 );
+  settings.setRasterBorderColor( Qt::green );
+  _renderLegend( testName, &legendModel, settings );
+  QVERIFY( _verifyImage( testName, mReport ) );
+}
+
 QTEST_MAIN( TestQgsLegendRenderer )
 #include "testqgslegendrenderer.moc"
diff --git a/tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border.png b/tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da7f6d269692cf8c52d3a23bff397febec6d11a
GIT binary patch
literal 4569
zcmZ`-by!sI);&l!gGfpZ(n|Uxq`L+r1q5m78M;Ms2oVsGQb2K}6_D;uX%LY{0SW0C
zO5ncUzwUFt@1Ey5b7r17=Z&@ZUTf_WtE;0%PQpk6K@hoyy0SjFdV$lIhyZ+^Cww#l
z7d$UT4MQSuJR!1+0l$ge)lI=o6rF!hoD_ZvCJ2HBX(%fg`e$xsIUx)k=z6Y1**eY?
z_3W5vaYZN$+c=GijGSkwU=J03>u*rwkfTyGl}9@1|8e@H@|;P4D%YmK#JmWuS4jGu
zkB?2)*F!!vv=>g%pLrbdquYbv<{Hny)<x2((CXBXXh^nKTEGx93k)V<g45E%yr|2X
znSML`da{bUO*xScg0?NT4=y2WipR|rx7cY11Ai)V3cq>%TKB<&sOjlx%B@7za_bI)
z?=v$?Ls?Q68_}9J-CbSQ-^;8`D(nZNv1%NJpFVYs=ieU%cb7hOw@&@{$Xk?C0lvOs
zV`F2w1_rnW1_u8A{;h+9pJvVkEt{1+Jw-G%HLYxH!ZSo26mQdVaB$#0e*E}kzhBTA
zg(?{-sjFk)<>l=i9#&IRBUFaN?1!_-!A<CT;}UZPB_-VE%QF|KHCHR`MRIb4LIi>J
zmsh;*ettXOTJrL^ZgF#C3JTPRT5xa+<-NV{;=IErr7h6U+Su6Wotb$9@ihJ#etZAU
zojW8*)NHMSy}iAsPk=Owin8*^&#pLP=uv~OcFx@Tc)ru_VjIa)dPc_RN`KmojfUD<
zDyZIXhec9KioeqAvkiJoGB-azIX5>qJR~V8N#^WWSg#?y)UqY-vuzJGw10T`fk_<o
zLK&W8R)b24jwZx;rxHioSH;WE4>rT`bI-pLIU~l$&yU&IaDEma&uMFGtGetb_p!56
z8T@HyW21PE-NMYyn)C7Ty)P)>8JnEs4wILknws)N)_2m7pqJOzH2_er($dsCJUr~2
zoi!mIUS5q7Z6l)_2DG%as+^phhDJsz(Uh!QxVX5C_q=(ex@H^v1UZ%)DyynSV_+Oa
z5I|lSYgGII20g5>k5_yX8Hs1l*?3`HRbBnEu1<3A^htftafxC>GWUII=(V_8c4m{-
z00<mkrDWhC&vlu3`=##qxsvJhbo$)OBSL37ufw%bywI`n@sw1**ruRkR5uq52{DxN
z>J`t|oy|?VFAJAtFO!oSZlGh-xssD&V~H6U8TCP=ZFi_e|M|x#N88DX7l%z;TwJmN
zgW<q=2M|DuA(2R2`^QB`c;Fd!etuHuMRs<=`SA|_*S^6)eCXAyR}l0;pZ69u@!{d2
zkn49L^w|?xR(KK-b*%Ex<?at9NZ!GL8@sbm`jr)6VQ6UhE-#NDH8s`qF+52<=jmjh
zk(ZaKt&5wRnw}oa+uK{nrjrOQ7C}HBZgN{yTRUE#RhG;7Mnz#EaaL9q6uQ%L)!b8G
zYSDBJYJ7UZ2))V<@U?bz{b=Rl=m=Jlmj?%1$^AU9YHV!W*1fa`L5JU1YEn~aq0quY
zUV}>kka#i)SD$r@)1#uI77tEG#>Nzp$UAt~6l#2`Dl4Hzm>$5Ss;cURX0GOpbPyKN
zhHbgJpoGc-4(wg$>Z{aR0{54K=@}TphF3Aw)wEz)&llVbOiia&FDGIjx-mLBIaz-#
z&~tQi>sjha%qcFO*>V|qr{H#T@jw_gD?tU**Vm^xdvf_l@_PM({Xn`f6#D%6bC#ab
ziHR*=mBM@6baZsyzP@}iu6M=7m->>qgSRcS3N9!{_E-9GAduV2K|u{;_mpoLSKD-v
zK&`2F%y#!zw7Lb7`^ucgxzuy@(X#e~ukrc$`DbfAa94-2et%<qj11}z$0vm#DZgz)
zo|ziAx0%Bi8l~;7fG^;1c>NtpVqyh%ccGzdnYhZzyU%Y*Qoj*HhR4N`g0<=D>4i1;
z?ZDaDak%eich-6=L6BCOfQpR`yu`fj+Gi6oOH0eOjg6nvRW1dEg<+uRQ1gwvHSKuU
za1vN#NZj1q2HwiChJ}Tti#kwjZf@>wOz<!N`t>tW?ovJ|ND53k)04PL{(G{tC-yqG
z`{kd2lk;;99v-5=z(9$ROKI%(94R3oAq^efRk85baK8M;M`>I;K{8KHUc|&$GzF>@
z8<%o1Gc)HNbtf=ufztA{1=;bs+I311)FWP~w~tTX<Yd~jxVXOl{y0ciRW&NyZL-wT
zq2$p*aPWQ~ccpC)Mco+~6a=0m7}Ov&<mv9N%frvhYmJKXZaO?VT0hxa!u>@-mAH1X
zPCPL&!E@(M@Qz$}fga{vY3XodX>oDKC$k#1By~0_A}c2+Vo*p#=ysNKCnOS`oy~GE
z-`7WsMxzTpel)D@gyti+1_lt)Pyf&l4h{;5ibiB*G0UEBiaNUV6TSt+R9REg@#PE2
zljfg#s_-OvGczWz5zU^ukSkd)H{Y=j8bTr>iU7KMQc^h>45o585v^&1<)#y~h^(m*
z2jsnfaBx18g)>Na@$G~7pWP11vd^E}4%f%oX-M>pjL`hXB|<%GySuwjvAVcx!}M2T
zmcd6UV@uicY`PNL9y|`Mk*0-)&khg0?Hn91B_$M~s<BvXy0C53*b-ed99I>Q5JFjl
zjQrn{_P_Ox56QH5aA3PHc=ALRfj}&7ZztT~f6$9u)Tc8wH3h(;6B84s&mVMSw`TOr
z&7arS)+UO~M=R#0WW0X;Y-~&)2%{1Y&HM6lYM059uCIj#qoboazWGltj*Ri}@e7+4
zwtEK#lpj8vR%6;x%Gr++@bmM#dCxm0pv7fUATm0dLsF9A;Md?e+mOd$f-I{js1Z`A
zx4+-k703z^DQU-YUotywoN(}&_vS(it4Ic-1gWD#(R_h5tF5nZ@9M%Abr@1cAjlv#
zE-nHM4Gl*}$I#MJ!6(7NFly@dO2C?3K)8QwZ&M_xN19gH{{Xe?dBG~>O9qO7M?jz(
zXdajVcH_pxWZ^YPC+i-5NJvO+U7a=H17Kt16%=p`F8`c*ot&Nh{5AN71Q~L^C4O>x
z+9&gnOIDTzNPo2Yt@h5?>tG1ZW68M&Kg#CjW*|dtdD?FlH#VN3N$Id_wr^`5`XZmP
zNc#)fYH4XHd3XpnHZ@s0J3nh|lm<8~wM7t0c>KhJ-ZeL~fP*Toi-?#wOrA~N+L|4;
z&>Ww_Z)|h2`=hL?N(G3Uw6rwTsF9BwT3s!Mcq2xRkB?78K@k-nPYx`{;>rrzAYaFN
z^t}o+|3U8-Cnq~6Cw_KzHW3+FWK&bHWj+Zc;kisCd-ccb@5B0qG_kR<?p|IU5rmX%
zv~kv;W@44YWrDCmPyK+DQ+%JE7GY{oQc{93Gsi#fPi<RRU{z63`Q8{H>gna>ak6U-
zxm`-uvwX95b4v^jh1S;A4mUsWnVme3kMA2FPe#qvt2jA1c^|Inl~+}90y-=zF8=*_
z3wVs!;Z*}|ZE_gwQBz<F1iZp}wYG@~ea4$N{NF=PSLlF>V%pmkC4+Qzsff{vzb@*1
zeiK1m-Q7hZGW&ab>{3!vDI30{^Yc0a0s=H3;@@p-Y}5h5C=>$&174_rd9A#%aw3Zi
z9HL=m6`Wl7J7>?59*8OomL=tv0F8|0Y8hcQR#E~^_aE1}+ar<jfSHAg^WriyZ)Qq*
z5v;7N03lHT;%Fzru)n`=Wp7Uq6cn_3`b1e()n;qD%H7AuNODC0WO7160x)f9Gjp<b
zy;SPAsDWsaiHV6p^LBRyP0N)h)|==+DW9D9O9vhj85tS9=(BTlb$z9^YF6vcuBfEs
z@#n+?40_GK;yu#Ub#Z;YZ$JSM4gmo{t^Xc;Jhf*jEapX0QrM4<Xi+Q(MBygpi_H)q
zbUi&iM;Dilt(h7a4NYWOnGjfbRN-|drZ`~TY_XeDAi5DbIqbj#x*u&A{qp~@yc}6u
zD*<Hm2DeUT>kD=zp&+a)n7e&+^s^c(a1kIxFh<5AT`ua_<+0;|!NC-+ZY&z;HzHjK
zN6?}%G%=A<HJ%Y4R2Wc$er7^)GBPSEs!-dW1nd6PI{>maV3Md98NZy2r3|ss(&l+n
z?3}qGk)P@@MYk=1*E`#8*jaXcbbm@+N5|e3;6!ut=56DhVY#bYkmlRI1Mp=e441HX
zbTsMq?b`))br~`Blocox>aNem*W<GWkX9Dx!DI9km@)}0%*fENcPd{eOB0BFT7^u&
zeq_cDC@T#ut++4!{Tcg5zbBLB+1^!GSF;3fkW>JI;Ty&bJ5=<i3HAUdNCku8z!iZ<
z0&bHg+r;NbI~sNF?&;ZHWK>KA62GX3kIS2po}Neh<;Bl9!N2yayu7@*evTWA4xA4e
z$m{M01_lu=muFfzB^4E-T=%n|16SDD*=hCdqbXvIaDG66F9n;<HfwzLM67@H00x7F
zacZS5ZcbI~9vpP6jbc33M%WP<BKSaK)DZ|};HS(R;^+i_j$+i(rThc{e0r9aiC}{r
zt*xPw4<w|dFgZCmgcLVh!NWPFrIf&JMMg!z0W(=xSe&fqzZJ3{pua071{W2*F77tp
z2>?0&qfl8{$;QsE&~^!KumRqrptQ87<WU0^J$=mnzUN2Nio6*imYX-9gT=`MyD2GY
zS~AenLkQ+o1J;C*iAmVDn{3x#dU<tq2{81@>FQfyyWSVg+KMSF#kU8jVLsm8FVt_n
zPvTH}iQvKjfdwLN_3~+ER#t}l=nZ=Vef{3~c?$u_-o8E!0lg{=CL%l{qHlIK(_fk;
zRvDgmo0~ftz=x1#NpzC)-?f^q_24kb7qq6;e3=T3R3m3%*0lYX4^9yx27oT^STvfj
zgIP6l^+iNQIb2*^>Kv$i_I`Gek`NKS&{F+2F~KP)DCq3$41eE@HmzEH-D@WTx`v3J
zrM97=l9|Axqoab7k|<zIqbQiCe@Cl-ot(rJ6_MoS<q3(4Ul~*8=%#?y3Ycbj9-8)%
zk+PY<`1ts;>gw(&a;CE2b1dpNuqr<Rxr~gDN2H|OI2cKg#guQ}<f{li_Z=G@UEh0n
zrX*zb5;@fhFxg#7lmiV75$Kwl8b0dcnrpsg>>C)cL+xn4zPpY|90px!Z5F|QH>xxx
zq5&tne)@)Ctyy-*w5Z4b*}_Ju&N&Vb4Rr$!@VL4RHhl1)eP)IU*s*Q58Uiv#&R-yn
zLC#WqHhB&tM?ym4utp1)B%b=9H;DtN3OXkzXKaD<v~)a3cp`vdx?fAf!NK7liXqwB
z>umo|oBaMbjqBoM5KKdRU|S@TK?WQZLbDC<PT*|%pSO#1@s;#!Azy%m{}zj1oWq;F
zf|HotsT0iqhi*IlzkBZgYfvJ)W2VN&!oPnv8F(X3IW#on?&}-X(js?xdA@V$i)?)-
zY?GItZ@cm(#StjH_`(xhIXO9L|6S-h7orukCi4s1<V1nNm`7RStwD^x=R5$T0s02@
z!(av)XmfLOD-<dL<Ym=qZlUAA7tl<4Dqaf(y%?8HW=#J5x7cK3T+(=$0Rz}tBCA|f
zT%1-&g9zJ50rS>Qxx+9E4Gj(3y?ga7j~M71&yhZszR+Pxh^UUfJ~dD}J%9h&hrwfZ
zcl8H=J5NeTp!j6b^zhTA<2^?1UlYZ~8f;X5Wk-W6xp0D2TMg3*Jo3Hu_4UzqG-+W)
zg~6xhGMxCSk(8_~a^RQJ)6=bvx93K_rONr4m07i^1^n8SSGDa#sH?B-(fLi!%-q1c
zEX@(N@oZ#`Z+2>Br~Hq%89xparS?Y5Yg7J>dFK_5EQw3U57?V7@NNduP|;B?QM3yG
E7a0PIo&W#<

literal 0
HcmV?d00001

diff --git a/tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png b/tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec1e653339b0762b48fd460ee8e7b7e181deb63
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^#Xwxf!3HFM_pJ#9Qfx`y?k)`fL2$v|<&%LToCO|{
zKxN#WAk1if^7LAuAbW|YuPgg~E)F4U*$3+myk=lv+Un`z7*cWT?Ol8CtU{UNAJ1FP
zGj3s7F5r7g&hgp&r2;uQqD{-@IZR+#Yr2)QE83gisi?46c;QaAbk3#)LK|IA<e&D<
zJ1ncWy;^^N)&7UuR~-Jh$D*PxUc}be_~P^v&qW$M6NF~4r~y$Uhy~^VSxvMN{&N4b
z%18D`F*Cu|HNA9l6wnasR{ZhVvhZcX=bw8nz1*U5@{EaG|JC>314{%yKYi+Y`DMt*
zikQ23;fWGTKh$TW&EKy3)#m;7IQh1P>(;L~o#`XuDp(btn(?8}QmQxLNuHPw)8qpx
z1_xEz*#2)id)D{un>QYl^z`&XG(<wQrmA>`hllUly_@;+)JZ3w)W}uW)ckq4v%Q_Y
zjqTBFwwg3hSTu4%!h+@5^>Zr=?_IhysjR$w>e)0=mPWSb#;CQ^jy*P<WN#!MrZ#!w
z>C@h;L$t)&7V7Hg+_-md-qzc>w{P4q2)}pye$2U;nHwW~&YwSj>;C<4z3IUMET_^o
zTUl6Kc=&K(UVi@mzo9SBEU3-R_1*VA+d}4?eD@-c+qZA;+Q0w$*|WWAn<Z!H?Qb;T
z`TFbEueXYG_s`Z9>yC<#zkcnSSh<~E^15~FR)uI~78XvF7ueaebJM0pix(@GTFFj5
zo%*%PRwee<tUc>fj55Dg-8GuoGk4y+O{zb4+_AjjqLkR{b{H7UbLY>W{k)Q4SBIqQ
zMAO;6-Nzr76%{3&K7D$chsv|l-~Z<KzdUnIWvbWN`cvVnuZpn9KbO6l724n5e<m$<
zMS#YOH*eldKW}eqYse@RzcnS>36YBCUzZj>@3)|--H!*DrWrh4{an^LB{Ts5!U1Ji

literal 0
HcmV?d00001