From 99cbb788f2a5db93cda47a6882e34d4dd326cacc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 7 Jan 2015 17:41:57 +0000 Subject: [PATCH] Corrected the starting location of the step edit window for steps 1-9 so that they start at the same location as step 10 and greater Fixed the positioning of the Fixed Change Bar to use the format default font rather than the current step / substep font, to ensure consistency. --- PROMS/Volian.Controls.Library/RTBItem.cs | 3 ++- PROMS/Volian.Print.Library/vlnParagraph.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs index df2b22e5..aafd1987 100644 --- a/PROMS/Volian.Controls.Library/RTBItem.cs +++ b/PROMS/Volian.Controls.Library/RTBItem.cs @@ -167,7 +167,8 @@ namespace Volian.Controls.Library Invalidate(); if (MyItemInfo.MyTab.Offset == 0) { - _MyStepRTB.Left = lblTab.Left + lblTab.Width; + if (MyItemInfo.FormatStepData == null || MyItemInfo.FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}")) + _MyStepRTB.Left = lblTab.Left + lblTab.Width; _MyStepRTB.Width = Width - _MyStepRTB.Left - RTBMargin - CheckOffMargin; } _TabFormat = value; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 048d118f..37cc3c55 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3525,6 +3525,7 @@ namespace Volian.Print.Library (myPageHelper.ChangeBarDefinition.MyChangeBarLoc == PrintChangeBarLoc.AERleftRNOright && !itemInfo.IsInRNO)) msgAlign = Element.ALIGN_RIGHT; float coltotwips = col * itemInfo.FormatStepData.Font.CharsToTwips; + if (cbd.AbsoluteFixedChangeColumn) 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, myPageHelper.ChangeBarDefinition.MyChangeBarText == PrintChangeBarText.RevNum,