Skip to content
Permalink
Browse files

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

  • Loading branch information
nyalldawson committed Jan 30, 2017
1 parent 2293973 commit 4a0793d1a36719131ee16c1122a3f1ccb8a29e50
Showing with 4 additions and 7 deletions.
  1. +4 −7 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 );

0 comments on commit 4a0793d

Please sign in to comment.
You can’t perform that action at this time.