diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs index 1a5c7699..8b33de3f 100644 --- a/PROMS/Volian.Controls.Library/GridItem.cs +++ b/PROMS/Volian.Controls.Library/GridItem.cs @@ -783,9 +783,11 @@ namespace Volian.Controls.Library if (highlight) { MyFlexGrid.StyleBackColor = Color.Gray; + MyFlexGrid.Styles.Fixed.BackColor = Color.Gray; } else { + MyFlexGrid.Styles.Fixed.BackColor = MyFlexGrid.DefaultFixedBackgroundColor; if (MyFlexGrid.Focused) // If active Set BackColor to the active color SetActive(); else // Otherwise Set the BackColor to either the InactiveColor or the AnnotationColor diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 2941dbd9..dc4ca2b9 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1557,6 +1557,8 @@ namespace Volian.Controls.Library btnStepPaste.Enabled = true; SetPasteButtonEnabled(); } + if (MyFlexGrid != null) + MyFlexGrid.Styles.Fixed.BackColor = MyFlexGrid.DefaultFixedBackgroundColor; MyEditItem.IdentifyChildren(false); } diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 0cd17976..0d81699e 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -23,6 +23,12 @@ namespace Volian.Controls.Library public partial class VlnFlexGrid : C1.Win.C1FlexGrid.C1FlexGrid { public static GridCopyInfo MyCopyInfo = new GridCopyInfo(); + private Color _DefaultFixedBackgroundColor; + + public Color DefaultFixedBackgroundColor + { + get { return _DefaultFixedBackgroundColor; } + } public void CopyToCopiedFlexGrid(GridCopyOption myCopyOption) { @@ -33,7 +39,6 @@ namespace Volian.Controls.Library this.BorderStyle = C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None; sr.Close(); } - //FlipCopied(); // create a flipped version of the grid MyCopyInfo.MyCopyOption = myCopyOption; OnCopyOptionChanged(this, new EventArgs()); switch (MyCopyInfo.MyCopyOption) @@ -560,6 +565,7 @@ namespace Volian.Controls.Library this.Styles.Focus.BackColor = Color.LightCyan; this.HighLight = HighLightEnum.WithFocus; + _DefaultFixedBackgroundColor = this.Styles.Fixed.BackColor; this.AllowMerging = C1.Win.C1FlexGrid.AllowMergingEnum.Custom; this.AllowResizing = C1.Win.C1FlexGrid.AllowResizingEnum.Both;