Respect snapping while moving annotations (fix #10551)

nyalldawson · nyalldawson · commit 7a2be4225955 · 2017-01-30T09:13:53.000+10:00
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -173,7 +173,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )
   {
     if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveMapPosition )
     {
-      QgsPoint mapPos = transformCanvasToAnnotation( toMapCoordinates( e->pos() ), annotation );
+      QgsPoint mapPos = transformCanvasToAnnotation( e->snapPoint( QgsMapMouseEvent::SnapProjectConfig ), annotation );
       annotation->setMapPosition( mapPos );
       annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),
                                        e->posF().y() / mCanvas->height() ) );

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )`
`173`	`173`	`{`
`174`	`174`	`if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveMapPosition )`
`175`	`175`	`{`
`176`		`- QgsPoint mapPos = transformCanvasToAnnotation( toMapCoordinates( e->pos() ), annotation );`
	`176`	`+ QgsPoint mapPos = transformCanvasToAnnotation( e->snapPoint( QgsMapMouseEvent::SnapProjectConfig ), annotation );`
`177`	`177`	`annotation->setMapPosition( mapPos );`
`178`	`178`	`annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(),`
`179`	`179`	`e->posF().y() / mCanvas->height() ) );`