[composer] Draw annotations over grids/overviews (fix #10300)

qgis · Jan 30, 2017 · 4a0793d · 4a0793d
1 parent 2293973
commit 4a0793d
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -359,9 +359,6 @@ void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem*,
 
     //restore rotation
     painter->restore();
-
-    //draw canvas items
-    drawAnnotations( painter );
   }
   else if ( mComposition->plotStyle() == QgsComposition::Print ||
             mComposition->plotStyle() == QgsComposition::Postscript )
@@ -398,10 +395,6 @@ void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem*,
 
     //restore rotation
     painter->restore();
-
-    //draw canvas items
-    drawAnnotations( painter );
-
     mDrawing = false;
   }
 
@@ -416,6 +409,10 @@ void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem*,
   {
     mGridStack->drawItems( painter );
   }
+
+  //draw canvas items
+  drawAnnotations( painter );
+
   if ( shouldDrawPart( Frame ) )
   {
     drawFrame( painter );