Skip to content
Permalink
Browse files

Fix svg marker colors not correctly restored from project

  • Loading branch information
nyalldawson committed Oct 11, 2015
1 parent 3aa6c4f commit 1bd2a69f9b2854940e54a0295094158f72826638
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -1099,24 +1099,24 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )
if ( props.contains( "fill" ) )
{
//pre 2.5 projects used "fill"
m->setFillColor( QColor( props["fill"] ) );
m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["fill"] ) );
}
else if ( props.contains( "color" ) )
{
m->setFillColor( QColor( props["color"] ) );
m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["color"] ) );
}
if ( props.contains( "outline" ) )
{
//pre 2.5 projects used "outline"
m->setOutlineColor( QColor( props["outline"] ) );
m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline"] ) );
}
else if ( props.contains( "outline_color" ) )
{
m->setOutlineColor( QColor( props["outline_color"] ) );
m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline_color"] ) );
}
else if ( props.contains( "line_color" ) )
{
m->setOutlineColor( QColor( props["line_color"] ) );
m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["line_color"] ) );
}

if ( props.contains( "outline-width" ) )

0 comments on commit 1bd2a69

Please sign in to comment.
You can’t perform that action at this time.