paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-11 17:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Further improves formula placement

Browse Source 
git-svn-id: trunk@37871 -
This commit is contained in:
sekelsenmat 2012-07-05 11:23:32 +00:00
parent c3f39a0742
commit c499095dbc
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/fpvectorial/fpvectorial.pas
View File

@ -1741,7 +1741,7 @@ begin
Result := Max(Formula.Width, AdjacentFormula.Width);
end;
fekRoot: Result := Formula.CalculateWidth(ADest) + 5;
fekPower: Result := Result * 1.5;
fekPower: Result := Formula.CalculateWidth(ADest) * 1.5;
fekSomatory: Result := 8;
else
end;
@ -1954,6 +1954,8 @@ var
lElement: TvFormulaElement;
lPosX: Double = 0;
lPosY: Double = 0;
lCentralizeFactor: Double = 0;
lCentralizeFactorAdj: Double = 0;
begin
CalculateHeight(ADest);
CalculateWidth(ADest);
@ -1972,8 +1974,22 @@ begin
case lElement.Kind of
fekFraction:
begin
lElement.Formula.PositionElements(ADest, lElement.Left, lElement.Top);
lElement.AdjacentFormula.PositionElements(ADest, lElement.Left, lElement.Top - lElement.Formula.Height - 3);
// Check which fraction is the largest and centralize the other one
lElement.Formula.CalculateWidth(ADest);
lElement.AdjacentFormula.CalculateWidth(ADest);
if lElement.Formula.Width > lElement.AdjacentFormula.Width then
begin
lCentralizeFactor := 0;
lCentralizeFactorAdj := lElement.Formula.Width / 2 - lElement.AdjacentFormula.Width / 2;
end
else
begin
lCentralizeFactor := lElement.AdjacentFormula.Width / 2 - lElement.Formula.Width / 2;
lCentralizeFactorAdj := 0;
end;
lElement.Formula.PositionElements(ADest, lElement.Left + lCentralizeFactor, lElement.Top);
lElement.AdjacentFormula.PositionElements(ADest, lElement.Left + lCentralizeFactorAdj, lElement.Top - lElement.Formula.Height - 3);
end;
fekRoot:
begin