logic to align Note and Cautions that use the box logic without a box
This commit is contained in:
parent
247ad3fdac
commit
20903705be
@ -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)
|
||||
{
|
||||
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
|
||||
// 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.
|
||||
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
|
||||
// if it existed for this level.
|
||||
myTab.XOffset += tabWidth;
|
||||
if (tableftadj != 0 && myTab.Width<tableftadj)
|
||||
if (tableftadj != 0 && myTab.Width < tableftadj)
|
||||
tabWidth = myTab.Width = tableftadj;
|
||||
XOffset += tabWidth;
|
||||
myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));
|
||||
|
Loading…
x
Reference in New Issue
Block a user