diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index db910266..0ca458ed 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4874,7 +4874,7 @@ namespace Volian.Print.Library else if (itemInfo.IsParagraph && (((itemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) || ((itemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedDeviations) == E_PurchaseOptions.EnhancedDeviations)) && - itemInfo.FormatStepData != null && itemInfo.MyPrevious != null && itemInfo.MyPrevious.FormatStepData.Type == "TitleWithTextBelow") + itemInfo.FormatStepData != null && PreviousIsTitleWithTextBelow(itemInfo)) { // This code was needed for fix for B2015-183 && // IP2 backgrounds so that any 'paragraph's that were at the same @@ -4884,7 +4884,10 @@ namespace Volian.Print.Library if ((colOvrd ?? 0) != 0) XOffset = (float)colOvrd; else + { XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin; + Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin; + } return; } else if (itemInfo.MyParent.FormatStepData != null && itemInfo.MyParent.FormatStepData.Type == "TitleWithTextBelow" && (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || (!itemInfo.IsCaution && !itemInfo.IsNote))) @@ -4897,7 +4900,10 @@ namespace Volian.Print.Library XOffset += delta; } else + { XOffset = childindent + MyParent.XOffset;//(itemInfo.FormatStepData.Font.CharsToTwips * 2); + Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin; + } return; } else if (itemInfo.FormatStepData != null && itemInfo.FormatStepData.Type == "TitleWithTextRight") @@ -5175,6 +5181,16 @@ namespace Volian.Print.Library } } + private bool PreviousIsTitleWithTextBelow(ItemInfo itemInfo) + { + while(itemInfo.MyPrevious != null) + { + if (itemInfo.MyPrevious.FormatStepData.Type == "TitleWithTextBelow") return true; + itemInfo=itemInfo.MyPrevious; + } + return false; + } + private static float GetLeftJustify(FormatInfo formatInfo, int indxLevels) { LeftJustifyList jstlst = formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList;