Fix Blocker Issue #7871 : SVG Marker fill and outlin colors are restored

when changing widget or reopening style window
qgis · Aug 30, 2013 · 53fd7f3 · 53fd7f3
1 parent 26efcbc
commit 53fd7f3
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -905,9 +905,27 @@ void QgsSvgMarkerSymbolLayerV2Widget::setGuiForSvg( const QgsSvgMarkerSymbolLaye
   mBorderWidthSpinBox->setEnabled( hasOutlineWidthParam );
 
   if ( hasFillParam )
-    mChangeColorButton->setColor( defaultFill );
+  {
+    if ( layer->fillColor().isValid() )
+    {
+      mChangeColorButton->setColor( layer->fillColor() );
+    }
+    else
+    {
+      mChangeColorButton->setColor( defaultFill );
+    }
+  }
   if ( hasOutlineParam )
-    mChangeBorderColorButton->setColor( defaultOutline );
+  {
+    if ( layer->outlineColor().isValid() )
+    {
+      mChangeBorderColorButton->setColor( layer->outlineColor() );
+    }
+    else
+    {
+      mChangeBorderColorButton->setColor( defaultOutline );
+    }
+  }
 
   mFileLineEdit->blockSignals( true );
   mFileLineEdit->setText( layer->path() );