Commit 2139a92d authored by Anna Pavlova's avatar Anna Pavlova Committed by Alexander.Trofimov

Поправлен важный баг : в определенных ситуациях (например формула из меню в...

Поправлен важный баг : в определенных ситуациях (например формула из меню в разделе оператор, со стрелкой внизу, располагалась существенно ниже, выходила за границы размеров GroupCharacter)
parent ca3a4fe6
...@@ -4093,26 +4093,30 @@ CCharacter.prototype.setPosition = function(pos, PosInfo) ...@@ -4093,26 +4093,30 @@ CCharacter.prototype.setPosition = function(pos, PosInfo)
PosOper.x = this.pos.x + this.GapLeft + alignOp; PosOper.x = this.pos.x + this.GapLeft + alignOp;
PosOper.y = this.pos.y; PosOper.y = this.pos.y;
this.operator.setPosition(PosOper);
PosBase.x = this.pos.x + this.GapLeft + alignCnt; PosBase.x = this.pos.x + this.GapLeft + alignCnt;
PosBase.y = this.pos.y + this.operator.size.height; PosBase.y = this.pos.y + this.operator.size.height;
Base.setPosition(PosBase, PosInfo);
} }
else if(this.Pr.pos === LOCATION_BOT) else if(this.Pr.pos === LOCATION_BOT)
{ {
PosBase.x = this.pos.x + this.GapLeft + alignCnt; PosBase.x = this.pos.x + this.GapLeft + alignCnt;
PosBase.y = this.pos.y; PosBase.y = this.pos.y;
Base.setPosition(PosBase, PosInfo); //Base.setPosition(PosBase, PosInfo);
PosOper.x = this.pos.x + this.GapLeft + alignOp; PosOper.x = this.pos.x + this.GapLeft + alignOp;
PosOper.y = this.pos.y + Base.size.height; PosOper.y = this.pos.y + Base.size.height;
this.operator.setPosition(PosOper); //this.operator.setPosition(PosOper);
} }
this.operator.setPosition(PosOper);
if(Base.Type == para_Math_Content)
PosBase.y += Base.size.ascent;
Base.setPosition(PosBase, PosInfo);
pos.x += this.size.width; pos.x += this.size.width;
}; };
CCharacter.prototype.Draw_Elements = function(PDSE) CCharacter.prototype.Draw_Elements = function(PDSE)
......
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