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

B2023-052: Inconsistent change bar location

Browse Source 
B2023-052: Beaver Valley - Inconsistent change bar location
This commit is contained in:
Kathy Ruffing 2023-05-10 13:16:43 +00:00
parent 3dd59e20d8
commit 620d5dab42
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -577,6 +577,18 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _FooterLength, "@FooterLength"); return LazyLoad(ref _FooterLength, "@FooterLength");
} }
} }
// B2023-052: Beaver Valley - Inconsistent change bar location
private LazyLoad<float?> _AbsChgBarAdj;
[Category("Location")]
[DisplayName("Absolute change bar adjustment for margin differences")]
[Description("Absolute change bar adjustment for margin differences")]
public float? AbsChgBarAdj
{
get
{
return LazyLoad(ref _AbsChgBarAdj, "@AbsChgBarAdj");
}
}
#endregion #endregion
#region LeftMargin #region LeftMargin
private LazyLoad<float?> _LeftMargin; private LazyLoad<float?> _LeftMargin;

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

@ -5562,6 +5562,10 @@ namespace Volian.Print.Library
!itemInfo.IsInRNO)) msgAlign = Element.ALIGN_RIGHT; !itemInfo.IsInRNO)) msgAlign = Element.ALIGN_RIGHT;
float coltotwips = col * itemInfo.FormatStepData.Font.CharsToTwips; float coltotwips = col * itemInfo.FormatStepData.Font.CharsToTwips;
if (cbd.AbsoluteFixedChangeColumn) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips; if (cbd.AbsoluteFixedChangeColumn) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips;
// B2023-052: Beaver Valley - Inconsistent change bar location - used AbsoluteFixedChangeColumn flag, but the LeftMargin
// was still added in, thus sections had different locations for change bar if sections had different left margin. Use
// adjustment, 'AbsChgBarAdj'
coltotwips += itemInfo.MyDocStyle.Layout.AbsChgBarAdj ?? 0;
if (itemInfo.IsFigure) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips; if (itemInfo.IsFigure) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips;
return new vlnChangeBar(cb, this, (float)itemInfo.MyDocStyle.Layout.LeftMargin + coltotwips, yoff, msgAlign, return new vlnChangeBar(cb, this, (float)itemInfo.MyDocStyle.Layout.LeftMargin + coltotwips, yoff, msgAlign,
myPageHelper.ChangeBarDefinition.MyChangeBarText == PrintChangeBarText.RevNum, myPageHelper.ChangeBarDefinition.MyChangeBarText == PrintChangeBarText.RevNum,