B2018-140 CP - Top Continue Message was overlapping the Table outline
This commit is contained in:
@@ -2574,6 +2574,8 @@ namespace Volian.Print.Library
|
||||
float msgTopMargin = yTopMargin;
|
||||
// B2017-106: if caution/note move the message up a little so it doesn't touch the caution/note lines:
|
||||
if (MyItemInfo.IsNote || MyItemInfo.IsCaution) msgTopMargin += 4;
|
||||
// B2018-140: if table move the message up a little so it doesn't touch the table lines:
|
||||
if (MyItemInfo.IsTable) msgTopMargin += 6;
|
||||
MyPageHelper.TopMessageRs.Add(new vlnText(cb, this, cltxt, cltxt, vt.XOffset, msgTopMargin, vt.MyFont));
|
||||
}
|
||||
else if (vpo is vlnText) // As of 6/22/15, CP wants the step designator in the continue message also.
|
||||
@@ -3354,8 +3356,7 @@ namespace Volian.Print.Library
|
||||
// if this is a Note or Caution off of a Note or Caution (Catawba EG/1A/CSAM/SACGR1 step 1)
|
||||
// then indent it the length of its tab
|
||||
if (itemInfo.IsCaution || itemInfo.IsNote)
|
||||
XOffset += (!itemInfo.IsBackgroundStep()) ? (itemInfo.FormatStepData.TabData.IdentPrint.Length - 1) * 6 : 0; // B2018-139 don't adjust XOffset when processing a Caution, or Note background text is is off of Caution or Note WCN BG SAG-10 step 4
|
||||
|
||||
XOffset += (itemInfo.FormatStepData.TabData.IdentPrint.Length - 1) * 6;
|
||||
else
|
||||
if (itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset != null)
|
||||
XOffset = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.DevNoteOrCautionTabOffset);
|
||||
@@ -5680,15 +5681,9 @@ namespace Volian.Print.Library
|
||||
int adj = 2;
|
||||
if (myTab != null)
|
||||
{
|
||||
//B2018-139 use XOffset when processing HLS, Caution, or Note background text and tab
|
||||
if (itemInfo.IsHigh || (itemInfo.IsNote && (itemInfo.MyParent.IsHigh || itemInfo.MyParent.IsCaution || itemInfo.MyParent.IsNote)) || (itemInfo.IsCaution && (itemInfo.MyParent.IsHigh || itemInfo.MyParent.IsCaution || itemInfo.MyParent.IsNote)))
|
||||
myTab.XOffset = XOffset;
|
||||
else
|
||||
{
|
||||
// F2018-041 seq tabs off of TitleWithTextBelow were running into the step text
|
||||
myTab.XOffset = XOffset + (itemInfo.FormatStepData.Font.CharsToTwips * adj); // F2018-041 move tab over 2 chars so it positions like paragraphs under TitleWithTextBelow
|
||||
adj += myTab.Text.Length; // F2018-041 add the length of the tab to the adjustment of the XOffset
|
||||
}
|
||||
// F2018-041 seq tabs off of TitleWithTextBelow were running into the step text
|
||||
myTab.XOffset = XOffset + (itemInfo.FormatStepData.Font.CharsToTwips * adj); // F2018-041 move tab over 2 chars so it positions like paragraphs under TitleWithTextBelow
|
||||
adj += myTab.Text.Length; // F2018-041 add the length of the tab to the adjustment of the XOffset
|
||||
}
|
||||
XOffset += (itemInfo.FormatStepData.Font.CharsToTwips * adj); // indent 2 characters for background steps
|
||||
Width -= (itemInfo.FormatStepData.Font.CharsToTwips * adj); // Adjust width by 2 characters
|
||||
|
Reference in New Issue
Block a user