fix the back color of edit textbox not updated from control appearance

unvell · May 5, 2021 · 4fba21a · 4fba21a
1 parent be5f6a7
commit 4fba21a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 14 deletions.
diff --git a/Editor/ControlAppearanceEditorForm.cs b/Editor/ControlAppearanceEditorForm.cs
@@ -92,15 +92,12 @@ private void colorPickerControl_ColorPicked(object sender, EventArgs e)
 			ControlAppearanceColors key = (ControlAppearanceColors)Enum.Parse(
 			typeof(ControlAppearanceColors), lstColors.SelectedItem.ToString());
 
-			grid.ControlStyle.SetColor(key, colorPickerControl.SolidColor);
-
-			grid.ControlStyle = grid.ControlStyle;
+			grid.ControlStyle[key] = colorPickerControl.SolidColor;
 		}
 
 		private void NumSelectionWidth_ValueChanged(object sender, EventArgs e)
 		{
 			grid.ControlStyle.SelectionBorderWidth = (float)numSelectionWidth.Value;
-			grid.Invalidate();
 		}
 		#endregion // Set Styles
 

diff --git a/ReoGrid/Control/ControlShare.cs b/ReoGrid/Control/ControlShare.cs
@@ -107,7 +107,7 @@ private void InitControl()
 			this.builtInCrossCursor = LoadCursorFromResource(unvell.ReoGrid.Properties.Resources.cross);
 #endif // WINFORM || WPF
 
-			this.controlStyle = ControlAppearanceStyle.CreateDefaultControlStyle();
+			this.ControlStyle = ControlAppearanceStyle.CreateDefaultControlStyle();
 		}
 
 		private void InitWorkbook(IControlAdapter adapter)
@@ -1273,21 +1273,39 @@ public ControlAppearanceStyle ControlStyle
 			get { return this.controlStyle; }
 			set
 			{
-				this.controlStyle = value ?? throw new ArgumentNullException("ControlStyle", "cannot set ControlStyle to null");
+				if (value == null)
+				{
+					throw new ArgumentNullException("ControlStyle", "cannot set ControlStyle to null");
+				}
+
+				if (this.controlStyle != value)
+				{
+					if (this.controlStyle != null) this.controlStyle.CurrentControl = null;
+					this.controlStyle = value;
+				}
 				//workbook.SetControlStyle(value);
 
-				this.adapter.Invalidate();
+				this.ApplyControlStyle();
+			}
+		}
+
+		internal void ApplyControlStyle()
+		{
+			this.controlStyle.CurrentControl = this;
 
 #if WINFORM
-				sheetTab.BackColor = value[ControlAppearanceColors.SheetTabBackground];
-				this.BackColor = value[ControlAppearanceColors.GridBackground];
+			sheetTab.BackColor = this.controlStyle[ControlAppearanceColors.SheetTabBackground];
+			this.BackColor = this.controlStyle[ControlAppearanceColors.GridBackground];
 #elif WPF
-				sheetTab.Background = new System.Windows.Media.SolidColorBrush(value[ControlAppearanceColors.SheetTabBackground]);
+			sheetTab.Background = new System.Windows.Media.SolidColorBrush(this.controlStyle[ControlAppearanceColors.SheetTabBackground]);
 #endif // WINFORM & WPF
 
-			}
+			this.adapter?.Invalidate();
 		}
-		#endregion // App
+
+		//private AppearanceStyle appearanceStyle = new AppearanceStyle(this);
+
+		#endregion // Appearance
 
 		#region Mouse
 		private void OnWorksheetMouseDown(RGPointF location, MouseButtons buttons)

diff --git a/ReoGrid/Core/Workbook/Appearance.cs b/ReoGrid/Core/Workbook/Appearance.cs
@@ -89,6 +89,8 @@ public enum ControlAppearanceColors : short
 	/// </summary>
 	public class ControlAppearanceStyle
 	{
+		internal ReoGridControl CurrentControl { get; set; }
+
 		private Dictionary<ControlAppearanceColors, SolidColor> colors = new Dictionary<ControlAppearanceColors, SolidColor>(100);
 
 		internal Dictionary<ControlAppearanceColors, SolidColor> Colors
@@ -116,6 +118,7 @@ public bool GetColor(ControlAppearanceColors colorKey, out SolidColor color)
 		public void SetColor(ControlAppearanceColors colorKey, SolidColor color)
 		{
 			colors[colorKey] = color;
+			this.CurrentControl?.ApplyControlStyle();
 		}
 
 		/// <summary>
@@ -133,7 +136,10 @@ public SolidColor this[ControlAppearanceColors colorKey]
 				else
 					return SolidColor.Black;
 			}
-			set { SetColor(colorKey, value); }
+			set
+			{
+				SetColor(colorKey, value);
+			}
 		}
 
 		/// <summary>

diff --git a/ReoGrid/WinForm/WinFormControl.cs b/ReoGrid/WinForm/WinFormControl.cs
@@ -495,7 +495,8 @@ public void ShowEditControl(Graphics.Rectangle bounds, Cell cell)
 				editTextbox.InitialSize = rect.Size;
 				editTextbox.VAlign = cell.InnerStyle.VAlign;
 				editTextbox.Font = cell.RenderFont;
-				editTextbox.ForeColor = cell.InnerStyle.TextColor;
+				editTextbox.ForeColor = cell.InnerStyle.HasStyle(PlainStyleFlag.TextColor)
+					? cell.InnerStyle.TextColor : this.control.ControlStyle[ControlAppearanceColors.GridText];
 				editTextbox.BackColor = cell.InnerStyle.HasStyle(PlainStyleFlag.BackColor)
 					? cell.InnerStyle.BackColor : this.control.ControlStyle[ControlAppearanceColors.GridBackground];
 				editTextbox.ResumeLayout();