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

* 重构主题配色代码，删除部分主题

Browse Source 
- UIComboboxEx: 删除
- UITitlePage: 删除
This commit is contained in:
Sunny 2022-03-20 17:16:40 +08:00
parent 6bc0b66907
commit 1ab06414ae
74 changed files with 1640 additions and 2355 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.

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

File diff suppressed because it is too large Load Diff

5
SunnyUI.Demo/Controls/FButton.cs
View File

@ -49,11 +49,6 @@ namespace Sunny.UI.Demo
Console.WriteLine("4. FButton_Final"); Console.WriteLine("4. FButton_Final");
} }
private void uiButton10_Click(object sender, EventArgs e)
{
uiButton10.Selected = !uiButton10.Selected;
}
private void uiSwitch1_ValueChanged(object sender, bool value) private void uiSwitch1_ValueChanged(object sender, bool value)
{ {
Console.WriteLine(uiSwitch1.Active); Console.WriteLine(uiSwitch1.Active);

62
SunnyUI.Demo/Controls/FDataGridView.Designer.cs generated
View File

@ -35,51 +35,31 @@ namespace Sunny.UI.Demo
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.uiDataGridViewFooter1 = new Sunny.UI.UIDataGridViewFooter(); this.uiDataGridViewFooter1 = new Sunny.UI.UIDataGridViewFooter();
this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
this.uiPagination1 = new Sunny.UI.UIPagination(); this.uiPagination1 = new Sunny.UI.UIPagination();
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// uiDataGridViewFooter1 // uiDataGridViewFooter1
// //
this.uiDataGridViewFooter1.DataGridView = null; this.uiDataGridViewFooter1.DataGridView = this.uiDataGridView1;
this.uiDataGridViewFooter1.Dock = System.Windows.Forms.DockStyle.Bottom; this.uiDataGridViewFooter1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.uiDataGridViewFooter1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiDataGridViewFooter1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiDataGridViewFooter1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiDataGridViewFooter1.Location = new System.Drawing.Point(0, 386); this.uiDataGridViewFooter1.Location = new System.Drawing.Point(0, 386);
this.uiDataGridViewFooter1.MinimumSize = new System.Drawing.Size(1, 1); this.uiDataGridViewFooter1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiDataGridViewFooter1.Name = "uiDataGridViewFooter1"; this.uiDataGridViewFooter1.Name = "uiDataGridViewFooter1";
this.uiDataGridViewFooter1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiDataGridViewFooter1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiDataGridViewFooter1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiDataGridViewFooter1.RectSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)(((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
| System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
this.uiDataGridViewFooter1.Size = new System.Drawing.Size(800, 29); this.uiDataGridViewFooter1.Size = new System.Drawing.Size(800, 29);
this.uiDataGridViewFooter1.TabIndex = 5; this.uiDataGridViewFooter1.TabIndex = 5;
this.uiDataGridViewFooter1.Text = "uiDataGridViewFooter1"; this.uiDataGridViewFooter1.Text = "uiDataGridViewFooter1";
// //
// uiPagination1
//
this.uiPagination1.ActivePage = 20;
this.uiPagination1.CausesValidation = false;
this.uiPagination1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.uiPagination1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
this.uiPagination1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPagination1.Location = new System.Drawing.Point(0, 415);
this.uiPagination1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPagination1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPagination1.Name = "uiPagination1";
this.uiPagination1.PagerCount = 11;
this.uiPagination1.PageSize = 50;
this.uiPagination1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiPagination1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
this.uiPagination1.Size = new System.Drawing.Size(800, 35);
this.uiPagination1.TabIndex = 4;
this.uiPagination1.Text = "uiDataGridPage1";
this.uiPagination1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPagination1.TotalCount = 40000;
this.uiPagination1.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.uiPagination1_PageChanged);
//
// uiDataGridView1 // uiDataGridView1
// //
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiDataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.uiDataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.uiDataGridView1.BackgroundColor = System.Drawing.Color.White; this.uiDataGridView1.BackgroundColor = System.Drawing.Color.White;
this.uiDataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; this.uiDataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
@ -96,7 +76,7 @@ namespace Sunny.UI.Demo
dataGridViewCellStyle3.BackColor = System.Drawing.Color.White; dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.uiDataGridView1.DefaultCellStyle = dataGridViewCellStyle3; this.uiDataGridView1.DefaultCellStyle = dataGridViewCellStyle3;
@ -107,7 +87,7 @@ namespace Sunny.UI.Demo
this.uiDataGridView1.Location = new System.Drawing.Point(0, 35); this.uiDataGridView1.Location = new System.Drawing.Point(0, 35);
this.uiDataGridView1.Name = "uiDataGridView1"; this.uiDataGridView1.Name = "uiDataGridView1";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
@ -117,15 +97,39 @@ namespace Sunny.UI.Demo
dataGridViewCellStyle5.BackColor = System.Drawing.Color.White; dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255))))); dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5; this.uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5;
this.uiDataGridView1.RowTemplate.Height = 23; this.uiDataGridView1.RowTemplate.Height = 23;
this.uiDataGridView1.SelectedIndex = -1; this.uiDataGridView1.SelectedIndex = -1;
this.uiDataGridView1.ShowGridLine = true; this.uiDataGridView1.ShowGridLine = true;
this.uiDataGridView1.Size = new System.Drawing.Size(800, 351); this.uiDataGridView1.Size = new System.Drawing.Size(800, 351);
this.uiDataGridView1.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiDataGridView1.TabIndex = 6; this.uiDataGridView1.TabIndex = 6;
// //
// uiPagination1
//
this.uiPagination1.ActivePage = 20;
this.uiPagination1.CausesValidation = false;
this.uiPagination1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.uiPagination1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPagination1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPagination1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPagination1.Location = new System.Drawing.Point(0, 415);
this.uiPagination1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPagination1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPagination1.Name = "uiPagination1";
this.uiPagination1.PagerCount = 11;
this.uiPagination1.PageSize = 50;
this.uiPagination1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.uiPagination1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
this.uiPagination1.Size = new System.Drawing.Size(800, 35);
this.uiPagination1.TabIndex = 4;
this.uiPagination1.Text = "uiDataGridPage1";
this.uiPagination1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPagination1.TotalCount = 40000;
this.uiPagination1.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.uiPagination1_PageChanged);
//
// FDataGridView // FDataGridView
// //
this.AllowShowTitle = true; this.AllowShowTitle = true;

4
SunnyUI.Demo/Controls/FDataGridView.cs
View File

@ -36,6 +36,10 @@ namespace Sunny.UI.Demo
uiPagination1.PageSize = 50; uiPagination1.PageSize = 50;
uiDataGridView1.SelectIndexChange += uiDataGridView1_SelectIndexChange; uiDataGridView1.SelectIndexChange += uiDataGridView1_SelectIndexChange;
uiDataGridView1.ShowGridLine = true;
//设置统计绑定的表格
uiDataGridViewFooter1.DataGridView = uiDataGridView1;
} }
public override void Init() public override void Init()

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

@ -45,7 +45,6 @@ namespace Sunny.UI.Demo
this.uiLabel3 = new Sunny.UI.UILabel(); this.uiLabel3 = new Sunny.UI.UILabel();
this.uiLabel4 = new Sunny.UI.UILabel(); this.uiLabel4 = new Sunny.UI.UILabel();
this.uiLine5 = new Sunny.UI.UILine(); this.uiLine5 = new Sunny.UI.UILine();
this.label1 = new System.Windows.Forms.Label();
this.uiSmoothLabel1 = new Sunny.UI.UISmoothLabel(); this.uiSmoothLabel1 = new Sunny.UI.UISmoothLabel();
this.uiSmoothLabel2 = new Sunny.UI.UISmoothLabel(); this.uiSmoothLabel2 = new Sunny.UI.UISmoothLabel();
this.uiLine6 = new Sunny.UI.UILine(); this.uiLine6 = new Sunny.UI.UILine();
@ -92,6 +91,7 @@ namespace Sunny.UI.Demo
// //
// uiLine4 // uiLine4
// //
this.uiLine4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine4.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine4.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine4.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine4.Location = new System.Drawing.Point(30, 208); this.uiLine4.Location = new System.Drawing.Point(30, 208);
@ -141,6 +141,7 @@ namespace Sunny.UI.Demo
// //
// uiLine3 // uiLine3
// //
this.uiLine3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine3.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine3.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine3.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine3.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine3.Location = new System.Drawing.Point(30, 133); this.uiLine3.Location = new System.Drawing.Point(30, 133);
@ -153,6 +154,7 @@ namespace Sunny.UI.Demo
// //
// uiLine2 // uiLine2
// //
this.uiLine2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine2.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine2.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine2.Location = new System.Drawing.Point(381, 55); this.uiLine2.Location = new System.Drawing.Point(381, 55);
@ -165,6 +167,7 @@ namespace Sunny.UI.Demo
// //
// uiLine1 // uiLine1
// //
this.uiLine1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine1.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine1.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine1.Location = new System.Drawing.Point(30, 55); this.uiLine1.Location = new System.Drawing.Point(30, 55);
@ -180,9 +183,8 @@ namespace Sunny.UI.Demo
this.uiLinkLabel1.ActiveLinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiLinkLabel1.ActiveLinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40)))));
this.uiLinkLabel1.AutoSize = true; this.uiLinkLabel1.AutoSize = true;
this.uiLinkLabel1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLinkLabel1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLinkLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLinkLabel1.LinkBehavior = System.Windows.Forms.LinkBehavior.AlwaysUnderline; this.uiLinkLabel1.LinkBehavior = System.Windows.Forms.LinkBehavior.AlwaysUnderline;
this.uiLinkLabel1.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); this.uiLinkLabel1.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
this.uiLinkLabel1.Location = new System.Drawing.Point(394, 90); this.uiLinkLabel1.Location = new System.Drawing.Point(394, 90);
this.uiLinkLabel1.Name = "uiLinkLabel1"; this.uiLinkLabel1.Name = "uiLinkLabel1";
this.uiLinkLabel1.Size = new System.Drawing.Size(146, 21); this.uiLinkLabel1.Size = new System.Drawing.Size(146, 21);
@ -238,6 +240,7 @@ namespace Sunny.UI.Demo
// //
// uiLine5 // uiLine5
// //
this.uiLine5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine5.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine5.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine5.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine5.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine5.Location = new System.Drawing.Point(30, 290); this.uiLine5.Location = new System.Drawing.Point(30, 290);
@ -248,15 +251,6 @@ namespace Sunny.UI.Demo
this.uiLine5.Text = "UILabel（旋转角度）"; this.uiLine5.Text = "UILabel（旋转角度）";
this.uiLine5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiLine5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(522, 171);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(55, 21);
this.label1.TabIndex = 52;
this.label1.Text = "label1";
//
// uiSmoothLabel1 // uiSmoothLabel1
// //
this.uiSmoothLabel1.Font = new System.Drawing.Font("微软雅黑", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.uiSmoothLabel1.Font = new System.Drawing.Font("微软雅黑", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -277,6 +271,7 @@ namespace Sunny.UI.Demo
// //
// uiLine6 // uiLine6
// //
this.uiLine6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiLine6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiLine6.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLine6.LineDashStyle = Sunny.UI.UILineDashStyle.None; this.uiLine6.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine6.Location = new System.Drawing.Point(381, 290); this.uiLine6.Location = new System.Drawing.Point(381, 290);
@ -295,7 +290,6 @@ namespace Sunny.UI.Demo
this.Controls.Add(this.uiLine6); this.Controls.Add(this.uiLine6);
this.Controls.Add(this.uiSmoothLabel2); this.Controls.Add(this.uiSmoothLabel2);
this.Controls.Add(this.uiSmoothLabel1); this.Controls.Add(this.uiSmoothLabel1);
this.Controls.Add(this.label1);
this.Controls.Add(this.uiLine5); this.Controls.Add(this.uiLine5);
this.Controls.Add(this.uiLabel4); this.Controls.Add(this.uiLabel4);
this.Controls.Add(this.uiLabel3); this.Controls.Add(this.uiLabel3);
@ -339,7 +333,6 @@ namespace Sunny.UI.Demo
private UILabel uiLabel3; private UILabel uiLabel3;
private UILabel uiLabel4; private UILabel uiLabel4;
private UILine uiLine5; private UILine uiLine5;
private System.Windows.Forms.Label label1;
private UISmoothLabel uiSmoothLabel1; private UISmoothLabel uiSmoothLabel1;
private UISmoothLabel uiSmoothLabel2; private UISmoothLabel uiSmoothLabel2;
private UILine uiLine6; private UILine uiLine6;

32
SunnyUI.Demo/Forms/FColorful.Designer.cs generated
View File

@ -47,9 +47,10 @@ namespace Sunny.UI.Demo
// uiPanel1 // uiPanel1
// //
this.uiPanel1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(190)))), ((int)(((byte)(172))))); this.uiPanel1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(190)))), ((int)(((byte)(172)))));
this.uiPanel1.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel1.ForeColor = System.Drawing.Color.White; this.uiPanel1.ForeColor = System.Drawing.Color.White;
this.uiPanel1.Location = new System.Drawing.Point(23, 56); this.uiPanel1.Location = new System.Drawing.Point(173, 56);
this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel1.Name = "uiPanel1"; this.uiPanel1.Name = "uiPanel1";
@ -64,14 +65,15 @@ namespace Sunny.UI.Demo
// //
// uiPanel2 // uiPanel2
// //
this.uiPanel2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(152)))), ((int)(((byte)(0))))); this.uiPanel2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(0)))));
this.uiPanel2.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel2.ForeColor = System.Drawing.Color.White; this.uiPanel2.ForeColor = System.Drawing.Color.White;
this.uiPanel2.Location = new System.Drawing.Point(173, 56); this.uiPanel2.Location = new System.Drawing.Point(323, 56);
this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel2.Name = "uiPanel2"; this.uiPanel2.Name = "uiPanel2";
this.uiPanel2.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(152)))), ((int)(((byte)(0))))); this.uiPanel2.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(0)))));
this.uiPanel2.Size = new System.Drawing.Size(120, 100); this.uiPanel2.Size = new System.Drawing.Size(120, 100);
this.uiPanel2.Style = Sunny.UI.UIStyle.Custom; this.uiPanel2.Style = Sunny.UI.UIStyle.Custom;
this.uiPanel2.StyleCustomMode = true; this.uiPanel2.StyleCustomMode = true;
@ -83,9 +85,10 @@ namespace Sunny.UI.Demo
// uiPanel3 // uiPanel3
// //
this.uiPanel3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(190)))), ((int)(((byte)(60))))); this.uiPanel3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(190)))), ((int)(((byte)(60)))));
this.uiPanel3.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel3.ForeColor = System.Drawing.Color.White; this.uiPanel3.ForeColor = System.Drawing.Color.White;
this.uiPanel3.Location = new System.Drawing.Point(473, 56); this.uiPanel3.Location = new System.Drawing.Point(473, 174);
this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel3.Name = "uiPanel3"; this.uiPanel3.Name = "uiPanel3";
@ -101,9 +104,10 @@ namespace Sunny.UI.Demo
// uiPanel4 // uiPanel4
// //
this.uiPanel4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(100)))), ((int)(((byte)(80))))); this.uiPanel4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(100)))), ((int)(((byte)(80)))));
this.uiPanel4.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel4.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel4.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel4.ForeColor = System.Drawing.Color.White; this.uiPanel4.ForeColor = System.Drawing.Color.White;
this.uiPanel4.Location = new System.Drawing.Point(323, 56); this.uiPanel4.Location = new System.Drawing.Point(623, 174);
this.uiPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel4.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel4.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel4.Name = "uiPanel4"; this.uiPanel4.Name = "uiPanel4";
@ -119,6 +123,7 @@ namespace Sunny.UI.Demo
// uiPanel5 // uiPanel5
// //
this.uiPanel5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(98)))), ((int)(((byte)(161))))); this.uiPanel5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(98)))), ((int)(((byte)(161)))));
this.uiPanel5.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel5.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel5.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel5.ForeColor = System.Drawing.Color.White; this.uiPanel5.ForeColor = System.Drawing.Color.White;
this.uiPanel5.Location = new System.Drawing.Point(623, 56); this.uiPanel5.Location = new System.Drawing.Point(623, 56);
@ -136,14 +141,15 @@ namespace Sunny.UI.Demo
// //
// uiPanel6 // uiPanel6
// //
this.uiPanel6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(94)))), ((int)(((byte)(99))))); this.uiPanel6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34)))));
this.uiPanel6.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel6.ForeColor = System.Drawing.Color.White; this.uiPanel6.ForeColor = System.Drawing.Color.White;
this.uiPanel6.Location = new System.Drawing.Point(473, 174); this.uiPanel6.Location = new System.Drawing.Point(473, 56);
this.uiPanel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel6.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel6.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel6.Name = "uiPanel6"; this.uiPanel6.Name = "uiPanel6";
this.uiPanel6.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(94)))), ((int)(((byte)(99))))); this.uiPanel6.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34)))));
this.uiPanel6.Size = new System.Drawing.Size(120, 100); this.uiPanel6.Size = new System.Drawing.Size(120, 100);
this.uiPanel6.Style = Sunny.UI.UIStyle.Custom; this.uiPanel6.Style = Sunny.UI.UIStyle.Custom;
this.uiPanel6.StyleCustomMode = true; this.uiPanel6.StyleCustomMode = true;
@ -155,6 +161,7 @@ namespace Sunny.UI.Demo
// uiPanel7 // uiPanel7
// //
this.uiPanel7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(126)))), ((int)(((byte)(164))))); this.uiPanel7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(126)))), ((int)(((byte)(164)))));
this.uiPanel7.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel7.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel7.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel7.ForeColor = System.Drawing.Color.White; this.uiPanel7.ForeColor = System.Drawing.Color.White;
this.uiPanel7.Location = new System.Drawing.Point(323, 174); this.uiPanel7.Location = new System.Drawing.Point(323, 174);
@ -173,6 +180,7 @@ namespace Sunny.UI.Demo
// uiPanel8 // uiPanel8
// //
this.uiPanel8.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(188)))), ((int)(((byte)(212))))); this.uiPanel8.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(188)))), ((int)(((byte)(212)))));
this.uiPanel8.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel8.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel8.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel8.ForeColor = System.Drawing.Color.White; this.uiPanel8.ForeColor = System.Drawing.Color.White;
this.uiPanel8.Location = new System.Drawing.Point(173, 174); this.uiPanel8.Location = new System.Drawing.Point(173, 174);
@ -191,6 +199,7 @@ namespace Sunny.UI.Demo
// uiPanel9 // uiPanel9
// //
this.uiPanel9.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183))))); this.uiPanel9.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183)))));
this.uiPanel9.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel9.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel9.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel9.ForeColor = System.Drawing.Color.White; this.uiPanel9.ForeColor = System.Drawing.Color.White;
this.uiPanel9.Location = new System.Drawing.Point(23, 174); this.uiPanel9.Location = new System.Drawing.Point(23, 174);
@ -209,9 +218,10 @@ namespace Sunny.UI.Demo
// uiPanel10 // uiPanel10
// //
this.uiPanel10.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136))))); this.uiPanel10.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(150)))), ((int)(((byte)(136)))));
this.uiPanel10.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel10.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel10.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel10.ForeColor = System.Drawing.Color.White; this.uiPanel10.ForeColor = System.Drawing.Color.White;
this.uiPanel10.Location = new System.Drawing.Point(623, 174); this.uiPanel10.Location = new System.Drawing.Point(23, 56);
this.uiPanel10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel10.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel10.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel10.Name = "uiPanel10"; this.uiPanel10.Name = "uiPanel10";
@ -237,6 +247,7 @@ namespace Sunny.UI.Demo
// uiPanel11 // uiPanel11
// //
this.uiPanel11.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183))))); this.uiPanel11.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(58)))), ((int)(((byte)(183)))));
this.uiPanel11.FillColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiPanel11.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel11.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel11.ForeColor = System.Drawing.Color.White; this.uiPanel11.ForeColor = System.Drawing.Color.White;
this.uiPanel11.Location = new System.Drawing.Point(23, 340); this.uiPanel11.Location = new System.Drawing.Point(23, 340);
@ -265,7 +276,6 @@ namespace Sunny.UI.Demo
// FColorful // FColorful
// //
this.AllowShowTitle = true; this.AllowShowTitle = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(776, 543); this.ClientSize = new System.Drawing.Size(776, 543);
this.Controls.Add(this.uiLabel2); this.Controls.Add(this.uiLabel2);

14
SunnyUI.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.30804.86 VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI", "SunnyUI\SunnyUI.csproj", "{AB1CB247-E20B-4CBE-B269-570ADDD96C53}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI", "SunnyUI\SunnyUI.csproj", "{AB1CB247-E20B-4CBE-B269-570ADDD96C53}"
EndProject EndProject
@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunnyUI.Demo", "SunnyUI.Dem
{AB1CB247-E20B-4CBE-B269-570ADDD96C53} = {AB1CB247-E20B-4CBE-B269-570ADDD96C53} {AB1CB247-E20B-4CBE-B269-570ADDD96C53} = {AB1CB247-E20B-4CBE-B269-570ADDD96C53}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI.Net5.Demo", "SunnyUI.Net5.Demo\SunnyUI.Net5.Demo.csproj", "{CD5517A6-D0A1-4758-9D18-B4189C5157F5}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunnyUI.Net5.Demo", "SunnyUI.Net5.Demo\SunnyUI.Net5.Demo.csproj", "{9DC83AA6-73F5-4EEB-9D63-C1C26260840C}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -26,10 +26,10 @@ Global
{6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Release|Any CPU.ActiveCfg = Release|Any CPU {6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Release|Any CPU.Build.0 = Release|Any CPU {6AE19B87-C2AA-4C56-BC26-1C343F30FF58}.Release|Any CPU.Build.0 = Release|Any CPU
{CD5517A6-D0A1-4758-9D18-B4189C5157F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9DC83AA6-73F5-4EEB-9D63-C1C26260840C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD5517A6-D0A1-4758-9D18-B4189C5157F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9DC83AA6-73F5-4EEB-9D63-C1C26260840C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD5517A6-D0A1-4758-9D18-B4189C5157F5}.Release|Any CPU.ActiveCfg = Release|Any CPU {9DC83AA6-73F5-4EEB-9D63-C1C26260840C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD5517A6-D0A1-4758-9D18-B4189C5157F5}.Release|Any CPU.Build.0 = Release|Any CPU {9DC83AA6-73F5-4EEB-9D63-C1C26260840C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

4
SunnyUI/Charts/UIChart.cs
View File

@ -109,7 +109,7 @@ namespace Sunny.UI
/// </summary> /// </summary>
[Description("字体颜色")] [Description("字体颜色")]
[Category("SunnyUI")] [Category("SunnyUI")]
[DefaultValue(typeof(Color), "White")] [DefaultValue(typeof(Color), "54, 54, 54")]
public override Color ForeColor public override Color ForeColor
{ {
get => foreColor; get => foreColor;
@ -132,7 +132,7 @@ namespace Sunny.UI
/// </summary> /// </summary>
[Description("填充颜色")] [Description("填充颜色")]
[Category("SunnyUI")] [Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "244, 244, 244")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;

13
SunnyUI/Controls/Color/UIColorWheel.cs
View File

@ -295,8 +295,12 @@ namespace Sunny.UI
/// <param name="style">Ö÷ÌâÑùʽ</param> /// <param name="style">Ö÷ÌâÑùʽ</param>
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -306,9 +310,8 @@ namespace Sunny.UI
/// <param name="uiColor"></param> /// <param name="uiColor"></param>
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
FrameColor = uiColor.RectColor; FrameColor = uiColor.ColorWheelFrameColor;
BackColor = uiColor.PlainColor; BackColor = uiColor.ColorWheelBackColor;
Invalidate();
} }
/// <summary> /// <summary>

15
SunnyUI/Controls/Color/UILabelRotate.cs
View File

@ -215,8 +215,12 @@ namespace Sunny.UI
/// <param name="style">Ö÷ĚâŃůĘ˝</param> /// <param name="style">Ö÷ĚâŃůĘ˝</param>
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -224,11 +228,10 @@ namespace Sunny.UI
/// ÉčÖĂÖ÷ĚâŃůĘ˝ŃŐÉŤ /// ÉčÖĂÖ÷ĚâŃůĘ˝ŃŐÉŤ
/// </summary> /// </summary>
/// <param name="uiColor"></param> /// <param name="uiColor"></param>
public virtual void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
FrameColor = uiColor.RectColor; FrameColor = uiColor.LabelRotateFrameColor;
ForeColor = uiColor.PanelForeColor; ForeColor = uiColor.LabelRotateForeColor;
Invalidate();
} }
/// <summary> /// <summary>

1
SunnyUI/Controls/TypeEditor/UIRadiusSidesEditor.cs
View File

@ -89,6 +89,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 属性窗体 /// 属性窗体
/// </summary> /// </summary>
[ToolboxItem(false)]
public class UICornerRadiusSidesUI : UIDropEditorUI public class UICornerRadiusSidesUI : UIDropEditorUI
{ {
private TableLayoutPanel tableLayoutPanel1; private TableLayoutPanel tableLayoutPanel1;

7
SunnyUI/Controls/UIAvatar.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-01-01 * 创建日期: 2020-01-01
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -67,8 +68,8 @@ namespace Sunny.UI
ShowText = false; ShowText = false;
ShowRect = false; ShowRect = false;
fillColor = UIStyles.GetStyleColor(UIStyle.Blue).AvatarFillColor; fillColor = UIStyles.Blue.AvatarFillColor;
foreColor = UIStyles.GetStyleColor(UIStyle.Blue).AvatarForeColor; foreColor = UIStyles.Blue.AvatarForeColor;
} }
private int avatarSize = 60; private int avatarSize = 60;
@ -113,9 +114,9 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.AvatarFillColor; fillColor = uiColor.AvatarFillColor;
foreColor = uiColor.AvatarForeColor; foreColor = uiColor.AvatarForeColor;
Invalidate();
} }
private UIIcon icon = UIIcon.Symbol; private UIIcon icon = UIIcon.Symbol;

9
SunnyUI/Controls/UIBattery.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-06-04: V2.2.5 增加文件 * 2020-06-04: V2.2.5 增加文件
* 2021-06-18: V3.0.4 修改可自定义背景色 * 2021-06-18: V3.0.4 修改可自定义背景色
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -120,7 +121,7 @@ namespace Sunny.UI
} }
/// <summary> /// <summary>
/// 默认电量颜色 /// 默认电量颜色
/// </summary> /// </summary>
[Description("默认电量颜色")] [Description("默认电量颜色")]
[Category("SunnyUI")] [Category("SunnyUI")]
@ -132,11 +133,11 @@ namespace Sunny.UI
} }
/// <summary> /// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色")] [Description("填充颜色")]
[Category("SunnyUI")] [Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -146,7 +147,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor; fillColor = uiColor.BatteryFillColor;
} }
protected override void OnPaintFill(Graphics g, GraphicsPath path) protected override void OnPaintFill(Graphics g, GraphicsPath path)

15
SunnyUI/Controls/UIBreadcrumb.cs
View File

@ -19,6 +19,7 @@
* 2021-04-10: V3.0.2 增加文件说明 * 2021-04-10: V3.0.2 增加文件说明
* 2022-01-26: V3.1.0 增加两端对齐，AlignBothEnds * 2022-01-26: V3.1.0 增加两端对齐，AlignBothEnds
* 2022-01-26: V3.1.0 增加未选中步骤文字颜色 * 2022-01-26: V3.1.0 增加未选中步骤文字颜色
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -215,7 +216,7 @@ namespace Sunny.UI
private int itemWidth; private int itemWidth;
[DefaultValue(120)] [DefaultValue(160)]
[Description("节点宽度"), Category("SunnyUI")] [Description("节点宽度"), Category("SunnyUI")]
public int ItemWidth public int ItemWidth
{ {
@ -258,7 +259,7 @@ namespace Sunny.UI
/// </summary> /// </summary>
[Description("未选节点颜色")] [Description("未选节点颜色")]
[Category("SunnyUI")] [Category("SunnyUI")]
[DefaultValue(typeof(Color), "155, 200, 255")] [DefaultValue(typeof(Color), "185, 217, 255")]
public Color UnSelectedColor public Color UnSelectedColor
{ {
get => rectColor; get => rectColor;
@ -281,8 +282,7 @@ namespace Sunny.UI
if (unSelectedForeColor != value) if (unSelectedForeColor != value)
{ {
unSelectedForeColor = value; unSelectedForeColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
@ -302,10 +302,9 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PrimaryColor;
unSelectedForeColor = foreColor = uiColor.ButtonForeColor; unSelectedForeColor = uiColor.ButtonForeColor;
rectColor = uiColor.GridSelectedColor; rectColor = uiColor.BreadcrumbUnSelectedColor;
Invalidate();
} }
protected override void OnMouseClick(MouseEventArgs e) protected override void OnMouseClick(MouseEventArgs e)

46
SunnyUI/Controls/UIButton.cs
View File

@ -24,6 +24,7 @@
* 2021-07-18: V3.0.5 增加ShowFocusColor，用来显示Focus状态 * 2021-07-18: V3.0.5 增加ShowFocusColor，用来显示Focus状态
* 2021-12-11: V3.0.9 增加了渐变色 * 2021-12-11: V3.0.9 增加了渐变色
* 2022-02-26: V3.1.1 增加了AutoSize属性 * 2022-02-26: V3.1.1 增加了AutoSize属性
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -49,17 +50,17 @@ namespace Sunny.UI
Height = 35; Height = 35;
Cursor = Cursors.Hand; Cursor = Cursors.Hand;
foreHoverColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForeHoverColor; foreHoverColor = UIStyles.Blue.ButtonForeHoverColor;
forePressColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForePressColor; forePressColor = UIStyles.Blue.ButtonForePressColor;
foreSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForeSelectedColor; foreSelectedColor = UIStyles.Blue.ButtonForeSelectedColor;
rectHoverColor = UIStyles.GetStyleColor(UIStyle.Blue).RectHoverColor; rectHoverColor = UIStyles.Blue.ButtonRectHoverColor;
rectPressColor = UIStyles.GetStyleColor(UIStyle.Blue).RectPressColor; rectPressColor = UIStyles.Blue.ButtonRectPressColor;
rectSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).RectSelectedColor; rectSelectedColor = UIStyles.Blue.ButtonRectSelectedColor;
fillHoverColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillHoverColor; fillHoverColor = UIStyles.Blue.ButtonFillHoverColor;
fillPressColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillPressColor; fillPressColor = UIStyles.Blue.ButtonFillPressColor;
fillSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillSelectedColor; fillSelectedColor = UIStyles.Blue.ButtonFillSelectedColor;
SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick); SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick);
} }
@ -295,19 +296,18 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ButtonFillHoverColor;
rectHoverColor = uiColor.RectHoverColor; rectHoverColor = uiColor.ButtonRectHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor; foreHoverColor = uiColor.ButtonForeHoverColor;
fillPressColor = uiColor.ButtonFillPressColor; fillPressColor = uiColor.ButtonFillPressColor;
rectPressColor = uiColor.RectPressColor; rectPressColor = uiColor.ButtonRectPressColor;
forePressColor = uiColor.ButtonForePressColor; forePressColor = uiColor.ButtonForePressColor;
fillSelectedColor = uiColor.ButtonFillSelectedColor; fillSelectedColor = uiColor.ButtonFillSelectedColor;
foreSelectedColor = uiColor.ButtonForeSelectedColor; foreSelectedColor = uiColor.ButtonForeSelectedColor;
rectSelectedColor = uiColor.RectSelectedColor; rectSelectedColor = uiColor.ButtonRectSelectedColor;
Invalidate();
} }
/// <summary> /// <summary>
@ -393,15 +393,15 @@ namespace Sunny.UI
set => SetForeDisableColor(value); set => SetForeDisableColor(value);
} }
[DefaultValue(typeof(Color), "111, 168, 255"), Category("SunnyUI")] [DefaultValue(typeof(Color), "115, 179, 255"), Category("SunnyUI")]
[Description("鼠标移上时填充颜色")] [Description("鼠标移上时填充颜色")]
public Color FillHoverColor public Color FillHoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("鼠标按下时填充颜色")] [Description("鼠标按下时填充颜色")]
public Color FillPressColor public Color FillPressColor
{ {
@ -414,7 +414,7 @@ namespace Sunny.UI
public Color ForeHoverColor public Color ForeHoverColor
{ {
get => foreHoverColor; get => foreHoverColor;
set => SetForeHoveColor(value); set => SetForeHoverColor(value);
} }
[DefaultValue(typeof(Color), "White"), Category("SunnyUI")] [DefaultValue(typeof(Color), "White"), Category("SunnyUI")]
@ -425,15 +425,15 @@ namespace Sunny.UI
set => SetForePressColor(value); set => SetForePressColor(value);
} }
[DefaultValue(typeof(Color), "111, 168, 255"), Category("SunnyUI")] [DefaultValue(typeof(Color), "115, 179, 255"), Category("SunnyUI")]
[Description("鼠标移上时边框颜色")] [Description("鼠标移上时边框颜色")]
public Color RectHoverColor public Color RectHoverColor
{ {
get => rectHoverColor; get => rectHoverColor;
set => SetRectHoveColor(value); set => SetRectHoverColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("鼠标按下时边框颜色")] [Description("鼠标按下时边框颜色")]
public Color RectPressColor public Color RectPressColor
{ {
@ -441,7 +441,7 @@ namespace Sunny.UI
set => SetRectPressColor(value); set => SetRectPressColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("选中时填充颜色")] [Description("选中时填充颜色")]
public Color FillSelectedColor public Color FillSelectedColor
{ {
@ -457,7 +457,7 @@ namespace Sunny.UI
set => SetForeSelectedColor(value); set => SetForeSelectedColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("选中时边框颜色")] [Description("选中时边框颜色")]
public Color RectSelectedColor public Color RectSelectedColor
{ {

7
SunnyUI/Controls/UICheckBox.cs
View File

@ -20,6 +20,7 @@
* 2020-04-16: V2.2.1 增加ReadOnly属性 * 2020-04-16: V2.2.1 增加ReadOnly属性
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2021-04-26: V3.0.3 增加默认事件CheckedChanged * 2021-04-26: V3.0.3 增加默认事件CheckedChanged
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -41,9 +42,10 @@ namespace Sunny.UI
base.Cursor = Cursors.Hand; base.Cursor = Cursors.Hand;
ShowRect = false; ShowRect = false;
Size = new Size(150, 29); Size = new Size(150, 29);
foreColor = UIStyles.GetStyleColor(UIStyle.Blue).CheckBoxForeColor;
fillColor = UIStyles.GetStyleColor(UIStyle.Blue).CheckBoxColor;
SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick); SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick);
foreColor = UIStyles.Blue.CheckBoxForeColor;
fillColor = UIStyles.Blue.CheckBoxColor;
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
@ -200,7 +202,6 @@ namespace Sunny.UI
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.CheckBoxColor; fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor; foreColor = uiColor.CheckBoxForeColor;
Invalidate();
} }
/// <summary> /// <summary>

2
SunnyUI/Controls/UIColorPicker.cs
View File

@ -97,7 +97,7 @@ namespace Sunny.UI
private Color selectColor; private Color selectColor;
[DefaultValue(typeof(Color), "80, 159, 254")] [DefaultValue(typeof(Color), "80, 160, 255")]
[Description("选中颜色"), Category("SunnyUI")] [Description("选中颜色"), Category("SunnyUI")]
public Color Value public Color Value
{ {

4
SunnyUI/Controls/UIComboBox.cs
View File

@ -350,7 +350,7 @@ namespace Sunny.UI
set => ListBox.ForeColor = value; set => ListBox.ForeColor = value;
} }
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color ItemSelectForeColor public Color ItemSelectForeColor
{ {
get => ListBox.ItemSelectForeColor; get => ListBox.ItemSelectForeColor;
@ -364,7 +364,7 @@ namespace Sunny.UI
set => ListBox.ItemSelectBackColor = value; set => ListBox.ItemSelectBackColor = value;
} }
[DefaultValue(typeof(Color), "80, 160, 255")] [DefaultValue(typeof(Color), "220, 236, 255")]
public Color ItemHoverColor public Color ItemHoverColor
{ {
get => ListBox.HoverColor; get => ListBox.HoverColor;

3
SunnyUI/Controls/UIComboDataGridView.cs
View File

@ -77,7 +77,7 @@ namespace Sunny.UI
base.OnFontChanged(e); base.OnFontChanged(e);
if (item != null) item.DataGridView.Font = Font; if (item != null) item.DataGridView.Font = Font;
} }
[DefaultValue(false)]
public bool ShowFilter { get; set; } public bool ShowFilter { get; set; }
private readonly UIComboDataGridViewItem item = new UIComboDataGridViewItem(); private readonly UIComboDataGridViewItem item = new UIComboDataGridViewItem();
@ -103,6 +103,7 @@ namespace Sunny.UI
SelectIndexChange(this, value.ToString().ToInt()); SelectIndexChange(this, value.ToString().ToInt());
} }
[DefaultValue(null)]
public string FilterColomnName { get; set; } public string FilterColomnName { get; set; }
} }
} }

271
SunnyUI/Controls/UIComboboxEx.cs
View File

@ -1,271 +0,0 @@
/******************************************************************************
* SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
* CopyRight (C) 2012-2022 ShenYongHua(沈永华).
* QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
*
* Blog: https://www.cnblogs.com/yhuse
* Gitee: https://gitee.com/yhuse/SunnyUI
* GitHub: https://github.com/yhuse/SunnyUI
*
* SunnyUI.dll can be used for free under the GPL-3.0 license.
* If you use this code, please keep this note.
* 如果您使用此代码，请保留此说明。
******************************************************************************
* 文件名称: UIComboBoxEx.cs
* 文件说明: 组合框（继承自Combobox）
* 当前版本: V3.1
* 创建日期: 2021-02-20
*
* 2021-02-20: V3.0.1 增加文件说明
******************************************************************************/
using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
namespace Sunny.UI
{
[ToolboxItem(false)]
public class UIComboboxEx : ComboBox, IStyleInterface
{
public UIComboboxEx()
{
Version = UIGlobal.Version;
base.Font = UIFontColor.Font();
base.ForeColor = UIFontColor.Primary;
base.BackColor = Color.White;
DrawMode = DrawMode.OwnerDrawFixed;
//FlatStyle = FlatStyle.Flat;
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.DoubleBuffer, true);
SetStyle(ControlStyles.Selectable, true);
SetStyle(ControlStyles.SupportsTransparentBackColor, true);
SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
base.DoubleBuffered = true;
this.DoubleBuffered();
UpdateStyles();
Width = 150;
}
[Browsable(false)]
public bool IsScaled { get; private set; }
public void SetDPIScale()
{
if (!IsScaled)
{
this.SetDPIScaleFont();
IsScaled = true;
}
}
private UIStyle _style = UIStyle.Blue;
protected override void OnBackColorChanged(EventArgs e)
{
base.OnBackColorChanged(e);
Invalidate();
}
/// <summary>
/// 字体颜色
/// </summary>
[Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "48, 48, 48")]
public override Color ForeColor
{
get => foreColor;
set => SetForeColor(value);
}
/// <summary>
/// 设置字体颜色
/// </summary>
/// <param name="value">颜色</param>
protected void SetForeColor(Color value)
{
if (foreColor != value)
{
foreColor = value;
_style = UIStyle.Custom;
Invalidate();
}
}
/// <summary>
/// 边框颜色
/// </summary>
[Description("边框颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")]
public Color RectColor
{
get => rectColor;
set => SetRectColor(value);
}
/// <summary>
/// 设置边框颜色
/// </summary>
/// <param name="value">颜色</param>
protected void SetRectColor(Color value)
{
if (rectColor != value)
{
rectColor = value;
_style = UIStyle.Custom;
Invalidate();
}
}
/// <summary>
/// 主题样式
/// </summary>
[DefaultValue(UIStyle.Blue), Description("主题样式"), Category("SunnyUI")]
public UIStyle Style
{
get => _style;
set => SetStyle(value);
}
/// <summary>
/// 自定义主题风格
/// </summary>
[DefaultValue(false)]
[Description("获取或设置可以自定义主题风格"), Category("SunnyUI")]
public bool StyleCustomMode { get; set; }
public string Version { get; }
/// <summary>
/// Tag字符串
/// </summary>
[DefaultValue(null)]
[Description("获取或设置包含有关控件的数据的对象字符串"), Category("SunnyUI")]
public string TagString { get; set; }
/// <summary>
/// 设置主题样式
/// </summary>
/// <param name="style">主题样式</param>
public void SetStyle(UIStyle style)
{
UIBaseStyle uiColor = UIStyles.GetStyleColor(style);
if (!uiColor.IsCustom()) SetStyleColor(uiColor);
_style = style;
}
/// <summary>
/// 设置主题样式颜色
/// </summary>
/// <param name="uiColor"></param>
public virtual void SetStyleColor(UIBaseStyle uiColor)
{
rectColor = uiColor.RectColor;
foreColor = UIFontColor.Primary;
_itemSelectBackColor = uiColor.ListItemSelectBackColor;
_itemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();
}
private Color _itemSelectBackColor = UIColor.Blue;
private Color _itemSelectForeColor = Color.White;
[Description("下拉框选中背景颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")]
public Color ItemSelectBackColor
{
get => _itemSelectBackColor;
set
{
if (_itemSelectBackColor != value)
{
_itemSelectBackColor = value;
_style = UIStyle.Custom;
if (DesignMode)
Invalidate();
}
}
}
[Description("下拉框选中字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "White")]
public Color ItemSelectForeColor
{
get => _itemSelectForeColor;
set
{
if (_itemSelectForeColor != value)
{
_itemSelectForeColor = value;
_style = UIStyle.Custom;
if (DesignMode)
Invalidate();
}
}
}
/// <summary>
/// 边框颜色
/// </summary>
protected Color rectColor = UIStyles.GetStyleColor(UIStyle.Blue).RectColor;
/// <summary>
/// 字体颜色
/// </summary>
protected Color foreColor = UIFontColor.Primary;
protected override void OnDrawItem(DrawItemEventArgs e)
{
Color fColor = ForeColor;
Color bColor = BackColor;
if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
{
fColor = ItemSelectForeColor;
bColor = ItemSelectBackColor;
}
e.Graphics.FillRectangle(bColor, e.Bounds);
if (e.Index >= 0)
{
e.Graphics.DrawString(GetItemText(Items[e.Index]), Font, fColor, e.Bounds.X + 1, e.Bounds.Y);
}
}
private readonly Graphics graphics = null;
private Graphics Graphics => graphics ?? CreateGraphics();
protected override void WndProc(ref Message m)
{
if (IsDisposed || Disposing) return;
switch (m.Msg)
{
//WM_PAINT = 0xf; 要求一个窗口重画自己,即Paint事件时
//WM_CTLCOLOREDIT = 0x133;当一个编辑型控件将要被绘制时发送此消息给它的父窗口；
//通过响应这条消息，所有者窗口可以通过使用给定的相关显示设备的句柄来设置编辑框的文本和背景颜色
//windows消息值表,可参考:http://hi.baidu.com/dooy/blog/item/0e770a24f70e3b2cd407421b.html
case Win32.User.WM_PAINT:
//case Win32.User.WM_CTLCOLOREDIT:
base.WndProc(ref m);
//Graphics.FillRectangle(BackColor, new Rectangle(0, 0, Width, Height));
Graphics.DrawRectangle(rectColor, 0, 0, Width - 1, Height - 1);
// if (Text.IsValid())
// {
// SizeF sf = Graphics.MeasureString(Text, Font);
// Graphics.DrawString(Text, Font, ForeColor, 0, (Height - sf.Height) / 2);
// }
//
// Graphics.DrawFontImage(61703, 24, rectColor, new Rectangle(Width - 28, 1, 28, Height - 2));
break;
default:
base.WndProc(ref m);
break;
}
}
}
}

17
SunnyUI/Controls/UIContextMenuStrip.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System.ComponentModel; using System.ComponentModel;
@ -36,6 +37,9 @@ namespace Sunny.UI
RenderMode = ToolStripRenderMode.Professional; RenderMode = ToolStripRenderMode.Professional;
Renderer = new ToolStripProfessionalRenderer(ColorTable); Renderer = new ToolStripProfessionalRenderer(ColorTable);
Version = UIGlobal.Version; Version = UIGlobal.Version;
ColorTable.SetStyleColor(UIStyles.Blue);
BackColor = UIStyles.Blue.ContextMenuColor;
} }
[Browsable(false), DefaultValue(false)] [Browsable(false), DefaultValue(false)]
@ -75,8 +79,12 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -84,7 +92,6 @@ namespace Sunny.UI
{ {
ColorTable.SetStyleColor(uiColor); ColorTable.SetStyleColor(uiColor);
BackColor = uiColor.ContextMenuColor; BackColor = uiColor.ContextMenuColor;
Invalidate();
} }
public string Version { get; } public string Version { get; }
@ -125,7 +132,7 @@ namespace Sunny.UI
StyleColor = color; StyleColor = color;
} }
public override Color MenuItemSelected => StyleColor.MenuSelectedColor; public override Color MenuItemSelected => StyleColor.ContextMenuSelectedColor;
public override Color MenuItemPressedGradientBegin => StyleColor.ButtonFillPressColor; public override Color MenuItemPressedGradientBegin => StyleColor.ButtonFillPressColor;
@ -133,7 +140,7 @@ namespace Sunny.UI
public override Color MenuItemPressedGradientEnd => StyleColor.ButtonFillPressColor; public override Color MenuItemPressedGradientEnd => StyleColor.ButtonFillPressColor;
public override Color MenuBorder => StyleColor.RectColor; public override Color MenuBorder => StyleColor.ButtonRectColor;
public override Color MenuItemBorder => StyleColor.PrimaryColor; public override Color MenuItemBorder => StyleColor.PrimaryColor;

316
SunnyUI/Controls/UIControl.cs
View File

@ -21,6 +21,7 @@
* 2021-12-13: V3.0.9 边框线宽可设置1或者2 * 2021-12-13: V3.0.9 边框线宽可设置1或者2
* 2022-01-10: V3.1.0 调整边框和圆角的绘制 * 2022-01-10: V3.1.0 调整边框和圆角的绘制
* 2022-02-16: V3.1.1 基类增加只读颜色设置 * 2022-02-16: V3.1.1 基类增加只读颜色设置
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -48,6 +49,8 @@ namespace Sunny.UI
base.MinimumSize = new Size(1, 1); base.MinimumSize = new Size(1, 1);
} }
protected bool selected;
[Browsable(false), DefaultValue(false)] [Browsable(false), DefaultValue(false)]
public bool IsScaled { get; set; } public bool IsScaled { get; set; }
@ -252,8 +255,12 @@ namespace Sunny.UI
/// <param name="style">主题样式</param> /// <param name="style">主题样式</param>
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -265,24 +272,28 @@ namespace Sunny.UI
{ {
fillColor = uiColor.ButtonFillColor; fillColor = uiColor.ButtonFillColor;
fillColor2 = uiColor.ButtonFillColor2; fillColor2 = uiColor.ButtonFillColor2;
rectColor = uiColor.RectColor;
foreColor = uiColor.ButtonForeColor; foreColor = uiColor.ButtonForeColor;
rectColor = uiColor.ButtonRectColor;
fillDisableColor = uiColor.FillDisableColor; fillDisableColor = uiColor.FillDisableColor;
rectDisableColor = uiColor.RectDisableColor;
foreDisableColor = uiColor.ForeDisableColor; foreDisableColor = uiColor.ForeDisableColor;
rectDisableColor = uiColor.RectDisableColor;
fillReadOnlyColor = uiColor.FillDisableColor; fillReadOnlyColor = uiColor.FillDisableColor;
rectReadOnlyColor = uiColor.RectDisableColor; rectReadOnlyColor = uiColor.RectDisableColor;
foreReadOnlyColor = uiColor.ForeDisableColor; foreReadOnlyColor = uiColor.ForeDisableColor;
fillPressColor = fillHoverColor = fillColor; fillHoverColor = fillColor;
rectPressColor = rectHoverColor = rectColor; foreHoverColor = foreColor;
forePressColor = foreHoverColor = foreColor; rectHoverColor = rectColor;
fillSelectedColor = uiColor.ButtonFillSelectedColor; fillPressColor = fillColor;
forePressColor = foreColor;
rectPressColor = rectColor;
Invalidate(); fillSelectedColor = fillColor;
foreSelectedColor = foreColor;
rectSelectedColor = rectColor;
} }
protected UIStyle _style = UIStyle.Blue; protected UIStyle _style = UIStyle.Blue;
@ -587,134 +598,139 @@ namespace Sunny.UI
Invalidate(); Invalidate();
} }
/// <summary>
/// 选中颜色
/// </summary>
protected Color fillSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillSelectedColor;
/// <summary>
/// 边框颜色
/// </summary>
protected Color rectColor = UIStyles.GetStyleColor(UIStyle.Blue).RectColor;
protected bool fillColorGradient = false;
/// <summary> /// <summary>
/// 填充颜色 /// 填充颜色
/// </summary> /// </summary>
protected Color fillColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillColor; protected Color fillColor = UIStyles.Blue.ButtonFillColor;
/// <summary>
/// 填充颜色
/// </summary>
protected Color fillColor2 = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillColor;
/// <summary>
/// 字体颜色
/// </summary>
protected Color foreColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForeColor;
/// <summary>
/// 字体鼠标移上颜色
/// </summary>
protected Color foreHoverColor;
/// <summary>
/// 字体鼠标按下颜色
/// </summary>
protected Color forePressColor;
/// <summary>
/// 字体不可用颜色
/// </summary>
protected Color foreDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).ForeDisableColor;
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyle.Blue.Colors().ForeDisableColor;
/// <summary>
/// 边框鼠标移上颜色
/// </summary>
protected Color rectHoverColor;
/// <summary>
/// 边框鼠标按下颜色
/// </summary>
protected Color rectPressColor;
/// <summary>
/// 边框不可用颜色
/// </summary>
protected Color rectDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).RectDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyles.GetStyleColor(UIStyle.Blue).RectDisableColor;
/// <summary> /// <summary>
/// 填充鼠标移上颜色 /// 填充鼠标移上颜色
/// </summary> /// </summary>
protected Color fillHoverColor; protected Color fillHoverColor = UIStyles.Blue.ButtonFillColor;
/// <summary> /// <summary>
/// 填充鼠标按下颜色 /// 填充鼠标按下颜色
/// </summary> /// </summary>
protected Color fillPressColor; protected Color fillPressColor = UIStyles.Blue.ButtonFillColor;
/// <summary>
/// 选中颜色
/// </summary>
protected Color fillSelectedColor = UIStyles.Blue.ButtonFillColor;
/// <summary> /// <summary>
/// 填充不可用颜色 /// 填充不可用颜色
/// </summary> /// </summary>
protected Color fillDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).FillDisableColor; protected Color fillDisableColor = UIStyles.Blue.FillDisableColor;
/// <summary> /// <summary>
/// 填充只读颜色 /// 填充只读颜色
/// </summary> /// </summary>
protected Color fillReadOnlyColor = UIStyles.GetStyleColor(UIStyle.Blue).FillDisableColor; protected Color fillReadOnlyColor = UIStyles.Blue.FillDisableColor;
/// <summary>
/// 填充颜色
/// </summary>
protected Color fillColor2 = UIStyles.Blue.ButtonFillColor2;
protected bool fillColorGradient = false;
/// <summary>
/// 边框颜色
/// </summary>
protected Color rectColor = UIStyles.Blue.ButtonRectColor;
/// <summary>
/// 边框鼠标移上颜色
/// </summary>
protected Color rectHoverColor = UIStyles.Blue.ButtonRectColor;
/// <summary>
/// 边框鼠标按下颜色
/// </summary>
protected Color rectPressColor = UIStyles.Blue.ButtonRectColor;
/// <summary>
/// 边框选中颜色
/// </summary>
protected Color rectSelectedColor = UIStyles.Blue.ButtonRectColor;
/// <summary>
/// 边框不可用颜色
/// </summary>
protected Color rectDisableColor = UIStyles.Blue.RectDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyles.Blue.RectDisableColor;
/// <summary>
/// 字体颜色
/// </summary>
protected Color foreColor = UIStyles.Blue.ButtonForeColor;
/// <summary>
/// 字体鼠标移上颜色
/// </summary>
protected Color foreHoverColor = UIStyles.Blue.ButtonForeColor;
/// <summary>
/// 字体鼠标按下颜色
/// </summary>
protected Color forePressColor = UIStyles.Blue.ButtonForeColor;
/// <summary>
/// 字体选中颜色
/// </summary>
protected Color foreSelectedColor = UIStyles.Blue.ButtonForeColor;
/// <summary>
/// 字体不可用颜色
/// </summary>
protected Color foreDisableColor = UIStyles.Blue.ForeDisableColor;
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyles.Blue.ForeDisableColor;
/// <summary> /// <summary>
/// 设置选中颜色 /// 设置选中颜色
/// </summary> /// </summary>
/// <param name="value">颜色</param> /// <param name="color">颜色</param>
protected void SetFillSelectedColor(Color value) protected void SetFillSelectedColor(Color color)
{ {
if (fillSelectedColor != value) if (fillSelectedColor != color)
{ {
fillSelectedColor = value; fillSelectedColor = color;
Invalidate(); SetStyleCustom();
} }
} }
protected bool selected;
protected Color foreSelectedColor;
/// <summary> /// <summary>
/// 设置选中颜色 /// 设置选中颜色
/// </summary> /// </summary>
/// <param name="value">颜色</param> /// <param name="color">颜色</param>
protected void SetForeSelectedColor(Color value) protected void SetForeSelectedColor(Color color)
{ {
if (foreSelectedColor != value) if (foreSelectedColor != color)
{ {
foreSelectedColor = value; foreSelectedColor = color;
Invalidate(); SetStyleCustom();
} }
} }
protected Color rectSelectedColor;
/// <summary> /// <summary>
/// 设置选中颜色 /// 设置选中颜色
/// </summary> /// </summary>
/// <param name="value">颜色</param> /// <param name="color">颜色</param>
protected void SetRectSelectedColor(Color value) protected void SetRectSelectedColor(Color color)
{ {
if (rectSelectedColor != value) if (rectSelectedColor != color)
{ {
rectSelectedColor = value; rectSelectedColor = color;
Invalidate(); SetStyleCustom();
} }
} }
@ -722,10 +738,13 @@ namespace Sunny.UI
/// 设置填充鼠标移上颜色 /// 设置填充鼠标移上颜色
/// </summary> /// </summary>
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetFillHoveColor(Color color) protected void SetFillHoverColor(Color color)
{ {
fillHoverColor = color; if (fillHoverColor != color)
_style = UIStyle.Custom; {
fillHoverColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -734,8 +753,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetFillPressColor(Color color) protected void SetFillPressColor(Color color)
{ {
fillPressColor = color; if (fillPressColor != color)
_style = UIStyle.Custom; {
fillPressColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -744,8 +766,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetFillDisableColor(Color color) protected void SetFillDisableColor(Color color)
{ {
fillDisableColor = color; if (fillDisableColor != color)
_style = UIStyle.Custom; {
fillDisableColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
@ -754,18 +779,24 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetFillReadOnlyColor(Color color) protected void SetFillReadOnlyColor(Color color)
{ {
fillReadOnlyColor = color; if (fillReadOnlyColor != color)
_style = UIStyle.Custom; {
fillReadOnlyColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
/// 设备边框鼠标移上颜色 /// 设备边框鼠标移上颜色
/// </summary> /// </summary>
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetRectHoveColor(Color color) protected void SetRectHoverColor(Color color)
{ {
rectHoverColor = color; if (rectHoverColor != color)
_style = UIStyle.Custom; {
rectHoverColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -774,8 +805,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetRectPressColor(Color color) protected void SetRectPressColor(Color color)
{ {
rectPressColor = color; if (rectPressColor != color)
_style = UIStyle.Custom; {
rectPressColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -784,8 +818,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetRectDisableColor(Color color) protected void SetRectDisableColor(Color color)
{ {
rectDisableColor = color; if (rectDisableColor != color)
_style = UIStyle.Custom; {
rectDisableColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
@ -794,18 +831,24 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetRectReadOnlyColor(Color color) protected void SetRectReadOnlyColor(Color color)
{ {
rectReadOnlyColor = color; if (rectReadOnlyColor != color)
_style = UIStyle.Custom; {
rectReadOnlyColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
/// 设置字体鼠标移上颜色 /// 设置字体鼠标移上颜色
/// </summary> /// </summary>
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetForeHoveColor(Color color) protected void SetForeHoverColor(Color color)
{ {
foreHoverColor = color; if (foreHoverColor != color)
_style = UIStyle.Custom; {
foreHoverColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -814,8 +857,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetForePressColor(Color color) protected void SetForePressColor(Color color)
{ {
forePressColor = color; if (forePressColor != color)
_style = UIStyle.Custom; {
forePressColor = color;
SetStyleCustom(false);
}
} }
/// <summary> /// <summary>
@ -824,8 +870,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetForeDisableColor(Color color) protected void SetForeDisableColor(Color color)
{ {
foreDisableColor = color; if (foreDisableColor != color)
_style = UIStyle.Custom; {
foreDisableColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
@ -834,8 +883,11 @@ namespace Sunny.UI
/// <param name="color">颜色</param> /// <param name="color">颜色</param>
protected void SetForeReadonlyColor(Color color) protected void SetForeReadonlyColor(Color color)
{ {
foreReadOnlyColor = color; if (foreReadOnlyColor != color)
_style = UIStyle.Custom; {
foreReadOnlyColor = color;
SetStyleCustom();
}
} }
/// <summary> /// <summary>
@ -847,8 +899,7 @@ namespace Sunny.UI
if (rectColor != value) if (rectColor != value)
{ {
rectColor = value; rectColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -861,8 +912,7 @@ namespace Sunny.UI
if (fillColor != value) if (fillColor != value)
{ {
fillColor = value; fillColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -875,8 +925,7 @@ namespace Sunny.UI
if (fillColor2 != value) if (fillColor2 != value)
{ {
fillColor2 = value; fillColor2 = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -889,11 +938,16 @@ namespace Sunny.UI
if (foreColor != value) if (foreColor != value)
{ {
foreColor = value; foreColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
protected void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
/// <summary>引发 <see cref="E:System.Windows.Forms.Control.GotFocus" /> 事件。</summary> /// <summary>引发 <see cref="E:System.Windows.Forms.Control.GotFocus" /> 事件。</summary>
/// <param name="e">包含事件数据的 <see cref="T:System.EventArgs" />。</param> /// <param name="e">包含事件数据的 <see cref="T:System.EventArgs" />。</param>
protected override void OnGotFocus(EventArgs e) protected override void OnGotFocus(EventArgs e)

21
SunnyUI/Controls/UIDataGridView.cs
View File

@ -499,7 +499,7 @@ namespace Sunny.UI
} }
} }
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
[Description("奇数行显示颜色"), Category("SunnyUI")] [Description("奇数行显示颜色"), Category("SunnyUI")]
public Color StripeOddColor public Color StripeOddColor
{ {
@ -513,17 +513,21 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
//列头部颜色 //列头部颜色
ColumnHeadersDefaultCellStyle.BackColor = uiColor.TitleColor; ColumnHeadersDefaultCellStyle.BackColor = uiColor.GridTitleColor;
ColumnHeadersDefaultCellStyle.ForeColor = uiColor.TitleForeColor; ColumnHeadersDefaultCellStyle.ForeColor = uiColor.GridTitleForeColor;
ColumnHeadersDefaultCellStyle.SelectionBackColor = uiColor.TitleColor; ColumnHeadersDefaultCellStyle.SelectionBackColor = uiColor.GridTitleColor;
//行头部颜色 //行头部颜色
RowHeadersDefaultCellStyle.BackColor = uiColor.PlainColor; RowHeadersDefaultCellStyle.BackColor = uiColor.PlainColor;
@ -542,7 +546,8 @@ namespace Sunny.UI
RowsDefaultCellStyle.SelectionForeColor = uiColor.GridSelectedForeColor; RowsDefaultCellStyle.SelectionForeColor = uiColor.GridSelectedForeColor;
RowsDefaultCellStyle.ForeColor = UIFontColor.Primary; RowsDefaultCellStyle.ForeColor = UIFontColor.Primary;
GridColor = RectColor = uiColor.RectColor; GridColor = uiColor.GridLineColor;
RectColor = uiColor.RectColor;
RowsDefaultCellStyle.BackColor = UIColor.White; RowsDefaultCellStyle.BackColor = UIColor.White;
AlternatingRowsDefaultCellStyle.BackColor = UIColor.LightBlue; AlternatingRowsDefaultCellStyle.BackColor = UIColor.LightBlue;
@ -551,8 +556,6 @@ namespace Sunny.UI
HBar.FillColor = VBar.FillColor = uiColor.GridStripeOddColor; HBar.FillColor = VBar.FillColor = uiColor.GridStripeOddColor;
HBar.ForeColor = VBar.ForeColor = uiColor.PrimaryColor; HBar.ForeColor = VBar.ForeColor = uiColor.PrimaryColor;
Invalidate();
} }
/// <summary> /// <summary>

9
SunnyUI/Controls/UIDataGridViewFooter.cs
View File

@ -38,7 +38,6 @@ namespace Sunny.UI
SetStyleFlags(true, false, true); SetStyleFlags(true, false, true);
Height = 29; Height = 29;
RadiusSides = UICornerRadiusSides.None; RadiusSides = UICornerRadiusSides.None;
RectSides = ToolStripStatusLabelBorderSides.None;
Font = UIFontColor.Font(); Font = UIFontColor.Font();
foreColor = UIFontColor.Primary; foreColor = UIFontColor.Primary;
@ -98,7 +97,7 @@ namespace Sunny.UI
{ {
if (dgv.ShowGridLine) if (dgv.ShowGridLine)
{ {
g.DrawLine(dgv.GridColor, 0, 0, 0, Height); //g.DrawLine(dgv.GridColor, 0, 0, 0, Height);
} }
foreach (DataGridViewColumn column in dgv.Columns) foreach (DataGridViewColumn column in dgv.Columns)
@ -111,8 +110,8 @@ namespace Sunny.UI
{ {
g.DrawLine(dgv.GridColor, rect.Left - minleft, 0, rect.Left - minleft, Height); g.DrawLine(dgv.GridColor, rect.Left - minleft, 0, rect.Left - minleft, Height);
g.DrawLine(dgv.GridColor, rect.Right - minleft, 0, rect.Right - minleft, Height); g.DrawLine(dgv.GridColor, rect.Right - minleft, 0, rect.Right - minleft, Height);
g.DrawLine(dgv.GridColor, rect.Left - minleft, 0, rect.Right - minleft, 0); //g.DrawLine(dgv.GridColor, rect.Left - minleft, 0, rect.Right - minleft, 0);
g.DrawLine(dgv.GridColor, rect.Left - minleft, Height - 1, rect.Right - minleft, Height - 1); //g.DrawLine(dgv.GridColor, rect.Left - minleft, Height - 1, rect.Right - minleft, Height - 1);
} }
string str = this[column.Name]; string str = this[column.Name];
@ -184,7 +183,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;

3
SunnyUI/Controls/UIDoubleUpDown.cs
View File

@ -111,7 +111,7 @@ namespace Sunny.UI
private double _value; private double _value;
[DefaultValue(0)] [DefaultValue(0D)]
[Description("选中数值"), Category("SunnyUI")] [Description("选中数值"), Category("SunnyUI")]
public double Value public double Value
{ {
@ -353,6 +353,7 @@ namespace Sunny.UI
} }
private int buttonWidth = 29; private int buttonWidth = 29;
[DefaultValue(29)]
public int ButtonWidth public int ButtonWidth
{ {
get => buttonWidth; get => buttonWidth;

32
SunnyUI/Controls/UIHeaderButton.cs
View File

@ -23,6 +23,7 @@
* 2021-09-21: V3.0.7 增加Disabled颜色 * 2021-09-21: V3.0.7 增加Disabled颜色
* 2021-12-07: V3.0.9 更改图片自动刷新 * 2021-12-07: V3.0.9 更改图片自动刷新
* 2022-01-02: V3.0.9 增加角标 * 2022-01-02: V3.0.9 增加角标
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -51,19 +52,19 @@ namespace Sunny.UI
RectSides = ToolStripStatusLabelBorderSides.None; RectSides = ToolStripStatusLabelBorderSides.None;
Padding = new Padding(0, 8, 0, 3); Padding = new Padding(0, 8, 0, 3);
foreHoverColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForeHoverColor;
forePressColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForePressColor;
foreSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonForeSelectedColor;
fillHoverColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillHoverColor;
fillPressColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillPressColor;
fillSelectedColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillSelectedColor;
SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick); SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick);
foreHoverColor = UIStyles.Blue.ButtonForeHoverColor;
forePressColor = UIStyles.Blue.ButtonForePressColor;
foreSelectedColor = UIStyles.Blue.ButtonForeSelectedColor;
fillHoverColor = UIStyles.Blue.ButtonFillHoverColor;
fillPressColor = UIStyles.Blue.ButtonFillPressColor;
fillSelectedColor = UIStyles.Blue.ButtonFillSelectedColor;
fillDisableColor = fillColor; fillDisableColor = fillColor;
foreDisableColor = foreColor; foreDisableColor = foreColor;
rectDisableColor = UIStyles.GetStyleColor(UIStyle.Blue).RectDisableColor; rectDisableColor = UIStyles.Blue.RectDisableColor;
} }
private bool showTips = false; private bool showTips = false;
@ -225,6 +226,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ButtonFillHoverColor;
foreHoverColor = uiColor.ButtonForeHoverColor; foreHoverColor = uiColor.ButtonForeHoverColor;
@ -237,8 +239,6 @@ namespace Sunny.UI
rectDisableColor = uiColor.RectDisableColor; rectDisableColor = uiColor.RectDisableColor;
fillDisableColor = fillColor; fillDisableColor = fillColor;
foreDisableColor = foreColor; foreDisableColor = foreColor;
Invalidate();
} }
[Description("不可用颜色"), Category("SunnyUI")] [Description("不可用颜色"), Category("SunnyUI")]
@ -287,15 +287,15 @@ namespace Sunny.UI
set => SetForeDisableColor(value); set => SetForeDisableColor(value);
} }
[DefaultValue(typeof(Color), "111, 168, 255"), Category("SunnyUI")] [DefaultValue(typeof(Color), "115, 179, 255"), Category("SunnyUI")]
[Description("鼠标移上时填充颜色")] [Description("鼠标移上时填充颜色")]
public Color FillHoverColor public Color FillHoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("鼠标按下时填充颜色")] [Description("鼠标按下时填充颜色")]
public Color FillPressColor public Color FillPressColor
{ {
@ -308,7 +308,7 @@ namespace Sunny.UI
public Color ForeHoverColor public Color ForeHoverColor
{ {
get => foreHoverColor; get => foreHoverColor;
set => SetForeHoveColor(value); set => SetForeHoverColor(value);
} }
[DefaultValue(typeof(Color), "White"), Category("SunnyUI")] [DefaultValue(typeof(Color), "White"), Category("SunnyUI")]
@ -319,7 +319,7 @@ namespace Sunny.UI
set => SetForePressColor(value); set => SetForePressColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("选中时填充颜色")] [Description("选中时填充颜色")]
public Color FillSelectedColor public Color FillSelectedColor
{ {

25
SunnyUI/Controls/UIHorScrollBar.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-01-01 * 创建日期: 2020-01-01
* *
* 2020-07-18: V2.2.6 新增水平滚动条 * 2020-07-18: V2.2.6 新增水平滚动条
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -43,10 +44,10 @@ namespace Sunny.UI
Height = SystemInformation.HorizontalScrollBarHeight + 2; Height = SystemInformation.HorizontalScrollBarHeight + 2;
ShowText = false; ShowText = false;
fillColor = UIColor.LightBlue; fillColor = UIStyles.Blue.ScrollBarFillColor;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.ScrollBarForeColor;
fillHoverColor = Color.FromArgb(111, 168, 255); fillHoverColor = UIStyles.Blue.ScrollBarFillHoverColor;
fillPressColor = Color.FromArgb(74, 131, 229); fillPressColor = UIStyles.Blue.ScrollBarFillPressColor;
} }
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
@ -428,11 +429,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor;
fillColor = uiColor.ScrollBarFillColor;
foreColor = uiColor.ScrollBarForeColor; foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ScrollBarFillHoverColor;
fillPressColor = uiColor.ButtonFillPressColor; fillPressColor = uiColor.ScrollBarFillPressColor;
Invalidate();
} }
/// <summary> /// <summary>
@ -450,7 +451,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -458,15 +459,15 @@ namespace Sunny.UI
} }
[Description("鼠标移上颜色"), Category("SunnyUI")] [Description("鼠标移上颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "111, 168, 255")] [DefaultValue(typeof(Color), "115, 179, 255")]
public Color HoverColor public Color HoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[Description("鼠标按下颜色"), Category("SunnyUI")] [Description("鼠标按下颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "74, 131, 229")] [DefaultValue(typeof(Color), "64, 128, 204")]
public Color PressColor public Color PressColor
{ {
get => fillPressColor; get => fillPressColor;

30
SunnyUI/Controls/UIHorScrollBarEx.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-08-29 * 创建日期: 2020-08-29
* *
* 2020-08-29: V2.2.7 新增水平滚动条 * 2020-08-29: V2.2.7 新增水平滚动条
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -37,13 +38,14 @@ namespace Sunny.UI
ShowRect = false; ShowRect = false;
Height = ScrollBarInfo.HorizontalScrollBarHeight() + 1; Height = ScrollBarInfo.HorizontalScrollBarHeight() + 1;
fillColor = UIColor.LightBlue; fillColor = UIStyles.Blue.ScrollBarFillColor;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.ScrollBarForeColor;
fillHoverColor = Color.FromArgb(111, 168, 255); fillHoverColor = UIStyles.Blue.ScrollBarFillHoverColor;
fillPressColor = Color.FromArgb(74, 131, 229); fillPressColor = UIStyles.Blue.ScrollBarFillPressColor;
} }
private int maximum = 100; private int maximum = 100;
[DefaultValue(100)]
public int Maximum public int Maximum
{ {
get => maximum; get => maximum;
@ -53,12 +55,13 @@ namespace Sunny.UI
Invalidate(); Invalidate();
} }
} }
[DefaultValue(10)]
public int LargeChange { get; set; } = 10; public int LargeChange { get; set; } = 10;
private int thisValue; private int thisValue;
public event EventHandler ValueChanged; public event EventHandler ValueChanged;
[DefaultValue(0)]
public int Value public int Value
{ {
get => thisValue; get => thisValue;
@ -71,6 +74,7 @@ namespace Sunny.UI
} }
private int boundsWidth = 10; private int boundsWidth = 10;
[DefaultValue(10)]
public int BoundsWidth public int BoundsWidth
{ {
get => boundsWidth; get => boundsWidth;
@ -227,11 +231,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor;
fillColor = uiColor.ScrollBarFillColor;
foreColor = uiColor.ScrollBarForeColor; foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ScrollBarFillHoverColor;
fillPressColor = uiColor.ButtonFillPressColor; fillPressColor = uiColor.ScrollBarFillPressColor;
Invalidate();
} }
@ -250,7 +254,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -258,15 +262,15 @@ namespace Sunny.UI
} }
[Description("鼠标移上颜色"), Category("SunnyUI")] [Description("鼠标移上颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "111, 168, 255")] [DefaultValue(typeof(Color), "115, 179, 255")]
public Color HoverColor public Color HoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[Description("鼠标按下颜色"), Category("SunnyUI")] [Description("鼠标按下颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "74, 131, 229")] [DefaultValue(typeof(Color), "64, 128, 204")]
public Color PressColor public Color PressColor
{ {
get => fillPressColor; get => fillPressColor;

3
SunnyUI/Controls/UIIPTextBox.cs
View File

@ -212,6 +212,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 获取输入的IP地址 /// 获取输入的IP地址
/// </summary> /// </summary>
[DefaultValue(null)]
public IPAddress Value public IPAddress Value
{ {
get => _value; get => _value;
@ -232,8 +233,6 @@ namespace Sunny.UI
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.EditorBackColor; fillColor = uiColor.EditorBackColor;
foreColor = UIFontColor.Primary; foreColor = UIFontColor.Primary;

12
SunnyUI/Controls/UIImageButton.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-01-01 * 创建日期: 2020-01-01
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -62,14 +63,17 @@ namespace Sunny.UI
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
ForeColor = uiColor.LabelForeColor; foreColor = uiColor.ImageButtonForeColor;
Invalidate();
} }
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }

16
SunnyUI/Controls/UIImageListBox.cs
View File

@ -20,6 +20,7 @@
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2020-05-21: V2.2.5 增加鼠标滑过高亮 * 2020-05-21: V2.2.5 增加鼠标滑过高亮
* 2021-08-07: V3.0.5 从文件载入图片，并且解除占用 * 2021-08-07: V3.0.5 从文件载入图片，并且解除占用
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -212,7 +213,7 @@ namespace Sunny.UI
bar.FillColor = Color.White; bar.FillColor = Color.White;
} }
hoverColor = uiColor.TreeViewHoverColor; hoverColor = uiColor.ListItemHoverColor;
if (listbox != null) if (listbox != null)
{ {
listbox.HoverColor = hoverColor; listbox.HoverColor = hoverColor;
@ -300,7 +301,7 @@ namespace Sunny.UI
set => listbox.ItemSelectBackColor = value; set => listbox.ItemSelectBackColor = value;
} }
[DefaultValue(typeof(Color), "White")] [DefaultValue(typeof(Color), "243, 249, 255")]
[Description("选中项字体颜色"), Category("SunnyUI")] [Description("选中项字体颜色"), Category("SunnyUI")]
public Color ItemSelectForeColor public Color ItemSelectForeColor
{ {
@ -334,7 +335,7 @@ namespace Sunny.UI
private Color hoverColor = Color.FromArgb(155, 200, 255); private Color hoverColor = Color.FromArgb(155, 200, 255);
[DefaultValue(typeof(Color), "155, 200, 255")] [DefaultValue(typeof(Color), "220, 236, 255")]
[Description("鼠标移上颜色"), Category("SunnyUI")] [Description("鼠标移上颜色"), Category("SunnyUI")]
public Color HoverColor public Color HoverColor
{ {
@ -537,8 +538,12 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -546,7 +551,6 @@ namespace Sunny.UI
{ {
ItemSelectBackColor = uiColor.ListItemSelectBackColor; ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor; ItemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();
} }
[Category("SunnyUI"), Description("The border color used to paint the control.")] [Category("SunnyUI"), Description("The border color used to paint the control.")]

1
SunnyUI/Controls/UIIntegerUpDown.cs
View File

@ -330,6 +330,7 @@ namespace Sunny.UI
} }
private int buttonWidth = 29; private int buttonWidth = 29;
[DefaultValue(29)]
public int ButtonWidth public int ButtonWidth
{ {
get => buttonWidth; get => buttonWidth;

101
SunnyUI/Controls/UILabel.cs
View File

@ -20,9 +20,9 @@
* 2020-04-23: V2.2.4 增加UISymbolLabel * 2020-04-23: V2.2.4 增加UISymbolLabel
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2020-11-12: V3.0.8 增加文字旋转角度 * 2020-11-12: V3.0.8 增加文字旋转角度
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
@ -39,7 +39,7 @@ namespace Sunny.UI
base.Font = UIFontColor.Font(); base.Font = UIFontColor.Font();
Version = UIGlobal.Version; Version = UIGlobal.Version;
base.TextAlign = ContentAlignment.MiddleLeft; base.TextAlign = ContentAlignment.MiddleLeft;
ForeColorChanged += UILabel_ForeColorChanged; foreColor = UIStyles.Blue.LabelForeColor;
} }
private int angle; private int angle;
@ -67,13 +67,6 @@ namespace Sunny.UI
} }
} }
private void UILabel_ForeColorChanged(object sender, EventArgs e)
{
_style = UIStyle.Custom;
}
private Color foreColor = UIStyles.GetStyleColor(UIStyle.Blue).LabelForeColor;
/// <summary> /// <summary>
/// Tag字符串 /// Tag字符串
/// </summary> /// </summary>
@ -81,6 +74,7 @@ namespace Sunny.UI
[Description("获取或设置包含有关控件的数据的对象字符串"), Category("SunnyUI")] [Description("获取或设置包含有关控件的数据的对象字符串"), Category("SunnyUI")]
public string TagString { get; set; } public string TagString { get; set; }
private Color foreColor;
/// <summary> /// <summary>
/// 字体颜色 /// 字体颜色
/// </summary> /// </summary>
@ -91,17 +85,30 @@ namespace Sunny.UI
get => foreColor; get => foreColor;
set set
{ {
foreColor = value; if (foreColor != value)
Invalidate(); {
foreColor = value;
SetStyleCustom();
}
} }
} }
protected void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
public string Version { get; } public string Version { get; }
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -115,7 +122,6 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor) public virtual void SetStyleColor(UIBaseStyle uiColor)
{ {
ForeColor = uiColor.LabelForeColor; ForeColor = uiColor.LabelForeColor;
Invalidate();
} }
private UIStyle _style = UIStyle.Blue; private UIStyle _style = UIStyle.Blue;
@ -130,12 +136,6 @@ namespace Sunny.UI
set => SetStyle(value); set => SetStyle(value);
} }
protected override void OnForeColorChanged(EventArgs e)
{
base.OnForeColorChanged(e);
_style = UIStyle.Custom;
}
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
{ {
if (TextAlign == ContentAlignment.MiddleCenter && Angle != 0 && !AutoSize) if (TextAlign == ContentAlignment.MiddleCenter && Angle != 0 && !AutoSize)
@ -162,7 +162,9 @@ namespace Sunny.UI
ActiveLinkColor = UIColor.Orange; ActiveLinkColor = UIColor.Orange;
VisitedLinkColor = UIColor.Red; VisitedLinkColor = UIColor.Red;
LinkColor = UIColor.Blue;
foreColor = UIStyles.Blue.LabelForeColor;
base.LinkColor = linkColor = UIColor.Blue;
} }
[Browsable(false)] [Browsable(false)]
@ -195,16 +197,20 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
ForeColor = uiColor.LabelForeColor; foreColor = uiColor.LabelForeColor;
LinkColor = uiColor.LabelForeColor; linkColor = uiColor.PrimaryColor;
Invalidate(); base.LinkColor = linkColor;
} }
private UIStyle _style = UIStyle.Blue; private UIStyle _style = UIStyle.Blue;
@ -219,10 +225,49 @@ namespace Sunny.UI
set => SetStyle(value); set => SetStyle(value);
} }
protected override void OnForeColorChanged(EventArgs e) private Color foreColor;
/// <summary>
/// 字体颜色
/// </summary>
[Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "48, 48, 48")]
public override Color ForeColor
{
get => foreColor;
set
{
if (foreColor != value)
{
foreColor = value;
SetStyleCustom();
}
}
}
private void SetStyleCustom(bool needRefresh = true)
{ {
base.OnForeColorChanged(e);
_style = UIStyle.Custom; _style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
private Color linkColor;
/// <summary>
/// 字体颜色
/// </summary>
[Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")]
public new Color LinkColor
{
get => linkColor;
set
{
if (linkColor != value)
{
linkColor = value;
base.LinkColor = value;
SetStyleCustom();
}
}
} }
} }
} }

6
SunnyUI/Controls/UILedLabel.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2021-04-11 * 创建日期: 2021-04-11
* *
* 2021-04-11: V3.0.2 增加文件说明 * 2021-04-11: V3.0.2 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System.Collections; using System.Collections;
@ -35,7 +36,7 @@ namespace Sunny.UI
{ {
SetStyleFlags(true, false); SetStyleFlags(true, false);
ShowText = ShowRect = ShowFill = false; ShowText = ShowRect = ShowFill = false;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.LedLabelForeColor;
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
@ -179,8 +180,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
foreColor = uiColor.RectColor; foreColor = uiColor.LedLabelForeColor;
Invalidate();
} }
} }
} }

19
SunnyUI/Controls/UILine.cs
View File

@ -19,6 +19,7 @@
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2022-01-05: V3.0.9 增加线的样式，支持透明背景 * 2022-01-05: V3.0.9 增加线的样式，支持透明背景
* 2022-01-10: V3.1.0 修复了文本为空不显示的问题 * 2022-01-10: V3.1.0 修复了文本为空不显示的问题
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -36,8 +37,8 @@ namespace Sunny.UI
SetStyleFlags(true, false); SetStyleFlags(true, false);
Size = new Size(360, 29); Size = new Size(360, 29);
MinimumSize = new Size(1, 1); MinimumSize = new Size(1, 1);
foreColor = UIStyles.GetStyleColor(UIStyle.Blue).LineForeColor; foreColor = UIStyles.Blue.LineForeColor;
fillColor = UIStyles.GetStyleColor(UIStyle.Blue).PlainColor; fillColor = UIStyles.Blue.LineFillColor;
} }
public enum LineDirection public enum LineDirection
@ -84,10 +85,10 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor;
rectColor = uiColor.RectColor; rectColor = uiColor.LineRectColor;
foreColor = uiColor.LineForeColor; foreColor = uiColor.LineForeColor;
Invalidate(); fillColor = uiColor.LineFillColor;
} }
/// <summary> /// <summary>
@ -156,7 +157,7 @@ namespace Sunny.UI
protected override void OnPaintRect(Graphics g, GraphicsPath path) protected override void OnPaintRect(Graphics g, GraphicsPath path)
{ {
//
} }
protected override void OnPaintFore(Graphics g, GraphicsPath path) protected override void OnPaintFore(Graphics g, GraphicsPath path)
@ -169,8 +170,6 @@ namespace Sunny.UI
pen.DashStyle = (DashStyle)((int)LineDashStyle); pen.DashStyle = (DashStyle)((int)LineDashStyle);
} }
if (Direction == LineDirection.Horizontal) if (Direction == LineDirection.Horizontal)
{ {
if (Text.IsValid()) if (Text.IsValid())
@ -284,7 +283,7 @@ namespace Sunny.UI
UILineDashStyle lineDashStyle = UILineDashStyle.None; UILineDashStyle lineDashStyle = UILineDashStyle.None;
[Description("线的样式"), Category("SunnyUI")] [Description("线的样式"), Category("SunnyUI")]
[DefaultValue("None")] [DefaultValue(UILineDashStyle.None)]
public UILineDashStyle LineDashStyle public UILineDashStyle LineDashStyle
{ {
get => lineDashStyle; get => lineDashStyle;
@ -302,7 +301,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;

18
SunnyUI/Controls/UIListBox.cs
View File

@ -27,6 +27,7 @@
* 2021-12-29: V3.0.9 增加修改文字颜色 * 2021-12-29: V3.0.9 增加修改文字颜色
* 2022-02-23: V3.1.1 按键上下移动选择项目时，滚动条跟随 * 2022-02-23: V3.1.1 按键上下移动选择项目时，滚动条跟随
* 2022-03-08: V3.1.1 修复在选中某一项后，清除选中项需要两次操作 * 2022-03-08: V3.1.1 修复在选中某一项后，清除选中项需要两次操作
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -400,7 +401,7 @@ namespace Sunny.UI
bar.FillColor = Color.White; bar.FillColor = Color.White;
} }
hoverColor = uiColor.TreeViewHoverColor; hoverColor = uiColor.ListItemHoverColor;
if (listbox != null) if (listbox != null)
{ {
listbox.HoverColor = hoverColor; listbox.HoverColor = hoverColor;
@ -479,7 +480,7 @@ namespace Sunny.UI
set => listbox.ItemSelectBackColor = value; set => listbox.ItemSelectBackColor = value;
} }
[DefaultValue(typeof(Color), "White")] [DefaultValue(typeof(Color), "243, 249, 255")]
[Description("列表项选中字体颜色"), Category("SunnyUI")] [Description("列表项选中字体颜色"), Category("SunnyUI")]
public Color ItemSelectForeColor public Color ItemSelectForeColor
{ {
@ -513,7 +514,7 @@ namespace Sunny.UI
private Color hoverColor = Color.FromArgb(155, 200, 255); private Color hoverColor = Color.FromArgb(155, 200, 255);
[DefaultValue(typeof(Color), "155, 200, 255")] [DefaultValue(typeof(Color), "220, 236, 255")]
[Description("列表项鼠标移上颜色"), Category("SunnyUI")] [Description("列表项鼠标移上颜色"), Category("SunnyUI")]
public Color HoverColor public Color HoverColor
{ {
@ -576,7 +577,7 @@ namespace Sunny.UI
public event EventHandler ValueMemberChanged; public event EventHandler ValueMemberChanged;
[DefaultValue(null)] [DefaultValue("")]
[Description("格式说明符，指示显示值的方式")] [Description("格式说明符，指示显示值的方式")]
public string FormatString public string FormatString
{ {
@ -811,8 +812,12 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -820,7 +825,6 @@ namespace Sunny.UI
{ {
ItemSelectBackColor = uiColor.ListItemSelectBackColor; ItemSelectBackColor = uiColor.ListItemSelectBackColor;
ItemSelectForeColor = uiColor.ListItemSelectForeColor; ItemSelectForeColor = uiColor.ListItemSelectForeColor;
Invalidate();
} }
[Category("SunnyUI"), Description("The border color used to paint the control.")] [Category("SunnyUI"), Description("The border color used to paint the control.")]

9
SunnyUI/Controls/UILogo.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-01-01 * 创建日期: 2020-01-01
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System.ComponentModel; using System.ComponentModel;
@ -41,7 +42,8 @@ namespace Sunny.UI
MinimumSize = MaximumSize = new Size(300, 80); MinimumSize = MaximumSize = new Size(300, 80);
ForeColor = UIFontColor.Primary; foreColor = UIFontColor.Primary;
fillColor = UIColor.Blue;
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
@ -120,9 +122,8 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
foreColor = UIFontColor.Primary; foreColor = uiColor.LogoForeColor;
fillColor = uiColor.MenuSelectedColor; fillColor = uiColor.LogoFillColor;
Invalidate();
} }
/// <summary> /// <summary>

6
SunnyUI/Controls/UIMarkLabel.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2021-03-07 * 创建日期: 2021-03-07
* *
* 2021-03-07: V3.0.2 增加文件说明 * 2021-03-07: V3.0.2 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System.ComponentModel; using System.ComponentModel;
@ -33,6 +34,7 @@ namespace Sunny.UI
public UIMarkLabel() public UIMarkLabel()
{ {
Padding = new Padding(MarkSize + 2, 0, 0, 0); Padding = new Padding(MarkSize + 2, 0, 0, 0);
markColor = UIStyles.Blue.MarkLabelForeColor;
} }
private bool autoSize; private bool autoSize;
@ -93,7 +95,7 @@ namespace Sunny.UI
} }
private Color markColor = UIColor.Blue; private Color markColor;
[Description("标签颜色"), Category("SunnyUI")] [Description("标签颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")] [DefaultValue(typeof(Color), "80, 160, 255")]
@ -110,7 +112,7 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
markColor = uiColor.RectColor; markColor = uiColor.MarkLabelForeColor;
Invalidate(); Invalidate();
} }

1
SunnyUI/Controls/UIMillisecondTimer.cs
View File

@ -88,6 +88,7 @@ namespace Sunny.UI
] ]
public object Tag { get; set; } public object Tag { get; set; }
[DefaultValue(null)]
public string TagString { get; set; } public string TagString { get; set; }
/// <summary> /// <summary>

78
SunnyUI/Controls/UINavBar.cs
View File

@ -21,6 +21,7 @@
* 2021-03-20: V3.0.2 增加可设置背景图片 * 2021-03-20: V3.0.2 增加可设置背景图片
* 2021-06-08: V3.0.4 标题选中高亮颜色增加可调整高度 * 2021-06-08: V3.0.4 标题选中高亮颜色增加可调整高度
* 2021-08-07: V3.0.5 显示/隐藏子节点提示箭头，增加选中项圆角 * 2021-08-07: V3.0.5 显示/隐藏子节点提示箭头，增加选中项圆角
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -48,7 +49,7 @@ namespace Sunny.UI
SetStyle(ControlStyles.SupportsTransparentBackColor, true); SetStyle(ControlStyles.SupportsTransparentBackColor, true);
SetStyle(ControlStyles.UserPaint, true); SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.OptimizedDoubleBuffer, true); SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
//SetStyle(ControlStyles.ResizeRedraw, true);
DoubleBuffered = true; DoubleBuffered = true;
UpdateStyles(); UpdateStyles();
Font = UIFontColor.Font(); Font = UIFontColor.Font();
@ -58,6 +59,9 @@ namespace Sunny.UI
Width = 500; Width = 500;
Height = 110; Height = 110;
Version = UIGlobal.Version; Version = UIGlobal.Version;
selectedForeColor = UIStyles.Blue.NavBarMenuSelectedColor;
selectedHighColor = UIStyles.Blue.NavBarMenuSelectedColor;
} }
[Browsable(false)] [Browsable(false)]
@ -178,20 +182,15 @@ namespace Sunny.UI
get => foreColor; get => foreColor;
set set
{ {
foreColor = value; if (foreColor != value)
_menuStyle = UIMenuStyle.Custom; {
_style = UIStyle.Custom; foreColor = value;
Invalidate(); _menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
protected override void OnBackColorChanged(EventArgs e)
{
base.OnBackColorChanged(e);
_menuStyle = UIMenuStyle.Custom;
_style = UIStyle.Custom;
}
private Color backColor = Color.FromArgb(56, 56, 56); private Color backColor = Color.FromArgb(56, 56, 56);
[DefaultValue(typeof(Color), "56, 56, 56")] [DefaultValue(typeof(Color), "56, 56, 56")]
@ -201,10 +200,12 @@ namespace Sunny.UI
get => backColor; get => backColor;
set set
{ {
backColor = value; if (backColor != value)
_menuStyle = UIMenuStyle.Custom; {
_style = UIStyle.Custom; backColor = value;
Invalidate(); _menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -226,8 +227,12 @@ namespace Sunny.UI
get => menuSelectedColor; get => menuSelectedColor;
set set
{ {
menuSelectedColor = value; if (menuSelectedColor != value)
_menuStyle = UIMenuStyle.Custom; {
menuSelectedColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -243,8 +248,12 @@ namespace Sunny.UI
get => menuHoverColor; get => menuHoverColor;
set set
{ {
menuHoverColor = value; if (menuHoverColor != value)
_menuStyle = UIMenuStyle.Custom; {
menuHoverColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -261,12 +270,20 @@ namespace Sunny.UI
get => selectedHighColor; get => selectedHighColor;
set set
{ {
selectedHighColor = value; if (selectedHighColor != value)
_style = UIStyle.Custom; {
Invalidate(); selectedHighColor = value;
SetStyleCustom();
}
} }
} }
private void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
private int selectedHighColorSize = 4; private int selectedHighColorSize = 4;
/// <summary> /// <summary>
@ -402,8 +419,7 @@ namespace Sunny.UI
if (selectedForeColor != value) if (selectedForeColor != value)
{ {
selectedForeColor = value; selectedForeColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
@ -692,15 +708,19 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor; selectedForeColor = uiColor.NavBarMenuSelectedColor;
Invalidate(); selectedHighColor = uiColor.NavBarMenuSelectedColor;
} }
/// <summary> /// <summary>

136
SunnyUI/Controls/UINavMenu.cs
View File

@ -24,6 +24,7 @@
* 2021-08-27: V3.0.6 增加自定义TipsText显示的颜色 * 2021-08-27: V3.0.6 增加自定义TipsText显示的颜色
* 2021-12-13: V3.0.9 选中项可设置背景色渐变 * 2021-12-13: V3.0.9 选中项可设置背景色渐变
* 2022-01-02: V3.0.9 滚动条可设置颜色 * 2022-01-02: V3.0.9 滚动条可设置颜色
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -80,6 +81,9 @@ namespace Sunny.UI
Controls.Add(Bar); Controls.Add(Bar);
Version = UIGlobal.Version; Version = UIGlobal.Version;
SetScrollInfo(); SetScrollInfo();
selectedForeColor = UIStyles.Blue.NavMenuMenuSelectedColor;
selectedHighColor = UIStyles.Blue.NavMenuMenuSelectedColor;
} }
[Description("滚动条填充颜色"), Category("SunnyUI")] [Description("滚动条填充颜色"), Category("SunnyUI")]
@ -183,13 +187,6 @@ namespace Sunny.UI
MenuHelper.Clear(); MenuHelper.Clear();
} }
protected override void OnBackColorChanged(EventArgs e)
{
base.OnBackColorChanged(e);
menuStyle = UIMenuStyle.Custom;
_style = UIStyle.Custom;
}
private Color backColor = Color.FromArgb(56, 56, 56); private Color backColor = Color.FromArgb(56, 56, 56);
[DefaultValue(typeof(Color), "56, 56, 56")] [DefaultValue(typeof(Color), "56, 56, 56")]
@ -199,10 +196,12 @@ namespace Sunny.UI
get => backColor; get => backColor;
set set
{ {
backColor = value; if (backColor != value)
menuStyle = UIMenuStyle.Custom; {
_style = UIStyle.Custom; backColor = value;
Invalidate(); menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -248,35 +247,6 @@ namespace Sunny.UI
} }
} }
// /// <summary>
// /// SizeChange导致treeNode闪屏
// /// </summary>
// const int TVM_SETEXTENDEDSTYLE = 0x112C;
// const int TVS_EX_DOUBLEBUFFER = 0x0004;
//
// private void UpdateExtendedStyles()
// {
// int style = 0;
//
// if (DoubleBuffered)
// style |= TVS_EX_DOUBLEBUFFER;
//
// if (Style != 0)
// Win32.User.SendMessage(Handle, TVM_SETEXTENDEDSTYLE, new IntPtr(TVS_EX_DOUBLEBUFFER), new IntPtr(style));
// }
//
// protected override void OnHandleCreated(EventArgs e)
// {
// base.OnHandleCreated(e);
// UpdateExtendedStyles();
// }
//protected override void OnSizeChanged(EventArgs e)
//{
// base.OnSizeChanged(e);
// SetScrollInfo();
//}
private void Bar_ValueChanged(object sender, EventArgs e) private void Bar_ValueChanged(object sender, EventArgs e)
{ {
ScrollBarInfo.SetScrollValue(Handle, Bar.Value); ScrollBarInfo.SetScrollValue(Handle, Bar.Value);
@ -406,8 +376,7 @@ namespace Sunny.UI
set set
{ {
selectedHighColor = value; selectedHighColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -420,8 +389,11 @@ namespace Sunny.UI
get => hoverColor; get => hoverColor;
set set
{ {
hoverColor = value; if (hoverColor != value)
menuStyle = UIMenuStyle.Custom; {
hoverColor = value;
menuStyle = UIMenuStyle.Custom;
}
} }
} }
@ -439,15 +411,19 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
selectedForeColor = selectedHighColor = uiColor.MenuSelectedColor; selectedForeColor = uiColor.NavMenuMenuSelectedColor;
Invalidate(); selectedHighColor = uiColor.NavMenuMenuSelectedColor;
} }
private UIMenuStyle menuStyle = UIMenuStyle.Black; private UIMenuStyle menuStyle = UIMenuStyle.Black;
@ -489,6 +465,12 @@ namespace Sunny.UI
Invalidate(); Invalidate();
} }
private void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
private Color selectedForeColor = UIColor.Blue; private Color selectedForeColor = UIColor.Blue;
[DefaultValue(typeof(Color), "80, 160, 255")] [DefaultValue(typeof(Color), "80, 160, 255")]
@ -501,8 +483,7 @@ namespace Sunny.UI
if (selectedForeColor != value) if (selectedForeColor != value)
{ {
selectedForeColor = value; selectedForeColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
@ -521,25 +502,33 @@ namespace Sunny.UI
} }
Graphics g = CreateGraphics(); Graphics g = CreateGraphics();
if (CurrentNode != null) if (CurrentNode != null && CurrentNode != SelectedNode)
{ {
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Default)); ClearCurrentNode(g);
}
if (node != SelectedNode)
{
CurrentNode = node;
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Hot));
} }
CurrentNode = node;
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Hot));
g.Dispose(); g.Dispose();
} }
private void ClearCurrentNode(Graphics g)
{
if (CurrentNode != null && CurrentNode != SelectedNode)
{
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Default));
CurrentNode = null;
}
}
protected override void OnMouseLeave(EventArgs e) protected override void OnMouseLeave(EventArgs e)
{ {
Graphics g = CreateGraphics(); Graphics g = CreateGraphics();
if (CurrentNode != null) ClearCurrentNode(g);
{
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Default));
CurrentNode = null;
}
g.Dispose(); g.Dispose();
} }
@ -598,8 +587,11 @@ namespace Sunny.UI
get => showSecondBackColor; get => showSecondBackColor;
set set
{ {
showSecondBackColor = value; if (ShowSecondBackColor != value)
Invalidate(); {
showSecondBackColor = value;
Invalidate();
}
} }
} }
@ -615,7 +607,6 @@ namespace Sunny.UI
if (secondBackColor != value) if (secondBackColor != value)
{ {
secondBackColor = value; secondBackColor = value;
_style = UIStyle.Custom;
Invalidate(); Invalidate();
} }
} }
@ -660,23 +651,14 @@ namespace Sunny.UI
{ {
if (SelectedColorGradient) if (SelectedColorGradient)
{ {
if ((e.State & TreeNodeStates.Hot) != 0) LinearGradientBrush br = new LinearGradientBrush(new Point(0, 0), new Point(0, e.Node.Bounds.Height), SelectedColor, SelectedColor2);
{ br.GammaCorrection = true;
e.Graphics.FillRectangle(HoverColor, new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height))); e.Graphics.FillRectangle(br, new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height)));
br.Dispose();
}
else
{
LinearGradientBrush br = new LinearGradientBrush(new Point(0, 0), new Point(0, e.Node.Bounds.Height), SelectedColor, SelectedColor2);
br.GammaCorrection = true;
e.Graphics.FillRectangle(br, new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height)));
br.Dispose();
}
} }
else else
{ {
e.Graphics.FillRectangle((e.State & TreeNodeStates.Hot) != 0 ? HoverColor : SelectedColor, e.Graphics.FillRectangle(SelectedColor, new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height)));
new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height)));
} }
e.Graphics.DrawString(e.Node.Text, Font, SelectedForeColor, drawLeft, e.Bounds.Y + (ItemHeight - sf.Height) / 2.0f); e.Graphics.DrawString(e.Node.Text, Font, SelectedForeColor, drawLeft, e.Bounds.Y + (ItemHeight - sf.Height) / 2.0f);

92
SunnyUI/Controls/UIPanel.cs
View File

@ -25,6 +25,7 @@
* 2022-01-10: V3.1.0 调整边框和圆角的绘制 * 2022-01-10: V3.1.0 调整边框和圆角的绘制
* 2022-01-27: V3.1.0 禁止显示滚动条 * 2022-01-27: V3.1.0 禁止显示滚动条
* 2022-02-16: V3.1.1 基类增加只读颜色设置 * 2022-02-16: V3.1.1 基类增加只读颜色设置
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -43,9 +44,10 @@ namespace Sunny.UI
public partial class UIPanel : UserControl, IStyleInterface public partial class UIPanel : UserControl, IStyleInterface
{ {
private int radius = 5; private int radius = 5;
protected Color rectColor = UIStyles.GetStyleColor(UIStyle.Blue).RectColor; protected Color rectColor = UIStyles.Blue.PanelRectColor;
protected Color fillColor = UIStyles.GetStyleColor(UIStyle.Blue).PlainColor; protected Color fillColor = UIStyles.Blue.PanelFillColor;
protected Color foreColor = UIStyles.GetStyleColor(UIStyle.Blue).PanelForeColor; protected Color foreColor = UIStyles.Blue.PanelForeColor;
protected Color fillColor2 = UIStyles.Blue.PanelFillColor2;
protected bool InitializeComponentEnd; protected bool InitializeComponentEnd;
public UIPanel() public UIPanel()
@ -239,8 +241,7 @@ namespace Sunny.UI
{ {
rectColor = value; rectColor = value;
RectColorChanged?.Invoke(this, null); RectColorChanged?.Invoke(this, null);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
AfterSetRectColor(value); AfterSetRectColor(value);
@ -251,7 +252,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")] [Description("填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get get
@ -264,8 +265,7 @@ namespace Sunny.UI
{ {
fillColor = value; fillColor = value;
FillColorChanged?.Invoke(this, null); FillColorChanged?.Invoke(this, null);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
AfterSetFillColor(value); AfterSetFillColor(value);
@ -298,21 +298,15 @@ namespace Sunny.UI
if (fillColor2 != value) if (fillColor2 != value)
{ {
fillColor2 = value; fillColor2 = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
/// <summary>
/// 填充颜色
/// </summary>
protected Color fillColor2 = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillColor;
/// <summary> /// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor2 public Color FillColor2
{ {
get => fillColor2; get => fillColor2;
@ -322,19 +316,19 @@ namespace Sunny.UI
protected void SetFillDisableColor(Color color) protected void SetFillDisableColor(Color color)
{ {
fillDisableColor = color; fillDisableColor = color;
_style = UIStyle.Custom; SetStyleCustom();
} }
protected void SetRectDisableColor(Color color) protected void SetRectDisableColor(Color color)
{ {
rectDisableColor = color; rectDisableColor = color;
_style = UIStyle.Custom; SetStyleCustom();
} }
protected void SetForeDisableColor(Color color) protected void SetForeDisableColor(Color color)
{ {
foreDisableColor = color; foreDisableColor = color;
_style = UIStyle.Custom; SetStyleCustom();
} }
private bool showText = true; private bool showText = true;
@ -574,8 +568,9 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor) public virtual void SetStyleColor(UIBaseStyle uiColor)
{ {
fillColor2 = fillColor = uiColor.PlainColor; fillColor2 = uiColor.PanelFillColor2;
rectColor = uiColor.RectColor; fillColor = uiColor.PanelFillColor;
rectColor = uiColor.PanelRectColor;
foreColor = uiColor.PanelForeColor; foreColor = uiColor.PanelForeColor;
fillDisableColor = uiColor.FillDisableColor; fillDisableColor = uiColor.FillDisableColor;
@ -588,22 +583,6 @@ namespace Sunny.UI
Invalidate(); Invalidate();
} }
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyle.Blue.Colors().ForeDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyle.Blue.Colors().RectDisableColor;
/// <summary>
/// 填充只读颜色
/// </summary>
protected Color fillReadOnlyColor = UIStyle.Blue.Colors().FillDisableColor;
/// <summary> /// <summary>
/// 设置填充只读颜色 /// 设置填充只读颜色
/// </summary> /// </summary>
@ -612,8 +591,7 @@ namespace Sunny.UI
{ {
fillReadOnlyColor = color; fillReadOnlyColor = color;
AfterSetFillReadOnlyColor(color); AfterSetFillReadOnlyColor(color);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
/// <summary> /// <summary>
@ -624,8 +602,7 @@ namespace Sunny.UI
{ {
rectReadOnlyColor = color; rectReadOnlyColor = color;
AfterSetRectReadOnlyColor(color); AfterSetRectReadOnlyColor(color);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
/// <summary> /// <summary>
@ -636,8 +613,7 @@ namespace Sunny.UI
{ {
foreReadOnlyColor = color; foreReadOnlyColor = color;
AfterSetForeReadOnlyColor(color); AfterSetForeReadOnlyColor(color);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
/// <summary> /// <summary>
@ -652,8 +628,7 @@ namespace Sunny.UI
{ {
foreColor = value; foreColor = value;
AfterSetForeColor(value); AfterSetForeColor(value);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -685,9 +660,24 @@ namespace Sunny.UI
{ {
} }
protected Color foreDisableColor = Color.FromArgb(109, 109, 103); protected Color foreDisableColor = UIStyles.Blue.ForeDisableColor;
protected Color rectDisableColor = Color.FromArgb(173, 178, 181); protected Color rectDisableColor = UIStyles.Blue.RectDisableColor;
protected Color fillDisableColor = Color.FromArgb(244, 244, 244); protected Color fillDisableColor = UIStyles.Blue.FillDisableColor;
/// <summary>
/// 字体只读颜色
/// </summary>
protected Color foreReadOnlyColor = UIStyles.Blue.ForeDisableColor;
/// <summary>
/// 边框只读颜色
/// </summary>
protected Color rectReadOnlyColor = UIStyles.Blue.RectDisableColor;
/// <summary>
/// 填充只读颜色
/// </summary>
protected Color fillReadOnlyColor = UIStyles.Blue.FillDisableColor;
protected Color GetRectColor() protected Color GetRectColor()
{ {
@ -767,5 +757,11 @@ namespace Sunny.UI
[Browsable(false)] [Browsable(false)]
public new bool AutoScroll { get; set; } = false; public new bool AutoScroll { get; set; } = false;
protected void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
} }
} }

4
SunnyUI/Controls/UIProcessBar.cs
View File

@ -21,6 +21,7 @@
* 2021-08-07: V3.0.5 增加垂直方向的进度显示 * 2021-08-07: V3.0.5 增加垂直方向的进度显示
* 2021-08-14: V3.0.6 修改不显示百分比时，显示数值 * 2021-08-14: V3.0.6 修改不显示百分比时，显示数值
* 2021-10-14: V3.0.8 调整最小高度为3 * 2021-10-14: V3.0.8 调整最小高度为3
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -232,14 +233,13 @@ namespace Sunny.UI
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.ProcessBarFillColor; fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor; foreColor = uiColor.ProcessBarForeColor;
Invalidate();
} }
/// <summary> /// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;

4
SunnyUI/Controls/UIProgressIndicator.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -46,7 +47,7 @@ namespace Sunny.UI
ShowText = false; ShowText = false;
ShowRect = false; ShowRect = false;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.ProgressIndicatorColor;
} }
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
@ -71,7 +72,6 @@ namespace Sunny.UI
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
foreColor = uiColor.ProgressIndicatorColor; foreColor = uiColor.ProgressIndicatorColor;
ClearImage(); ClearImage();
Invalidate();
} }
private int Index; private int Index;

7
SunnyUI/Controls/UIRadioButton.cs
View File

@ -20,6 +20,7 @@
* 2020-04-16: V2.2.1 增加ReadOnly属性 * 2020-04-16: V2.2.1 增加ReadOnly属性
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2021-04-26: V3.0.3 增加默认事件CheckedChanged * 2021-04-26: V3.0.3 增加默认事件CheckedChanged
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -48,8 +49,9 @@ namespace Sunny.UI
Cursor = Cursors.Hand; Cursor = Cursors.Hand;
ShowRect = false; ShowRect = false;
Size = new Size(150, 29); Size = new Size(150, 29);
foreColor = UIStyles.GetStyleColor(UIStyle.Blue).CheckBoxForeColor;
fillColor = UIStyles.GetStyleColor(UIStyle.Blue).CheckBoxColor; foreColor = UIStyles.Blue.CheckBoxForeColor;
fillColor = UIStyles.Blue.CheckBoxColor;
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)
@ -224,7 +226,6 @@ namespace Sunny.UI
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.CheckBoxColor; fillColor = uiColor.CheckBoxColor;
foreColor = uiColor.CheckBoxForeColor; foreColor = uiColor.CheckBoxForeColor;
Invalidate();
} }
[DefaultValue(0)] [DefaultValue(0)]

5
SunnyUI/Controls/UIRichTextBox.cs
View File

@ -278,8 +278,6 @@ namespace Sunny.UI
scrollBarColor = uiColor.PrimaryColor; scrollBarColor = uiColor.PrimaryColor;
scrollBarBackColor = fillColor; scrollBarBackColor = fillColor;
} }
Invalidate();
} }
private Color scrollBarColor = Color.FromArgb(80, 160, 255); private Color scrollBarColor = Color.FromArgb(80, 160, 255);
@ -644,7 +642,7 @@ namespace Sunny.UI
set => edit.AllowDrop = value; set => edit.AllowDrop = value;
} }
[DefaultValue(false)] [DefaultValue(true)]
public bool AutoWordSelection public bool AutoWordSelection
{ {
get => edit.AllowDrop; get => edit.AllowDrop;
@ -839,6 +837,7 @@ namespace Sunny.UI
set => edit.ZoomFactor = value; set => edit.ZoomFactor = value;
} }
[DefaultValue(true)]
public bool WordWrap public bool WordWrap
{ {
get => edit.WordWrap; get => edit.WordWrap;

2
SunnyUI/Controls/UIRoundMeter.cs
View File

@ -189,7 +189,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 角度 /// 角度
/// </summary> /// </summary>
[DefaultValue(0)] [DefaultValue(0D)]
[Description("角度"), Category("SunnyUI")] [Description("角度"), Category("SunnyUI")]
public double Angle public double Angle
{ {

21
SunnyUI/Controls/UIRoundProcess.cs
View File

@ -17,7 +17,8 @@
* 创建日期: 2021-04-08 * 创建日期: 2021-04-08
* *
* 2021-04-08: V3.0.2 增加文件说明 * 2021-04-08: V3.0.2 增加文件说明
* 2021-10-18: V3.0.8 增加显示小数位数 * 2021-10-18: V3.0.8 增加显示小数位数
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -42,9 +43,10 @@ namespace Sunny.UI
Inner = 30; Inner = 30;
Outer = 50; Outer = 50;
fillColor = UIColor.Blue; fillColor = UIStyles.Blue.ProcessBarForeColor;
rectColor = Color.FromArgb(155, 200, 255); foreColor = UIStyles.Blue.ProcessBarForeColor;
foreColor = UIColor.Blue; rectColor = UIStyles.Blue.ProcessBackColor;
ShowText = false; ShowText = false;
ShowRect = false; ShowRect = false;
} }
@ -123,7 +125,7 @@ namespace Sunny.UI
/// </summary> /// </summary>
[Description("进度条背景色")] [Description("进度条背景色")]
[Category("SunnyUI")] [Category("SunnyUI")]
[DefaultValue(typeof(Color), "155, 200, 255")] [DefaultValue(typeof(Color), "185, 217, 255")]
public Color ProcessBackColor public Color ProcessBackColor
{ {
get => rectColor; get => rectColor;
@ -186,12 +188,13 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.RectColor;
foreColor = uiColor.RectColor; fillColor = uiColor.ProcessBarForeColor;
rectColor = uiColor.GridSelectedColor; foreColor = uiColor.ProcessBarForeColor;
Invalidate(); rectColor = uiColor.ProcessBackColor;
} }
[DefaultValue(false)]
public bool ShowProcess public bool ShowProcess
{ {
get => ShowText; get => ShowText;

25
SunnyUI/Controls/UIScrollBar.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -44,10 +45,10 @@ namespace Sunny.UI
Height = 300; Height = 300;
ShowText = false; ShowText = false;
fillColor = UIColor.LightBlue; fillColor = UIStyles.Blue.ScrollBarFillColor;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.ScrollBarForeColor;
fillHoverColor = Color.FromArgb(111, 168, 255); fillHoverColor = UIStyles.Blue.ScrollBarFillHoverColor;
fillPressColor = Color.FromArgb(74, 131, 229); fillPressColor = UIStyles.Blue.ScrollBarFillPressColor;
} }
private int scrollValue; private int scrollValue;
@ -433,11 +434,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor;
fillColor = uiColor.ScrollBarFillColor;
foreColor = uiColor.ScrollBarForeColor; foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ScrollBarFillHoverColor;
fillPressColor = uiColor.ButtonFillPressColor; fillPressColor = uiColor.ScrollBarFillPressColor;
Invalidate();
} }
/// <summary> /// <summary>
@ -455,22 +456,22 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
set => SetFillColor(value); set => SetFillColor(value);
} }
[DefaultValue(typeof(Color), "111, 168, 255")] [DefaultValue(typeof(Color), "115, 179, 255")]
[Description("鼠标移上颜色"), Category("SunnyUI")] [Description("鼠标移上颜色"), Category("SunnyUI")]
public Color HoverColor public Color HoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[DefaultValue(typeof(Color), "74, 131, 229")] [DefaultValue(typeof(Color), "64, 128, 204")]
[Description("鼠标按下颜色"), Category("SunnyUI")] [Description("鼠标按下颜色"), Category("SunnyUI")]
public Color PressColor public Color PressColor
{ {

14
SunnyUI/Controls/UIScrollingText.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-06-29: V2.2.6 新增控件 * 2020-06-29: V2.2.6 新增控件
* 2021-07-16: V3.0.5 增加属性控制开启滚动 * 2021-07-16: V3.0.5 增加属性控制开启滚动
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -40,8 +41,8 @@ namespace Sunny.UI
public UIScrollingText() public UIScrollingText()
{ {
SetStyleFlags(true, false); SetStyleFlags(true, false);
fillColor = UIStyles.GetStyleColor(UIStyle.Blue).PlainColor; fillColor = UIStyles.Blue.ScrollingTextFillColor;
foreColor = UIStyles.GetStyleColor(UIStyle.Blue).RectColor; foreColor = UIStyles.Blue.ScrollingTextForeColor;
Reset(); Reset();
timer = new Timer(); timer = new Timer();
@ -254,16 +255,15 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor; fillColor = uiColor.ScrollingTextFillColor;
foreColor = uiColor.RectColor; foreColor = uiColor.ScrollingTextForeColor;
Invalidate();
} }
/// <summary> /// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "80, 160, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -274,7 +274,7 @@ namespace Sunny.UI
/// 字体颜色 /// 字体颜色
/// </summary> /// </summary>
[Description("字体颜色"), Category("SunnyUI")] [Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "White")] [DefaultValue(typeof(Color), "80, 160, 255")]
public override Color ForeColor public override Color ForeColor
{ {
get => foreColor; get => foreColor;

1
SunnyUI/Controls/UISignal.cs
View File

@ -127,6 +127,7 @@ namespace Sunny.UI
protected override void OnPaintFill(Graphics g, GraphicsPath path) protected override void OnPaintFill(Graphics g, GraphicsPath path)
{ {
//
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)

38
SunnyUI/Controls/UISmoothLabel.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2022-01-22 * 创建日期: 2022-01-22
* *
* 2022-01-22: V3.1.0 增加文件说明 * 2022-01-22: V3.1.0 增加文件说明
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
@ -37,6 +38,10 @@ namespace Sunny.UI
{ {
base.Font = UIFontColor.Font(36); base.Font = UIFontColor.Font(36);
Version = UIGlobal.Version; Version = UIGlobal.Version;
foreColor = UIStyles.Blue.SmoothLabelForeColor;
rectColor = UIStyles.Blue.SmoothLabelRectColor;
drawPath = new GraphicsPath(); drawPath = new GraphicsPath();
drawPen = new Pen(new SolidBrush(rectColor), rectSize); drawPen = new Pen(new SolidBrush(rectColor), rectSize);
forecolorBrush = new SolidBrush(ForeColor); forecolorBrush = new SolidBrush(ForeColor);
@ -73,7 +78,7 @@ namespace Sunny.UI
} }
} }
private Color foreColor = UIStyles.GetStyleColor(UIStyle.Blue).LabelForeColor; private Color foreColor;
// <summary> // <summary>
/// Tag字符串 /// Tag字符串
@ -94,17 +99,26 @@ namespace Sunny.UI
{ {
foreColor = value; foreColor = value;
forecolorBrush.Color = foreColor; forecolorBrush.Color = foreColor;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
protected void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
public string Version { get; } public string Version { get; }
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
@ -117,11 +131,12 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor) public virtual void SetStyleColor(UIBaseStyle uiColor)
{ {
foreColor = uiColor.ButtonForeColor; foreColor = uiColor.SmoothLabelForeColor;
rectColor = uiColor.SmoothLabelRectColor;
forecolorBrush.Color = foreColor; forecolorBrush.Color = foreColor;
rectColor = uiColor.ButtonFillColor; if (rectSize != 0)
if (rectSize != 0) drawPen.Color = rectColor; drawPen.Color = rectColor;
Invalidate();
} }
private UIStyle _style = UIStyle.Blue; private UIStyle _style = UIStyle.Blue;
@ -148,7 +163,7 @@ namespace Sunny.UI
Invalidate(); Invalidate();
} }
protected Color rectColor = UIStyles.GetStyleColor(UIStyle.Blue).RectColor; protected Color rectColor;
/// <summary> /// <summary>
/// 边框颜色 /// 边框颜色
@ -168,8 +183,7 @@ namespace Sunny.UI
rectColor = value; rectColor = value;
if (rectSize != 0) drawPen.Color = rectColor; if (rectSize != 0) drawPen.Color = rectColor;
RectColorChanged?.Invoke(this, null); RectColorChanged?.Invoke(this, null);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }

12
SunnyUI/Controls/UISwitch.cs
View File

@ -21,6 +21,7 @@
* 2021-05-06: V3.0.3 更新Active状态改变时触发ValueChanged事件 * 2021-05-06: V3.0.3 更新Active状态改变时触发ValueChanged事件
* 2021-09-14: V3.0.7 增加Disabled颜色 * 2021-09-14: V3.0.7 增加Disabled颜色
* 2022-01-02: V3.0.9 增加是否只读属性 * 2022-01-02: V3.0.9 增加是否只读属性
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -55,9 +56,14 @@ namespace Sunny.UI
Width = 75; Width = 75;
ShowText = false; ShowText = false;
ShowRect = false; ShowRect = false;
foreColor = Color.White;
inActiveColor = Color.Gray; inActiveColor = Color.Gray;
fillColor = Color.White; fillColor = Color.White;
rectColor = UIStyles.Blue.SwitchActiveColor;
fillColor = UIStyles.Blue.SwitchFillColor;
inActiveColor = UIStyles.Blue.SwitchInActiveColor;
rectDisableColor = UIStyles.Blue.SwitchRectDisableColor;
} }
[DefaultValue(false)] [DefaultValue(false)]
@ -198,11 +204,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
rectColor = uiColor.SwitchActiveColor; rectColor = uiColor.SwitchActiveColor;
fillColor = uiColor.SwitchFillColor; fillColor = uiColor.SwitchFillColor;
inActiveColor = uiColor.SwitchInActiveColor; inActiveColor = uiColor.SwitchInActiveColor;
rectDisableColor = uiColor.RectDisableColor; rectDisableColor = uiColor.SwitchRectDisableColor;
Invalidate();
} }
[Description("不可用颜色"), Category("SunnyUI")] [Description("不可用颜色"), Category("SunnyUI")]

21
SunnyUI/Controls/UISymbolButton.cs
View File

@ -19,6 +19,7 @@
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2020-07-26: V2.2.6 增加Image属性，增加图片和文字的摆放位置 * 2020-07-26: V2.2.6 增加Image属性，增加图片和文字的摆放位置
* 2022-01-05: V3.0.9 字体图标增加颜色设置 * 2022-01-05: V3.0.9 字体图标增加颜色设置
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -76,8 +77,7 @@ namespace Sunny.UI
if (symbolColor != value) if (symbolColor != value)
{ {
symbolColor = value; symbolColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
@ -93,8 +93,7 @@ namespace Sunny.UI
if (symbolHoverColor != value) if (symbolHoverColor != value)
{ {
symbolHoverColor = value; symbolHoverColor = value;
_style = UIStyle.Custom; SetStyleCustom(false);
Invalidate();
} }
} }
} }
@ -110,8 +109,7 @@ namespace Sunny.UI
if (symbolPressColor != value) if (symbolPressColor != value)
{ {
symbolPressColor = value; symbolPressColor = value;
_style = UIStyle.Custom; SetStyleCustom(false);
Invalidate();
} }
} }
} }
@ -127,8 +125,7 @@ namespace Sunny.UI
if (symbolDisableColor != value) if (symbolDisableColor != value)
{ {
symbolDisableColor = value; symbolDisableColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
@ -144,20 +141,20 @@ namespace Sunny.UI
if (symbolSelectedColor != value) if (symbolSelectedColor != value)
{ {
symbolSelectedColor = value; symbolSelectedColor = value;
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
} }
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor);
symbolColor = uiColor.ButtonForeColor; symbolColor = uiColor.ButtonForeColor;
symbolHoverColor = uiColor.ButtonForeHoverColor; symbolHoverColor = uiColor.ButtonForeHoverColor;
symbolPressColor = uiColor.ButtonForePressColor; symbolPressColor = uiColor.ButtonForePressColor;
symbolDisableColor = uiColor.ForeDisableColor;
symbolSelectedColor = uiColor.ButtonForeSelectedColor; symbolSelectedColor = uiColor.ButtonForeSelectedColor;
base.SetStyleColor(uiColor); symbolDisableColor = uiColor.ForeDisableColor;
} }
private Image image; private Image image;

8
SunnyUI/Controls/UISymbolLabel.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-04-23: V2.2.4 增加UISymbolLabel * 2020-04-23: V2.2.4 增加UISymbolLabel
* 2021-12-24: V3.0.9 修复Dock和AutoSize同时设置的Bug * 2021-12-24: V3.0.9 修复Dock和AutoSize同时设置的Bug
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -43,8 +44,8 @@ namespace Sunny.UI
{ {
SetStyleFlags(true, false); SetStyleFlags(true, false);
ShowRect = false; ShowRect = false;
foreColor = UIFontColor.Primary; symbolColor = UIStyles.Blue.LabelForeColor;
symbolColor = UIFontColor.Primary; foreColor = UIStyles.Blue.LabelForeColor;
Width = 170; Width = 170;
Height = 35; Height = 35;
} }
@ -207,7 +208,8 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
symbolColor = foreColor = uiColor.LabelForeColor; symbolColor = uiColor.LabelForeColor;
foreColor = uiColor.LabelForeColor;
} }
protected override void OnPaint(PaintEventArgs e) protected override void OnPaint(PaintEventArgs e)

90
SunnyUI/Controls/UITabControl.cs
View File

@ -66,6 +66,10 @@ namespace Sunny.UI
DisposeTabPageAfterRemove = true; DisposeTabPageAfterRemove = true;
AutoClosePage = true; AutoClosePage = true;
tabSelectedForeColor = UIStyles.Blue.TabControlTabSelectedColor;
tabSelectedHighColor = UIStyles.Blue.TabControlTabSelectedColor;
_fillColor = UIStyles.Blue.TabControlBackColor;
} }
private ConcurrentDictionary<TabPage, string> TipsTexts = new ConcurrentDictionary<TabPage, string>(); private ConcurrentDictionary<TabPage, string> TipsTexts = new ConcurrentDictionary<TabPage, string>();
@ -289,7 +293,7 @@ namespace Sunny.UI
/// 当使用边框时填充颜色，当值为背景色或透明色或空值则不填充 /// 当使用边框时填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("当使用边框时填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")] [Description("当使用边框时填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => _fillColor; get => _fillColor;
@ -297,11 +301,16 @@ namespace Sunny.UI
{ {
_fillColor = value; _fillColor = value;
AfterSetFillColor(value); AfterSetFillColor(value);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
private void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
}
/// <summary> /// <summary>
/// 边框颜色 /// 边框颜色
/// </summary> /// </summary>
@ -312,9 +321,12 @@ namespace Sunny.UI
get => tabBackColor; get => tabBackColor;
set set
{ {
tabBackColor = value; if (tabBackColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabBackColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -330,9 +342,12 @@ namespace Sunny.UI
get => tabSelectedColor; get => tabSelectedColor;
set set
{ {
tabSelectedColor = value; if (tabSelectedColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabSelectedColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -348,9 +363,11 @@ namespace Sunny.UI
get => tabSelectedForeColor; get => tabSelectedForeColor;
set set
{ {
tabSelectedForeColor = value; if (tabSelectedForeColor != value)
_style = UIStyle.Custom; {
Invalidate(); tabSelectedForeColor = value;
SetStyleCustom();
}
} }
} }
@ -366,9 +383,12 @@ namespace Sunny.UI
get => tabUnSelectedForeColor; get => tabUnSelectedForeColor;
set set
{ {
tabUnSelectedForeColor = value; if (tabUnSelectedForeColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabUnSelectedForeColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -385,9 +405,11 @@ namespace Sunny.UI
get => tabSelectedHighColor; get => tabSelectedHighColor;
set set
{ {
tabSelectedHighColor = value; if (tabSelectedHighColor != value)
_style = UIStyle.Custom; {
Invalidate(); tabSelectedHighColor = value;
SetStyleCustom();
}
} }
} }
@ -450,16 +472,20 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor; tabSelectedForeColor = uiColor.TabControlTabSelectedColor;
_fillColor = uiColor.PlainColor; tabSelectedHighColor = uiColor.TabControlTabSelectedColor;
Invalidate(); _fillColor = uiColor.TabControlBackColor;
} }
private UIMenuStyle _menuStyle = UIMenuStyle.Black; private UIMenuStyle _menuStyle = UIMenuStyle.Black;
@ -505,9 +531,12 @@ namespace Sunny.UI
get => showCloseButton; get => showCloseButton;
set set
{ {
showCloseButton = value; if (showCloseButton != value)
if (showActiveCloseButton) showActiveCloseButton = false; {
Invalidate(); showCloseButton = value;
if (showActiveCloseButton) showActiveCloseButton = false;
Invalidate();
}
} }
} }
@ -519,9 +548,12 @@ namespace Sunny.UI
get => showActiveCloseButton; get => showActiveCloseButton;
set set
{ {
showActiveCloseButton = value; if (showActiveCloseButton != value)
if (showCloseButton) showCloseButton = false; {
Invalidate(); showActiveCloseButton = value;
if (showCloseButton) showCloseButton = false;
Invalidate();
}
} }
} }

79
SunnyUI/Controls/UITabControlMenu.cs
View File

@ -44,6 +44,10 @@ namespace Sunny.UI
AfterSetFillColor(FillColor); AfterSetFillColor(FillColor);
Size = new Size(450, 270); Size = new Size(450, 270);
Version = UIGlobal.Version; Version = UIGlobal.Version;
tabSelectedForeColor = UIStyles.Blue.TabControlTabSelectedColor;
tabSelectedHighColor = UIStyles.Blue.TabControlTabSelectedColor;
_fillColor = UIStyles.Blue.TabControlBackColor;
} }
[Browsable(false)] [Browsable(false)]
@ -95,16 +99,18 @@ namespace Sunny.UI
/// 当使用边框时填充颜色，当值为背景色或透明色或空值则不填充 /// 当使用边框时填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("当使用边框时填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")] [Description("当使用边框时填充颜色，当值为背景色或透明色或空值则不填充"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => _fillColor; get => _fillColor;
set set
{ {
_fillColor = value; if (_fillColor != value)
AfterSetFillColor(value); {
_style = UIStyle.Custom; _fillColor = value;
Invalidate(); AfterSetFillColor(value);
SetStyleCustom();
}
} }
} }
@ -118,9 +124,12 @@ namespace Sunny.UI
get => tabBackColor; get => tabBackColor;
set set
{ {
tabBackColor = value; if (tabBackColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabBackColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -136,9 +145,12 @@ namespace Sunny.UI
get => tabSelectedColor; get => tabSelectedColor;
set set
{ {
tabSelectedColor = value; if (tabSelectedColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabSelectedColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -154,9 +166,11 @@ namespace Sunny.UI
get => tabSelectedForeColor; get => tabSelectedForeColor;
set set
{ {
tabSelectedForeColor = value; if (tabSelectedForeColor != value)
_style = UIStyle.Custom; {
Invalidate(); tabSelectedForeColor = value;
SetStyleCustom();
}
} }
} }
@ -172,9 +186,12 @@ namespace Sunny.UI
get => tabUnSelectedForeColor; get => tabUnSelectedForeColor;
set set
{ {
tabUnSelectedForeColor = value; if (tabUnSelectedForeColor != value)
_menuStyle = UIMenuStyle.Custom; {
Invalidate(); tabUnSelectedForeColor = value;
_menuStyle = UIMenuStyle.Custom;
Invalidate();
}
} }
} }
@ -191,9 +208,11 @@ namespace Sunny.UI
get => tabSelectedHighColor; get => tabSelectedHighColor;
set set
{ {
tabSelectedHighColor = value; if (tabSelectedHighColor != value)
_style = UIStyle.Custom; {
Invalidate(); tabSelectedHighColor = value;
SetStyleCustom();
}
} }
} }
@ -228,16 +247,26 @@ namespace Sunny.UI
public void SetStyle(UIStyle style) public void SetStyle(UIStyle style)
{ {
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
} }
public void SetStyleColor(UIBaseStyle uiColor) public void SetStyleColor(UIBaseStyle uiColor)
{ {
tabSelectedForeColor = tabSelectedHighColor = uiColor.MenuSelectedColor; tabSelectedForeColor = uiColor.TabControlTabSelectedColor;
_fillColor = uiColor.PlainColor; tabSelectedHighColor = uiColor.TabControlTabSelectedColor;
Invalidate(); _fillColor = uiColor.TabControlBackColor;
}
private void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
} }
private UIMenuStyle _menuStyle = UIMenuStyle.Black; private UIMenuStyle _menuStyle = UIMenuStyle.Black;

25
SunnyUI/Controls/UITextBox.cs
View File

@ -146,6 +146,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 字体只读颜色 /// 字体只读颜色
/// </summary> /// </summary>
[DefaultValue(typeof(Color), "109, 109, 103")]
public Color ForeReadOnlyColor public Color ForeReadOnlyColor
{ {
get => foreReadOnlyColor; get => foreReadOnlyColor;
@ -155,6 +156,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 边框只读颜色 /// 边框只读颜色
/// </summary> /// </summary>
[DefaultValue(typeof(Color), "173, 178, 181")]
public Color RectReadOnlyColor public Color RectReadOnlyColor
{ {
get => rectReadOnlyColor; get => rectReadOnlyColor;
@ -164,6 +166,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 填充只读颜色 /// 填充只读颜色
/// </summary> /// </summary>
[DefaultValue(typeof(Color), "244, 244, 244")]
public Color FillReadOnlyColor public Color FillReadOnlyColor
{ {
get => fillReadOnlyColor; get => fillReadOnlyColor;
@ -637,7 +640,7 @@ namespace Sunny.UI
/// 当InputType为数字类型时，能输入的最大值 /// 当InputType为数字类型时，能输入的最大值
/// </summary> /// </summary>
[Description("当InputType为数字类型时，能输入的最大值。"), Category("SunnyUI")] [Description("当InputType为数字类型时，能输入的最大值。"), Category("SunnyUI")]
[DefaultValue(int.MaxValue)] [DefaultValue(2147483647D)]
public double Maximum public double Maximum
{ {
get => edit.MaxValue; get => edit.MaxValue;
@ -648,7 +651,7 @@ namespace Sunny.UI
/// 当InputType为数字类型时，能输入的最小值 /// 当InputType为数字类型时，能输入的最小值
/// </summary> /// </summary>
[Description("当InputType为数字类型时，能输入的最小值。"), Category("SunnyUI")] [Description("当InputType为数字类型时，能输入的最小值。"), Category("SunnyUI")]
[DefaultValue(int.MinValue)] [DefaultValue(-2147483648D)]
public double Minimum public double Minimum
{ {
get => edit.MinValue; get => edit.MinValue;
@ -764,8 +767,6 @@ namespace Sunny.UI
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
if (uiColor.IsCustom()) return;
fillColor = uiColor.EditorBackColor; fillColor = uiColor.EditorBackColor;
foreColor = UIFontColor.Primary; foreColor = UIFontColor.Primary;
edit.BackColor = GetFillColor(); edit.BackColor = GetFillColor();
@ -788,15 +789,13 @@ namespace Sunny.UI
btn.RectColor = uiColor.RectColor; btn.RectColor = uiColor.RectColor;
btn.FillHoverColor = uiColor.ButtonFillHoverColor; btn.FillHoverColor = uiColor.ButtonFillHoverColor;
btn.RectHoverColor = uiColor.RectHoverColor; btn.RectHoverColor = uiColor.ButtonRectHoverColor;
btn.ForeHoverColor = uiColor.ButtonForeHoverColor; btn.ForeHoverColor = uiColor.ButtonForeHoverColor;
btn.FillPressColor = uiColor.ButtonFillPressColor; btn.FillPressColor = uiColor.ButtonFillPressColor;
btn.RectPressColor = uiColor.RectPressColor; btn.RectPressColor = uiColor.ButtonRectPressColor;
btn.ForePressColor = uiColor.ButtonForePressColor; btn.ForePressColor = uiColor.ButtonForePressColor;
} }
Invalidate();
} }
private Color scrollBarColor = Color.FromArgb(80, 160, 255); private Color scrollBarColor = Color.FromArgb(80, 160, 255);
@ -1228,7 +1227,7 @@ namespace Sunny.UI
set => btn.SymbolSize = value; set => btn.SymbolSize = value;
} }
[DefaultValue(typeof(Point), "0, 0")] [DefaultValue(typeof(Point), "0, 1")]
[Description("按钮字体图标的偏移位置"), Category("SunnyUI")] [Description("按钮字体图标的偏移位置"), Category("SunnyUI")]
public Point ButtonSymbolOffset public Point ButtonSymbolOffset
{ {
@ -1281,7 +1280,7 @@ namespace Sunny.UI
} }
} }
[DefaultValue(typeof(Color), "111, 168, 255"), Category("SunnyUI")] [DefaultValue(typeof(Color), "115, 179, 255"), Category("SunnyUI")]
[Description("按钮鼠标移上时填充颜色")] [Description("按钮鼠标移上时填充颜色")]
public Color ButtonFillHoverColor public Color ButtonFillHoverColor
{ {
@ -1305,7 +1304,7 @@ namespace Sunny.UI
} }
} }
[DefaultValue(typeof(Color), "111, 168, 255"), Category("SunnyUI")] [DefaultValue(typeof(Color), "115, 179, 255"), Category("SunnyUI")]
[Description("鼠标移上时边框颜色")] [Description("鼠标移上时边框颜色")]
public Color ButtonRectHoverColor public Color ButtonRectHoverColor
{ {
@ -1317,7 +1316,7 @@ namespace Sunny.UI
} }
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("按钮鼠标按下时填充颜色")] [Description("按钮鼠标按下时填充颜色")]
public Color ButtonFillPressColor public Color ButtonFillPressColor
{ {
@ -1341,7 +1340,7 @@ namespace Sunny.UI
} }
} }
[DefaultValue(typeof(Color), "74, 131, 229"), Category("SunnyUI")] [DefaultValue(typeof(Color), "64, 128, 204"), Category("SunnyUI")]
[Description("按钮鼠标按下时边框颜色")] [Description("按钮鼠标按下时边框颜色")]
public Color ButtonRectPressColor public Color ButtonRectPressColor
{ {

8
SunnyUI/Controls/UITitlePanel.cs
View File

@ -65,14 +65,16 @@ namespace Sunny.UI
SetStyleFlags(true, false); SetStyleFlags(true, false);
ShowText = false; ShowText = false;
CalcSystemBoxPos(); CalcSystemBoxPos();
titleColor = UIStyles.Blue.PanelTitleColor;
titleForeColor = UIStyles.Blue.PanelTitleForeColor;
} }
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
titleColor = uiColor.TitleColor; titleColor = uiColor.PanelTitleColor;
titleForeColor = uiColor.TitleForeColor; titleForeColor = uiColor.PanelTitleForeColor;
Invalidate();
} }
private HorizontalAlignment textAlign = HorizontalAlignment.Center; private HorizontalAlignment textAlign = HorizontalAlignment.Center;

15
SunnyUI/Controls/UITrackBar.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2021-04-11: V3.0.2 增加垂直显示方式 * 2021-04-11: V3.0.2 增加垂直显示方式
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -43,9 +44,11 @@ namespace Sunny.UI
ShowText = false; ShowText = false;
ShowRect = false; ShowRect = false;
fillColor = UIColor.LightBlue;
foreColor = UIColor.Blue; rectDisableColor = UIStyles.Blue.TrackDisableColor;
rectColor = UIColor.Blue; rectColor = UIStyles.Blue.TrackBarRectColor;
fillColor = UIStyles.Blue.TrackBarFillColor;
foreColor = UIStyles.Blue.TrackBarForeColor;
} }
public enum BarDirection public enum BarDirection
@ -134,11 +137,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
rectDisableColor = uiColor.TrackDisableColor; rectDisableColor = uiColor.TrackDisableColor;
rectColor = uiColor.TrackBarRectColor; rectColor = uiColor.TrackBarRectColor;
fillColor = uiColor.TrackBarFillColor; fillColor = uiColor.TrackBarFillColor;
foreColor = uiColor.TrackBarForeColor; foreColor = uiColor.TrackBarForeColor;
Invalidate();
} }
protected override void OnPaintFill(Graphics g, GraphicsPath path) protected override void OnPaintFill(Graphics g, GraphicsPath path)
@ -266,7 +269,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -295,7 +298,7 @@ namespace Sunny.UI
set => SetRectColor(value); set => SetRectColor(value);
} }
[DefaultValue(typeof(Color), "173, 178, 181")] [DefaultValue(typeof(Color), "Silver")]
[Description("不可用时颜色"), Category("SunnyUI")] [Description("不可用时颜色"), Category("SunnyUI")]
public Color DisableColor public Color DisableColor
{ {

41
SunnyUI/Controls/UITreeView.cs
View File

@ -22,6 +22,7 @@
* 2021-07-19: V3.0.5 调整了显示CheckBoxes时图片位置 * 2021-07-19: V3.0.5 调整了显示CheckBoxes时图片位置
* 2021-08-26: V3.0.6 CheckBoxes增加三态，感谢群友：笑口常开 * 2021-08-26: V3.0.6 CheckBoxes增加三态，感谢群友：笑口常开
* 2022-01-05: V3.0.9 TreeNodeStateSync: 节点点击时同步父节点和子节点的状态 * 2022-01-05: V3.0.9 TreeNodeStateSync: 节点点击时同步父节点和子节点的状态
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -179,8 +180,6 @@ namespace Sunny.UI
Bar.HoverColor = uiColor.ButtonFillHoverColor; Bar.HoverColor = uiColor.ButtonFillHoverColor;
Bar.PressColor = uiColor.ButtonFillPressColor; Bar.PressColor = uiColor.ButtonFillPressColor;
} }
Invalidate();
} }
protected override void AfterSetFillColor(Color color) protected override void AfterSetFillColor(Color color)
@ -233,6 +232,7 @@ namespace Sunny.UI
} }
[Browsable(false)] [Browsable(false)]
[DefaultValue(null)]
public TreeNode SelectedNode public TreeNode SelectedNode
{ {
get => view.SelectedNode; get => view.SelectedNode;
@ -715,31 +715,36 @@ namespace Sunny.UI
if (node == null || CurrentNode == node) return; if (node == null || CurrentNode == node) return;
var g = CreateGraphics(); var g = CreateGraphics();
if (CurrentNode != null) if (CurrentNode != null && CurrentNode != SelectedNode)
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, {
new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), ClearCurrentNode(g);
TreeNodeStates.Default)); }
if (node != SelectedNode)
{
CurrentNode = node;
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Hot));
}
CurrentNode = node;
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode,
new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Hot));
g.Dispose(); g.Dispose();
} }
protected override void OnMouseLeave(EventArgs e) protected override void OnMouseLeave(EventArgs e)
{ {
var g = CreateGraphics(); var g = CreateGraphics();
if (CurrentNode != null) ClearCurrentNode(g);
{
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode,
new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height),
TreeNodeStates.Default));
CurrentNode = null;
}
g.Dispose(); g.Dispose();
} }
private void ClearCurrentNode(Graphics g)
{
if (CurrentNode != null && CurrentNode != SelectedNode)
{
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Default));
OnDrawNode(new DrawTreeNodeEventArgs(g, CurrentNode, new Rectangle(0, CurrentNode.Bounds.Y, Width, CurrentNode.Bounds.Height), TreeNodeStates.Default));
CurrentNode = null;
}
}
protected override void OnDrawNode(DrawTreeNodeEventArgs e) protected override void OnDrawNode(DrawTreeNodeEventArgs e)
{ {
@ -794,7 +799,7 @@ namespace Sunny.UI
if (e.Node == SelectedNode) if (e.Node == SelectedNode)
{ {
e.Graphics.FillRectangle((e.State & TreeNodeStates.Hot) != 0 ? HoverColor : SelectedColor, e.Graphics.FillRectangle(SelectedColor,
new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height))); new Rectangle(new Point(0, e.Node.Bounds.Y), new Size(Width, e.Node.Bounds.Height)));
e.Graphics.DrawString(e.Node.Text, Font, SelectedForeColor, drawLeft, e.Graphics.DrawString(e.Node.Text, Font, SelectedForeColor, drawLeft,

29
SunnyUI/Controls/UIVerScrollBarEx.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-08-29 * 创建日期: 2020-08-29
* *
* 2020-08-29: V2.2.7 新增水平滚动条 * 2020-08-29: V2.2.7 新增水平滚动条
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -37,13 +38,14 @@ namespace Sunny.UI
ShowRect = false; ShowRect = false;
Width = ScrollBarInfo.VerticalScrollBarWidth() + 1; Width = ScrollBarInfo.VerticalScrollBarWidth() + 1;
fillColor = UIColor.LightBlue; fillColor = UIStyles.Blue.ScrollBarFillColor;
foreColor = UIColor.Blue; foreColor = UIStyles.Blue.ScrollBarForeColor;
fillHoverColor = Color.FromArgb(111, 168, 255); fillHoverColor = UIStyles.Blue.ScrollBarFillHoverColor;
fillPressColor = Color.FromArgb(74, 131, 229); fillPressColor = UIStyles.Blue.ScrollBarFillPressColor;
} }
private int maximum = 100; private int maximum = 100;
[DefaultValue(100)]
public int Maximum public int Maximum
{ {
get => maximum; get => maximum;
@ -54,11 +56,13 @@ namespace Sunny.UI
} }
} }
[DefaultValue(10)]
public int LargeChange { get; set; } = 10; public int LargeChange { get; set; } = 10;
private int thisValue; private int thisValue;
public event EventHandler ValueChanged; public event EventHandler ValueChanged;
[DefaultValue(0)]
public int Value public int Value
{ {
get => thisValue; get => thisValue;
@ -71,6 +75,7 @@ namespace Sunny.UI
} }
private int boundsHeight = 10; private int boundsHeight = 10;
[DefaultValue(10)]
public int BoundsHeight public int BoundsHeight
{ {
get => boundsHeight; get => boundsHeight;
@ -226,11 +231,11 @@ namespace Sunny.UI
public override void SetStyleColor(UIBaseStyle uiColor) public override void SetStyleColor(UIBaseStyle uiColor)
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.PlainColor;
fillColor = uiColor.ScrollBarFillColor;
foreColor = uiColor.ScrollBarForeColor; foreColor = uiColor.ScrollBarForeColor;
fillHoverColor = uiColor.ButtonFillHoverColor; fillHoverColor = uiColor.ScrollBarFillHoverColor;
fillPressColor = uiColor.ButtonFillPressColor; fillPressColor = uiColor.ScrollBarFillPressColor;
Invalidate();
} }
@ -249,7 +254,7 @@ namespace Sunny.UI
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary> /// </summary>
[Description("填充颜色"), Category("SunnyUI")] [Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "235, 243, 255")] [DefaultValue(typeof(Color), "243, 249, 255")]
public Color FillColor public Color FillColor
{ {
get => fillColor; get => fillColor;
@ -257,15 +262,15 @@ namespace Sunny.UI
} }
[Description("鼠标移上颜色"), Category("SunnyUI")] [Description("鼠标移上颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "111, 168, 255")] [DefaultValue(typeof(Color), "115, 179, 255")]
public Color HoverColor public Color HoverColor
{ {
get => fillHoverColor; get => fillHoverColor;
set => SetFillHoveColor(value); set => SetFillHoverColor(value);
} }
[Description("鼠标按下颜色"), Category("SunnyUI")] [Description("鼠标按下颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "74, 131, 229")] [DefaultValue(typeof(Color), "64, 128, 204")]
public Color PressColor public Color PressColor
{ {
get => fillPressColor; get => fillPressColor;

7
SunnyUI/Controls/UIWaitingBar.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2020-07-20 * 创建日期: 2020-07-20
* *
* 2020-07-20: V2.2.6 新增等待滚动条控件 * 2020-07-20: V2.2.6 新增等待滚动条控件
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -38,12 +39,13 @@ namespace Sunny.UI
Size = new Size(300, 29); Size = new Size(300, 29);
ShowText = false; ShowText = false;
fillColor = UIColor.LightBlue;
foreColor = UIColor.Blue;
timer = new Timer(); timer = new Timer();
timer.Interval = 200; timer.Interval = 200;
timer.Tick += Timer_Tick; timer.Tick += Timer_Tick;
timer.Start(); timer.Start();
fillColor = UIStyles.Blue.ProcessBarFillColor;
foreColor = UIStyles.Blue.ProcessBarForeColor;
} }
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
@ -142,7 +144,6 @@ namespace Sunny.UI
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
fillColor = uiColor.ProcessBarFillColor; fillColor = uiColor.ProcessBarFillColor;
foreColor = uiColor.ProcessBarForeColor; foreColor = uiColor.ProcessBarForeColor;
Invalidate();
} }
} }
} }

90
SunnyUI/Forms/UIForm.cs
View File

@ -29,6 +29,7 @@
* 2021-08-17: V3.0.8 增加IFrame接口 * 2021-08-17: V3.0.8 增加IFrame接口
* 2022-01-03: V3.0.9 标题栏按钮可以设置颜色 * 2022-01-03: V3.0.9 标题栏按钮可以设置颜色
* 2022-02-09: V3.1.0 增加页面间传值方法SetParamToPage * 2022-02-09: V3.1.0 增加页面间传值方法SetParamToPage
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -68,6 +69,15 @@ namespace Sunny.UI
FormBorderStyle = FormBorderStyle.None; FormBorderStyle = FormBorderStyle.None;
m_aeroEnabled = false; m_aeroEnabled = false;
showTitleIcon = false; showTitleIcon = false;
controlBoxForeColor = UIStyles.Blue.FormControlBoxForeColor;
controlBoxFillHoverColor = UIStyles.Blue.FormControlBoxFillHoverColor;
ControlBoxCloseFillHoverColor = UIStyles.Blue.FormControlBoxCloseFillHoverColor;
rectColor = UIStyles.Blue.FormRectColor;
foreColor = UIStyles.Blue.FormForeColor;
BackColor = UIStyles.Blue.FormBackColor;
titleColor = UIStyles.Blue.FormTitleColor;
titleForeColor = UIStyles.Blue.FormTitleForeColor;
} }
[Browsable(false)] [Browsable(false)]
@ -423,16 +433,18 @@ namespace Sunny.UI
get => titleColor; get => titleColor;
set set
{ {
titleColor = value; if (titleColor != value)
_style = UIStyle.Custom; {
Invalidate(); titleColor = value;
SetStyleCustom();
}
} }
} }
/// <summary> /// <summary>
/// 标题颜色 /// 标题颜色
/// </summary> /// </summary>
private Color titleForeColor = Color.White; private Color titleForeColor;
/// <summary> /// <summary>
/// 标题颜色 /// 标题颜色
@ -443,9 +455,11 @@ namespace Sunny.UI
get => titleForeColor; get => titleForeColor;
set set
{ {
titleForeColor = value; if (titleForeColor != value)
_style = UIStyle.Custom; {
Invalidate(); titleForeColor = value;
SetStyleCustom();
}
} }
} }
@ -540,9 +554,9 @@ namespace Sunny.UI
} }
} }
protected Color foreColor = UIFontColor.Primary; protected Color foreColor;
protected Color rectColor = UIColor.Blue; protected Color rectColor;
/// <summary> /// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充 /// 填充颜色，当值为背景色或透明色或空值则不填充
@ -557,9 +571,8 @@ namespace Sunny.UI
if (foreColor != value) if (foreColor != value)
{ {
foreColor = value; foreColor = value;
_style = UIStyle.Custom;
AfterSetForeColor(ForeColor); AfterSetForeColor(ForeColor);
Invalidate(); SetStyleCustom();
} }
} }
} }
@ -577,8 +590,7 @@ namespace Sunny.UI
rectColor = value; rectColor = value;
AfterSetRectColor(value); AfterSetRectColor(value);
RectColorChanged?.Invoke(this, EventArgs.Empty); RectColorChanged?.Invoke(this, EventArgs.Empty);
_style = UIStyle.Custom; SetStyleCustom();
Invalidate();
} }
} }
@ -903,12 +915,9 @@ namespace Sunny.UI
return; return;
} }
//Color showTitleColor = IsDesignMode || IsActive ? rectColor : Color.FromArgb(173, 178, 181);
Color showTitleColor = rectColor;
if (ShowTitle) if (ShowTitle)
{ {
e.Graphics.FillRectangle(showTitleColor, 0, 0, Width, TitleHeight); e.Graphics.FillRectangle(titleColor, 0, 0, Width, TitleHeight);
} }
if (ShowRect) if (ShowRect)
@ -944,14 +953,14 @@ namespace Sunny.UI
}; };
} }
e.Graphics.DrawLines(showTitleColor, points); e.Graphics.DrawLines(rectColor, points);
if (!unShowRadius) if (!unShowRadius)
{ {
e.Graphics.DrawLine(Color.FromArgb(120, showTitleColor), new Point(2, 1), new Point(1, 2)); e.Graphics.DrawLine(Color.FromArgb(120, rectColor), new Point(2, 1), new Point(1, 2));
e.Graphics.DrawLine(Color.FromArgb(120, showTitleColor), new Point(2, Height - 1 - 1), new Point(1, Height - 1 - 2)); e.Graphics.DrawLine(Color.FromArgb(120, rectColor), new Point(2, Height - 1 - 1), new Point(1, Height - 1 - 2));
e.Graphics.DrawLine(Color.FromArgb(120, showTitleColor), new Point(Width - 1 - 2, 1), new Point(Width - 1 - 1, 2)); e.Graphics.DrawLine(Color.FromArgb(120, rectColor), new Point(Width - 1 - 2, 1), new Point(Width - 1 - 1, 2));
e.Graphics.DrawLine(Color.FromArgb(120, showTitleColor), new Point(Width - 1 - 2, Height - 1 - 1), new Point(Width - 1 - 1, Height - 1 - 2)); e.Graphics.DrawLine(Color.FromArgb(120, rectColor), new Point(Width - 1 - 2, Height - 1 - 1), new Point(Width - 1 - 1, Height - 1 - 2));
} }
} }
@ -1169,11 +1178,11 @@ namespace Sunny.UI
} }
} }
private Color controlBoxFillHoverColor = Color.FromArgb(111, 168, 255); private Color controlBoxFillHoverColor;
/// <summary> /// <summary>
/// 标题栏颜色 /// 标题栏颜色
/// </summary> /// </summary>
[Description("标题栏按钮移上背景颜色"), Category("SunnyUI"), DefaultValue(typeof(Color), "111, 168, 255")] [Description("标题栏按钮移上背景颜色"), Category("SunnyUI"), DefaultValue(typeof(Color), "115, 179, 255")]
public Color ControlBoxFillHoverColor public Color ControlBoxFillHoverColor
{ {
get => controlBoxFillHoverColor; get => controlBoxFillHoverColor;
@ -1188,7 +1197,7 @@ namespace Sunny.UI
} }
} }
private Color controlBoxCloseFillHoverColor = Color.Red; private Color controlBoxCloseFillHoverColor;
/// <summary> /// <summary>
/// 标题栏颜色 /// 标题栏颜色
/// </summary> /// </summary>
@ -1210,8 +1219,13 @@ namespace Sunny.UI
{ {
this.SuspendLayout(); this.SuspendLayout();
UIStyleHelper.SetChildUIStyle(this, style); UIStyleHelper.SetChildUIStyle(this, style);
UIBaseStyle uiColor = style.Colors();
if (!uiColor.IsCustom()) SetStyleColor(uiColor); if (!style.IsCustom())
{
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
UIStyleChanged?.Invoke(this, new EventArgs()); UIStyleChanged?.Invoke(this, new EventArgs());
this.ResumeLayout(); this.ResumeLayout();
@ -1221,14 +1235,20 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor) public virtual void SetStyleColor(UIBaseStyle uiColor)
{ {
controlBoxForeColor = uiColor.ButtonForeColor; controlBoxForeColor = UIStyles.Blue.FormControlBoxForeColor;
controlBoxFillHoverColor = uiColor.ButtonFillHoverColor; controlBoxFillHoverColor = UIStyles.Blue.FormControlBoxFillHoverColor;
rectColor = uiColor.RectColor; ControlBoxCloseFillHoverColor = UIStyles.Blue.FormControlBoxCloseFillHoverColor;
foreColor = UIFontColor.Primary; rectColor = uiColor.FormRectColor;
BackColor = uiColor.PlainColor; foreColor = uiColor.FormForeColor;
titleColor = uiColor.TitleColor; BackColor = uiColor.FormBackColor;
titleForeColor = uiColor.TitleForeColor; titleColor = uiColor.FormTitleColor;
Invalidate(); titleForeColor = uiColor.FormTitleForeColor;
}
protected void SetStyleCustom(bool needRefresh = true)
{
_style = UIStyle.Custom;
if (needRefresh) Invalidate();
} }
protected override void OnLocationChanged(EventArgs e) protected override void OnLocationChanged(EventArgs e)

5
SunnyUI/Forms/UIMessageForm.cs
View File

@ -103,18 +103,17 @@ namespace Sunny.UI
{ {
base.SetStyleColor(uiColor); base.SetStyleColor(uiColor);
if (btnOK != null) if (btnOK != null)
{ {
btnOK.FillColor = BackColor; btnOK.FillColor = BackColor;
btnOK.RectColor = Color.FromArgb(36, uiColor.RectColor); btnOK.RectColor = Color.FromArgb(36, uiColor.ButtonRectColor);
btnOK.ForeColor = uiColor.LabelForeColor; btnOK.ForeColor = uiColor.LabelForeColor;
} }
if (btnCancel != null) if (btnCancel != null)
{ {
btnCancel.FillColor = BackColor; btnCancel.FillColor = BackColor;
btnCancel.RectColor = Color.FromArgb(36, uiColor.RectColor); btnCancel.RectColor = Color.FromArgb(36, uiColor.ButtonRectColor);
btnCancel.ForeColor = uiColor.LabelForeColor; btnCancel.ForeColor = uiColor.LabelForeColor;
} }

24
SunnyUI/Forms/UINotifier.cs
View File

@ -188,30 +188,30 @@ namespace Sunny.UI
{ {
case UINotifierType.ERROR: case UINotifierType.ERROR:
icon.Symbol = 61527; icon.Symbol = 61527;
icon.SymbolColor = UIStyles.GetStyleColor(UIStyle.Red).ButtonFillColor; icon.SymbolColor = UIStyles.Red.ButtonFillColor;
LeaveColor = UIStyles.GetStyleColor(UIStyle.Red).ButtonFillColor; LeaveColor = UIStyles.Red.ButtonFillColor;
HoverColor = UIStyles.GetStyleColor(UIStyle.Red).ButtonFillHoverColor; HoverColor = UIStyles.Red.ButtonFillHoverColor;
break; break;
case UINotifierType.INFO: case UINotifierType.INFO:
icon.Symbol = 61530; icon.Symbol = 61530;
icon.SymbolColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillColor; icon.SymbolColor = UIStyles.Blue.ButtonFillColor;
LeaveColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillColor; LeaveColor = UIStyles.Blue.ButtonFillColor;
HoverColor = UIStyles.GetStyleColor(UIStyle.Blue).ButtonFillHoverColor; HoverColor = UIStyles.Blue.ButtonFillHoverColor;
break; break;
case UINotifierType.WARNING: case UINotifierType.WARNING:
icon.Symbol = 61553; icon.Symbol = 61553;
icon.SymbolColor = UIStyles.GetStyleColor(UIStyle.Orange).ButtonFillColor; icon.SymbolColor = UIStyles.Orange.ButtonFillColor;
LeaveColor = UIStyles.GetStyleColor(UIStyle.Orange).ButtonFillColor; LeaveColor = UIStyles.Orange.ButtonFillColor;
HoverColor = UIStyles.GetStyleColor(UIStyle.Orange).ButtonFillHoverColor; HoverColor = UIStyles.Orange.ButtonFillHoverColor;
break; break;
case UINotifierType.OK: case UINotifierType.OK:
icon.Symbol = 61528; icon.Symbol = 61528;
icon.SymbolColor = UIStyles.GetStyleColor(UIStyle.Green).ButtonFillColor; icon.SymbolColor = UIStyles.Green.ButtonFillColor;
LeaveColor = UIStyles.GetStyleColor(UIStyle.Green).ButtonFillColor; LeaveColor = UIStyles.Green.ButtonFillColor;
HoverColor = UIStyles.GetStyleColor(UIStyle.Green).ButtonFillHoverColor; HoverColor = UIStyles.Green.ButtonFillHoverColor;
break; break;
} }

40
SunnyUI/Frames/UIPage.cs
View File

@ -55,7 +55,6 @@ namespace Sunny.UI
{ {
InitializeComponent(); InitializeComponent();
base.BackColor = UIColor.LightBlue;
TopLevel = false; TopLevel = false;
if (this.Register()) SetStyle(UIStyles.Style); if (this.Register()) SetStyle(UIStyles.Style);
@ -68,6 +67,12 @@ namespace Sunny.UI
Version = UIGlobal.Version; Version = UIGlobal.Version;
SetDPIScale(); SetDPIScale();
BackColor = UIStyles.Blue.PageBackColor;
_rectColor = UIStyles.Blue.PageRectColor;
ForeColor = UIStyles.Blue.PageForeColor;
titleFillColor = UIStyles.Blue.PageTitleFillColor;
titleForeColor = UIStyles.Blue.PageTitleForeColor;
} }
[Browsable(false)] [Browsable(false)]
@ -322,21 +327,6 @@ namespace Sunny.UI
[DefaultValue(false)] [DefaultValue(false)]
public bool NeedReload { get; set; } public bool NeedReload { get; set; }
// private void EventLoad()
// {
// Type type = this.GetType().BaseType;
// while (type.Name != "Form")
// {
// type = type.BaseType;
// }
//
// FieldInfo targetMethod = type.GetField("EVENT_LOAD", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
// object obj = (object)targetMethod.GetValue(this);
//
// EventHandler handler = (EventHandler)this.Events[obj];
// handler?.Invoke(this, EventArgs.Empty);
// }
public virtual void Final() public virtual void Final()
{ {
Finalize?.Invoke(this, new EventArgs()); Finalize?.Invoke(this, new EventArgs());
@ -347,8 +337,12 @@ namespace Sunny.UI
this.SuspendLayout(); this.SuspendLayout();
UIStyleHelper.SetChildUIStyle(this, style); UIStyleHelper.SetChildUIStyle(this, style);
UIBaseStyle uiColor = UIStyles.GetStyleColor(style); if (!style.IsCustom())
if (!uiColor.IsCustom()) SetStyleColor(uiColor); {
SetStyleColor(style.Colors());
Invalidate();
}
_style = style; _style = style;
UIStyleChanged?.Invoke(this, new EventArgs()); UIStyleChanged?.Invoke(this, new EventArgs());
this.ResumeLayout(); this.ResumeLayout();
@ -358,10 +352,12 @@ namespace Sunny.UI
public virtual void SetStyleColor(UIBaseStyle uiColor) public virtual void SetStyleColor(UIBaseStyle uiColor)
{ {
BackColor = uiColor.PlainColor; BackColor = uiColor.PageBackColor;
RectColor = uiColor.RectColor; _rectColor = uiColor.PageRectColor;
ForeColor = UIFontColor.Primary; ForeColor = uiColor.PageForeColor;
Invalidate(); titleFillColor = uiColor.PageTitleFillColor;
titleForeColor = uiColor.PageTitleForeColor;
} }
protected virtual void AfterSetFillColor(Color color) protected virtual void AfterSetFillColor(Color color)

85
SunnyUI/Frames/UITitlePage.Designer.cs generated
View File

@ -1,85 +0,0 @@
namespace Sunny.UI
{
partial class UITitlePage
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.PageTitle = new Sunny.UI.UITitlePage.UITitle();
this.PagePanel = new Sunny.UI.UIPanel();
this.SuspendLayout();
//
// PageTitle
//
this.PageTitle.Dock = System.Windows.Forms.DockStyle.Top;
this.PageTitle.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.PageTitle.Location = new System.Drawing.Point(0, 0);
this.PageTitle.MinimumSize = new System.Drawing.Size(1, 1);
this.PageTitle.Name = "PageTitle";
this.PageTitle.Padding = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.PageTitle.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.PageTitle.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
this.PageTitle.Size = new System.Drawing.Size(1399, 35);
this.PageTitle.Symbol = 0;
this.PageTitle.SymbolSize = 24;
this.PageTitle.TabIndex = 0;
this.PageTitle.Text = "UITitlePage";
this.PageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// PagePanel
//
this.PagePanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.PagePanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.PagePanel.Location = new System.Drawing.Point(0, 35);
this.PagePanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.PagePanel.MinimumSize = new System.Drawing.Size(1, 1);
this.PagePanel.Name = "PagePanel";
this.PagePanel.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
this.PagePanel.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
this.PagePanel.Size = new System.Drawing.Size(1399, 878);
this.PagePanel.TabIndex = 1;
this.PagePanel.Text = null;
this.PagePanel.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
//
// UITitlePage
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1399, 913);
this.Controls.Add(this.PagePanel);
this.Controls.Add(this.PageTitle);
this.Name = "UITitlePage";
this.Text = "UITitlePage";
this.Shown += new System.EventHandler(this.UITitlePage_Shown);
this.ResumeLayout(false);
}
#endregion
private UITitle PageTitle;
protected UIPanel PagePanel;
}
}

213
SunnyUI/Frames/UITitlePage.cs
View File

@ -1,213 +0,0 @@
/******************************************************************************
* SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
* CopyRight (C) 2012-2022 ShenYongHua(沈永华).
* QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
*
* Blog: https://www.cnblogs.com/yhuse
* Gitee: https://gitee.com/yhuse/SunnyUI
* GitHub: https://github.com/yhuse/SunnyUI
*
* SunnyUI.dll can be used for free under the GPL-3.0 license.
* If you use this code, please keep this note.
* 如果您使用此代码，请保留此说明。
******************************************************************************
* 文件名称: UITitlePage.cs
* 文件说明: 标题栏页面
* 当前版本: V3.1
* 创建日期: 2020-01-01
*
* 2020-01-01: V2.2.0 增加文件说明
******************************************************************************/
using System;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Windows.Forms;
namespace Sunny.UI
{
public partial class UITitlePage : UIPage, ISymbol
{
public UITitlePage()
{
InitializeComponent();
base.BackColor = UIColor.LightBlue;
TopLevel = false;
if (this.Register()) SetStyle(UIStyles.Style);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.DoubleBuffer, true);
UpdateStyles();
if (!IsDesignMode) base.Dock = DockStyle.Fill;
Version = UIGlobal.Version;
}
public new string Version
{
get;
}
private string text;
public override string Text
{
get => text;
set
{
text = value;
if (PageTitle != null)
{
PageTitle.Text = value;
}
}
}
private bool showTitle = true;
[Description("显示标题"), Category("SunnyUI")]
[DefaultValue(true)]
public new bool ShowTitle
{
get => showTitle;
set => showTitle = value;
}
protected override void SymbolChange()
{
base.SymbolChange();
int left = Symbol > 0 ? (6 * 2 + SymbolSize) : 6;
PageTitle.Padding = new Padding(left, 0, 0, 0);
PageTitle.Symbol = Symbol;
PageTitle.SymbolSize = SymbolSize;
PageTitle.Invalidate();
}
/// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary>
[Description("标题颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "76, 76, 76")]
public new Color TitleFillColor
{
get => PageTitle.FillColor;
set
{
if (PageTitle != null)
PageTitle.FillColor = value;
}
}
/// <summary>
/// 字体颜色
/// </summary>
[Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "White")]
public new Color TitleForeColor
{
get => PageTitle.ForeColor;
set
{
if (PageTitle != null)
PageTitle.ForeColor = value;
}
}
[ToolboxItem(true)]
private class UITitle : UIControl
{
public UITitle()
{
SetStyleFlags(true, false);
fillColor = Color.FromArgb(76, 76, 76);
foreColor = Color.White;
}
/// <summary>
/// 填充颜色，当值为背景色或透明色或空值则不填充
/// </summary>
[Description("填充颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "76, 76, 76")]
public Color FillColor
{
get => fillColor;
set => SetFillColor(value);
}
/// <summary>
/// 字体颜色
/// </summary>
[Description("字体颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "White")]
public override Color ForeColor
{
get => foreColor;
set => SetForeColor(value);
}
public override void SetStyleColor(UIBaseStyle uiColor)
{
base.SetStyleColor(uiColor);
FillColor = uiColor.PageTitleFillColor;
ForeColor = uiColor.PageTitleForeColor;
}
private int symbol;
public int Symbol
{
get => symbol;
set
{
symbol = value;
Invalidate();
}
}
private int symbolSize = 24;
public int SymbolSize
{
get => symbolSize;
set
{
symbolSize = Math.Max(value, 16);
symbolSize = Math.Min(value, 128);
Invalidate();
}
}
private Point symbolOffset = new Point(0, 0);
[DefaultValue(typeof(Point), "0, 0")]
[Description("字体图标的偏移位置"), Category("SunnyUI")]
public Point SymbolOffset
{
get => symbolOffset;
set
{
symbolOffset = value;
Invalidate();
}
}
protected override void OnPaintFore(Graphics g, GraphicsPath path)
{
base.OnPaintFore(g, path);
if (Symbol > 0)
{
g.DrawFontImage(Symbol, SymbolSize, ForeColor, new Rectangle(6, 0, SymbolSize, Height), SymbolOffset.X, SymbolOffset.Y);
}
}
}
private void UITitlePage_Shown(object sender, System.EventArgs e)
{
if (!IsDesignMode)
{
PageTitle.Visible = showTitle;
}
}
}
}

60
SunnyUI/Frames/UITitlePage.resx
View File

@ -1,60 +0,0 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

122
SunnyUI/Style/UIStyle.cs
View File

@ -128,60 +128,6 @@ namespace Sunny.UI
[DisplayText("Purple")] [DisplayText("Purple")]
Purple = 9, Purple = 9,
/// <summary>
/// Office蓝
/// </summary>
[DisplayText("Office2010Blue")]
Office2010Blue = 101,
/// <summary>
/// Office银
/// </summary>
[DisplayText("Office2010Silver")]
Office2010Silver = 102,
/// <summary>
/// Office黑
/// </summary>
[DisplayText("Office2010Black")]
Office2010Black = 103,
/// <summary>
/// 浅蓝
/// </summary>
[DisplayText("LightBlue")]
LightBlue = 201,
/// <summary>
/// 浅绿
/// </summary>
[DisplayText("LightGreen")]
LightGreen = 202,
/// <summary>
/// 浅橙
/// </summary>
[DisplayText("LightOrange")]
LightOrange = 203,
/// <summary>
/// 浅红
/// </summary>
[DisplayText("LightRed")]
LightRed = 204,
/// <summary>
/// 浅灰
/// </summary>
[DisplayText("LightGray")]
LightGray = 205,
/// <summary>
/// 浅紫
/// </summary>
[DisplayText("LightPurple")]
LightPurple = 209,
/// <summary> /// <summary>
/// 多彩的 /// 多彩的
/// </summary> /// </summary>
@ -201,9 +147,9 @@ namespace Sunny.UI
List<UIStyle> styles = new List<UIStyle>(); List<UIStyle> styles = new List<UIStyle>();
foreach (UIStyle style in Enum.GetValues(typeof(UIStyle))) foreach (UIStyle style in Enum.GetValues(typeof(UIStyle)))
{ {
if (style.Value() >= UIStyle.Blue.Value() && style.Value() <= UIStyle.Office2010Black.Value()) if (style.Value() >= UIStyle.Blue.Value() && style.Value() < UIStyle.Colorful.Value())
{ {
if (style == UIStyle.DarkBlue) continue; //if (style == UIStyle.DarkBlue) continue;
styles.Add(style); styles.Add(style);
} }
} }
@ -224,52 +170,27 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 蓝 /// 蓝
/// </summary> /// </summary>
private static readonly UIBaseStyle Blue = new UIBlueStyle(); public static readonly UIBaseStyle Blue = new UIBlueStyle();
/// <summary>
/// 浅蓝
/// </summary>
private static readonly UIBaseStyle LightBlue = new UILightBlueStyle();
/// <summary> /// <summary>
/// 橙 /// 橙
/// </summary> /// </summary>
private static readonly UIBaseStyle Orange = new UIOrangeStyle(); public static readonly UIBaseStyle Orange = new UIOrangeStyle();
/// <summary>
/// 浅橙
/// </summary>
private static readonly UIBaseStyle LightOrange = new UILightOrangeStyle();
/// <summary> /// <summary>
/// 灰 /// 灰
/// </summary> /// </summary>
private static readonly UIBaseStyle Gray = new UIGrayStyle(); private static readonly UIBaseStyle Gray = new UIGrayStyle();
/// <summary>
/// 浅灰
/// </summary>
private static readonly UIBaseStyle LightGray = new UILightGrayStyle();
/// <summary> /// <summary>
/// 绿 /// 绿
/// </summary> /// </summary>
private static readonly UIBaseStyle Green = new UIGreenStyle(); public static readonly UIBaseStyle Green = new UIGreenStyle();
/// <summary>
/// 浅绿
/// </summary>
private static readonly UIBaseStyle LightGreen = new UILightGreenStyle();
/// <summary> /// <summary>
/// 红 /// 红
/// </summary> /// </summary>
private static readonly UIBaseStyle Red = new UIRedStyle(); public static readonly UIBaseStyle Red = new UIRedStyle();
/// <summary>
/// 浅红
/// </summary>
private static readonly UIBaseStyle LightRed = new UILightRedStyle();
/// <summary> /// <summary>
/// 深蓝 /// 深蓝
@ -281,36 +202,16 @@ namespace Sunny.UI
/// </summary> /// </summary>
private static readonly UIBaseStyle Black = new UIBlackStyle(); private static readonly UIBaseStyle Black = new UIBlackStyle();
/// <summary>
/// Office蓝
/// </summary>
private static readonly UIBaseStyle Office2010Blue = new UIOffice2010BlueStyle();
/// <summary>
/// Office银
/// </summary>
private static readonly UIBaseStyle Office2010Silver = new UIOffice2010SilverStyle();
/// <summary> /// <summary>
/// 紫 /// 紫
/// </summary> /// </summary>
private static readonly UIBaseStyle Purple = new UIPurpleStyle(); private static readonly UIBaseStyle Purple = new UIPurpleStyle();
/// <summary>
/// 浅紫
/// </summary>
private static readonly UIBaseStyle LightPurple = new UILightPurpleStyle();
/// <summary> /// <summary>
/// 多彩 /// 多彩
/// </summary> /// </summary>
private static readonly UIColorfulStyle Colorful = new UIColorfulStyle(); private static readonly UIColorfulStyle Colorful = new UIColorfulStyle();
/// <summary>
/// Office黑
/// </summary>
private static readonly UIBaseStyle Office2010Black = new UIOffice2010BlackStyle();
public static void InitColorful(Color styleColor, Color foreColor) public static void InitColorful(Color styleColor, Color foreColor)
{ {
Colorful.Init(styleColor, foreColor); Colorful.Init(styleColor, foreColor);
@ -331,23 +232,14 @@ namespace Sunny.UI
{ {
AddStyle(Custom); AddStyle(Custom);
AddStyle(Blue); AddStyle(Blue);
AddStyle(LightBlue);
AddStyle(Orange); AddStyle(Orange);
AddStyle(LightOrange);
AddStyle(Gray); AddStyle(Gray);
AddStyle(LightGray);
AddStyle(Green); AddStyle(Green);
AddStyle(LightGreen);
AddStyle(Red); AddStyle(Red);
AddStyle(LightRed);
AddStyle(DarkBlue); AddStyle(DarkBlue);
AddStyle(Black); AddStyle(Black);
AddStyle(White); AddStyle(White);
AddStyle(Purple); AddStyle(Purple);
AddStyle(LightPurple);
AddStyle(Office2010Blue);
AddStyle(Office2010Silver);
AddStyle(Office2010Black);
AddStyle(Colorful); AddStyle(Colorful);
MenuColors.TryAdd(UIMenuStyle.Custom, new UIMenuCustomColor()); MenuColors.TryAdd(UIMenuStyle.Custom, new UIMenuCustomColor());
@ -568,7 +460,7 @@ namespace Sunny.UI
/// <summary> /// <summary>
/// 深蓝 /// 深蓝
/// </summary> /// </summary>
public static readonly Color DarkBlue = Color.FromArgb(26, 82, 137); public static readonly Color DarkBlue = Color.FromArgb(14, 30, 63);
/// <summary> /// <summary>
/// 白 /// 白

794
SunnyUI/Style/UIStyleColor.cs
View File

@ -18,6 +18,7 @@
* *
* 2020-01-01: V2.2.0 增加文件说明 * 2020-01-01: V2.2.0 增加文件说明
* 2020-04-25: V2.2.4 更新主题配置类 * 2020-04-25: V2.2.4 更新主题配置类
* 2022-03-19: V3.1.1 重构主题配色
******************************************************************************/ ******************************************************************************/
using System.Drawing; using System.Drawing;
@ -33,91 +34,310 @@ namespace Sunny.UI
public virtual Color SecondaryColor { get; protected set; } public virtual Color SecondaryColor { get; protected set; }
public virtual Color PlainColor { get; protected set; } public virtual Color PlainColor { get; protected set; }
public virtual Color RectColor { get; protected set; } public virtual Color FillDisableColor { get; protected set; }
public virtual Color RectHoverColor { get; protected set; } public virtual Color RectDisableColor { get; protected set; }
public virtual Color RectPressColor { get; protected set; } public virtual Color ForeDisableColor { get; protected set; }
public virtual Color RectSelectedColor { get; protected set; }
public virtual Color RectColor { get; protected set; }
//Button
public virtual Color ButtonFillColor { get; protected set; } public virtual Color ButtonFillColor { get; protected set; }
public virtual Color ButtonFillHoverColor { get; protected set; } public virtual Color ButtonFillHoverColor { get; protected set; }
public virtual Color ButtonFillPressColor { get; protected set; } public virtual Color ButtonFillPressColor { get; protected set; }
public virtual Color ButtonFillSelectedColor { get; protected set; } public virtual Color ButtonFillSelectedColor { get; protected set; }
public virtual Color ButtonFillColor2 { get; protected set; }
public virtual Color ButtonForeColor { get; protected set; } public virtual Color ButtonForeColor { get; protected set; }
public virtual Color ButtonForeHoverColor { get; protected set; } public virtual Color ButtonForeHoverColor { get; protected set; }
public virtual Color ButtonForePressColor { get; protected set; } public virtual Color ButtonForePressColor { get; protected set; }
public virtual Color ButtonForeSelectedColor { get; protected set; } public virtual Color ButtonForeSelectedColor { get; protected set; }
public virtual Color FillDisableColor => Color.FromArgb(244, 244, 244); public virtual Color ButtonRectColor { get; protected set; }
public virtual Color RectDisableColor => Color.FromArgb(173, 178, 181); public virtual Color ButtonRectHoverColor { get; protected set; }
public virtual Color ForeDisableColor => Color.FromArgb(109, 109, 103); public virtual Color ButtonRectPressColor { get; protected set; }
public virtual Color ButtonRectSelectedColor { get; protected set; }
public virtual Color LabelForeColor => UIFontColor.Primary; //Battery
public virtual Color BatteryFillColor { get; protected set; }
public virtual Color AvatarFillColor => Color.Silver; //Avatar
public virtual Color AvatarForeColor => PrimaryColor; public virtual Color AvatarFillColor { get; protected set; }
public virtual Color AvatarForeColor { get; protected set; }
public virtual Color CheckBoxColor => PrimaryColor; //ImageButton
public virtual Color CheckBoxForeColor => LabelForeColor; public virtual Color ImageButtonForeColor { get; protected set; }
public virtual Color PanelForeColor => LabelForeColor;
public virtual Color DropDownControlColor => PanelForeColor; //Breadcrumb
public virtual Color BreadcrumbUnSelectedColor { get; protected set; }
public virtual Color TitleColor { get; protected set; } //CheckBox
public virtual Color TitleForeColor { get; protected set; } public virtual Color CheckBoxColor { get; protected set; }
public virtual Color CheckBoxForeColor { get; protected set; }
public virtual Color MenuSelectedColor { get; protected set; } = UIColor.Blue; //Logo
public virtual Color LogoForeColor { get; protected set; }
public virtual Color LogoFillColor { get; protected set; }
public virtual Color GridSelectedColor { get; protected set; } = Color.FromArgb(155, 200, 255); //Line
public virtual Color LineForeColor { get; protected set; }
public virtual Color LineFillColor { get; protected set; }
public virtual Color LineRectColor { get; protected set; }
public virtual Color GridSelectedForeColor => UIFontColor.Primary; //TrackBar
public virtual Color GridStripeEvenColor => Color.White; public virtual Color TrackBarFillColor { get; protected set; }
public virtual Color GridStripeOddColor => PlainColor; public virtual Color TrackBarForeColor { get; protected set; }
public virtual Color TrackBarRectColor { get; protected set; }
public virtual Color TrackDisableColor { get; protected set; }
public virtual Color GridLineColor => Color.FromArgb(233, 236, 244); //Switch
public virtual Color SwitchActiveColor { get; protected set; }
public virtual Color SwitchInActiveColor { get; protected set; }
public virtual Color SwitchFillColor { get; protected set; }
public virtual Color SwitchRectDisableColor { get; protected set; }
public virtual Color ListItemSelectBackColor => PrimaryColor; //Label
public virtual Color ListItemSelectForeColor => PlainColor; public virtual Color LabelForeColor { get; protected set; }
public virtual Color LineForeColor => UIFontColor.Primary; //LabelRotate
public virtual Color LabelRotateFrameColor { get; protected set; }
public virtual Color LabelRotateForeColor { get; protected set; }
public virtual Color ContextMenuColor => PlainColor; //ColorWheel
public virtual Color ColorWheelFrameColor { get; protected set; }
public virtual Color ColorWheelBackColor { get; protected set; }
public virtual Color ProgressIndicatorColor => PrimaryColor; //ContextMenu
public virtual Color ContextMenuColor { get; protected set; }
public virtual Color ContextMenuSelectedColor { get; protected set; }
public virtual Color ProcessBarFillColor => PlainColor; //ScrollBar
public virtual Color ScrollBarFillColor { get; protected set; }
public virtual Color ScrollBarForeColor { get; protected set; }
public virtual Color ScrollBarFillHoverColor { get; protected set; }
public virtual Color ScrollBarFillPressColor { get; protected set; }
public virtual Color ProcessBarForeColor => PrimaryColor; //ProcessBar
public virtual Color ProcessBarFillColor { get; protected set; }
public virtual Color ProcessBarForeColor { get; protected set; }
public virtual Color ProcessBackColor { get; protected set; }
public virtual Color ScrollBarForeColor => PrimaryColor; //SmoothLabel
public virtual Color SmoothLabelForeColor { get; protected set; }
public virtual Color SmoothLabelRectColor { get; protected set; }
public virtual Color SwitchActiveColor => PrimaryColor; //ScrollingText
public virtual Color ScrollingTextFillColor { get; protected set; }
public virtual Color ScrollingTextForeColor { get; protected set; }
public virtual Color SwitchInActiveColor => Color.Gray; //LedLabel
public virtual Color LedLabelForeColor { get; protected set; }
public virtual Color SwitchFillColor => Color.White; //UIMarkLabel
public virtual Color MarkLabelForeColor { get; protected set; }
public virtual Color TrackBarFillColor => PlainColor; //Page
public virtual Color PageBackColor { get; protected set; }
public virtual Color PageRectColor { get; protected set; }
public virtual Color PageForeColor { get; protected set; }
public virtual Color PageTitleFillColor { get; protected set; }
public virtual Color PageTitleForeColor { get; protected set; }
public virtual Color TrackBarForeColor => PrimaryColor; //Form
public virtual Color FormTitleColor { get; protected set; }
public virtual Color FormTitleForeColor { get; protected set; }
public virtual Color FormForeColor { get; protected set; }
public virtual Color FormRectColor { get; protected set; }
public virtual Color FormControlBoxForeColor { get; protected set; }
public virtual Color FormControlBoxFillHoverColor { get; protected set; }
public virtual Color FormControlBoxCloseFillHoverColor { get; protected set; }
public virtual Color FormBackColor { get; protected set; }
public virtual Color TrackBarRectColor => PrimaryColor; //ProgressIndicator
public virtual Color ProgressIndicatorColor { get; protected set; }
public virtual Color TrackDisableColor => Color.Silver; //NavBar
public virtual Color NavBarMenuSelectedColor { get; protected set; }
public virtual Color PageTitleFillColor => Color.FromArgb(76, 76, 76); //NavMenu
public virtual Color NavMenuMenuSelectedColor { get; protected set; }
public virtual Color PageTitleForeColor => Color.White; //TabControl
public virtual Color TabControlTabSelectedColor { get; protected set; }
public virtual Color TabControlBackColor { get; protected set; }
public virtual Color TreeViewSelectedColor => PrimaryColor; //Panel
public virtual Color PanelForeColor { get; protected set; }
public virtual Color PanelRectColor { get; protected set; }
public virtual Color PanelFillColor { get; protected set; }
public virtual Color PanelFillColor2 { get; protected set; }
public virtual Color PanelTitleColor { get; protected set; }
public virtual Color PanelTitleForeColor { get; protected set; }
public virtual Color TreeViewHoverColor => GridSelectedColor; //DrawDownControl
public virtual Color DropDownControlColor { get; protected set; }
public virtual bool BuiltIn => true; //ListBox
public virtual Color ListItemSelectBackColor { get; protected set; }
public virtual Color ListItemSelectForeColor { get; protected set; }
public virtual Color ListItemHoverColor { get; protected set; }
public virtual Color EditorBackColor => Color.White; //TreeView
public virtual Color TreeViewSelectedColor { get; protected set; }
public virtual Color TreeViewHoverColor { get; protected set; }
public virtual Color ButtonFillColor2 => ButtonFillColor; //TextBox
public virtual Color EditorBackColor { get; protected set; }
//DataGridView
public virtual Color GridSelectedColor { get; protected set; }
public virtual Color GridSelectedForeColor { get; protected set; }
public virtual Color GridStripeEvenColor { get; protected set; }
public virtual Color GridStripeOddColor { get; protected set; }
public virtual Color GridLineColor { get; protected set; }
public virtual Color GridTitleColor { get; protected set; }
public virtual Color GridTitleForeColor { get; protected set; }
protected virtual void Init(Color color, UIStyle style, Color foreColor)
{
Name = style;
FillDisableColor = Color.FromArgb(244, 244, 244);
RectDisableColor = Color.FromArgb(173, 178, 181);
ForeDisableColor = Color.FromArgb(109, 109, 103);
PrimaryColor = color;
RectColor = color;
Color[] colors = Color.White.GradientColors(PrimaryColor, 16);
Color[] colors1 = PrimaryColor.GradientColors(Color.Black, 16);
PlainColor = colors[1];
SecondaryColor = colors[5];
RegularColor = colors[10];
GridSelectedColor = colors[3];
GridSelectedForeColor = UIFontColor.Primary;
GridStripeEvenColor = foreColor;
GridStripeOddColor = PlainColor;
GridLineColor = PrimaryColor;
GridTitleColor = PrimaryColor;
GridTitleForeColor = foreColor;
FormTitleColor = PrimaryColor;
FormTitleForeColor = foreColor;
FormForeColor = UIFontColor.Primary;
FormRectColor = PrimaryColor;
FormControlBoxFillHoverColor = colors[12];
FormControlBoxCloseFillHoverColor = UIColor.Red;
FormBackColor = PlainColor;
FormControlBoxForeColor = Color.White;
PanelForeColor = UIFontColor.Primary;
PanelRectColor = PrimaryColor;
PanelFillColor = PlainColor;
PanelFillColor2 = PlainColor;
PanelTitleColor = PrimaryColor;
PanelTitleForeColor = foreColor;
ButtonFillColor = PrimaryColor;
ButtonFillHoverColor = colors[12];
ButtonFillPressColor = colors1[3];
ButtonFillSelectedColor = colors1[3];
ButtonFillColor2 = ButtonFillColor;
ButtonForeColor = foreColor;
ButtonForeHoverColor = foreColor;
ButtonForePressColor = foreColor;
ButtonForeSelectedColor = foreColor;
ButtonRectColor = PrimaryColor;
ButtonRectHoverColor = colors[12];
ButtonRectSelectedColor = colors1[3];
ButtonRectPressColor = colors1[3];
BatteryFillColor = PlainColor;
BreadcrumbUnSelectedColor = colors[6];
AvatarFillColor = Color.Silver;
AvatarForeColor = PrimaryColor;
ImageButtonForeColor = UIFontColor.Primary;
CheckBoxColor = PrimaryColor;
CheckBoxForeColor = UIFontColor.Primary;
LogoForeColor = UIFontColor.Primary;
LogoFillColor = PrimaryColor;
LineForeColor = UIFontColor.Primary;
LineFillColor = PlainColor;
LineRectColor = PrimaryColor;
TrackBarFillColor = PlainColor;
TrackBarForeColor = PrimaryColor;
TrackBarRectColor = PrimaryColor;
TrackDisableColor = Color.Silver;
SwitchActiveColor = PrimaryColor;
SwitchInActiveColor = Color.Gray;
SwitchFillColor = Color.White;
SwitchRectDisableColor = RectDisableColor;
LabelForeColor = UIFontColor.Primary;
LabelRotateFrameColor = ButtonRectColor;
LabelRotateForeColor = UIFontColor.Primary;
ColorWheelFrameColor = ButtonRectColor;
ColorWheelBackColor = PlainColor;
ContextMenuColor = PlainColor;
ContextMenuSelectedColor = PrimaryColor;
ScrollBarFillColor = PlainColor;
ScrollBarForeColor = PrimaryColor;
ScrollBarFillHoverColor = ButtonFillHoverColor;
ScrollBarFillPressColor = ButtonFillPressColor;
ProcessBarFillColor = PlainColor;
ProcessBarForeColor = PrimaryColor;
ProcessBackColor = colors[6];
SmoothLabelForeColor = ButtonForeColor;
SmoothLabelRectColor = ButtonRectColor;
ScrollingTextFillColor = PlainColor;
ScrollingTextForeColor = PrimaryColor;
LedLabelForeColor = PrimaryColor;
MarkLabelForeColor = PrimaryColor;
PageBackColor = PlainColor;
PageRectColor = PrimaryColor;
PageForeColor = UIFontColor.Primary;
PageTitleFillColor = Color.FromArgb(76, 76, 76);
PageTitleForeColor = Color.White;
ProgressIndicatorColor = PrimaryColor;
NavBarMenuSelectedColor = PrimaryColor;
TabControlTabSelectedColor = PrimaryColor;
TabControlBackColor = PlainColor;
DropDownControlColor = UIFontColor.Primary;
ListItemSelectBackColor = PrimaryColor;
ListItemSelectForeColor = PlainColor;
ListItemHoverColor = colors[3];
TreeViewSelectedColor = PrimaryColor;
TreeViewHoverColor = colors[3];
EditorBackColor = UIColor.White;
NavMenuMenuSelectedColor = PrimaryColor;
}
public virtual void LoadFromFile() public virtual void LoadFromFile()
{ {
@ -128,38 +348,7 @@ namespace Sunny.UI
return Name.DisplayText(); return Name.DisplayText();
} }
protected virtual void Init(Color color, UIStyle style, Color foreColor) public virtual bool BuiltIn => true;
{
Name = style;
MenuSelectedColor = TitleColor = RectColor = PrimaryColor = color;
Color[] colors = Color.White.GradientColors(PrimaryColor, 16);
Color[] colors1 = PrimaryColor.GradientColors(Color.Black, 16);
PlainColor = colors[1];
SecondaryColor = colors[5];
RegularColor = colors[10];
ButtonFillColor = PrimaryColor;
RectHoverColor = ButtonFillHoverColor = colors[12];
RectSelectedColor = RectPressColor = ButtonFillSelectedColor = ButtonFillPressColor = colors1[3];
GridSelectedColor = colors[3];
ButtonForeColor = ButtonForeHoverColor = ButtonForePressColor = ButtonForeSelectedColor = TitleForeColor = foreColor;
}
protected virtual void InitPlain(Color color, UIStyle style, Color foreColor)
{
Name = style;
MenuSelectedColor = RectColor = RectHoverColor = TitleColor = ButtonForeColor = ButtonFillHoverColor = PrimaryColor = color;
Color[] colors = Color.White.GradientColors(PrimaryColor, 16);
Color[] colors1 = PrimaryColor.GradientColors(Color.Black, 16);
ButtonFillColor = PlainColor = colors[1];
SecondaryColor = colors[5];
RegularColor = colors[10];
ButtonFillSelectedColor = RectPressColor = RectSelectedColor = ButtonFillPressColor = colors1[3];
GridSelectedColor = colors[3];
ButtonForeHoverColor = ButtonForePressColor = ButtonForeSelectedColor = TitleForeColor = foreColor;
}
} }
public class UIPurpleStyle : UIBaseStyle public class UIPurpleStyle : UIBaseStyle
@ -170,14 +359,6 @@ namespace Sunny.UI
} }
} }
public class UILightPurpleStyle : UIBaseStyle
{
public UILightPurpleStyle()
{
base.InitPlain(UIColor.Purple, UIStyle.LightPurple, Color.White);
}
}
public class UIColorfulStyle : UIBaseStyle public class UIColorfulStyle : UIBaseStyle
{ {
public UIColorfulStyle() public UIColorfulStyle()
@ -196,448 +377,67 @@ namespace Sunny.UI
public override UIStyle Name => UIStyle.Custom; public override UIStyle Name => UIStyle.Custom;
} }
public class UIOffice2010BlueStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.Office2010Blue;
public override Color PrimaryColor => Color.FromArgb(120, 148, 182);
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => Color.FromArgb(207, 221, 238);
public override Color ButtonFillColor => Color.FromArgb(217, 230, 243);
public override Color ButtonFillHoverColor => Color.FromArgb(249, 226, 137);
public override Color ButtonFillPressColor => Color.FromArgb(255, 228, 137);
public override Color ButtonForeColor => Color.FromArgb(30, 57, 91);
public override Color ButtonForeHoverColor => Color.FromArgb(30, 57, 91);
public override Color ButtonForePressColor => Color.FromArgb(30, 57, 91);
public override Color RectColor => Color.FromArgb(180, 192, 211);
public override Color RectHoverColor => Color.FromArgb(238, 201, 88);
public override Color RectPressColor => Color.FromArgb(194, 118, 43);
public override Color TitleColor => Color.FromArgb(191, 210, 233);
public override Color TitleForeColor => Color.FromArgb(30, 57, 91);
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
}
public class UIOffice2010SilverStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.Office2010Silver;
public override Color PrimaryColor => Color.FromArgb(139, 144, 151);
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => Color.FromArgb(224, 228, 233);
public override Color ButtonFillColor => Color.FromArgb(247, 248, 249);
public override Color ButtonFillHoverColor => Color.FromArgb(249, 226, 137);
public override Color ButtonFillPressColor => Color.FromArgb(255, 228, 137);
public override Color ButtonForeColor => Color.FromArgb(46, 46, 46);
public override Color ButtonForeHoverColor => Color.FromArgb(46, 46, 46);
public override Color ButtonForePressColor => Color.FromArgb(46, 46, 46);
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => Color.FromArgb(139, 144, 151);
public override Color RectHoverColor => Color.FromArgb(238, 201, 88);
public override Color RectPressColor => Color.FromArgb(194, 118, 43);
public override Color TitleColor => Color.Silver;
public override Color TitleForeColor => Color.FromArgb(46, 46, 46);
}
public class UIOffice2010BlackStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.Office2010Black;
public override Color PrimaryColor => Color.FromArgb(49, 49, 49);
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => Color.FromArgb(211, 211, 211);
public override Color ButtonFillColor => Color.FromArgb(211, 211, 211);
public override Color ButtonFillHoverColor => Color.FromArgb(249, 226, 137);
public override Color ButtonFillPressColor => Color.FromArgb(255, 228, 137);
public override Color ButtonForeColor => Color.Black;
public override Color ButtonForeHoverColor => Color.FromArgb(70, 70, 70);
public override Color ButtonForePressColor => Color.FromArgb(70, 70, 70);
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => Color.FromArgb(145, 145, 145);
public override Color RectHoverColor => Color.FromArgb(238, 201, 88);
public override Color RectPressColor => Color.FromArgb(194, 118, 43);
public override Color AvatarFillColor => Color.FromArgb(148, 148, 148);
public override Color TitleColor => Color.FromArgb(118, 118, 118);
public override Color TitleForeColor => Color.Black;
}
public class UIBlueStyle : UIBaseStyle public class UIBlueStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Blue; public UIBlueStyle()
public override Color PrimaryColor => UIColor.Blue; {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Blue, UIStyle.Blue, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => UIColor.LightBlue;
public override Color ButtonFillColor => UIColor.Blue;
public override Color ButtonFillHoverColor => Color.FromArgb(111, 168, 255);
public override Color ButtonFillPressColor => Color.FromArgb(74, 131, 229);
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Blue;
public override Color RectHoverColor => Color.FromArgb(111, 168, 255);
public override Color RectPressColor => Color.FromArgb(74, 131, 229);
public override Color TitleColor => UIColor.Blue;
public override Color TitleForeColor => Color.White;
}
public class UILightBlueStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.LightBlue;
public override Color PrimaryColor => UIColor.Blue;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => UIColor.LightBlue;
public override Color ButtonFillColor => UIColor.LightBlue;
public override Color ButtonFillHoverColor => UIColor.Blue;
public override Color ButtonFillPressColor => Color.FromArgb(74, 131, 229);
public override Color ButtonForeColor => UIColor.Blue;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Blue;
public override Color RectHoverColor => UIColor.Blue;
public override Color RectPressColor => Color.FromArgb(74, 131, 229);
public override Color TitleColor => UIColor.Blue;
public override Color TitleForeColor => Color.White;
} }
public class UIGreenStyle : UIBaseStyle public class UIGreenStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Green; public UIGreenStyle()
public override Color PrimaryColor => UIColor.Green; {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Green, UIStyle.Green, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => UIColor.LightGreen;
public override Color ButtonFillColor => UIColor.Green;
public override Color ButtonFillHoverColor => Color.FromArgb(136, 202, 81);
public override Color ButtonFillPressColor => Color.FromArgb(100, 168, 35);
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Green;
public override Color RectHoverColor => Color.FromArgb(136, 202, 81);
public override Color RectPressColor => Color.FromArgb(100, 168, 35);
public override Color TitleColor => UIColor.Green;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Green;
public override Color GridSelectedColor => Color.FromArgb(173, 227, 123);
}
public class UILightGreenStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.LightGreen;
public override Color PrimaryColor => UIColor.Green;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => UIColor.LightGreen;
public override Color ButtonFillColor => UIColor.LightGreen;
public override Color ButtonFillHoverColor => UIColor.Green;
public override Color ButtonFillPressColor => Color.FromArgb(100, 168, 35);
public override Color ButtonForeColor => UIColor.Green;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Green;
public override Color RectHoverColor => UIColor.Green;
public override Color RectPressColor => Color.FromArgb(100, 168, 35);
public override Color TitleColor => UIColor.Green;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Green;
public override Color GridSelectedColor => Color.FromArgb(173, 227, 123);
} }
public class UIRedStyle : UIBaseStyle public class UIRedStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Red; public UIRedStyle()
public override Color PrimaryColor => UIColor.Red; {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Red, UIStyle.Red, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => UIColor.LightRed;
public override Color ButtonFillColor => UIColor.Red;
public override Color ButtonFillHoverColor => Color.FromArgb(232, 127, 128);
public override Color ButtonFillPressColor => Color.FromArgb(202, 87, 89);
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Red;
public override Color RectHoverColor => Color.FromArgb(232, 127, 128);
public override Color RectPressColor => Color.FromArgb(202, 87, 89);
public override Color TitleColor => UIColor.Red;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Red;
public override Color GridSelectedColor => Color.FromArgb(241, 160, 160);
}
public class UILightRedStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.LightRed;
public override Color PrimaryColor => UIColor.Red;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => UIColor.LightRed;
public override Color ButtonFillColor => UIColor.LightRed;
public override Color ButtonFillHoverColor => UIColor.Red;
public override Color ButtonFillPressColor => Color.FromArgb(202, 87, 89);
public override Color ButtonForeColor => UIColor.Red;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Red;
public override Color RectHoverColor => UIColor.Red;
public override Color RectPressColor => Color.FromArgb(202, 87, 89);
public override Color TitleColor => UIColor.Red;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Red;
public override Color GridSelectedColor => Color.FromArgb(241, 160, 160);
} }
public class UIOrangeStyle : UIBaseStyle public class UIOrangeStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Orange; public UIOrangeStyle()
public override Color PrimaryColor => UIColor.Orange; {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Orange, UIStyle.Orange, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => UIColor.LightOrange;
public override Color ButtonFillColor => UIColor.Orange;
public override Color ButtonFillHoverColor => Color.FromArgb(223, 174, 86);
public override Color ButtonFillPressColor => Color.FromArgb(192, 137, 43);
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Orange;
public override Color RectHoverColor => Color.FromArgb(223, 174, 86);
public override Color RectPressColor => Color.FromArgb(192, 137, 43);
public override Color TitleColor => UIColor.Orange;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Orange;
public override Color GridSelectedColor => Color.FromArgb(238, 207, 151);
}
public class UILightOrangeStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.LightOrange;
public override Color PrimaryColor => UIColor.Orange;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => UIColor.LightOrange;
public override Color ButtonFillColor => UIColor.LightOrange;
public override Color ButtonFillHoverColor => UIColor.Orange;
public override Color ButtonFillPressColor => Color.FromArgb(192, 137, 43);
public override Color ButtonForeColor => UIColor.Orange;
public override Color ButtonForeHoverColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color ButtonForePressColor => Color.White;
public override Color RectColor => UIColor.Orange;
public override Color RectHoverColor => UIColor.Orange;
public override Color RectPressColor => Color.FromArgb(192, 137, 43);
public override Color TitleColor => UIColor.Orange;
public override Color TitleForeColor => Color.White;
public override Color MenuSelectedColor => UIColor.Orange;
public override Color GridSelectedColor => Color.FromArgb(238, 207, 151);
} }
public class UIGrayStyle : UIBaseStyle public class UIGrayStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Gray; public UIGrayStyle()
public override Color PrimaryColor => UIColor.Gray; {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Gray, UIStyle.Gray, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => UIColor.LightGray;
public override Color ButtonFillColor => UIColor.Gray;
public override Color ButtonFillHoverColor => Color.FromArgb(158, 160, 165);
public override Color ButtonFillPressColor => Color.FromArgb(121, 123, 129);
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Gray;
public override Color RectHoverColor => Color.FromArgb(158, 160, 165);
public override Color RectPressColor => Color.FromArgb(121, 123, 129);
public override Color TitleColor => UIColor.Gray;
public override Color TitleForeColor => Color.White;
public override Color GridSelectedColor => Color.Silver;
}
public class UILightGrayStyle : UIBaseStyle
{
public override UIStyle Name => UIStyle.LightGray;
public override Color PrimaryColor => UIColor.Gray;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color PlainColor => UIColor.LightGray;
public override Color ButtonFillColor => UIColor.LightGray;
public override Color ButtonFillHoverColor => UIColor.Gray;
public override Color ButtonFillPressColor => Color.FromArgb(121, 123, 129);
public override Color ButtonForeColor => UIColor.Gray;
public override Color ButtonForeHoverColor => Color.White;
public override Color ButtonForePressColor => Color.White;
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => UIColor.Gray;
public override Color RectHoverColor => UIColor.Gray;
public override Color RectPressColor => Color.FromArgb(121, 123, 129);
public override Color TitleColor => UIColor.Gray;
public override Color TitleForeColor => Color.White;
public override Color GridSelectedColor => Color.Silver;
} }
public class UIWhiteStyle : UIBaseStyle public class UIWhiteStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.White; public UIWhiteStyle()
public override Color PrimaryColor => Color.FromArgb(216, 219, 227); {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.White, UIStyle.White, Color.Black);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => Color.White;
public override Color ButtonFillColor => Color.White;
public override Color ButtonFillHoverColor => UIColor.LightBlue;
public override Color ButtonFillPressColor => UIColor.LightBlue;
public override Color ButtonForeColor => Color.FromArgb(0x60, 0x62, 0x66);
public override Color ButtonForeHoverColor => UIColor.Blue;
public override Color ButtonForePressColor => Color.FromArgb(74, 131, 229);
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => Color.FromArgb(216, 219, 227);
public override Color RectHoverColor => Color.FromArgb(197, 222, 255);
public override Color RectPressColor => Color.FromArgb(74, 131, 229);
public override Color AvatarFillColor => Color.FromArgb(130, 130, 130);
public override Color TitleColor => Color.FromArgb(216, 219, 227);
public override Color TitleForeColor => Color.FromArgb(0x60, 0x62, 0x66);
} }
public class UIDarkBlueStyle : UIBaseStyle public class UIDarkBlueStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.DarkBlue; public UIDarkBlueStyle()
public override Color ButtonFillColor => Color.FromArgb(26, 82, 137); {
public override Color ButtonFillColor2 => Color.FromArgb(4, 41, 87); base.Init(UIColor.DarkBlue, UIStyle.DarkBlue, Color.White);
public override Color ButtonFillHoverColor => Color.FromArgb(15, 61, 112); }
public override Color ButtonFillPressColor => Color.FromArgb(4, 41, 87);
public override Color ButtonFillSelectedColor => this.ButtonFillPressColor;
public override Color ButtonForeColor => Color.FromArgb(157, 197, 205);
public override Color ButtonForeHoverColor => UIFontColor.Primary;
public override Color ButtonForePressColor => UIFontColor.Primary;
public override Color ButtonForeSelectedColor => UIFontColor.Primary;
public override Color CheckBoxColor => UIColor.Blue;
public override Color ContextMenuColor => UIColor.RegularGray;
public override Color DropDownControlColor => this.ButtonForeColor;
public override Color GridSelectedColor => UIFontColor.Plain;
public override Color GridSelectedForeColor => UIColor.White;
public override Color GridStripeOddColor => UIColor.RegularGray;
public override Color LabelForeColor => this.ButtonForeColor;
public override Color LineForeColor => this.ButtonForeColor;
public override Color ListItemSelectBackColor => UIColor.Blue;
public override Color ListItemSelectForeColor => UIColor.LightBlue;
public override Color PlainColor => UIColor.DarkBlue;
public override Color PrimaryColor => UIColor.DarkBlue;
public override Color ProcessBarFillColor => this.PlainColor;
public override Color ProcessBarForeColor => UIColor.RegularGray;
public override Color ProgressIndicatorColor => UIColor.Blue;
public override Color RectColor => Color.FromArgb(110, 202, 236);
public override Color RectHoverColor => this.RectColor;
public override Color RectPressColor => this.RectColor;
public override Color RectSelectedColor => this.RectColor;
public override Color RegularColor => Color.FromArgb(120, 148, 182);
public override Color ScrollBarForeColor => UIColor.RegularGray;
public override Color SecondaryColor => Color.FromArgb(120, 148, 182);
public override Color SwitchActiveColor => UIColor.DarkBlue;
public override Color SwitchFillColor => Color.White;
public override Color SwitchInActiveColor => UIFontColor.Plain;
public override Color TitleColor => this.PrimaryColor;
public override Color TitleForeColor => this.ButtonForeColor;
public override Color TrackBarForeColor => UIColor.Blue;
public override Color TrackBarRectColor => UIColor.Blue;
public override Color TrackDisableColor => Color.Silver;
public override Color TreeViewHoverColor => UIFontColor.Plain;
public override Color TreeViewSelectedColor => UIFontColor.Secondary;
} }
public class UIBlackStyle : UIBaseStyle public class UIBlackStyle : UIBaseStyle
{ {
public override UIStyle Name => UIStyle.Black; public UIBlackStyle()
public override Color PrimaryColor => Color.FromArgb(24, 24, 24); {
public override Color RegularColor => Color.FromArgb(120, 148, 182); base.Init(UIColor.Black, UIStyle.Black, Color.White);
public override Color SecondaryColor => Color.FromArgb(120, 148, 182); }
public override Color PlainColor => Color.FromArgb(24, 24, 24);
public override Color ButtonFillColor => UIColor.DarkBlue;
public override Color ButtonFillHoverColor => UIColor.RegularBlue;
public override Color ButtonFillPressColor => UIColor.LightBlue;
public override Color ButtonForeColor => Color.White;
public override Color ButtonForeHoverColor => Color.FromArgb(130, 130, 130);
public override Color ButtonForePressColor => Color.FromArgb(130, 130, 130);
public override Color RectSelectedColor => RectPressColor;
public override Color ButtonForeSelectedColor => ButtonForePressColor;
public override Color ButtonFillSelectedColor => ButtonFillPressColor;
public override Color RectColor => Color.FromArgb(130, 130, 130);
public override Color RectHoverColor => Color.FromArgb(130, 130, 130);
public override Color RectPressColor => Color.FromArgb(130, 130, 130);
public override Color LabelForeColor => UIFontColor.Plain;
public override Color DropDownControlColor => UIFontColor.Primary;
public override Color CheckBoxColor => UIColor.Blue;
public override Color TitleColor => Color.FromArgb(130, 130, 130);
public override Color TitleForeColor => Color.White;
public override Color LineForeColor => UIFontColor.Plain;
public override Color ContextMenuColor => UIColor.RegularGray;
public override Color GridStripeOddColor => UIColor.RegularGray;
public override Color GridSelectedColor => UIFontColor.Plain;
public override Color GridSelectedForeColor => UIColor.White;
public override Color ListItemSelectBackColor => UIColor.Blue;
public override Color ListItemSelectForeColor => UIColor.LightBlue;
public override Color ProgressIndicatorColor => UIColor.Blue;
public override Color ProcessBarFillColor => PlainColor;
public override Color ProcessBarForeColor => UIColor.RegularGray;
public override Color ScrollBarForeColor => UIColor.RegularGray;
public override Color SwitchActiveColor => UIColor.DarkBlue;
public override Color SwitchInActiveColor => UIFontColor.Plain;
public override Color SwitchFillColor => Color.White;
public override Color TrackBarForeColor => UIColor.Blue;
public override Color TrackBarRectColor => UIColor.Blue;
public override Color TrackDisableColor => Color.Silver;
public override Color TreeViewSelectedColor => UIFontColor.Secondary;
public override Color TreeViewHoverColor => UIFontColor.Plain;
} }
} }