Commit 0a125efc authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Поправила recalculate и тп для Placeholder

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55285 954022d7-b5bf-4e40-9824-e11837661b57
parent 22eb9c12
......@@ -5244,7 +5244,7 @@ CMathContent.prototype =
var oSize;
for(var i = 0; i < this.content.length; i++)
{
if(this.content[i].typeObj === MATH_COMP)
if(this.content[i].typeObj === MATH_COMP || this.content[i].typeObj === MATH_PLACEHOLDER)
oSize = this.content[i].size;
else
oSize = this.content[i].Math_GetSize();
......@@ -5449,7 +5449,6 @@ CMathContent.prototype =
return result;
},
getGapsInside: function(RecalcInfo) // учитываем gaps внутренних объектов
{
var gaps = {left: 0, right: 0};
......@@ -5589,6 +5588,8 @@ CMathContent.prototype =
}
else if(this.content[i].typeObj == MATH_COMP)
this.content[i].draw(x, y, pGraphics);
else if(this.content[i].typeObj == MATH_PLACEHOLDER)
this.content[i].draw(x, y, pGraphics);
else // MATH_PARA_RUN
this.content[i].Math_Draw(x, y, pGraphics);
......@@ -6406,6 +6407,8 @@ CMathContent.prototype =
this.content[i].setPosition(_pos);
_pos.x += this.content[i].size.width + this.content[i].GapRight;
}
else if(this.content[i].typeObj == MATH_PLACEHOLDER)
this.content[i].setPosition(_pos);
else
{
this.content[i].Math_SetPosition(_pos);
......
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