попадание ios

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61593 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/Format/Shape.js

@@ -123,6 +123,16 @@ function hitToHandles(x, y, object)
         }
     }
 
+    // теперь смотрим расстояние до центра фигуры, чтобы можно было двигать маленькую
+    dist_x = t_x - hc;
+    dist_y = t_y - vc;
+    _tmp_dist =  dist_x * dist_x + dist_y * dist_y;
+    if (_tmp_dist < _min_dist && !check_line)
+    {
+        _min_dist = _tmp_dist;
+        _ret_value = -1;
+    }
+
     if (_min_dist < radius)
         return _ret_value;
 

Common/Drawings/Hit.js

@@ -20,6 +20,11 @@ function HitInLine(context, px, py, x0, y0, x1, y1)
         d *= global_mouseEvent.KoefPixToMM;
     }
 
+    if (undefined !== window.AscHitToHandlesEpsilon)
+    {
+        d = window.AscHitToHandlesEpsilon/Math.sqrt(tx*tx+ty*ty);
+    }
+
     dx=-ty*d;
     dy=tx*d;
 
@@ -52,6 +57,11 @@ function HitInBezier4(context, px, py, x0, y0, x1, y1, x2, y2, x3, y3)
         d *= global_mouseEvent.KoefPixToMM;
     }
 
+    if (undefined !== window.AscHitToHandlesEpsilon)
+    {
+        d = window.AscHitToHandlesEpsilon/Math.sqrt(tx*tx+ty*ty);
+    }
+
     dx=-ty*d;
     dy=tx*d;
 
@@ -84,6 +94,11 @@ function HitInBezier3(context, px, py, x0, y0, x1, y1, x2, y2)
         d *= global_mouseEvent.KoefPixToMM;
     }
 
+    if (undefined !== window.AscHitToHandlesEpsilon)
+    {
+        d = window.AscHitToHandlesEpsilon/Math.sqrt(tx*tx+ty*ty);
+    }
+
     dx=-ty*d;
     dy=tx*d;
 

Common/Native/Wrappers/DrawingDocument.js

@@ -1634,7 +1634,7 @@ CDrawingDocument.prototype =
                 if (this.Native["GetDeviceDPI"])
                 {
                     // 1см
-                    window.AscHitToHandlesEpsilon = 10 * this.Native["GetDeviceDPI"]() / (25.4 * this.Native["DD_GetDotsPerMM"]() );
+                    window.AscHitToHandlesEpsilon = 5 * this.Native["GetDeviceDPI"]() / (25.4 * this.Native["DD_GetDotsPerMM"]() );
                 }
 
                 var _isDrawings = this.LogicDocument.DrawingObjects.isPointInDrawingObjects2(pos.X, pos.Y, pos.Page, true);