Don't draw annotation text outside of painter's clip region (fix #10400)

nyalldawson · nyalldawson · commit af0d68cf3dc4 · 2014-06-05T16:31:53.000+10:00
diff --git a/src/gui/qgstextannotationitem.cpp b/src/gui/qgstextannotationitem.cpp
@@ -64,8 +64,16 @@ void QgsTextAnnotationItem::paint( QPainter * painter )
   painter->translate( mOffsetFromReferencePoint.x() + frameWidth / 2.0,
                       mOffsetFromReferencePoint.y() + frameWidth / 2.0 );
 
+  QRectF clipRect = QRectF( 0, 0, mFrameSize.width() - frameWidth / 2.0, mFrameSize.height() - frameWidth / 2.0 ) ;
+  if ( painter->hasClipping() )
+  {
+    //QTextDocument::drawContents will draw text outside of the painter's clip region
+    //when it is passed a clip rectangle. So, we need to intersect it with the
+    //painter's clip region to prevent text drawn outside clipped region (eg, outside composer maps, see #10400)
+    clipRect = clipRect.intersected( painter->clipRegion().boundingRect() );
+  }
   //draw text document
-  mDocument->drawContents( painter, QRectF( 0, 0, mFrameSize.width() - frameWidth / 2.0, mFrameSize.height() - frameWidth / 2.0 ) );
+  mDocument->drawContents( painter, clipRect );
   painter->restore();
   if ( isSelected() )
   {
