Followup effbfcd, better fix for #12747. The previous fix broke

nyalldawson · nyalldawson · commit 196d7a083ef7 · 2015-05-30T14:27:15.000+10:00
print exports of grid frames under OSX.
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -668,12 +668,11 @@ void QgsComposerMapGrid::draw( QPainter* p )
 
   p->restore();
 
-  //QPainter::setClipping(false) seems to be broken on OSX (#12747), setClipRect
-  //fails on other platforms...
-#ifndef Q_OS_MAC
   p->setClipping( false );
-#else
-  p->setClipRect( thisPaintRect, Qt::NoClip );
+#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 )
