Commit 94ff1ffd authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

При измерении и отрисовке размеры сдвигов приводим к целому числу.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58047 954022d7-b5bf-4e40-9824-e11837661b57
parent 581f61e6
...@@ -900,8 +900,8 @@ ...@@ -900,8 +900,8 @@
var fm = this.fmgrGraphics[3], var fm = this.fmgrGraphics[3],
r = getCvtRatio(0/*px*/, units >= 0 && units <=3 ? units : this.units, this.ppiX); r = getCvtRatio(0/*px*/, units >= 0 && units <=3 ? units : this.units, this.ppiX);
for (var tmp, w = 0, w2 = 0, i = 0; i < text.length; ++i) { for (var tmp, w = 0, w2 = 0, i = 0; i < text.length; ++i) {
tmp = fm.MeasureChar( text.charCodeAt(i) ); tmp = fm.MeasureChar(text.charCodeAt(i));
w += tmp.fAdvanceX; w += asc_round(tmp.fAdvanceX);
} }
w2 = w - tmp.fAdvanceX + tmp.oBBox.fMaxX - tmp.oBBox.fMinX + 1; w2 = w - tmp.fAdvanceX + tmp.oBBox.fMaxX - tmp.oBBox.fMinX + 1;
return this._calcTextMetrics(w * r, w2 * r, fm, r); return this._calcTextMetrics(w * r, w2 * r, fm, r);
...@@ -958,7 +958,7 @@ ...@@ -958,7 +958,7 @@
var length = text.length; var length = text.length;
for (var i = 0; i < length; ++i) { for (var i = 0; i < length; ++i) {
try { try {
_x = manager.LoadString2C(text.charAt(i), _x, _y); _x = asc_round(manager.LoadString4C(text.charCodeAt(i), _x, _y));
} catch(err) { } catch(err) {
// do nothing // do nothing
} }
......
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