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

Fixed a bug that was causing text to indent Also adjusted width to use more of the page (right margin)

Browse Source
This commit is contained in:
Rich 2016-05-27 14:16:50 +00:00
parent aab71bdd7e
commit f4609c2f50
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4874,7 +4874,7 @@ namespace Volian.Print.Library
else if (itemInfo.IsParagraph && else if (itemInfo.IsParagraph &&
(((itemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) || (((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.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 && // This code was needed for fix for B2015-183 &&
// IP2 backgrounds so that any 'paragraph's that were at the same // IP2 backgrounds so that any 'paragraph's that were at the same
@ -4884,7 +4884,10 @@ namespace Volian.Print.Library
if ((colOvrd ?? 0) != 0) if ((colOvrd ?? 0) != 0)
XOffset = (float)colOvrd; XOffset = (float)colOvrd;
else else
{
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin; XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin;
Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin;
}
return; return;
} }
else if (itemInfo.MyParent.FormatStepData != null && itemInfo.MyParent.FormatStepData.Type == "TitleWithTextBelow" && (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || (!itemInfo.IsCaution && !itemInfo.IsNote))) 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; XOffset += delta;
} }
else else
{
XOffset = childindent + MyParent.XOffset;//(itemInfo.FormatStepData.Font.CharsToTwips * 2); XOffset = childindent + MyParent.XOffset;//(itemInfo.FormatStepData.Font.CharsToTwips * 2);
Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin;
}
return; return;
} }
else if (itemInfo.FormatStepData != null && itemInfo.FormatStepData.Type == "TitleWithTextRight") 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) private static float GetLeftJustify(FormatInfo formatInfo, int indxLevels)
{ {
LeftJustifyList jstlst = formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList; LeftJustifyList jstlst = formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList;