diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index ab20beed..3592c858 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index e226331e..d70e479a 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net45/SunnyUI.dll b/Bin/net45/SunnyUI.dll
index 35c2dca3..5bf90de5 100644
Binary files a/Bin/net45/SunnyUI.dll and b/Bin/net45/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 69eb2a09..8b73d286 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll
index d2445567..8bc0a218 100644
Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index fd99dcff..16b6de2e 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Controls/FTabControl.Designer.cs b/SunnyUI.Demo/Controls/FTabControl.Designer.cs
index b03bc734..2ef23239 100644
--- a/SunnyUI.Demo/Controls/FTabControl.Designer.cs
+++ b/SunnyUI.Demo/Controls/FTabControl.Designer.cs
@@ -163,7 +163,7 @@ namespace Sunny.UI.Demo
this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.tabPage2.Location = new System.Drawing.Point(0, 40);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Size = new System.Drawing.Size(450, 230);
+ this.tabPage2.Size = new System.Drawing.Size(670, 143);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "tabPage2";
//
@@ -172,7 +172,7 @@ namespace Sunny.UI.Demo
this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.tabPage3.Location = new System.Drawing.Point(0, 40);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(450, 230);
+ this.tabPage3.Size = new System.Drawing.Size(670, 143);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "tabPage3";
//
@@ -180,7 +180,7 @@ namespace Sunny.UI.Demo
//
this.tabPage9.Location = new System.Drawing.Point(0, 40);
this.tabPage9.Name = "tabPage9";
- this.tabPage9.Size = new System.Drawing.Size(450, 230);
+ this.tabPage9.Size = new System.Drawing.Size(670, 143);
this.tabPage9.TabIndex = 4;
this.tabPage9.Text = "tabPage9";
this.tabPage9.UseVisualStyleBackColor = true;
@@ -189,7 +189,7 @@ namespace Sunny.UI.Demo
//
this.tabPage10.Location = new System.Drawing.Point(0, 40);
this.tabPage10.Name = "tabPage10";
- this.tabPage10.Size = new System.Drawing.Size(450, 230);
+ this.tabPage10.Size = new System.Drawing.Size(670, 143);
this.tabPage10.TabIndex = 5;
this.tabPage10.Text = "tabPage10";
this.tabPage10.UseVisualStyleBackColor = true;
@@ -198,7 +198,7 @@ namespace Sunny.UI.Demo
//
this.tabPage11.Location = new System.Drawing.Point(0, 40);
this.tabPage11.Name = "tabPage11";
- this.tabPage11.Size = new System.Drawing.Size(450, 230);
+ this.tabPage11.Size = new System.Drawing.Size(670, 143);
this.tabPage11.TabIndex = 6;
this.tabPage11.Text = "tabPage11";
this.tabPage11.UseVisualStyleBackColor = true;
@@ -207,7 +207,7 @@ namespace Sunny.UI.Demo
//
this.tabPage12.Location = new System.Drawing.Point(0, 40);
this.tabPage12.Name = "tabPage12";
- this.tabPage12.Size = new System.Drawing.Size(450, 230);
+ this.tabPage12.Size = new System.Drawing.Size(670, 143);
this.tabPage12.TabIndex = 7;
this.tabPage12.Text = "tabPage12";
this.tabPage12.UseVisualStyleBackColor = true;
@@ -216,7 +216,7 @@ namespace Sunny.UI.Demo
//
this.tabPage13.Location = new System.Drawing.Point(0, 40);
this.tabPage13.Name = "tabPage13";
- this.tabPage13.Size = new System.Drawing.Size(450, 230);
+ this.tabPage13.Size = new System.Drawing.Size(670, 143);
this.tabPage13.TabIndex = 8;
this.tabPage13.Text = "tabPage13";
this.tabPage13.UseVisualStyleBackColor = true;
diff --git a/SunnyUI/Charts/UIChart.cs b/SunnyUI/Charts/UIChart.cs
index 6d6f8a4e..3d252f0e 100644
--- a/SunnyUI/Charts/UIChart.cs
+++ b/SunnyUI/Charts/UIChart.cs
@@ -190,8 +190,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = ChartStyle.BackColor;
foreColor = ChartStyle.ForeColor;
}
diff --git a/SunnyUI/Controls/Color/UIColorWheel.cs b/SunnyUI/Controls/Color/UIColorWheel.cs
index a93e6fa3..3d4af3fe 100644
--- a/SunnyUI/Controls/Color/UIColorWheel.cs
+++ b/SunnyUI/Controls/Color/UIColorWheel.cs
@@ -283,7 +283,8 @@ namespace Sunny.UI
/// 主题样式
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@@ -293,7 +294,6 @@ namespace Sunny.UI
///
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
FrameColor = uiColor.RectColor;
BackColor = uiColor.PlainColor;
Invalidate();
diff --git a/SunnyUI/Controls/Color/UILabelRotate.cs b/SunnyUI/Controls/Color/UILabelRotate.cs
index bdf9236b..f33db224 100644
--- a/SunnyUI/Controls/Color/UILabelRotate.cs
+++ b/SunnyUI/Controls/Color/UILabelRotate.cs
@@ -203,7 +203,8 @@ namespace Sunny.UI
/// 主题样式
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@@ -213,7 +214,6 @@ namespace Sunny.UI
///
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
FrameColor = uiColor.RectColor;
ForeColor = uiColor.PanelForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/DropItem/UIDropControl.cs b/SunnyUI/Controls/DropItem/UIDropControl.cs
index e7d4b11c..864ea5bc 100644
--- a/SunnyUI/Controls/DropItem/UIDropControl.cs
+++ b/SunnyUI/Controls/DropItem/UIDropControl.cs
@@ -377,8 +377,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreColor = uiColor.DropDownControlColor;
edit.BackColor = fillColor = Color.White;
Invalidate();
diff --git a/SunnyUI/Controls/UIAvatar.cs b/SunnyUI/Controls/UIAvatar.cs
index 283e643c..40053cb4 100644
--- a/SunnyUI/Controls/UIAvatar.cs
+++ b/SunnyUI/Controls/UIAvatar.cs
@@ -113,8 +113,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.AvatarFillColor;
foreColor = uiColor.AvatarForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIBattery.cs b/SunnyUI/Controls/UIBattery.cs
index 013d65b9..e9275dd6 100644
--- a/SunnyUI/Controls/UIBattery.cs
+++ b/SunnyUI/Controls/UIBattery.cs
@@ -145,8 +145,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
}
diff --git a/SunnyUI/Controls/UIBreadcrumb.cs b/SunnyUI/Controls/UIBreadcrumb.cs
index 0c75fdc4..2d1081ed 100644
--- a/SunnyUI/Controls/UIBreadcrumb.cs
+++ b/SunnyUI/Controls/UIBreadcrumb.cs
@@ -239,8 +239,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PrimaryColor;
foreColor = uiColor.ButtonForeColor;
rectColor = uiColor.GridSelectedColor;
diff --git a/SunnyUI/Controls/UIButton.cs b/SunnyUI/Controls/UIButton.cs
index f79df1b5..f1f3d485 100644
--- a/SunnyUI/Controls/UIButton.cs
+++ b/SunnyUI/Controls/UIButton.cs
@@ -212,8 +212,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillHoverColor = uiColor.ButtonFillHoverColor;
rectHoverColor = uiColor.RectHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor;
diff --git a/SunnyUI/Controls/UICheckBox.cs b/SunnyUI/Controls/UICheckBox.cs
index 8a1f5033..9920d86c 100644
--- a/SunnyUI/Controls/UICheckBox.cs
+++ b/SunnyUI/Controls/UICheckBox.cs
@@ -197,8 +197,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIComboBox.cs b/SunnyUI/Controls/UIComboBox.cs
index 9a415a3e..5faac9f4 100644
--- a/SunnyUI/Controls/UIComboBox.cs
+++ b/SunnyUI/Controls/UIComboBox.cs
@@ -148,8 +148,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
ListBox.SetStyleColor(uiColor);
}
diff --git a/SunnyUI/Controls/UIComboboxEx.cs b/SunnyUI/Controls/UIComboboxEx.cs
index 703ddbdc..e97df610 100644
--- a/SunnyUI/Controls/UIComboboxEx.cs
+++ b/SunnyUI/Controls/UIComboboxEx.cs
@@ -139,7 +139,8 @@ namespace Sunny.UI
/// 涓婚鏍峰紡
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@@ -149,8 +150,6 @@ namespace Sunny.UI
///
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
_itemSelectBackColor = uiColor.ListItemSelectBackColor;
diff --git a/SunnyUI/Controls/UIContextMenuStrip.cs b/SunnyUI/Controls/UIContextMenuStrip.cs
index 1821988d..2d355e9c 100644
--- a/SunnyUI/Controls/UIContextMenuStrip.cs
+++ b/SunnyUI/Controls/UIContextMenuStrip.cs
@@ -54,14 +54,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
ColorTable.SetStyleColor(uiColor);
BackColor = uiColor.ContextMenuColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs
index 04326de6..06572f9d 100644
--- a/SunnyUI/Controls/UIControl.cs
+++ b/SunnyUI/Controls/UIControl.cs
@@ -227,7 +227,8 @@ namespace Sunny.UI
/// 涓婚鏍峰紡
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@@ -237,8 +238,6 @@ namespace Sunny.UI
///
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.ButtonFillColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.ButtonForeColor;
diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs
index 4a6547c3..c54b6440 100644
--- a/SunnyUI/Controls/UIDataGridView.cs
+++ b/SunnyUI/Controls/UIDataGridView.cs
@@ -481,11 +481,8 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- if (!style.Equals(UIStyle.Custom))
- {
- SetStyleColor(UIStyles.GetStyleColor(style));
- }
-
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
diff --git a/SunnyUI/Controls/UIDataGridViewFooter.cs b/SunnyUI/Controls/UIDataGridViewFooter.cs
index b15f15f4..a669727a 100644
--- a/SunnyUI/Controls/UIDataGridViewFooter.cs
+++ b/SunnyUI/Controls/UIDataGridViewFooter.cs
@@ -134,8 +134,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreColor = UIFontColor.Primary;
fillColor = uiColor.PlainColor;
diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.cs b/SunnyUI/Controls/UIFlowLayoutPanel.cs
index 61146d33..9068c69b 100644
--- a/SunnyUI/Controls/UIFlowLayoutPanel.cs
+++ b/SunnyUI/Controls/UIFlowLayoutPanel.cs
@@ -105,8 +105,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
Panel.BackColor = uiColor.PlainColor;
}
diff --git a/SunnyUI/Controls/UIHeaderButton.cs b/SunnyUI/Controls/UIHeaderButton.cs
index d448d2c5..2883826a 100644
--- a/SunnyUI/Controls/UIHeaderButton.cs
+++ b/SunnyUI/Controls/UIHeaderButton.cs
@@ -131,8 +131,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillHoverColor = uiColor.ButtonFillHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor;
diff --git a/SunnyUI/Controls/UIHorScrollBar.cs b/SunnyUI/Controls/UIHorScrollBar.cs
index c381d299..2453ba1d 100644
--- a/SunnyUI/Controls/UIHorScrollBar.cs
+++ b/SunnyUI/Controls/UIHorScrollBar.cs
@@ -426,8 +426,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;
diff --git a/SunnyUI/Controls/UIHorScrollBarEx.cs b/SunnyUI/Controls/UIHorScrollBarEx.cs
index 2f978565..581a6ce2 100644
--- a/SunnyUI/Controls/UIHorScrollBarEx.cs
+++ b/SunnyUI/Controls/UIHorScrollBarEx.cs
@@ -227,8 +227,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;
diff --git a/SunnyUI/Controls/UIImageListBox.cs b/SunnyUI/Controls/UIImageListBox.cs
index 86a804e3..6726b61a 100644
--- a/SunnyUI/Controls/UIImageListBox.cs
+++ b/SunnyUI/Controls/UIImageListBox.cs
@@ -187,8 +187,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
if (bar != null)
{
bar.ForeColor = uiColor.PrimaryColor;
@@ -495,17 +493,15 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor;
-
Invalidate();
}
diff --git a/SunnyUI/Controls/UILabel.cs b/SunnyUI/Controls/UILabel.cs
index 7f95ba85..0e47b346 100644
--- a/SunnyUI/Controls/UILabel.cs
+++ b/SunnyUI/Controls/UILabel.cs
@@ -75,7 +75,8 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
@@ -88,7 +89,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
ForeColor = uiColor.LabelForeColor;
Invalidate();
}
@@ -146,14 +146,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
ForeColor = uiColor.LabelForeColor;
LinkColor = uiColor.LabelForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UILedLabel.cs b/SunnyUI/Controls/UILedLabel.cs
index 7462a707..6609ff2b 100644
--- a/SunnyUI/Controls/UILedLabel.cs
+++ b/SunnyUI/Controls/UILedLabel.cs
@@ -179,8 +179,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreColor = uiColor.RectColor;
Invalidate();
}
diff --git a/SunnyUI/Controls/UILine.cs b/SunnyUI/Controls/UILine.cs
index 8024ffb1..d7728699 100644
--- a/SunnyUI/Controls/UILine.cs
+++ b/SunnyUI/Controls/UILine.cs
@@ -82,8 +82,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.LineForeColor;
diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs
index ed63c092..b6c65666 100644
--- a/SunnyUI/Controls/UIListBox.cs
+++ b/SunnyUI/Controls/UIListBox.cs
@@ -194,8 +194,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
if (bar != null)
{
bar.ForeColor = uiColor.PrimaryColor;
@@ -538,14 +536,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UILogo.cs b/SunnyUI/Controls/UILogo.cs
index 7616f8d9..46fc625c 100644
--- a/SunnyUI/Controls/UILogo.cs
+++ b/SunnyUI/Controls/UILogo.cs
@@ -120,8 +120,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreColor = UIFontColor.Primary;
fillColor = uiColor.MenuSelectedColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIMarkLabel.cs b/SunnyUI/Controls/UIMarkLabel.cs
index c679dd90..15321d00 100644
--- a/SunnyUI/Controls/UIMarkLabel.cs
+++ b/SunnyUI/Controls/UIMarkLabel.cs
@@ -110,8 +110,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
markColor = uiColor.RectColor;
Invalidate();
}
diff --git a/SunnyUI/Controls/UINavBar.cs b/SunnyUI/Controls/UINavBar.cs
index 794d1e38..89523ae8 100644
--- a/SunnyUI/Controls/UINavBar.cs
+++ b/SunnyUI/Controls/UINavBar.cs
@@ -618,14 +618,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor;
Invalidate();
}
diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs
index 8152659b..a97805d8 100644
--- a/SunnyUI/Controls/UINavMenu.cs
+++ b/SunnyUI/Controls/UINavMenu.cs
@@ -303,14 +303,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor;
Invalidate();
}
diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs
index 274d262a..e0c7ac13 100644
--- a/SunnyUI/Controls/UIPagination.cs
+++ b/SunnyUI/Controls/UIPagination.cs
@@ -792,8 +792,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreach (var button in buttons.Values)
{
button.FillColor = uiColor.PlainColor;
diff --git a/SunnyUI/Controls/UIPanel.cs b/SunnyUI/Controls/UIPanel.cs
index ebbdebac..c97af754 100644
--- a/SunnyUI/Controls/UIPanel.cs
+++ b/SunnyUI/Controls/UIPanel.cs
@@ -504,14 +504,13 @@ namespace Sunny.UI
{
this.SetChildUIStyle(style);
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
rectColor = uiColor.RectColor;
foreColor = uiColor.PanelForeColor;
diff --git a/SunnyUI/Controls/UIProcessBar.cs b/SunnyUI/Controls/UIProcessBar.cs
index 2f908377..efc732e1 100644
--- a/SunnyUI/Controls/UIProcessBar.cs
+++ b/SunnyUI/Controls/UIProcessBar.cs
@@ -172,8 +172,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIProgressIndicator.cs b/SunnyUI/Controls/UIProgressIndicator.cs
index 65f157a7..5b2ed7ac 100644
--- a/SunnyUI/Controls/UIProgressIndicator.cs
+++ b/SunnyUI/Controls/UIProgressIndicator.cs
@@ -57,8 +57,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
foreColor = uiColor.ProgressIndicatorColor;
ClearImage();
Invalidate();
diff --git a/SunnyUI/Controls/UIRadioButton.cs b/SunnyUI/Controls/UIRadioButton.cs
index aa2f74c8..683f2296 100644
--- a/SunnyUI/Controls/UIRadioButton.cs
+++ b/SunnyUI/Controls/UIRadioButton.cs
@@ -221,8 +221,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs
index 02d37487..ab49159c 100644
--- a/SunnyUI/Controls/UIRichTextBox.cs
+++ b/SunnyUI/Controls/UIRichTextBox.cs
@@ -137,8 +137,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
edit.BackColor = fillColor = Color.White;
edit.ForeColor = foreColor = UIFontColor.Primary;
diff --git a/SunnyUI/Controls/UIRoundProcess.cs b/SunnyUI/Controls/UIRoundProcess.cs
index d8513daf..cb81718d 100644
--- a/SunnyUI/Controls/UIRoundProcess.cs
+++ b/SunnyUI/Controls/UIRoundProcess.cs
@@ -167,8 +167,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.RectColor;
foreColor = uiColor.RectColor;
rectColor = uiColor.GridSelectedColor;
diff --git a/SunnyUI/Controls/UIScrollBar.cs b/SunnyUI/Controls/UIScrollBar.cs
index bd54ad5c..ae21f730 100644
--- a/SunnyUI/Controls/UIScrollBar.cs
+++ b/SunnyUI/Controls/UIScrollBar.cs
@@ -431,8 +431,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;
diff --git a/SunnyUI/Controls/UIScrollingText.cs b/SunnyUI/Controls/UIScrollingText.cs
index 54ec6dac..75bc0ae6 100644
--- a/SunnyUI/Controls/UIScrollingText.cs
+++ b/SunnyUI/Controls/UIScrollingText.cs
@@ -224,8 +224,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
foreColor = uiColor.RectColor;
Invalidate();
diff --git a/SunnyUI/Controls/UISwitch.cs b/SunnyUI/Controls/UISwitch.cs
index c69d6aea..5825a955 100644
--- a/SunnyUI/Controls/UISwitch.cs
+++ b/SunnyUI/Controls/UISwitch.cs
@@ -191,8 +191,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
rectColor = uiColor.SwitchActiveColor;
fillColor = uiColor.SwitchFillColor;
inActiveColor = uiColor.SwitchInActiveColor;
diff --git a/SunnyUI/Controls/UISymbolLabel.cs b/SunnyUI/Controls/UISymbolLabel.cs
index 07e327b2..0d458292 100644
--- a/SunnyUI/Controls/UISymbolLabel.cs
+++ b/SunnyUI/Controls/UISymbolLabel.cs
@@ -206,8 +206,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
symbolColor = foreColor = uiColor.LabelForeColor;
}
diff --git a/SunnyUI/Controls/UITabControl.cs b/SunnyUI/Controls/UITabControl.cs
index 57275b45..04aa2375 100644
--- a/SunnyUI/Controls/UITabControl.cs
+++ b/SunnyUI/Controls/UITabControl.cs
@@ -351,14 +351,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor;
_fillColor = uiColor.PlainColor;
Invalidate();
@@ -463,7 +462,7 @@ namespace Sunny.UI
if (TabSelectedHighColorSize > 0)
g.FillRectangle(TabSelectedHighColor, 0, bmp.Height - TabSelectedHighColorSize, bmp.Width, TabSelectedHighColorSize);
}
-
+
g.DrawString(TabPages[index].Text, Font, index == SelectedIndex ? tabSelectedForeColor : TabUnSelectedForeColor, textLeft, 2 + (TabRect.Height - sf.Height - 4) / 2.0f);
var menuItem = Helper[index];
@@ -841,7 +840,7 @@ namespace Sunny.UI
if (!_bPainting)
{
int itemTop = 0;
- if(_owner.Alignment ==TabAlignment.Top )
+ if (_owner.Alignment == TabAlignment.Top)
{
itemTop = 0;
}
diff --git a/SunnyUI/Controls/UITabControlMenu.cs b/SunnyUI/Controls/UITabControlMenu.cs
index a698fa61..40d31d7d 100644
--- a/SunnyUI/Controls/UITabControlMenu.cs
+++ b/SunnyUI/Controls/UITabControlMenu.cs
@@ -216,14 +216,13 @@ namespace Sunny.UI
public void SetStyle(UIStyle style)
{
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
public void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor;
_fillColor = uiColor.PlainColor;
Invalidate();
diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs
index d92dee04..cb1abed8 100644
--- a/SunnyUI/Controls/UITextBox.cs
+++ b/SunnyUI/Controls/UITextBox.cs
@@ -588,8 +588,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
edit.BackColor = fillColor = Enabled ? Color.White : FillDisableColor;
edit.ForeColor = foreColor = UIFontColor.Primary;
diff --git a/SunnyUI/Controls/UITitlePanel.cs b/SunnyUI/Controls/UITitlePanel.cs
index b64e1441..930edbaa 100644
--- a/SunnyUI/Controls/UITitlePanel.cs
+++ b/SunnyUI/Controls/UITitlePanel.cs
@@ -70,8 +70,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
titleColor = uiColor.TitleColor;
foreColor = uiColor.TitleForeColor;
Invalidate();
diff --git a/SunnyUI/Controls/UITrackBar.cs b/SunnyUI/Controls/UITrackBar.cs
index f1918f31..46153d54 100644
--- a/SunnyUI/Controls/UITrackBar.cs
+++ b/SunnyUI/Controls/UITrackBar.cs
@@ -135,8 +135,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
rectDisableColor = uiColor.TrackDisableColor;
rectColor = uiColor.TrackBarRectColor;
fillColor = uiColor.TrackBarFillColor;
diff --git a/SunnyUI/Controls/UITransfer.cs b/SunnyUI/Controls/UITransfer.cs
index 4cffe69b..11fc4c6c 100644
--- a/SunnyUI/Controls/UITransfer.cs
+++ b/SunnyUI/Controls/UITransfer.cs
@@ -201,8 +201,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
if (l1 == null || l2 == null) return;
if (b1 == null || b2 == null || b3 == null || b4 == null) return;
diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs
index 62922547..96c4e9b1 100644
--- a/SunnyUI/Controls/UITreeView.cs
+++ b/SunnyUI/Controls/UITreeView.cs
@@ -65,8 +65,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
+ base.SetStyleColor(uiColor);
if (view != null)
{
view.SelectedForeColor = UIColor.White;
diff --git a/SunnyUI/Controls/UIVerScrollBarEx.cs b/SunnyUI/Controls/UIVerScrollBarEx.cs
index 392087df..1311ea20 100644
--- a/SunnyUI/Controls/UIVerScrollBarEx.cs
+++ b/SunnyUI/Controls/UIVerScrollBarEx.cs
@@ -226,8 +226,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.PlainColor;
foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor;
diff --git a/SunnyUI/Controls/UIWaitingBar.cs b/SunnyUI/Controls/UIWaitingBar.cs
index 6ee4c809..75271e9d 100644
--- a/SunnyUI/Controls/UIWaitingBar.cs
+++ b/SunnyUI/Controls/UIWaitingBar.cs
@@ -128,8 +128,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor;
Invalidate();
diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs
index 3cccb18e..fa26ba49 100644
--- a/SunnyUI/Forms/UIForm.cs
+++ b/SunnyUI/Forms/UIForm.cs
@@ -1072,7 +1072,8 @@ namespace Sunny.UI
this.SetChildUIStyle(style);
btn.SetStyle(style);
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
UIStyleChanged?.Invoke(this, new EventArgs());
}
@@ -1081,8 +1082,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
BackColor = uiColor.PlainColor;
diff --git a/SunnyUI/Forms/UIMessageForm.cs b/SunnyUI/Forms/UIMessageForm.cs
index 08d5f7ac..23eea593 100644
--- a/SunnyUI/Forms/UIMessageForm.cs
+++ b/SunnyUI/Forms/UIMessageForm.cs
@@ -98,8 +98,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
if (btnOK != null)
{
btnOK.FillColor = BackColor;
diff --git a/SunnyUI/Pages/UIPage.cs b/SunnyUI/Pages/UIPage.cs
index 6b3cc610..9beb3110 100644
--- a/SunnyUI/Pages/UIPage.cs
+++ b/SunnyUI/Pages/UIPage.cs
@@ -281,7 +281,8 @@ namespace Sunny.UI
{
this.SetChildUIStyle(style);
- SetStyleColor(UIStyles.GetStyleColor(style));
+ UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
+ if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
UIStyleChanged?.Invoke(this, new EventArgs());
}
@@ -290,8 +291,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
- if (uiColor.IsCustom()) return;
-
BackColor = uiColor.PlainColor;
RectColor = uiColor.RectColor;
ForeColor = UIFontColor.Primary;
diff --git a/SunnyUI/Pages/UITitlePage.cs b/SunnyUI/Pages/UITitlePage.cs
index c3b51b2b..ec64086e 100644
--- a/SunnyUI/Pages/UITitlePage.cs
+++ b/SunnyUI/Pages/UITitlePage.cs
@@ -133,8 +133,6 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
- if (uiColor.IsCustom()) return;
-
FillColor = uiColor.PageTitleFillColor;
ForeColor = uiColor.PageTitleForeColor;
}
diff --git a/SunnyUI/Style/UIStyle.cs b/SunnyUI/Style/UIStyle.cs
index 260d3cf2..a9cb84f3 100644
--- a/SunnyUI/Style/UIStyle.cs
+++ b/SunnyUI/Style/UIStyle.cs
@@ -37,6 +37,10 @@ namespace Sunny.UI
string Version { get; }
string TagString { get; set; }
+
+ void SetStyleColor(UIBaseStyle uiColor);
+
+ void SetStyle(UIStyle style);
}
///