diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs index f908a4fc..1874a810 100644 --- a/PROMS/Volian.Controls.Library/StepItem.cs +++ b/PROMS/Volian.Controls.Library/StepItem.cs @@ -28,6 +28,11 @@ namespace Volian.Controls.Library Showing = 8, Done = 16 } + public enum E_ChangeBarPosition : int + { + Left = 0, + Right = 1 + } #endregion public partial class StepItem : UserControl { @@ -117,6 +122,7 @@ namespace Volian.Controls.Library private bool _Circle = false; private bool _CheckOff = false; private bool _ChangeBar = false; + #endregion #region Properties /// @@ -390,7 +396,7 @@ namespace Volian.Controls.Library get { return Width - lblTab.Left; } set { - Width = RTBMargin + value + lblTab.Left; + Width = RTBMargin + value + lblTab.Left +3; // +3 to allow for change bar position } } /// @@ -440,7 +446,7 @@ namespace Volian.Controls.Library lblTab.Width = tabString.Length * 8 * MyStepPanel.DPI / 96;// Adjust width for DPI Invalidate(); _MyStepRTB.Left = lblTab.Left + lblTab.Width;// +2; - _MyStepRTB.Width = Width - _MyStepRTB.Left - RTBMargin; + _MyStepRTB.Width = Width - _MyStepRTB.Left - RTBMargin - 3; // adjust for Change Bar Position _TabFormat = value; // tabString; } } @@ -457,6 +463,13 @@ namespace Volian.Controls.Library return count; } } + // hardcode to right for HLP. The change bar location from the format will need to be used to set this. + private E_ChangeBarPosition _ChangeBarPosition = E_ChangeBarPosition.Right; + public E_ChangeBarPosition ChangeBarPosition + { + get { return _ChangeBarPosition; } + set { _ChangeBarPosition = value; } + } /// /// Sets the previous item and adjusts locations /// @@ -1956,7 +1969,12 @@ namespace Volian.Controls.Library if (ChangeBar) { Pen penCB = new Pen(_MyStepPanel.MyStepPanelSettings.ChangeBarColor, _MyStepPanel.MyStepPanelSettings.ChangeBarWeight); - g.DrawLine(penCB, 0, _MyStepRTB.Top, 0, Height); + if (ChangeBarPosition == E_ChangeBarPosition.Left) + g.DrawLine(penCB, 0, _MyStepRTB.Top, 0, Height); // left, top, right, bottom. + else + { + g.DrawLine(penCB, Width-2, _MyStepRTB.Top, Width-2, Height); + } } } ///