From 70527cb0861a1db475e05d1380c8d611c0ba8709 Mon Sep 17 00:00:00 2001 From: olivierdalang Date: Tue, 6 Oct 2020 09:35:52 +0200 Subject: [PATCH] rotated ticks followup : fix annotation margin to corner calculation --- src/core/layout/qgslayoutitemmapgrid.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp index 1063a281d595..4f93c89b4949 100644 --- a/src/core/layout/qgslayoutitemmapgrid.cpp +++ b/src/core/layout/qgslayoutitemmapgrid.cpp @@ -1357,17 +1357,17 @@ void QgsLayoutItemMapGrid::drawCoordinateAnnotation( QgsRenderContext &context, facingLeft = !facingLeft; facingRight = !facingRight; } - if ( annot.border == BorderSide::Top && ( ( facingLeft && xpos < mRotatedAnnotationsMarginToCorner ) || - ( facingRight && xpos > mMap->rect().width() - mRotatedAnnotationsMarginToCorner ) ) ) + if ( annot.border == BorderSide::Top && ( ( facingLeft && annot.position.x() < mRotatedAnnotationsMarginToCorner ) || + ( facingRight && annot.position.x() > mMap->rect().width() - mRotatedAnnotationsMarginToCorner ) ) ) return; - if ( annot.border == BorderSide::Bottom && ( ( facingLeft && xpos > mMap->rect().width() - mRotatedAnnotationsMarginToCorner ) || - ( facingRight && xpos < mRotatedAnnotationsMarginToCorner ) ) ) + if ( annot.border == BorderSide::Bottom && ( ( facingLeft && annot.position.x() > mMap->rect().width() - mRotatedAnnotationsMarginToCorner ) || + ( facingRight && annot.position.x() < mRotatedAnnotationsMarginToCorner ) ) ) return; - if ( annot.border == BorderSide::Left && ( ( facingLeft && ypos > mMap->rect().height() - mRotatedAnnotationsMarginToCorner ) || - ( facingRight && ypos < mRotatedAnnotationsMarginToCorner ) ) ) + if ( annot.border == BorderSide::Left && ( ( facingLeft && annot.position.y() > mMap->rect().height() - mRotatedAnnotationsMarginToCorner ) || + ( facingRight && annot.position.y() < mRotatedAnnotationsMarginToCorner ) ) ) return; - if ( annot.border == BorderSide::Right && ( ( facingLeft && ypos < mRotatedAnnotationsMarginToCorner ) || - ( facingRight && ypos > mMap->rect().height() - mRotatedAnnotationsMarginToCorner ) ) ) + if ( annot.border == BorderSide::Right && ( ( facingLeft && annot.position.y() < mRotatedAnnotationsMarginToCorner ) || + ( facingRight && annot.position.y() > mMap->rect().height() - mRotatedAnnotationsMarginToCorner ) ) ) return; QgsScopedQPainterState painterState( context.painter() );