From 884eda31e2ed35f88bc0be0fd88770a48d5b1b80 Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Thu, 18 Nov 2021 19:31:02 +0000
Subject: [PATCH] C2021-004 added table cell shading button support logic

---
 .../Volian.Controls.Library/StepTabRibbon.cs  |  51 ++++++++++++++++--
 .../StepTabRibbon.designer.cs                 | Bin 561074 -> 562746 bytes
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index e121f00f..43e01701 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -2707,8 +2707,8 @@ namespace Volian.Controls.Library
 					ChangeTableTextFontSize(newSize);
 
 				}
+				}
 			}
-		}
 
 		// B2021-052 table cell text that ends with a link (RO or Transition) was not accepting a change in font size
 		private void ChangeTableTextFontSize(float newSize)
@@ -2732,7 +2732,7 @@ namespace Volian.Controls.Library
 				MyStepRTB.Select(MyStepRTB.TextLength - 1, 1); // select the space at the end of the text
 				MyStepRTB.SelectedText = ""; // remove the space
 				MyStepRTB.Select(ss, sl);
-			}
+		}
 		}
 
 		private void ToggleBold()
@@ -4422,6 +4422,7 @@ namespace Volian.Controls.Library
 				if (MyFlexGrid.Cols[0].Width == -1) MyFlexGrid.Cols[0].Width = MyFlexGrid.Cols.DefaultSize;
 				MyFlexGrid.Cols.Fixed = MyFlexGrid.Cols.Count;
 				MyFlexGrid.Rows.Fixed = MyFlexGrid.Rows.Count;
+				MyFlexGrid.StyleBackColor = MyFlexGrid.DefaultFixedBackgroundColor; // C2021-004 force the fixed background color
 				ToggleTableDesignButtons(false);
 				//MyFlexGrid.ListStyles();
 			}
@@ -4430,7 +4431,7 @@ namespace Volian.Controls.Library
 				// set grid back to "normal" mode
 				MyFlexGrid.Cols.Fixed = 0;
 				MyFlexGrid.Rows.Fixed = 0;
-				MyFlexGrid.StyleBackColor = Color.White;
+				MyFlexGrid.ShowTableCellShading(); // C2021-004 show the table cell colors
 				ToggleTableDesignButtons(true);
 				//MyFlexGrid.ListStyles();
 			}
@@ -4643,6 +4644,50 @@ namespace Volian.Controls.Library
 				ChangeFontSize(SelectionOption.All, newSize);
 			}
 		}
+		#region Table Cell Shading
+		// C2021-004 Table Cell Shading
+		private void btnTblDgnCellShading_SelectedColorChanged(object sender, EventArgs e)
+		{
+			Color newshading = btnCellShading.SelectedColor;
+			MyFlexGrid.SetShading(MyFlexGrid.Selection, newshading); // assign the selected color the selected cell(s)
+			MyEditItem.Invalidate();
+			MyFlexGrid.Invalidate();
+		}
+		// This adds a button named "More Shading Options..." to the DotNetBar defined Color Selector button
+		private bool _CustomButtonAdded = false;
+		private void btnCellShading_PopupShowing(object sender, EventArgs e)
+		{
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.ShadingOptionList == null) return; //not shading options defined in format
+			if (!_CustomButtonAdded)
+			{
+				ButtonItem button = new ButtonItem();
+				button.Text = "More Shading Options...";
+				button.BeginGroup = true;
+				foreach (ShadingOption ShadeOpt in MyItemInfo.ActiveFormat.PlantFormat.FormatData.ShadingOptionList)
+				{
+					ButtonItem btn = new ButtonItem();
+					btn.Tag = ShadeOpt;
+					btn.Text = ShadeOpt.ToString();
+					btn.Click += new EventHandler(MoreShadingOptionsClick);
+					button.SubItems.Add(btn);
+				}
+				btnCellShading.SubItems.Add(button);
+				((MenuPanel)((PopupItem)button.Parent).PopupControl).RecalcLayout();
+				_CustomButtonAdded = true;
+			}
+		}
+		private void MoreShadingOptionsClick(object sender, EventArgs e)
+		{
+			ShadingOption sopt = (ShadingOption)((BaseItem)sender).Tag;
+			/* debug information
+			//string str = string.Format("Alpha {0}\n Red {1}\nBlue {2}\nGreen{3}", sopt.Alpha, sopt.Red, sopt.Blue, sopt.Green);
+			//MessageBox.Show(str,"more shading click");
+			*/
+			MyFlexGrid.SetShading(MyFlexGrid.Selection, sopt);
+			MyEditItem.Invalidate();
+			MyFlexGrid.Invalidate();
+		}
+		#endregion
 	}
 	public class StepTabRibbonEventArgs : EventArgs
 	{
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs
index e51e78413308592558dfcf39d6152d3ac0d08359..f9aaf8191df96fa10a609c9c7b22812db6493b48 100644
GIT binary patch
delta 885
zcmaJ<Pe@a79RGgb+k1Pnx#F!&+uG0-MYwd9+CdEGI;2reI&_iEm1cj&Hq7#3h9KG@
zYVvH~=&}VJC2RwqD8xHS$8|915O!Du9f}|*Xor65wb1p5AK&lc_xpZ7|M=yzzO^Oa
z^0bB0FU>OLR?N1-={L)qlJmF<k1hA@O6sJvYZT(_T!5<(Q<^_CC`E4vg?l8QvNYq$
zd`6j`Alj5%<aS}rlUP-XTi$~6t>ouBpi6BQ&|;!M2~Fy`6?3ml>9WbCp0eP8hwp?F
z>cS!X-p_YIC$Y&R6u5y_RZC%?j~2fO0sA&;7=de$fH4&n+(e-r0&twZ3fMy0L$uPK
zNBGSW0)3&0ViB>8v=X`~Ea6^tID^Hr6!;`a^*bObnCDt5CXJYA&?jbV=4Y~;ogyww
zk#<Zl32{imINf!M2aM*XCvnbR)$}_*-2^?=IQQ<F2a2t8j?5G%8%lW{#QuuT8k*ob
zx38fJGz8-?#3K5`^cS#ghh;rQXk}xS`%$<I6ReLwh<VZdZ2iPR(z;P@uR?DV4`UGh
z&u(l}^eEvu`KU2zn31I57OM(m5+-#y^kP9gbJ%Dl3jeH7GRixsDbKk`^P))Qk0{Zz
zGPcgAN~oqvoc|&<_VRIBxx(#N)7|`a6NLxRNwyz?JU<)cS(#V~tVDG-Xx^AmAG|W(
z+n{tv@+;c&#>)3TNQ=WLI}8&b?2&G|FR|bfEH(q#^lnNzPdSwO=)GI2v)+Mvr~|$K
E0!i2NjQ{`u

delta 501
zcmdnBMrqT0r44nQ(?7^E%52W!=@Onk;Xk9$<^>9$c1%|g0J0`<?qiztKyLGfn;bff
zhSTMJnN=qX{1chpqs%BUeE~BQ*LEH@#vRPlH;6M!ZC8?E^pa&ZVlbJm=*z4;eSrz1
z$n*|wHmJe_mW<0h8I7kKE@#x9F3`-#vwdDOqm$BfrwdGSlNTtlP5-bMC>FAeaS0={
zIfKD;!xo@Akl1vS6^vh|JN##2nLh6-o7Qv#V@9dz7Zx%qY@fA~@rdtahre9yYyL29
zU-O44DSZ2)5au|R$s6pYrgMcb7u0hy=mVhwgA;=hg8>j5GUx(nV+Kp0SUE!?Lotvp
zVn}7kWyohJ1JWr#ej1Qngrvs+tjCnW3@DbwP|8pOq+xpVfO<f>AUaEcIu#g_88U$U
zWQJ@81wV!Yuq7ox0R^CB8jvhzs03P<1mxv_t=9#LVRK#@LncE7P#?&NAk`%d8Iuj~
zDo#Hzky)r+Ba#`2S%8=oh}pJlM6w?%nf}0lg>CyOPDVSS?eEUAcO0AU(Zu00jh(}3
Ox`QGI*L1yU96SI&b%!hf