Commit 879a8f53 authored by Oleg Korshul's avatar Oleg Korshul

developing...

parent 535f4533
...@@ -1308,8 +1308,8 @@ ...@@ -1308,8 +1308,8 @@
widthStyle /= AscCommon.AscBrowser.retinaPixelRatio; widthStyle /= AscCommon.AscBrowser.retinaPixelRatio;
heightStyle /= AscCommon.AscBrowser.retinaPixelRatio; heightStyle /= AscCommon.AscBrowser.retinaPixelRatio;
width = widthStyle *= AscCommon.AscBrowser.retinaPixelRatio; width = widthStyle * AscCommon.AscBrowser.retinaPixelRatio;
height = heightStyle *= AscCommon.AscBrowser.retinaPixelRatio; height = heightStyle * AscCommon.AscBrowser.retinaPixelRatio;
} }
this.canvasOuterStyle.left = left + 'px'; this.canvasOuterStyle.left = left + 'px';
......
...@@ -452,8 +452,8 @@ ChartPreviewManager.prototype.createChartPreview = function(type, styleIndex) { ...@@ -452,8 +452,8 @@ ChartPreviewManager.prototype.createChartPreview = function(type, styleIndex) {
this._canvas_charts.height = this.CHART_PREVIEW_HEIGHT_PIX; this._canvas_charts.height = this.CHART_PREVIEW_HEIGHT_PIX;
if (AscCommon.AscBrowser.isRetina) { if (AscCommon.AscBrowser.isRetina) {
this._canvas_charts.width <<= 1; this._canvas_charts.width *= AscCommon.AscBrowser.retinaPixelRatio;
this._canvas_charts.height <<= 1; this._canvas_charts.height *= AscCommon.AscBrowser.retinaPixelRatio;
} }
} }
......
...@@ -866,19 +866,19 @@ CAutoshapeTrack.prototype = ...@@ -866,19 +866,19 @@ CAutoshapeTrack.prototype =
this.m_oOverlay.IsRetina = true; this.m_oOverlay.IsRetina = true;
this.m_oOverlay.m_oContext.setTransform(1, 0, 0, 1, 0, 0); this.m_oOverlay.m_oContext.setTransform(1, 0, 0, 1, 0, 0);
left /= 2; left /= AscCommon.AscBrowser.retinaPixelRatio;
top /= 2; top /= AscCommon.AscBrowser.retinaPixelRatio;
width /= 2; width /= AscCommon.AscBrowser.retinaPixelRatio;
height /= 2; height /= AscCommon.AscBrowser.retinaPixelRatio;
if (matrix) if (matrix)
{ {
matrix.tx /= 2; matrix.tx /= AscCommon.AscBrowser.retinaPixelRatio;
matrix.ty /= 2; matrix.ty /= AscCommon.AscBrowser.retinaPixelRatio;
} }
this.m_oOverlay.m_oContext.translate(this.Graphics.m_oCoordTransform.tx, this.Graphics.m_oCoordTransform.ty); this.m_oOverlay.m_oContext.translate(this.Graphics.m_oCoordTransform.tx, this.Graphics.m_oCoordTransform.ty);
this.m_oOverlay.m_oContext.scale(2, 2); this.m_oOverlay.m_oContext.scale(AscCommon.AscBrowser.retinaPixelRatio, AscCommon.AscBrowser.retinaPixelRatio);
this.m_oOverlay.m_oContext.translate(-this.Graphics.m_oCoordTransform.tx, -this.Graphics.m_oCoordTransform.ty); this.m_oOverlay.m_oContext.translate(-this.Graphics.m_oCoordTransform.tx, -this.Graphics.m_oCoordTransform.ty);
} }
...@@ -1988,8 +1988,8 @@ CAutoshapeTrack.prototype = ...@@ -1988,8 +1988,8 @@ CAutoshapeTrack.prototype =
if (matrix) if (matrix)
{ {
matrix.tx *= 2; matrix.tx *= AscCommon.AscBrowser.retinaPixelRatio;
matrix.ty *= 2; matrix.ty *= AscCommon.AscBrowser.retinaPixelRatio;
} }
} }
}, },
...@@ -2275,7 +2275,7 @@ CAutoshapeTrack.prototype = ...@@ -2275,7 +2275,7 @@ CAutoshapeTrack.prototype =
var dist = TRACK_ADJUSTMENT_SIZE / 2; var dist = TRACK_ADJUSTMENT_SIZE / 2;
if (!overlay.IsRetina && overlay.IsCellEditor && AscCommon.AscBrowser.isRetina) if (!overlay.IsRetina && overlay.IsCellEditor && AscCommon.AscBrowser.isRetina)
dist *= 2; dist *= AscCommon.AscBrowser.retinaPixelRatio;
ctx.moveTo(cx - dist, cy); ctx.moveTo(cx - dist, cy);
ctx.lineTo(cx, cy - dist); ctx.lineTo(cx, cy - dist);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment