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

logic to align Note and Cautions that use the box logic without a box

Browse Source
This commit is contained in:
John Jenko 2013-07-19 01:53:18 +00:00
parent 247ad3fdac
commit 20903705be
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2254,6 +2254,14 @@ namespace Volian.Print.Library
} }
} }
} }
else if (((colOvrd ?? 0) != 0) && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.NullBox)
{
float tabOffset = (myTab == null ? 0 : myTab.XOffset) - XOffset;
XOffset = (float)colOvrd;
if (myTab != null) myTab.XOffset = XOffset + tabOffset;
return;
}
else if (bxIndx != null) else if (bxIndx != null)
{ {
Box bx = formatInfo.PlantFormat.FormatData.BoxList[(int)bxIndx]; Box bx = formatInfo.PlantFormat.FormatData.BoxList[(int)bxIndx];
@ -2297,7 +2305,7 @@ namespace Volian.Print.Library
} }
// if the step is within the rno and we're numbering the high level rno, we've got to account for the // if the step is within the rno and we're numbering the high level rno, we've got to account for the
// indenting (increased x offset) for the top level rno's tab, if there is no top level rno: // indenting (increased x offset) for the top level rno's tab, if there is no top level rno:
if (itemInfo.FormatStepData.NumberHighLevel && (itemInfo.MyHLS.RNOs == null || itemInfo.MyHLS.RNOs.Count<=0)) if (itemInfo.FormatStepData.NumberHighLevel && (itemInfo.MyHLS.RNOs == null || itemInfo.MyHLS.RNOs.Count <= 0))
{ {
// add in the size that an RNO off HLS would take. // add in the size that an RNO off HLS would take.
tabWidth += itemInfo.MyTab.RNOTabWidthAdjust; tabWidth += itemInfo.MyTab.RNOTabWidthAdjust;
@ -2315,7 +2323,7 @@ namespace Volian.Print.Library
// the tab. The offset of text needs to be adjusted by the 'leftjustify' format variable // the tab. The offset of text needs to be adjusted by the 'leftjustify' format variable
// if it existed for this level. // if it existed for this level.
myTab.XOffset += tabWidth; myTab.XOffset += tabWidth;
if (tableftadj != 0 && myTab.Width<tableftadj) if (tableftadj != 0 && myTab.Width < tableftadj)
tabWidth = myTab.Width = tableftadj; tabWidth = myTab.Width = tableftadj;
XOffset += tabWidth; XOffset += tabWidth;
myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray())); myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));