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

error this->t

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51955 954022d7-b5bf-4e40-9824-e11837661b57
parent 24f9f5e8
...@@ -921,6 +921,7 @@ DrawingContext.prototype = { ...@@ -921,6 +921,7 @@ DrawingContext.prototype = {
}, },
fillText: function (text, x, y, maxWidth, charWidths, angle) { fillText: function (text, x, y, maxWidth, charWidths, angle) {
var t = this;
function fillGlyph(pGlyph,fmgr) { function fillGlyph(pGlyph,fmgr) {
var nW = pGlyph.oBitmap.nWidth; var nW = pGlyph.oBitmap.nWidth;
var nH = pGlyph.oBitmap.nHeight; var nH = pGlyph.oBitmap.nHeight;
...@@ -933,9 +934,9 @@ DrawingContext.prototype = { ...@@ -933,9 +934,9 @@ DrawingContext.prototype = {
if (window.g_isMobileVersion) { if (window.g_isMobileVersion) {
// Special for iPad (5.1) // Special for iPad (5.1)
var _r = this.fillColor.r; var _r = t.fillColor.r;
var _g = this.fillColor.g; var _g = t.fillColor.g;
var _b = this.fillColor.b; var _b = t.fillColor.b;
if (!_r && !_g && !_b) { if (!_r && !_g && !_b) {
this.ctx.drawImage(pGlyph.oBitmap.oGlyphData.m_oCanvas, 0, 0, nW, nH, nX, nY, nW, nH); this.ctx.drawImage(pGlyph.oBitmap.oGlyphData.m_oCanvas, 0, 0, nW, nH, nX, nY, nW, nH);
...@@ -958,7 +959,7 @@ DrawingContext.prototype = { ...@@ -958,7 +959,7 @@ DrawingContext.prototype = {
this.ctx.drawImage(canvD, 0, 0, nW, nH, nX, nY, nW, nH); this.ctx.drawImage(canvD, 0, 0, nW, nH, nX, nY, nW, nH);
} }
} else { } else {
pGlyph.oBitmap.oGlyphData.checkColor(this.fillColor.r, this.fillColor.g, this.fillColor.b, nW, nH); pGlyph.oBitmap.oGlyphData.checkColor(_r, _g, _b, nW, nH);
pGlyph.oBitmap.draw(this.ctx, nX, nY); pGlyph.oBitmap.draw(this.ctx, nX, nY);
} }
} }
......
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