* ISytle：调整主题切换执行流程

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;

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;
         }

SunnyUI/Controls/Color/UIColorWheel.cs

@@ -283,7 +283,8 @@ namespace Sunny.UI
         /// <param name="style">Ö÷ĚâŃůĘ˝</param>
         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
         /// <param name="uiColor"></param>
         public void SetStyleColor(UIBaseStyle uiColor)
         {
-            if (uiColor.IsCustom()) return;
             FrameColor = uiColor.RectColor;
             BackColor = uiColor.PlainColor;
             Invalidate();

SunnyUI/Controls/Color/UILabelRotate.cs

@@ -203,7 +203,8 @@ namespace Sunny.UI
         /// <param name="style">Ö÷ĚâŃůĘ˝</param>
         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
         /// <param name="uiColor"></param>
         public virtual void SetStyleColor(UIBaseStyle uiColor)
         {
-            if (uiColor.IsCustom()) return;
             FrameColor = uiColor.RectColor;
             ForeColor = uiColor.PanelForeColor;
             Invalidate();

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();

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();

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;
         }
 

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;

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;

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();

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);
         }
 

SunnyUI/Controls/UIComboboxEx.cs

@@ -139,7 +139,8 @@ namespace Sunny.UI
         /// <param name="style">主题样式</param>
         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
         /// <param name="uiColor"></param>
         public virtual void SetStyleColor(UIBaseStyle uiColor)
         {
-            if (uiColor.IsCustom()) return;
-
             rectColor = uiColor.RectColor;
             foreColor = UIFontColor.Primary;
             _itemSelectBackColor = uiColor.ListItemSelectBackColor;

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();

SunnyUI/Controls/UIControl.cs

@@ -227,7 +227,8 @@ namespace Sunny.UI
         /// <param name="style">主题样式</param>
         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
         /// <param name="uiColor"></param>
         public virtual void SetStyleColor(UIBaseStyle uiColor)
         {
-            if (uiColor.IsCustom()) return;
-
             fillColor = uiColor.ButtonFillColor;
             rectColor = uiColor.RectColor;
             foreColor = uiColor.ButtonForeColor;

SunnyUI/Controls/UIDataGridView.cs

@@ -481,11 +481,8 @@ namespace Sunny.UI
 
         public void SetStyle(UIStyle style)
         {
-            if (!style.Equals(UIStyle.Custom))
+            UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
-            {
+            if (!uiColor.IsCustom()) SetStyleColor(uiColor);
-                SetStyleColor(UIStyles.GetStyleColor(style));
-            }
-
             _style = style;
         }
 

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;
 

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;
         }
 

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;
 

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;

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;

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();
             }
 

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();

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();
         }

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;

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();

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();

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();
         }

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();
         }

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();
         }

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;

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;

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();

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();

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();

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;
 

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;

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;

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();

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;

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;
         }
 

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;
                             }

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();

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;
 

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();

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;

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;
 

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;

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;

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();

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;

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;

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;

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;
             }

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);
     }
 
     /// <summary>