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

B2018-096 AEP 082.002CD Note Box overlapping Step Box

Browse Source
This commit is contained in:
Rich
2018-06-20 14:47:14 +00:00
parent 3cfe32d02d
commit 9cbbd3e9de
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5330,8 +5330,8 @@ namespace Volian.Print.Library
// else
// xoff = XOffset;
//}
vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff + _MyBoxLeftAdj, YOffset, itemInfo.MyHeader.MyFont);
// B2018-096 AEP 082.002CD Note Box overlapping Step Box
vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff + AdjustHeader + _MyBoxLeftAdj, YOffset, itemInfo.MyHeader.MyFont);
PartsAbove.Add(myHeader);
//return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? SixLinesPerInch : 0);
// Only use SpaceIn property for Cautions or Notes
@@ -6028,6 +6028,12 @@ namespace Volian.Print.Library
get { return _CheckOffWidth; }
set { _CheckOffWidth = value; }
}
private float _AdjustHeader = 0;// B2018-096 AEP 082.002CD Note Box overlapping Step Box
public float AdjustHeader
{
get { return _AdjustHeader; }
set { _AdjustHeader = value; }
}
public void AdjustWidth(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo, vlnTab myTab)
{
int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null;
@@ -6154,7 +6160,12 @@ namespace Volian.Print.Library
Width = (float)formatInfo.MyStepSectionLayoutData.WidT - tabWidth;
}
else
Width = _WidthAdjustBox + (float)bx.TxtWidth - tabWidth; // add 1 to get it to wrap like 16Bit
{
float oldWidth = _WidthAdjustBox + (float)bx.TxtWidth - tabWidth; // add 1 to get it to wrap like 16Bit
// B2018-096 AEP 082.002CD Note Box overlapping Step Box
Width = Math.Min(MyParent.Width + MyParent.XOffset - XOffset, oldWidth);
AdjustHeader = (Width - oldWidth)/2;
}
}
else if ((itemInfo.IsCaution || itemInfo.IsNote) && !itemInfo.FormatStepData.UseOldTemplate)
{