[composer] When searching snap targets, pick the closest one

manisandro · nyalldawson · commit b7517223b12b · 2014-05-29T23:13:12.000+10:00
diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp
@@ -1300,7 +1300,7 @@ void QgsComposerMouseHandles::checkNearestItem( double checkCoord, const QMap< d
   }
 
   double currentDiff = abs( checkCoord - currentCoord );
-  if ( currentDiff < mComposition->alignmentSnapTolerance() )
+  if ( currentDiff < mComposition->alignmentSnapTolerance() && currentDiff < smallestDiff )
   {
     itemCoord = currentCoord + itemCoordOffset;
     alignCoord = currentCoord;
@@ -1348,3 +1348,4 @@ bool QgsComposerMouseHandles::nearestItem( const QMap< double, const QgsComposer
     }
   }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,7 @@ void QgsComposerMouseHandles::checkNearestItem( double checkCoord, const QMap< d`
`1300`	`1300`	`}`
`1301`	`1301`
`1302`	`1302`	`double currentDiff = abs( checkCoord - currentCoord );`
`1303`		`- if ( currentDiff < mComposition->alignmentSnapTolerance() )`
	`1303`	`+ if ( currentDiff < mComposition->alignmentSnapTolerance() && currentDiff < smallestDiff )`
`1304`	`1304`	`{`
`1305`	`1305`	`itemCoord = currentCoord + itemCoordOffset;`
`1306`	`1306`	`alignCoord = currentCoord;`
`@@ -1348,3 +1348,4 @@ bool QgsComposerMouseHandles::nearestItem( const QMap< double, const QgsComposer`
`1348`	`1348`	`}`
`1349`	`1349`	`}`
`1350`	`1350`	`}`
	`1351`	`+`