From 2a30c1a40edb473f23c03dad275b718e51fe2657 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 22 Feb 2016 13:59:42 +0000 Subject: [PATCH] B2015-183: consistent left margin for backgrounds/deviations regardless of structure from TitleWithTextBelow type --- PROMS/Volian.Print.Library/vlnParagraph.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 76989088..9d3a420b 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4846,12 +4846,16 @@ namespace Volian.Print.Library XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin; return; } - else if (itemInfo.IsStep && ((itemInfo.MyActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) && - itemInfo.FormatStepData != null && itemInfo.MyPrevious != null && itemInfo.MyPrevious.FormatStepData.Type == "TitleWithTextBelow") + 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") { - // This code was needed for IP2 backgrounds so that any 'paragraph's that were at the same + // This code was needed for fix for B2015-183 && + // IP2 backgrounds so that any 'paragraph's that were at the same // level as the 'TitleWithTextBelow's would have same left margin (xoffset) as the 'TitleWithTextBelow'. // an example of this can be found in IP2 Backgrounds, 2-E-0, Step Description Table, Step 22, PLANT-SPECIFIC INFORMATION. + // (NOTE that the IP2 exaxmple was no longer in the data when the work on B2015-183 was done) if ((colOvrd ?? 0) != 0) XOffset = (float)colOvrd; else