Fix composer map frame/annotations not showing on OSX (refs #12747)

nyalldawson · nyalldawson · commit f5d4088a42a8 · 2015-06-24T21:34:55.000+10:00
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -664,7 +664,13 @@ void QgsComposerMapGrid::draw( QPainter* p )
   }
 
   p->restore();
+
   p->setClipping( false );
+#ifdef Q_OS_MAC
+  //QPainter::setClipping(false) seems to be broken on OSX (#12747). So we hack around it by
+  //setting a larger clip rect
+  p->setClipRect( mComposerMap->mapRectFromScene( mComposerMap->sceneBoundingRect() ).adjusted( -10, -10, 10, 10 ) );
+#endif
 
   if ( mGridFrameStyle != QgsComposerMapGrid::NoFrame )
   {

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,13 @@ void QgsComposerMapGrid::draw( QPainter* p )`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`p->restore();`
	`667`	`+`
`667`	`668`	`p->setClipping( false );`
	`669`	`+#ifdef Q_OS_MAC`
	`670`	`+ //QPainter::setClipping(false) seems to be broken on OSX (#12747). So we hack around it by`
	`671`	`+ //setting a larger clip rect`
	`672`	`+ p->setClipRect( mComposerMap->mapRectFromScene( mComposerMap->sceneBoundingRect() ).adjusted( -10, -10, 10, 10 ) );`
	`673`	`+#endif`
`668`	`674`
`669`	`675`	`if ( mGridFrameStyle != QgsComposerMapGrid::NoFrame )`
`670`	`676`	`{`