From ce099ed78e4080b25d02b966d2b58e72b28bf48c Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 3 Jan 2018 20:06:46 +0000 Subject: [PATCH] B2017-269 - Logic added to handle new flag BoldTransitionsExceptBoldHLS. This was necessary since different types of high level steps can be both bold and normal. --- PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index cd6ba5b9..689acf99 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -308,7 +308,13 @@ namespace VEPROMS.CSLA.Library } // Adjust RO display if (ROsShouldBeAdjusted) - text = DoTransitionAdjustments(text, _MyItemInfo.ActiveFormat.PlantFormat.FormatData.TransData.BoldTransition || (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.TransData.BoldTransitionExceptHLS && !_MyItemInfo.IsHigh)); + { + bool fontIsBold = _MyItemInfo.IsStep && (_MyItemInfo.FormatStepData.Font.Style & E_Style.Bold) != E_Style.Bold; + text = DoTransitionAdjustments(text, _MyItemInfo.ActiveFormat.PlantFormat.FormatData.TransData.BoldTransition || + (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.TransData.BoldTransitionExceptHLS && !_MyItemInfo.IsHigh) || + // B2017-269 Don't bold transition if font for step is bold + (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.TransData.BoldTransitionExceptBoldHLS && (!_MyItemInfo.IsHigh || fontIsBold))); + } // add colors around links: if (colorLinks) text = DoColorLinks(text);