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

1. Неправильный размер вычислялся у Delimiters, если в скобках была буква "a"

2. Поправила вычисление размеров и позиций для операторов в Accent, у которых глифы отрисовываю сама (теперь позиция выставляется для оператора та же, что и для baseline буквы "х"с оператором)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58424 954022d7-b5bf-4e40-9824-e11837661b57
parent 04e32d3b
......@@ -491,7 +491,6 @@ function CAccent(props)
};
this.shiftX = 0;
this.shiftX_2 = 0;
this.gap = 0;
/////////////////
......@@ -546,16 +545,15 @@ CAccent.prototype.setPosition = function(pos, PosInfo)
PosOper.x = this.pos.x + this.GapLeft + alignOp;
PosOper.y = this.pos.y + this.shiftX_2 ;
PosOper.y = this.pos.y;
//PosOper.y = this.pos.y + this.size.ascent - this.shiftX;
this.operator.setPosition(PosOper);
var PosBase = new CMathPosition();
PosBase.x = this.pos.x + this.GapLeft + alignCnt;
PosBase.y = this.pos.y + this.operator.size.height + this.gap;
PosBase.y = this.pos.y + this.operator.size.height;
this.elements[0][0].setPosition(PosBase, PosInfo);
}
......@@ -604,16 +602,14 @@ CAccent.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
var letterX = new CMathText(true);
letterX.add(0x78);
letterX.Resize(oMeasure, null);
this.gap = this.operator.size.ascentSign - letterX.size.ascent;
//this.gap = this.operator.size.ascentSign - letterX.size.ascent;
//this.shiftX_2 = this.operator.size.ascentSign;
this.shiftX_2 = 0;
}
var width = base.size.width > this.operator.size.width ? base.size.width : this.operator.size.width,
height = base.size.height + this.operator.size.height + this.gap,
ascent = this.operator.size.height + this.gap + this.elements[0][0].size.ascent;
height = base.size.height + this.operator.size.height,
ascent = this.operator.size.height + this.elements[0][0].size.ascent;
width += this.GapLeft + this.GapRight;
......
This diff is collapsed.
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