* 调整内置主题

SunnyUI.Demo/Controls/FButton.Designer.cs

@@ -269,7 +269,7 @@ namespace Sunny.UI.Demo
             this.uiSymbolButton24.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiSymbolButton24.Name = "uiSymbolButton24";
             this.uiSymbolButton24.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.RightTop | Sunny.UI.UICornerRadiusSides.RightBottom)));
-            this.uiSymbolButton24.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)(((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) 
+            this.uiSymbolButton24.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)(((System.Windows.Forms.ToolStripStatusLabelBorderSides.Top | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
             | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
             this.uiSymbolButton24.Size = new System.Drawing.Size(46, 35);
             this.uiSymbolButton24.Symbol = 61473;
@@ -991,7 +991,7 @@ namespace Sunny.UI.Demo
             this.uiButton1.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
             this.uiButton1.ShowFocusLine = true;
             this.uiButton1.Size = new System.Drawing.Size(100, 35);
-            this.uiButton1.Style = Sunny.UI.UIStyle.White;
+            this.uiButton1.Style = Sunny.UI.UIStyle.Gray;
             this.uiButton1.StyleCustomMode = true;
             this.uiButton1.TabIndex = 59;
             this.uiButton1.Text = "White";

SunnyUI/Style/UIStyle.cs

@@ -105,28 +105,37 @@ namespace Sunny.UI
         Gray = 5,
 
         /// <summary>
-        /// 白
+        /// 紫
         /// </summary>
-        [DisplayText("White")]
+        [DisplayText("Purple")]
-        White = 6,
+        Purple = 6,
+
+        /// <summary>
+        /// LayuiGreen
+        /// </summary>
+        LayuiGreen = 7,
+
+        /// <summary>
+        /// LayuiRed
+        /// </summary>
+        LayuiRed = 8,
+
+        /// <summary>
+        /// LayuiOrange
+        /// </summary>
+        LayuiOrange = 9,
 
         /// <summary>
         /// 深蓝
         /// </summary>
         [DisplayText("DarkBlue")]
-        DarkBlue = 7,
+        DarkBlue = 101,
 
         /// <summary>
         /// 黑
         /// </summary>
         [DisplayText("Black")]
-        Black = 8,
+        Black = 102,
-
-        /// <summary>
-        /// 紫
-        /// </summary>
-        [DisplayText("Purple")]
-        Purple = 9,
 
         /// <summary>
         /// 多彩的
@@ -149,7 +158,6 @@ namespace Sunny.UI
             {
                 if (style.Value() >= UIStyle.Blue.Value() && style.Value() < UIStyle.Colorful.Value())
                 {
-                    //if (style == UIStyle.DarkBlue) continue;
                     styles.Add(style);
                 }
             }
@@ -162,11 +170,6 @@ namespace Sunny.UI
         /// </summary>
         private static readonly UIBaseStyle Custom = new UICustomStyle();
 
-        /// <summary>
-        /// 白
-        /// </summary>
-        private static readonly UIBaseStyle White = new UIWhiteStyle();
-
         /// <summary>
         /// 蓝
         /// </summary>
@@ -237,9 +240,14 @@ namespace Sunny.UI
             AddStyle(Green);
             AddStyle(Red);
             AddStyle(DarkBlue);
+
+            AddStyle(new UIBaseStyle().Init(UIColor.LayuiGreen, UIStyle.LayuiGreen, Color.White, UIFontColor.Primary));
+            AddStyle(new UIBaseStyle().Init(UIColor.LayuiRed, UIStyle.LayuiRed, Color.White, UIFontColor.Primary));
+            AddStyle(new UIBaseStyle().Init(UIColor.LayuiOrange, UIStyle.LayuiOrange, Color.White, UIFontColor.Primary));
+
             AddStyle(Black);
-            AddStyle(White);
             AddStyle(Purple);
+
             AddStyle(Colorful);
 
             MenuColors.TryAdd(UIMenuStyle.Custom, new UIMenuCustomColor());
@@ -457,6 +465,36 @@ namespace Sunny.UI
         /// </summary>
         public static readonly Color Orange = Color.FromArgb(220, 155, 40);
 
+        /// <summary>
+        /// LayuiGreen
+        /// </summary>
+        public static readonly Color LayuiGreen = Color.FromArgb(0, 150, 136);
+
+        /// <summary>
+        /// LayuiRed
+        /// </summary>
+        public static readonly Color LayuiRed = Color.FromArgb(255, 87, 34);
+
+        /// <summary>
+        /// LayuiOrange
+        /// </summary>
+        public static readonly Color LayuiOrange = Color.FromArgb(255, 184, 0);
+
+        /// <summary>
+        /// LayuiCyan
+        /// </summary>
+        public static readonly Color LayuiCyan = Color.FromArgb(46, 57, 79);
+
+        /// <summary>
+        /// LayuiCyan
+        /// </summary>
+        public static readonly Color LayuiBlue = Color.FromArgb(69, 149, 255);
+
+        /// <summary>
+        /// LayuiCyan
+        /// </summary>
+        public static readonly Color LayuiBlack = Color.FromArgb(52, 55, 66);
+
         /// <summary>
         /// 深蓝
         /// </summary>

SunnyUI/Style/UIStyleColor.cs

@@ -222,7 +222,7 @@ namespace Sunny.UI
 
         protected Color ForeColor { get; set; }
 
-        protected virtual void Init(Color color, UIStyle style, Color reverseColor, Color foreColor)
+        public virtual UIBaseStyle Init(Color color, UIStyle style, Color reverseColor, Color foreColor)
         {
             Name = style;
 
@@ -383,6 +383,8 @@ namespace Sunny.UI
 
             FlowLayoutPanelBarFillColor = PlainColor;
             FlowLayoutPanelBarForeColor = PrimaryColor;
+
+            return this;
         }
 
         public virtual void LoadFromFile()
@@ -463,14 +465,6 @@ namespace Sunny.UI
         }
     }
 
-    public class UIWhiteStyle : UIBaseStyle
-    {
-        public UIWhiteStyle()
-        {
-            base.Init(UIColor.White, UIStyle.White, Color.Black, UIFontColor.Primary);
-        }
-    }
-
     public class UIDarkBlueStyle : UIBaseStyle
     {
         public UIDarkBlueStyle()
@@ -581,8 +575,105 @@ namespace Sunny.UI
     {
         public UIBlackStyle()
         {
-            base.Init(UIColor.Black, UIStyle.Black, Color.White, UIFontColor.Primary);
+            base.Init(UIColor.Blue, UIStyle.Black, Color.White, UIFontColor.Primary);
-            ContextMenuForeColor = Color.FromArgb(80, 80, 80);
+
+            PrimaryColor = UIColor.Black;
+            RectColor = Color.FromArgb(18, 58, 92);
+            PlainColor = UIColor.Black;
+            Color ForeColor = Color.White;
+
+            Color[] colors = Color.White.GradientColors(PrimaryColor, 16);
+            Color[] colors1 = PrimaryColor.GradientColors(Color.Black, 16);
+
+            FormTitleColor = colors1[2];
+            FormTitleForeColor = ForeColor;
+            FormForeColor = ForeColor;
+            FormRectColor = RectColor;
+            FormControlBoxFillHoverColor = colors[12];
+            FormControlBoxCloseFillHoverColor = UIColor.Red;
+            FormBackColor = PrimaryColor;
+            FormControlBoxForeColor = ForeColor;
+
+            PageBackColor = PlainColor;
+            PageRectColor = PrimaryColor;
+            PageForeColor = ForeColor;
+            PageTitleFillColor = Color.FromArgb(76, 76, 76);
+            PageTitleForeColor = ForeColor;
+
+            AvatarFillColor = Color.Silver;
+            AvatarForeColor = PrimaryColor;
+
+            LabelForeColor = ForeColor;
+
+            LineForeColor = ForeColor;
+            LineFillColor = PlainColor;
+            LineRectColor = ForeColor;
+
+            CheckBoxForeColor = ForeColor;
+
+            ContextMenuColor = Color.FromArgb(18, 58, 92);
+            ContextMenuSelectedColor = Color.FromArgb(80, 160, 255);
+            ContextMenuForeColor = ForeColor;
+
+            PanelForeColor = ForeColor;
+            PanelRectColor = RectColor;
+            PanelFillColor = PlainColor;
+            PanelFillColor2 = PlainColor;
+            PanelTitleColor = FormTitleColor;
+            PanelTitleForeColor = ForeColor;
+
+            TrackBarFillColor = PlainColor;
+            TrackBarForeColor = UIColor.Blue;
+            TrackBarRectColor = UIColor.Blue;
+            TrackDisableColor = Color.Silver;
+
+            BreadcrumbUnSelectedColor = Color.Silver;
+
+            ImageButtonForeColor = ForeColor;
+
+            BatteryFillColor = PrimaryColor;
+
+            DataGridViewFooterForeColor = ForeColor;
+
+            GridSelectedColor = colors[13];
+            GridSelectedForeColor = ForeColor;
+            GridStripeEvenColor = PlainColor;
+            GridStripeOddColor = PlainColor;
+            GridLineColor = RectColor;
+            GridTitleColor = Color.FromArgb(16, 45, 92);
+            GridTitleForeColor = ForeColor;
+            GridForeColor = ForeColor;
+            GridBarFillColor = PlainColor;
+            GridBarForeColor = ForeColor;
+
+            TreeViewSelectedColor = PrimaryColor;
+            TreeViewHoverColor = colors[13];
+            TreeViewBarFillColor = PlainColor;
+            TreeViewBarForeColor = ForeColor;
+            TreeViewForeColor = ForeColor;
+            TreeViewBackColor = PlainColor;
+            TreeViewLineColor = ForeColor;
+
+            PaginationForeColor = ForeColor;
+
+            FlowLayoutPanelBarFillColor = PlainColor;
+            FlowLayoutPanelBarForeColor = ForeColor;
+
+            ListItemSelectBackColor = UIColor.Blue;
+            ListItemSelectForeColor = ForeColor;
+            ListItemHoverColor = colors[13];
+            ListBarFillColor = PlainColor;
+            ListBarForeColor = ForeColor;
+            ListBackColor = PlainColor;
+            ListForeColor = ForeColor;
+
+            ScrollBarFillColor = PlainColor;
+            ScrollBarForeColor = ForeColor;
+
+            ScrollingTextFillColor = PlainColor;
+            ScrollingTextForeColor = ForeColor;
+
+            LogoForeColor = UIFontColor.Primary;
         }
     }
 }