Commit 61d9c002 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Поправил падение со scroll.

Баг http://bugzserver/show_bug.cgi?id=24727
Баг http://bugzserver/show_bug.cgi?id=24713

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56652 954022d7-b5bf-4e40-9824-e11837661b57
parent f8a86f88
...@@ -5256,9 +5256,10 @@ ...@@ -5256,9 +5256,10 @@
oldW = ctxW; oldW = ctxW;
} }
if (oldH > 0) { var moveHeight = oldH - lastRowHeight;
ctx.drawImage(ctx.getCanvas(), x, y, oldW, oldH - lastRowHeight, x + dx, y - dy, oldW, oldH - lastRowHeight); if (moveHeight > 0) {
this.drawingGraphicCtx.moveImageData(x, y, oldW, oldH - lastRowHeight, x + dx, y - dy); ctx.drawImage(ctx.getCanvas(), x, y, oldW, moveHeight, x + dx, y - dy, oldW, moveHeight);
this.drawingGraphicCtx.moveImageData(x, y, oldW, moveHeight, x + dx, y - dy);
} }
ctx.setFillStyle(this.settings.cells.defaultState.background) ctx.setFillStyle(this.settings.cells.defaultState.background)
.fillRect(this.headersLeft, y + (scrollDown ? oldH - dy - lastRowHeight : 0), .fillRect(this.headersLeft, y + (scrollDown ? oldH - dy - lastRowHeight : 0),
...@@ -5374,9 +5375,10 @@ ...@@ -5374,9 +5375,10 @@
this.objectRender.setScrollOffset(); this.objectRender.setScrollOffset();
var moveWidth = oldW - lastColWidth;
if (oldW > 0) { if (oldW > 0) {
ctx.drawImage(ctx.getCanvas(), x, y, oldW - lastColWidth, ctxH, x - dx, y, oldW - lastColWidth, ctxH); ctx.drawImage(ctx.getCanvas(), x, y, moveWidth, ctxH, x - dx, y, moveWidth, ctxH);
this.drawingGraphicCtx.moveImageData(x, y, oldW - lastColWidth, ctxH, x - dx, y); this.drawingGraphicCtx.moveImageData(x, y, moveWidth, ctxH, x - dx, y);
} }
ctx.setFillStyle(this.settings.cells.defaultState.background) ctx.setFillStyle(this.settings.cells.defaultState.background)
.fillRect(x + (scrollRight > 0 ? oldW - dx - lastColWidth : 0), y, Math.abs(dx) + lastColWidth, ctxH); .fillRect(x + (scrollRight > 0 ? oldW - dx - lastColWidth : 0), y, Math.abs(dx) + lastColWidth, ctxH);
......
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