Commit d2d57c34 authored by Alexander.Trofimov's avatar Alexander.Trofimov

draw color without cache

parent 8f14c2c2
...@@ -2566,6 +2566,8 @@ ...@@ -2566,6 +2566,8 @@
/** Рисует текст ячейки */ /** Рисует текст ячейки */
WorksheetView.prototype._drawCellText = WorksheetView.prototype._drawCellText =
function (drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells) { function (drawingCtx, col, row, colStart, colEnd, offsetX, offsetY, drawMergedCells) {
var c = this._getVisibleCell(col, row);
var color = c.getFont().getColor();
var ct = this._getCellTextCache(col, row); var ct = this._getCellTextCache(col, row);
if (!ct) { if (!ct) {
return null; return null;
...@@ -2717,7 +2719,7 @@ ...@@ -2717,7 +2719,7 @@
} }
} }
this.stringRender.render(drawingCtx, 0, 0, textW, ct.color); this.stringRender.render(drawingCtx, 0, 0, textW, color);
this.stringRender.resetTransform(drawingCtx); this.stringRender.resetTransform(drawingCtx);
if (clipUse) { if (clipUse) {
...@@ -2725,7 +2727,7 @@ ...@@ -2725,7 +2727,7 @@
} }
} else { } else {
ctx.AddClipRect(x1, y1, w, h); ctx.AddClipRect(x1, y1, w, h);
this.stringRender.restoreInternalState(ct.state).render(drawingCtx, textX, textY, textW, ct.color); this.stringRender.restoreInternalState(ct.state).render(drawingCtx, textX, textY, textW, color);
ctx.RemoveClipRect(); ctx.RemoveClipRect();
} }
......
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