From c30518c4fe839e83e5bc1e51bd6267ee4959d2f3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 17 Apr 2019 19:52:00 +0000 Subject: [PATCH] F2019-033 Added Flag to position the top continue message at the left margin F2019-033 Added flag to position top continue message at the left margin F2019-033 Added logic to support format flag to position the top continue message at the left margin --- PROMS/Formats/fmtall/PROMSMan1all.xml | Bin 85776 -> 85824 bytes .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 13 +++++++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/PROMSMan1all.xml b/PROMS/Formats/fmtall/PROMSMan1all.xml index 3a3ac8fdea1e576d815d9d84ff7f6f7d7dbd997f..ac0c2afe40eac88e9c4269581d18b140e6d2f4f6 100644 GIT binary patch delta 50 zcmbO*kM+Pj)`l&NR=UCl3`z_N3;_%|42cZM45HH GTND9kOb+@0 delta 25 hcmX>wk9ER4)`l&NR=Uha3?`EgZj;~MqszEO5de9Z2@3!K diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 748419e0..dc5e94ba 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -809,6 +809,19 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region PlaceAtLeftMargin + private LazyLoad _PlaceAtLeftMargin; // F2019-033 only use the Left Margin plus any Top message margin + [Category("Continue Msg")] + [DisplayName("Flag to position at left margin")] + [Description("Flag to position at left margin")] + public bool PlaceAtLeftMargin + { + get + { + return LazyLoad(ref _PlaceAtLeftMargin, "@PlaceAtLeftMargin"); + } + } + #endregion #region Message private LazyLoad _Message; [Category("Continue Msg")] diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 6ddb3fb4..02d0ba7c 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2819,7 +2819,13 @@ namespace Volian.Print.Library } } if (!PageBreakOnStep) - MyPageHelper.TopMessage = new vlnText(cb, this, myMsg, myMsg, docstyle.Layout.LeftMargin + XOffsetBox + docstyle.Continue.Top.Margin ?? 0, yTopMargin + 0.1F, docstyle.Continue.Top.Font);// MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font); + { + float colPos = docstyle.Layout.LeftMargin + docstyle.Continue.Top.Margin ?? 0; + if (!docstyle.Continue.Top.PlaceAtLeftMargin) //F2019-033 when true position with respect only to the left margin + colPos += XOffsetBox; //XOffsetbox get set when the tables, figures & equations were beyond the border and needed repositioned + MyPageHelper.TopMessage = new vlnText(cb, this, myMsg, myMsg, colPos, yTopMargin + 0.1F, docstyle.Continue.Top.Font);// MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font); + + } else MyPageHelper.TopMessage = null; }