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

C2021-004 logic to show the table shading

Browse Source
This commit is contained in:
John Jenko 2021-11-18 19:29:45 +00:00
parent 08d9a42575
commit 9ce881087a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/Volian.Controls.Library/GridItem.cs
View File

@ -327,7 +327,7 @@ namespace Volian.Controls.Library
cs.ForeColor = Color.Black; cs.ForeColor = Color.Black;
cs = MyFlexGrid.Styles["Highlight"]; cs = MyFlexGrid.Styles["Highlight"];
cs.ForeColor = Color.Black; cs.ForeColor = Color.Black;
cs.BackColor = MyStepPanel.InactiveColor; cs.BackColor = MyFlexGrid.MyShading.GetColor(MyFlexGrid.Row, MyFlexGrid.Col); // C2021-004 reset the last active table cell's shading color when leaving
} }
//void MyStepRTB_EnterKeyPressed(object sender, KeyEventArgs args) //void MyStepRTB_EnterKeyPressed(object sender, KeyEventArgs args)
@ -679,7 +679,7 @@ namespace Volian.Controls.Library
// in the grid: // in the grid:
MyFlexGrid.Cols.Fixed = 0; MyFlexGrid.Cols.Fixed = 0;
MyFlexGrid.Rows.Fixed = 0; MyFlexGrid.Rows.Fixed = 0;
MyFlexGrid.StyleBackColor = Color.White; MyFlexGrid.ShowTableCellShading(); // C2021-004 if the grid was in Fixed Mode, then also re-show the table cell shading
string xml = MyFlexGrid.GetXMLData(); string xml = MyFlexGrid.GetXMLData();
using (Item itm = MyItemInfo.Get()) using (Item itm = MyItemInfo.Get())
@ -1072,12 +1072,17 @@ namespace Volian.Controls.Library
SetActive(); SetActive();
else // Otherwise Set the BackColor to either the InactiveColor or the AnnotationColor else // Otherwise Set the BackColor to either the InactiveColor or the AnnotationColor
{ {
MyFlexGrid.StyleBackColor = MyFlexGrid.StyleBackColor =
MyItemInfo.ItemAnnotationCount == 0 ? MyStepPanel.InactiveColor : MyStepPanel.AnnotationColor; MyItemInfo.ItemAnnotationCount == 0 ? MyStepPanel.InactiveColor : MyStepPanel.AnnotationColor;
// Turn-off Size adjustment // Turn-off Size adjustment
MyFlexGrid.Cols.Fixed = 0; MyFlexGrid.Cols.Fixed = 0;
MyFlexGrid.Rows.Fixed = 0; MyFlexGrid.Rows.Fixed = 0;
} }
// C2021-004 Table Cell Shading.
// If the table has annotations, then show the yellow annoation background (table is not active control when in here)
// otherwise show the table shading assigned by the user
if (MyFlexGrid.GetMyItemInfo().ItemAnnotationCount == 0)
MyFlexGrid.ShowTableCellShading();
} }
} }
public override void SetActive() public override void SetActive()