Improve location of AER tables & Foldout note spacing

This commit is contained in:
Rich 2013-10-17 16:43:54 +00:00
parent 741196f035
commit 1fceb38e61

View File

@ -1890,8 +1890,10 @@ namespace Volian.Print.Library
XOffset = TableCenterPos; XOffset = TableCenterPos;
XOffset = XOffset - (this.Width / 2) + (float)itemInfo.MyDocStyle.Layout.LeftMargin; XOffset = XOffset - (this.Width / 2) + (float)itemInfo.MyDocStyle.Layout.LeftMargin;
} }
else if (aerTableOrFigure || itemInfo.RNOLevel != 0) // AER or RNO else if (itemInfo.RNOLevel != 0) // RNO
XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2;
else if (aerTableOrFigure)
XOffset = MyHighLevelParagraph.XOffset + MyHighLevelParagraph.Width / 2 - Width / 2;
else // Centered Table or Figure else // Centered Table or Figure
{ {
// Determine center of hls // Determine center of hls
@ -2154,7 +2156,7 @@ namespace Volian.Print.Library
xoff = XOffset; // XOffset has left margin included xoff = XOffset; // XOffset has left margin included
vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff, YOffset, itemInfo.MyHeader.MyFont); vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff, YOffset, itemInfo.MyHeader.MyFont);
PartsAbove.Add(myHeader); PartsAbove.Add(myHeader);
return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout ? SixLinesPerInch : 0); return myHeader.Height + ((!MyItemInfo.MyDocStyle.SpecialStepsFoldout || MyItemInfo.MyDocStyle.ExtraLineHeader) ? SixLinesPerInch : 0);
} }
private float AdjustToCharPosition(float position, float? CPI) private float AdjustToCharPosition(float position, float? CPI)
{ {