retina overlay (!!!) отключить в мобильных версиях

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

Common/Drawings/TrackObjects/RotateTracks.js

@@ -107,6 +107,8 @@ function OverlayObject(geometry, extX, extY, brush, pen, transform )
                 overlay.df();
                 overlay._e();
                 overlay.RestoreGrState();
+				
+				overlay.m_oOverlay.ClearAll = true;
             }
         }
         if(transform)

PowerPoint/Drawing/DrawingDocument.js

@@ -1550,6 +1550,21 @@ function CDrawingDocument()
                 var x4 = xDst + dKoefX * _x4;
                 var y4 = yDst + dKoefY * _y4;
 
+                if (global_MatrixTransformer.IsIdentity2(this.TextMatrix))
+                {
+                    x1 = (x1 >> 0) + 0.5;
+                    y1 = (y1 >> 0) + 0.5;
+
+                    x2 = (x2 >> 0) + 0.5;
+                    y2 = (y2 >> 0) + 0.5;
+
+                    x3 = (x3 >> 0) + 0.5;
+                    y3 = (y3 >> 0) + 0.5;
+
+                    x4 = (x4 >> 0) + 0.5;
+                    y4 = (y4 >> 0) + 0.5;
+                }
+
                 overlay.CheckPoint(x1, y1);
                 overlay.CheckPoint(x2, y2);
                 overlay.CheckPoint(x3, y3);

PowerPoint/Drawing/HtmlPage.js

@@ -523,7 +523,11 @@ function CEditorPage(api)
     {
         if (this.bIsRetinaSupport)
         {
-            if (htmlElem.id == "id_viewer" || htmlElem.id == "id_hor_ruler" || htmlElem.id == "id_vert_ruler" || htmlElem.id == "id_buttonTabs")
+            if (htmlElem.id == "id_viewer" ||
+                htmlElem.id == "id_viewer_overlay" ||
+                htmlElem.id == "id_hor_ruler" ||
+                htmlElem.id == "id_vert_ruler" ||
+                htmlElem.id == "id_buttonTabs")
                 return true;
         }
         return false;
@@ -2386,6 +2390,7 @@ function CEditorPage(api)
 
         var overlay = this.m_oOverlayApi;
 
+        overlay.SetBaseTransform();
         overlay.Clear();
         var ctx = overlay.m_oContext;
 
@@ -2458,6 +2463,8 @@ function CEditorPage(api)
 
                 elements.DrawOnOverlay(drDoc.AutoShapesTrack);
                 drDoc.AutoShapesTrack.CorrectOverlayBounds();
+
+                overlay.SetBaseTransform();
             }
         }
 

Word/Drawing/Overlay.js

@@ -624,13 +624,13 @@ CAutoshapeTrack.prototype =
         this.m_oContext = this.m_oOverlay.m_oContext;
 
         this.Graphics = new CGraphics();
-        this.Graphics.init(this.m_oContext,
-            !overlay.IsRetina ? (r - x) : 2 * (r - x),
-            !overlay.IsRetina ? (b - y) : 2 * (b - y),
-            w_mm, h_mm);
 
-        this.Graphics.m_oCoordTransform.tx = x;
-        this.Graphics.m_oCoordTransform.ty = y;
+        var _scale = this.m_oOverlay.IsRetina? 2 : 1;
+
+        this.Graphics.init(this.m_oContext, _scale * (r - x), _scale * (b - y), w_mm, h_mm);
+
+        this.Graphics.m_oCoordTransform.tx = _scale * x;
+        this.Graphics.m_oCoordTransform.ty = _scale * y;
 
         this.Graphics.SetIntegerGrid(false);