Commit 0934cecc authored by Oleg Korshul's avatar Oleg Korshul

retina <-> noretina switch

parent 419e1ab1
...@@ -199,10 +199,13 @@ CArrowDrawer.prototype.InitSize = function ( sizeW, sizeH, is_retina ) { ...@@ -199,10 +199,13 @@ CArrowDrawer.prototype.InitSize = function ( sizeW, sizeH, is_retina ) {
this.SizeNaturalH <<= 1; this.SizeNaturalH <<= 1;
} }
this.ImageLeft = [document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' )]; if (null == this.ImageLeft || null == this.ImageTop || null == this.ImageRight || null == this.ImageBottom)
this.ImageTop = [document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' )]; {
this.ImageRight = [document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' )]; this.ImageLeft = [document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas')];
this.ImageBottom = [document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' ), document.createElement( 'canvas' )]; this.ImageTop = [document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas')];
this.ImageRight = [document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas')];
this.ImageBottom = [document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas'), document.createElement('canvas')];
}
this.ImageLeft[ScrollOverType.NONE].width = this.SizeW; this.ImageLeft[ScrollOverType.NONE].width = this.SizeW;
this.ImageLeft[ScrollOverType.NONE].height = this.SizeH; this.ImageLeft[ScrollOverType.NONE].height = this.SizeH;
...@@ -1619,8 +1622,7 @@ function ScrollObject( elemID, settings, dbg ) { ...@@ -1619,8 +1622,7 @@ function ScrollObject( elemID, settings, dbg ) {
this.startColorFadeOutStart = _HEXTORGB_(this.settings.scrollerColorOver).R; this.startColorFadeOutStart = _HEXTORGB_(this.settings.scrollerColorOver).R;
this.startColorFadeInOutStart = -1; this.startColorFadeInOutStart = -1;
if ( window.devicePixelRatio == 2 ) this.IsRetina = AscCommon.AscBrowser.isRetina;
this.IsRetina = true;
this.piperImgVert = [document.createElement( 'canvas' ), document.createElement( 'canvas' )]; this.piperImgVert = [document.createElement( 'canvas' ), document.createElement( 'canvas' )];
this.piperImgHor = [document.createElement( 'canvas' ), document.createElement( 'canvas' )]; this.piperImgHor = [document.createElement( 'canvas' ), document.createElement( 'canvas' )];
...@@ -1851,6 +1853,12 @@ ScrollObject.prototype = { ...@@ -1851,6 +1853,12 @@ ScrollObject.prototype = {
}, },
Repos:function ( settings, bIsHorAttack, bIsVerAttack ) Repos:function ( settings, bIsHorAttack, bIsVerAttack )
{ {
if (this.IsRetina != AscCommon.AscBrowser.isRetina)
{
this.IsRetina = AscCommon.AscBrowser.isRetina;
this.ArrowDrawer.InitSize(this.settings.arrowSizeH, this.settings.arrowSizeW, this.IsRetina);
}
if (bIsVerAttack) if (bIsVerAttack)
{ {
var _canvasH = settings.screenH; var _canvasH = settings.screenH;
...@@ -2425,7 +2433,6 @@ ScrollObject.prototype = { ...@@ -2425,7 +2433,6 @@ ScrollObject.prototype = {
function drawScroller() { function drawScroller() {
that.context.beginPath(); that.context.beginPath();
if ( that.isVerticalScroll ) { if ( that.isVerticalScroll ) {
......
...@@ -2480,6 +2480,12 @@ function CEditorPage(api) ...@@ -2480,6 +2480,12 @@ function CEditorPage(api)
this.m_bIsUpdateHorRuler = true; this.m_bIsUpdateHorRuler = true;
this.m_bIsUpdateVerRuler = true; this.m_bIsUpdateVerRuler = true;
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
this.m_oHorRuler.RepaintChecker.BlitAttack = true; this.m_oHorRuler.RepaintChecker.BlitAttack = true;
this.m_oVerRuler.RepaintChecker.BlitAttack = true; this.m_oVerRuler.RepaintChecker.BlitAttack = true;
......
...@@ -2694,6 +2694,12 @@ function CEditorPage(api) ...@@ -2694,6 +2694,12 @@ function CEditorPage(api)
this.m_bIsUpdateHorRuler = true; this.m_bIsUpdateHorRuler = true;
this.m_bIsUpdateVerRuler = true; this.m_bIsUpdateVerRuler = true;
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
this.m_oHorRuler.RepaintChecker.BlitAttack = true; this.m_oHorRuler.RepaintChecker.BlitAttack = true;
this.m_oVerRuler.RepaintChecker.BlitAttack = true; this.m_oVerRuler.RepaintChecker.BlitAttack = true;
......
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