zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 重构主题配色代码

Browse Source
This commit is contained in:
Sunny 2022-03-22 17:43:44 +08:00
parent cbdf2f1db3
commit f6981e3763
4 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

21
SunnyUI.Demo/Controls/FButton.Designer.cs generated
View File

@ -512,14 +512,12 @@ namespace Sunny.UI.Demo
//
this.uiSymbolButton10.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiSymbolButton10.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiSymbolButton10.ForeSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton10.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.uiSymbolButton10.IsCircle = true;
this.uiSymbolButton10.Location = new System.Drawing.Point(112, 265);
this.uiSymbolButton10.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton10.Name = "uiSymbolButton10";
this.uiSymbolButton10.Padding = new System.Windows.Forms.Padding(6, 9, 0, 0);
this.uiSymbolButton10.RectSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton10.Size = new System.Drawing.Size(35, 35);
this.uiSymbolButton10.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton10.StyleCustomMode = true;
@ -556,24 +554,11 @@ namespace Sunny.UI.Demo
//
this.uiSymbolButton12.CircleRectWidth = 2;
this.uiSymbolButton12.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiSymbolButton12.FillColor = System.Drawing.Color.White;
this.uiSymbolButton12.FillColor2 = System.Drawing.Color.White;
this.uiSymbolButton12.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.uiSymbolButton12.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
this.uiSymbolButton12.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
this.uiSymbolButton12.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiSymbolButton12.ForeColor = System.Drawing.Color.Black;
this.uiSymbolButton12.ForeHoverColor = System.Drawing.Color.Black;
this.uiSymbolButton12.ForePressColor = System.Drawing.Color.Black;
this.uiSymbolButton12.ForeSelectedColor = System.Drawing.Color.Black;
this.uiSymbolButton12.IsCircle = true;
this.uiSymbolButton12.Location = new System.Drawing.Point(30, 265);
this.uiSymbolButton12.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton12.Name = "uiSymbolButton12";
this.uiSymbolButton12.RectColor = System.Drawing.Color.White;
this.uiSymbolButton12.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.uiSymbolButton12.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
this.uiSymbolButton12.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
this.uiSymbolButton12.Size = new System.Drawing.Size(35, 35);
this.uiSymbolButton12.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton12.StyleCustomMode = true;
@ -661,11 +646,9 @@ namespace Sunny.UI.Demo
//
this.uiSymbolButton4.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiSymbolButton4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiSymbolButton4.ForeSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton4.Location = new System.Drawing.Point(258, 215);
this.uiSymbolButton4.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton4.Name = "uiSymbolButton4";
this.uiSymbolButton4.RectSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton4.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton4.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton4.StyleCustomMode = true;
@ -702,11 +685,9 @@ namespace Sunny.UI.Demo
//
this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiSymbolButton1.ForeSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton1.Location = new System.Drawing.Point(30, 215);
this.uiSymbolButton1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton1.Name = "uiSymbolButton1";
this.uiSymbolButton1.RectSelectedColor = System.Drawing.Color.Empty;
this.uiSymbolButton1.Size = new System.Drawing.Size(100, 35);
this.uiSymbolButton1.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton1.StyleCustomMode = true;
@ -755,6 +736,7 @@ namespace Sunny.UI.Demo
this.uiButton13.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.uiButton13.Size = new System.Drawing.Size(100, 35);
this.uiButton13.Style = Sunny.UI.UIStyle.Red;
this.uiButton13.StyleCustomMode = true;
this.uiButton13.TabIndex = 76;
this.uiButton13.Text = "Red";
this.uiButton13.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@ -877,6 +859,7 @@ namespace Sunny.UI.Demo
this.uiButton4.ShowFocusLine = true;
this.uiButton4.Size = new System.Drawing.Size(100, 35);
this.uiButton4.Style = Sunny.UI.UIStyle.Red;
this.uiButton4.StyleCustomMode = true;
this.uiButton4.TabIndex = 64;
this.uiButton4.Text = "Red";
this.uiButton4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));

22
SunnyUI/Controls/UIControl.cs
View File

@ -253,7 +253,7 @@ namespace Sunny.UI
protected void SetStyleCustom(bool needRefresh = true)
{
_styleCustomMode = true;
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
@ -263,7 +263,7 @@ namespace Sunny.UI
/// <param name="style">主题样式</param>
public void SetStyle(UIStyle style)
{
if (!StyleCustomMode && !_style.IsCustom())
if (!style.IsCustom())
{
SetStyleColor(style.Colors());
Invalidate();
@ -272,28 +272,12 @@ namespace Sunny.UI
_style = style;
}
private bool _styleCustomMode;
/// <summary>
/// 自定义主题风格
/// </summary>
[DefaultValue(false)]
[Description("获取或设置可以自定义主题风格"), Category("SunnyUI")]
public bool StyleCustomMode
{
get => _styleCustomMode;
set
{
if (_styleCustomMode != value)
{
_styleCustomMode = value;
if (!_styleCustomMode)
{
SetStyle(_style);
}
}
}
}
public bool StyleCustomMode { get; set; }
/// <summary>
/// 设置主题样式颜色