Fix #5344 - square symbol not selectable

wonder-sk · wonder-sk · commit c6be15ed9898 · 2012-04-22T11:47:32.000+02:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -36,8 +36,6 @@ static QPointF _rotatedOffset( const QPointF& offset, double angle )
 
 QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QString name, QColor color, QColor borderColor, double size, double angle )
 {
-  if ( name == "rectangle" )
-    name = "square";
   mName = name;
   mColor = color;
   mBorderColor = borderColor;
@@ -226,7 +224,7 @@ bool QgsSimpleMarkerSymbolLayerV2::prepareShape()
 {
   mPolygon.clear();
 
-  if ( mName == "square" )
+  if ( mName == "square" || mName == "rectangle" )
   {
     mPolygon = QPolygonF( QRectF( QPointF( -1, -1 ), QPointF( 1, 1 ) ) );
     return true;

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ static QPointF _rotatedOffset( const QPointF& offset, double angle )`
`36`	`36`
`37`	`37`	`QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QString name, QColor color, QColor borderColor, double size, double angle )`
`38`	`38`	`{`
`39`		`- if ( name == "rectangle" )`
`40`		`- name = "square";`
`41`	`39`	`mName = name;`
`42`	`40`	`mColor = color;`
`43`	`41`	`mBorderColor = borderColor;`
`@@ -226,7 +224,7 @@ bool QgsSimpleMarkerSymbolLayerV2::prepareShape()`
`226`	`224`	`{`
`227`	`225`	`mPolygon.clear();`
`228`	`226`
`229`		`- if ( mName == "square" )`
	`227`	`+ if ( mName == "square" \|\| mName == "rectangle" )`
`230`	`228`	`{`
`231`	`229`	`mPolygon = QPolygonF( QRectF( QPointF( -1, -1 ), QPointF( 1, 1 ) ) );`
`232`	`230`	`return true;`