Commit a2d429ec authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил отрисовки при scroll (неправильно рассчитывался размер rect-а для отрисовки).

Баг http://bugzserver/show_bug.cgi?id=24206
ToDo перепроверить на новых исходниках initContextSmoothing

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56291 954022d7-b5bf-4e40-9824-e11837661b57
parent a8f178ef
...@@ -1295,6 +1295,7 @@ ...@@ -1295,6 +1295,7 @@
this.canvas.height = this.canvasOverlay.height = this.canvasGraphic.height = this.canvasGraphicOverlay.height = height; this.canvas.height = this.canvasOverlay.height = this.canvasGraphic.height = this.canvasGraphicOverlay.height = height;
// При смене ориентации у планшета, сбрасываются флаги у canvas! // При смене ориентации у планшета, сбрасываются флаги у canvas!
// ToDo перепроверить на новых исходниках, должно поправиться, был баг в отрисовке!!!!!!!!!!!!!
this.drawingCtx.initContextSmoothing(); this.drawingCtx.initContextSmoothing();
this.overlayCtx.initContextSmoothing(); this.overlayCtx.initContextSmoothing();
this.drawingCtxCharts.initContextSmoothing(); this.drawingCtxCharts.initContextSmoothing();
......
...@@ -5218,8 +5218,7 @@ ...@@ -5218,8 +5218,7 @@
diffWidth = this.cols[cFrozen].left - this.cols[0].left; diffWidth = this.cols[cFrozen].left - this.cols[0].left;
diffHeight = this.rows[rFrozen].top - this.rows[0].top; diffHeight = this.rows[rFrozen].top - this.rows[0].top;
y += diffHeight; y += diffHeight;
if (dy > 0) oldH -= diffHeight;
oldH -= diffHeight;
} }
oldVRE_isPartial = this._isRowDrawnPartially(vr.r2, vr.r1, diffHeight); oldVRE_isPartial = this._isRowDrawnPartially(vr.r2, vr.r1, diffHeight);
...@@ -5258,7 +5257,7 @@ ...@@ -5258,7 +5257,7 @@
} }
ctx.setFillStyle(this.settings.cells.defaultState.background) ctx.setFillStyle(this.settings.cells.defaultState.background)
.fillRect(this.headersLeft, y + (dy > 0 && oldH > 0 ? oldH - dy : 0), .fillRect(this.headersLeft, y + (dy > 0 && oldH > 0 ? oldH - dy : 0),
ctxW, ctxH - this.cellsTop - (oldH > 0 ? oldH : 0)); ctxW, Math.abs(dy));
var rangeGraphic = null; var rangeGraphic = null;
if ( !(dy > 0 && vr.r2 === oldEnd && !oldVRE_isPartial && dx === 0) ) { if ( !(dy > 0 && vr.r2 === oldEnd && !oldVRE_isPartial && dx === 0) ) {
...@@ -5358,8 +5357,7 @@ ...@@ -5358,8 +5357,7 @@
diffWidth = this.cols[cFrozen].left - this.cols[0].left; diffWidth = this.cols[cFrozen].left - this.cols[0].left;
diffHeight = this.rows[rFrozen].top - this.rows[0].top; diffHeight = this.rows[rFrozen].top - this.rows[0].top;
x += diffWidth; x += diffWidth;
if (dx > 0) oldW -= diffWidth;
oldW -= diffWidth;
} }
var oldVCE_isPartial = this._isColDrawnPartially(vr.c2, vr.c1, diffWidth); var oldVCE_isPartial = this._isColDrawnPartially(vr.c2, vr.c1, diffWidth);
...@@ -5374,8 +5372,7 @@ ...@@ -5374,8 +5372,7 @@
ctx.drawImage(ctx.getCanvas(), x, y, oldW, ctxH, x - dx, y, oldW, ctxH); ctx.drawImage(ctx.getCanvas(), x, y, oldW, ctxH, x - dx, y, oldW, ctxH);
} }
ctx.setFillStyle(this.settings.cells.defaultState.background) ctx.setFillStyle(this.settings.cells.defaultState.background)
.fillRect(x + (dx > 0 && oldW > 0 ? oldW - dx : 0), y, .fillRect(x + (dx > 0 && oldW > 0 ? oldW - dx : 0), y, Math.abs(dx), ctxH);
ctxW - this.cellsLeft - (oldW > 0 ? oldW : 0), ctxH);
var rangeGraphic = null; var rangeGraphic = null;
if ( !(dx > 0 && vr.c2 === oldEnd && !oldVCE_isPartial) ) { if ( !(dx > 0 && vr.c2 === oldEnd && !oldVCE_isPartial) ) {
......
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