git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61419 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/Qt_build/test_resources/sdk-all.js

@@ -357044,8 +357044,17 @@ CDrawingDocument.prototype =
             }
 
             var _selectCircleEpsMM = 10; // 1cm;
+            var _selectCircleEpsMM_square = _selectCircleEpsMM * _selectCircleEpsMM;
 
-            if (Math.abs(pos.X - _circlePos1_x) < _selectCircleEpsMM && Math.abs(pos.Y - _circlePos1_y) < _selectCircleEpsMM)
+            var _distance1 = ((pos.X - _circlePos1_x) * (pos.X - _circlePos1_x) + (pos.Y - _circlePos1_y) * (pos.Y - _circlePos1_y));
+            var _distance2 = ((pos.X - _circlePos2_x) * (pos.X - _circlePos2_x) + (pos.Y - _circlePos2_y) * (pos.Y - _circlePos2_y));
+
+            var candidate = 1;
+            if (_distance2 < _distance1)
+                candidate = 2;
+
+
+            if (1 == candidate && _distance1 < _selectCircleEpsMM_square)
             {
                 this.SelectClearLock = true;
                 this.SelectDrag = 1;
@@ -357081,7 +357090,7 @@ CDrawingDocument.prototype =
                 this.SelectClearLock = false;
             }
 
-            if (Math.abs(pos.X - _circlePos2_x) < _selectCircleEpsMM && Math.abs(pos.Y - _circlePos2_y) < _selectCircleEpsMM)
+            if (2 == candidate && _distance2 < _selectCircleEpsMM_square)
             {
                 this.SelectClearLock = true;
                 this.SelectDrag = 2;