попадание и трек с аспектом

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

Common/Drawings/Format/Shape.js

@@ -19,6 +19,11 @@ function hitToHandles(x, y, object)
         radius *= global_mouseEvent.KoefPixToMM;
     }
 
+    if (undefined !== window.AscHitToHandlesEpsilon)
+    {
+        radius = window.AscHitToHandlesEpsilon;
+    }
+
     // чтобы не считать корни
     radius *= radius;
 

Common/Drawings/TrackObjects/ResizeTracks.js

@@ -226,7 +226,7 @@ function ResizeTrackShapeImage(originalObject, cardDirection)
             var _new_used_half_height;
             var _temp;
 
-            if(ShiftKey === true && this.bAspect === true)
+            if((ShiftKey === true || window.AscAlwaysSaveAspectOnResizeTrack === true) && this.bAspect === true)
             {
                 var _new_aspect = this.aspect*(Math.abs(kd1/ kd2));
 
@@ -576,7 +576,7 @@ function ResizeTrackShapeImage(originalObject, cardDirection)
             var _real_height, _real_width;
             var _abs_height, _abs_width;
 
-            if(ShiftKey === true && this.bAspect === true)
+            if((ShiftKey === true || window.AscAlwaysSaveAspectOnResizeTrack === true) && this.bAspect === true)
             {
                 var _new_aspect = this.aspect*(Math.abs(kd1/ kd2));
 
@@ -919,7 +919,7 @@ function ResizeTrackGroup(originalObject, cardDirection, parentTrack)
             var _new_used_half_height;
             var _temp;
 
-            if(ShiftKey === true && this.bAspect === true)
+            if((ShiftKey === true || window.AscAlwaysSaveAspectOnResizeTrack === true) && this.bAspect === true)
             {
                 var _new_aspect = this.aspect*(Math.abs(kd1/ kd2));
 
@@ -1200,7 +1200,7 @@ function ResizeTrackGroup(originalObject, cardDirection, parentTrack)
             var _real_height, _real_width;
             var _abs_height, _abs_width;
 
-            if(ShiftKey === true && this.bAspect === true)
+            if((ShiftKey === true || window.AscAlwaysSaveAspectOnResizeTrack === true) && this.bAspect === true)
             {
                 var _new_aspect = this.aspect*(Math.abs(kd1/ kd2));
 

Common/Native/Wrappers/DrawingDocument.js

@@ -1579,9 +1579,7 @@ CDrawingDocument.prototype =
                 if (this.Native["GetDeviceDPI"])
                 {
                     // 1см
-                    global_mouseEvent.KoefPixToMM = 10 * this.Native["GetDeviceDPI"] / g_dKoef_in_to_mm;
-                    // Серега ориентируется на эту константу
-                    global_mouseEvent.KoefPixToMM /= TRACK_CIRCLE_RADIUS;
+                    window.AscHitToHandlesEpsilon = 10 * this.Native["GetDeviceDPI"]() / (25.4 * this.Native["DD_GetDotsPerMM"]() );
                 }
 
                 var _isDrawings = this.LogicDocument.DrawingObjects.isPointInDrawingObjects2(pos.X, pos.Y, pos.Page, true);

Common/Native/Wrappers/api.js

@@ -5296,6 +5296,7 @@ asc_docs_api.prototype["Native_Editor_Initialize_Settings"] = function(_params)
             case 101:
             {
                 this.WordControl.m_oDrawingDocument.IsMobile = _params[_current.pos++];
+                window.AscAlwaysSaveAspectOnResizeTrack = true;
                 break;
             }
             case 255: