Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added CenterToStepThenPage format flag which smothly transitions the left margin of a table as the table width increases from the high-level step width to the page width.

Browse Source
This commit is contained in:
Rich 2015-07-13 15:49:08 +00:00
parent 330f36250d
commit 4f4513ffe5
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/SUMall.xml
View File

Binary file not shown.

12
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -508,6 +508,18 @@ namespace VEPROMS.CSLA.Library
} }
} }
#endregion #endregion
#region CenterToStepThenPage
[Category("Layout")]
[Description("CenterToStepThenPage")]
private LazyLoad<bool> _CenterToStepThenPage;
public bool CenterToStepThenPage
{
get
{
return LazyLoad(ref _CenterToStepThenPage, "@CenterToStepThenPage");
}
}
#endregion
} }
#endregion #endregion
#region SectTop #region SectTop

33
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -4058,18 +4058,31 @@ namespace Volian.Print.Library
XOffset = hls1.XOffset + hls1.Width - Width; // align with the right edge of hls text XOffset = hls1.XOffset + hls1.Width - Width; // align with the right edge of hls text
} }
} }
if (itemInfo.MyDocStyle.Layout.CenterToStepThenPage)
{
if (Width > hls1.Width)
{
float XOffsetPage = leftMargin + ((pageWidth - leftMargin) - Width) / 2;
float fraction = (Width - hls1.Width) / ((pageWidth - leftMargin) - hls1.Width);
float XOffsetNew = (1 - fraction) * XOffset + fraction * XOffsetPage;
_MyLog.WarnFormat("***XOffsetAdjust-CenterToStepThenPage*** ItemID, XOffset, XOffsetPage, XOffsetNew ={0},{1},{2},{3}", itemInfo.ItemID, XOffset, XOffsetPage, XOffsetNew);
XOffset = XOffsetNew;
}
}
else
{
// if the XOffset < High Level Step Text's XOffset , then align with the High Level Step Text
if (XOffset < xLowerLimit && Width < (xUpperLimit - xLowerLimit))
XOffset = xLowerLimit;
// if the XOffset < High Level Step Text's XOffset , then align with the High Level Step Text // if the right margin exceeds the right edge of the rightmost RNO, then adjust right edge to match.
if (XOffset < xLowerLimit && Width < (xUpperLimit - xLowerLimit)) if (XOffset + Width > xUpperLimit)
XOffset = xLowerLimit; XOffset = xUpperLimit - Width;
// if the right margin exceeds the right edge of the rightmost RNO, then adjust right edge to match. // because of the above, if it pushes beyond the left margin, use the left margin.
if (XOffset + Width > xUpperLimit) if (XOffset < (float)itemInfo.MyDocStyle.Layout.LeftMargin)
XOffset = xUpperLimit - Width; XOffset = XOffsetBox = (float)itemInfo.MyDocStyle.Layout.LeftMargin;
}
// because of the above, if it pushes beyond the left margin, use the left margin.
if (XOffset < (float)itemInfo.MyDocStyle.Layout.LeftMargin)
XOffset = XOffsetBox = (float)itemInfo.MyDocStyle.Layout.LeftMargin;
} }
private float AdjustForBlankLines() private float AdjustForBlankLines()
{ {