[composer] Use miter joins for item frames (partial fix for #9479)

nyalldawson · nyalldawson · commit 5adbaf7d5d70 · 2014-02-05T22:59:52.000+11:00
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -100,6 +100,7 @@ void QgsComposerItem::init( bool manageZValue )
   setBrush( QBrush( QColor( 255, 255, 255, 255 ) ) );
   QPen defaultPen( QColor( 0, 0, 0 ) );
   defaultPen.setWidthF( 0.3 );
+  defaultPen.setJoinStyle( Qt::MiterJoin );
   setPen( defaultPen );
   //let z-Value be managed by composition
   if ( mComposition && manageZValue )
@@ -318,6 +319,7 @@ bool QgsComposerItem::_readXML( const QDomElement& itemElem, const QDomDocument&
     {
       QPen framePen( QColor( penRed, penGreen, penBlue, penAlpha ) );
       framePen.setWidthF( penWidth );
+      framePen.setJoinStyle( Qt::MiterJoin );
       setPen( framePen );
     }
   }
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1467,6 +1467,7 @@ void QgsComposerMap::drawGridFrameBorder( QPainter* p, const QMap< double, doubl
   //set pen to current frame pen
   QPen framePen = QPen( mGridFramePenColor );
   framePen.setWidthF( mGridFramePenThickness );
+  framePen.setJoinStyle( Qt::MiterJoin );
   p->setPen( framePen );
 
   QMap< double, double >::const_iterator posIt = pos.constBegin();
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -234,6 +234,7 @@ void QgsComposerScaleBar::applyDefaultSettings()
   mHeight = 3;
 
   mPen = QPen( QColor( 0, 0, 0 ) );
+  mPen.setJoinStyle( Qt::MiterJoin );
   mPen.setWidthF( 1.0 );
 
   mBrush.setColor( QColor( 0, 0, 0 ) );
diff --git a/src/core/composer/qgscomposertable.cpp b/src/core/composer/qgscomposertable.cpp
@@ -109,6 +109,7 @@ void QgsComposerTable::paint( QPainter* painter, const QStyleOptionGraphicsItem*
     QPen gridPen;
     gridPen.setWidthF( mGridStrokeWidth );
     gridPen.setColor( mGridColor );
+    gridPen.setJoinStyle( Qt::MiterJoin );
     painter->setPen( gridPen );
     drawHorizontalGridLines( painter, attributeMaps.size() );
     drawVerticalGridLines( painter, maxColumnWidthMap );

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ void QgsComposerItem::init( bool manageZValue )`
`100`	`100`	`setBrush( QBrush( QColor( 255, 255, 255, 255 ) ) );`
`101`	`101`	`QPen defaultPen( QColor( 0, 0, 0 ) );`
`102`	`102`	`defaultPen.setWidthF( 0.3 );`
	`103`	`+ defaultPen.setJoinStyle( Qt::MiterJoin );`
`103`	`104`	`setPen( defaultPen );`
`104`	`105`	`//let z-Value be managed by composition`
`105`	`106`	`if ( mComposition && manageZValue )`
`@@ -318,6 +319,7 @@ bool QgsComposerItem::_readXML( const QDomElement& itemElem, const QDomDocument&`
`318`	`319`	`{`
`319`	`320`	`QPen framePen( QColor( penRed, penGreen, penBlue, penAlpha ) );`
`320`	`321`	`framePen.setWidthF( penWidth );`
	`322`	`+ framePen.setJoinStyle( Qt::MiterJoin );`
`321`	`323`	`setPen( framePen );`
`322`	`324`	`}`
`323`	`325`	`}`