diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 12eb8bf2..9ec89781 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 38edfda8..c66985ae 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 701cabdf..2be3dfb5 100644 Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll index 5350c152..89622a1f 100644 Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index 3f2a603d..296e4a99 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FButton.Designer.cs b/SunnyUI.Demo/Controls/FButton.Designer.cs index cef7e927..0979a24d 100644 --- a/SunnyUI.Demo/Controls/FButton.Designer.cs +++ b/SunnyUI.Demo/Controls/FButton.Designer.cs @@ -663,10 +663,12 @@ this.uiSymbolButton8.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton8.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton8.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton8.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.uiSymbolButton8.IsCircle = true; this.uiSymbolButton8.Location = new System.Drawing.Point(194, 280); this.uiSymbolButton8.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton8.Name = "uiSymbolButton8"; + this.uiSymbolButton8.Padding = new System.Windows.Forms.Padding(7, 9, 0, 0); this.uiSymbolButton8.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiSymbolButton8.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiSymbolButton8.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); @@ -685,10 +687,12 @@ this.uiSymbolButton9.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton9.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton9.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton9.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.uiSymbolButton9.IsCircle = true; this.uiSymbolButton9.Location = new System.Drawing.Point(153, 280); this.uiSymbolButton9.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton9.Name = "uiSymbolButton9"; + this.uiSymbolButton9.Padding = new System.Windows.Forms.Padding(6, 8, 0, 0); this.uiSymbolButton9.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiSymbolButton9.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiSymbolButton9.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); @@ -704,10 +708,12 @@ this.uiSymbolButton10.Cursor = System.Windows.Forms.Cursors.Hand; this.uiSymbolButton10.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton10.ForeSelectedColor = System.Drawing.Color.Empty; + this.uiSymbolButton10.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.uiSymbolButton10.IsCircle = true; this.uiSymbolButton10.Location = new System.Drawing.Point(112, 280); this.uiSymbolButton10.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton10.Name = "uiSymbolButton10"; + this.uiSymbolButton10.Padding = new System.Windows.Forms.Padding(6, 9, 0, 0); this.uiSymbolButton10.RectSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton10.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton10.StyleCustomMode = true; @@ -721,10 +727,12 @@ this.uiSymbolButton11.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton11.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton11.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton11.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.uiSymbolButton11.IsCircle = true; this.uiSymbolButton11.Location = new System.Drawing.Point(71, 280); this.uiSymbolButton11.MinimumSize = new System.Drawing.Size(1, 1); this.uiSymbolButton11.Name = "uiSymbolButton11"; + this.uiSymbolButton11.Padding = new System.Windows.Forms.Padding(7, 10, 0, 0); this.uiSymbolButton11.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton11.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton11.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); @@ -1159,7 +1167,6 @@ // FButton // this.AlwaysOpen = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(800, 534); this.Name = "FButton"; diff --git a/SunnyUI.Demo/Controls/FCombobox.Designer.cs b/SunnyUI.Demo/Controls/FCombobox.Designer.cs index f7733aa2..1fcf0700 100644 --- a/SunnyUI.Demo/Controls/FCombobox.Designer.cs +++ b/SunnyUI.Demo/Controls/FCombobox.Designer.cs @@ -28,54 +28,54 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode61 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode62 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode63 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode64 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode57 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode58 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode59 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode60 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode33, - treeNode34, - treeNode35, - treeNode36}); - System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("节点4"); - System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("节点5"); - System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("节点6"); - System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("节点7"); - System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode38, - treeNode39, - treeNode40, - treeNode41}); - System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("节点00"); - System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("节点01"); - System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("节点02"); - System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("节点03"); - System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode45, - treeNode46, - treeNode47, - treeNode48}); - System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("节点11"); - System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("节点12"); - System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("节点13"); - System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("节点14"); - System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode50, - treeNode51, - treeNode52, - treeNode53}); - System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode1, + treeNode2, + treeNode3, + treeNode4}); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("节点4"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("节点5"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("节点6"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("节点7"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode6, + treeNode7, + treeNode8, + treeNode9}); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("节点00"); + System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("节点01"); + System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("节点02"); + System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("节点03"); + System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode13, + treeNode14, + treeNode15, + treeNode16}); + System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("节点11"); + System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("节点12"); + System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("节点13"); + System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("节点14"); + System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode18, + treeNode19, + treeNode20, + treeNode21}); + System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("节点3"); this.uiLine8 = new Sunny.UI.UILine(); this.uiDatetimePicker1 = new Sunny.UI.UIDatetimePicker(); this.uiColorPicker1 = new Sunny.UI.UIColorPicker(); @@ -119,6 +119,7 @@ this.PagePanel.Controls.Add(this.uiDatePicker1); this.PagePanel.Controls.Add(this.uiComboBox2); this.PagePanel.Controls.Add(this.uiComboBox1); + this.PagePanel.Size = new System.Drawing.Size(800, 415); // // uiLine8 // @@ -300,19 +301,19 @@ this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView1.Name = "uiComboTreeView1"; - treeNode61.Name = "节点0"; - treeNode61.Text = "节点0"; - treeNode62.Name = "节点1"; - treeNode62.Text = "节点1"; - treeNode63.Name = "节点2"; - treeNode63.Text = "节点2"; - treeNode64.Name = "节点3"; - treeNode64.Text = "节点3"; + treeNode29.Name = "节点0"; + treeNode29.Text = "节点0"; + treeNode30.Name = "节点1"; + treeNode30.Text = "节点1"; + treeNode31.Name = "节点2"; + treeNode31.Text = "节点2"; + treeNode32.Name = "节点3"; + treeNode32.Text = "节点3"; this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode61, - treeNode62, - treeNode63, - treeNode64}); + treeNode29, + treeNode30, + treeNode31, + treeNode32}); this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView1.TabIndex = 43; @@ -340,19 +341,19 @@ this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView2.Name = "uiComboTreeView2"; - treeNode57.Name = "节点0"; - treeNode57.Text = "节点0"; - treeNode58.Name = "节点1"; - treeNode58.Text = "节点1"; - treeNode59.Name = "节点2"; - treeNode59.Text = "节点2"; - treeNode60.Name = "节点3"; - treeNode60.Text = "节点3"; + treeNode25.Name = "节点0"; + treeNode25.Text = "节点0"; + treeNode26.Name = "节点1"; + treeNode26.Text = "节点1"; + treeNode27.Name = "节点2"; + treeNode27.Text = "节点2"; + treeNode28.Name = "节点3"; + treeNode28.Text = "节点3"; this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode57, - treeNode58, - treeNode59, - treeNode60}); + treeNode25, + treeNode26, + treeNode27, + treeNode28}); this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView2.TabIndex = 46; @@ -369,35 +370,35 @@ this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView3.Name = "uiComboTreeView3"; - treeNode33.Name = "节点0"; - treeNode33.Text = "节点0"; - treeNode34.Name = "节点1"; - treeNode34.Text = "节点1"; - treeNode35.Name = "节点2"; - treeNode35.Text = "节点2"; - treeNode36.Name = "节点3"; - treeNode36.Text = "节点3"; - treeNode37.Name = "节点0"; - treeNode37.Text = "节点0"; - treeNode38.Name = "节点4"; - treeNode38.Text = "节点4"; - treeNode39.Name = "节点5"; - treeNode39.Text = "节点5"; - treeNode40.Name = "节点6"; - treeNode40.Text = "节点6"; - treeNode41.Name = "节点7"; - treeNode41.Text = "节点7"; - treeNode42.Name = "节点1"; - treeNode42.Text = "节点1"; - treeNode43.Name = "节点2"; - treeNode43.Text = "节点2"; - treeNode44.Name = "节点3"; - treeNode44.Text = "节点3"; + treeNode1.Name = "节点0"; + treeNode1.Text = "节点0"; + treeNode2.Name = "节点1"; + treeNode2.Text = "节点1"; + treeNode3.Name = "节点2"; + treeNode3.Text = "节点2"; + treeNode4.Name = "节点3"; + treeNode4.Text = "节点3"; + treeNode5.Name = "节点0"; + treeNode5.Text = "节点0"; + treeNode6.Name = "节点4"; + treeNode6.Text = "节点4"; + treeNode7.Name = "节点5"; + treeNode7.Text = "节点5"; + treeNode8.Name = "节点6"; + treeNode8.Text = "节点6"; + treeNode9.Name = "节点7"; + treeNode9.Text = "节点7"; + treeNode10.Name = "节点1"; + treeNode10.Text = "节点1"; + treeNode11.Name = "节点2"; + treeNode11.Text = "节点2"; + treeNode12.Name = "节点3"; + treeNode12.Text = "节点3"; this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode37, - treeNode42, - treeNode43, - treeNode44}); + treeNode5, + treeNode10, + treeNode11, + treeNode12}); this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView3.ShowLines = true; this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29); @@ -413,35 +414,35 @@ this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView4.Name = "uiComboTreeView4"; - treeNode45.Name = "节点0"; - treeNode45.Text = "节点00"; - treeNode46.Name = "节点1"; - treeNode46.Text = "节点01"; - treeNode47.Name = "节点2"; - treeNode47.Text = "节点02"; - treeNode48.Name = "节点3"; - treeNode48.Text = "节点03"; - treeNode49.Name = "节点0"; - treeNode49.Text = "节点0"; - treeNode50.Name = "节点4"; - treeNode50.Text = "节点11"; - treeNode51.Name = "节点5"; - treeNode51.Text = "节点12"; - treeNode52.Name = "节点6"; - treeNode52.Text = "节点13"; - treeNode53.Name = "节点7"; - treeNode53.Text = "节点14"; - treeNode54.Name = "节点1"; - treeNode54.Text = "节点1"; - treeNode55.Name = "节点2"; - treeNode55.Text = "节点2"; - treeNode56.Name = "节点3"; - treeNode56.Text = "节点3"; + treeNode13.Name = "节点0"; + treeNode13.Text = "节点00"; + treeNode14.Name = "节点1"; + treeNode14.Text = "节点01"; + treeNode15.Name = "节点2"; + treeNode15.Text = "节点02"; + treeNode16.Name = "节点3"; + treeNode16.Text = "节点03"; + treeNode17.Name = "节点0"; + treeNode17.Text = "节点0"; + treeNode18.Name = "节点4"; + treeNode18.Text = "节点11"; + treeNode19.Name = "节点5"; + treeNode19.Text = "节点12"; + treeNode20.Name = "节点6"; + treeNode20.Text = "节点13"; + treeNode21.Name = "节点7"; + treeNode21.Text = "节点14"; + treeNode22.Name = "节点1"; + treeNode22.Text = "节点1"; + treeNode23.Name = "节点2"; + treeNode23.Text = "节点2"; + treeNode24.Name = "节点3"; + treeNode24.Text = "节点3"; this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode49, - treeNode54, - treeNode55, - treeNode56}); + treeNode17, + treeNode22, + treeNode23, + treeNode24}); this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView4.ShowLines = true; this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29); @@ -492,7 +493,6 @@ // // FCombobox // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(800, 450); this.Name = "FCombobox"; diff --git a/SunnyUI/Controls/DropItem/UIDateItem.cs b/SunnyUI/Controls/DropItem/UIDateItem.cs index 8ebc9008..ca2f4d46 100644 --- a/SunnyUI/Controls/DropItem/UIDateItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateItem.cs @@ -224,7 +224,7 @@ namespace Sunny.UI this.p1.Style = Sunny.UI.UIStyle.Custom; this.p1.TabIndex = 0; this.p1.Text = null; - this.p1.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p1_PaintOther); + this.p1.Paint += new System.Windows.Forms.PaintEventHandler(this.p1_Paint); this.p1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p1_MouseClick); this.p1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p1_MouseMove); // @@ -252,7 +252,7 @@ namespace Sunny.UI this.p2.Style = Sunny.UI.UIStyle.Custom; this.p2.TabIndex = 1; this.p2.Text = null; - this.p2.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p2_PaintOther); + this.p2.Paint += new System.Windows.Forms.PaintEventHandler(this.p2_Paint); this.p2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p2_MouseClick); this.p2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p2_MouseMove); // @@ -280,7 +280,7 @@ namespace Sunny.UI this.p3.Style = Sunny.UI.UIStyle.Custom; this.p3.TabIndex = 2; this.p3.Text = null; - this.p3.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p3_PaintOther); + this.p3.Paint += new System.Windows.Forms.PaintEventHandler(this.p3_Paint); this.p3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p3_MouseClick); this.p3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p3_MouseMove); // @@ -513,7 +513,7 @@ namespace Sunny.UI TopPanel.RectColor = p1.RectColor = p2.RectColor = p3.RectColor = color; } - private void p2_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p2_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { for (int i = 0; i < 12; i++) { @@ -558,7 +558,7 @@ namespace Sunny.UI private int activeYear = -1; - private void p1_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p1_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { for (int i = 0; i < 12; i++) { @@ -604,7 +604,7 @@ namespace Sunny.UI p2.Invalidate(); } - private void p3_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p3_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { int width = p3.Width / 7; int height = (p3.Height - 30) / 6; diff --git a/SunnyUI/Controls/DropItem/UIDateTimeItem.cs b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs index ad9b9827..8f3d6379 100644 --- a/SunnyUI/Controls/DropItem/UIDateTimeItem.cs +++ b/SunnyUI/Controls/DropItem/UIDateTimeItem.cs @@ -259,7 +259,7 @@ namespace Sunny.UI this.p1.Style = Sunny.UI.UIStyle.Custom; this.p1.TabIndex = 0; this.p1.Text = null; - this.p1.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p1_PaintOther); + this.p1.Paint += new System.Windows.Forms.PaintEventHandler(this.p1_Paint); this.p1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p1_MouseClick); this.p1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p1_MouseMove); // @@ -286,7 +286,7 @@ namespace Sunny.UI this.p2.Style = Sunny.UI.UIStyle.Custom; this.p2.TabIndex = 1; this.p2.Text = null; - this.p2.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p2_PaintOther); + this.p2.Paint += new System.Windows.Forms.PaintEventHandler(this.p2_Paint); this.p2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p2_MouseClick); this.p2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p2_MouseMove); // @@ -313,7 +313,7 @@ namespace Sunny.UI this.p3.Style = Sunny.UI.UIStyle.Custom; this.p3.TabIndex = 2; this.p3.Text = null; - this.p3.PaintOther += new System.Windows.Forms.PaintEventHandler(this.p3_PaintOther); + this.p3.Paint += new System.Windows.Forms.PaintEventHandler(this.p3_Paint); this.p3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.p3_MouseClick); this.p3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.p3_MouseMove); // @@ -1060,7 +1060,7 @@ namespace Sunny.UI ShowOther(); } - private void p2_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p2_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { for (int i = 0; i < 12; i++) { @@ -1101,7 +1101,7 @@ namespace Sunny.UI TabControl.SelectedTab = tabPage3; } - private void p1_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p1_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { for (int i = 0; i < 12; i++) { @@ -1144,7 +1144,7 @@ namespace Sunny.UI p2.Invalidate(); } - private void p3_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + private void p3_Paint(object sender, System.Windows.Forms.PaintEventArgs e) { int width = p3.Width / 7; int height = (p3.Height - 30) / 6; diff --git a/SunnyUI/Controls/DropItem/UIDropControl.cs b/SunnyUI/Controls/DropItem/UIDropControl.cs index 3e6b8b9c..0255c684 100644 --- a/SunnyUI/Controls/DropItem/UIDropControl.cs +++ b/SunnyUI/Controls/DropItem/UIDropControl.cs @@ -65,7 +65,6 @@ namespace Sunny.UI TextAlignment = ContentAlignment.MiddleLeft; fillColor = Color.White; edit.BackColor = Color.White; - PaintOther += UIDropControl_PaintOther; MouseMove += UIDropControl_MouseMove; } @@ -79,8 +78,9 @@ namespace Sunny.UI MouseLocation = e.Location; } - private void UIDropControl_PaintOther(object sender, PaintEventArgs e) + protected override void OnPaint(PaintEventArgs e) { + base.OnPaint(e); if (Enabled) { if (Radius == 0 || RadiusSides == UICornerRadiusSides.None) @@ -293,16 +293,12 @@ namespace Sunny.UI g.FillRoundRectangle(GetFillColor(), new Rectangle(Width - 27, edit.Top, 26, edit.Height), Radius, false); g.DrawRoundRectangle(rectColor, new Rectangle(0, 0, Width, Height), Radius, true); } - } - protected override void OnPaint(PaintEventArgs e) - { - base.OnPaint(e); Padding = new Padding(0, 0, 30, 2); - e.Graphics.FillRoundRectangle(GetFillColor(), new Rectangle(Width - 27, edit.Top, 25, edit.Height), Radius); + g.FillRoundRectangle(GetFillColor(), new Rectangle(Width - 27, edit.Top, 25, edit.Height), Radius); Color color = GetRectColor(); - SizeF sf = e.Graphics.GetFontImageSize(dropSymbol, 24); - e.Graphics.DrawFontImage(dropSymbol, 24, color, Width - 28 + (12 - sf.Width / 2.0f), (Height - sf.Height) / 2.0f); + SizeF sf = g.GetFontImageSize(dropSymbol, 24); + g.DrawFontImage(dropSymbol, 24, color, Width - 28 + (12 - sf.Width / 2.0f), (Height - sf.Height) / 2.0f); } protected override void OnGotFocus(EventArgs e) diff --git a/SunnyUI/Controls/UICheckBox.cs b/SunnyUI/Controls/UICheckBox.cs index ba747520..b23422a6 100644 --- a/SunnyUI/Controls/UICheckBox.cs +++ b/SunnyUI/Controls/UICheckBox.cs @@ -42,11 +42,11 @@ namespace Sunny.UI foreColor = UIStyles.Blue.CheckBoxForeColor; fillColor = UIStyles.Blue.CheckBoxColor; SetStyle(ControlStyles.StandardDoubleClick, UseDoubleClick); - PaintOther += UICheckBox_PaintOther; } - private void UICheckBox_PaintOther(object sender, PaintEventArgs e) + protected override void OnPaint(PaintEventArgs e) { + base.OnPaint(e); if (AutoSize) { SizeF sf = Text.MeasureString(Font); @@ -67,7 +67,7 @@ namespace Sunny.UI set { autoSize = value; - UICheckBox_PaintOther(this, null); + Invalidate(); } } diff --git a/SunnyUI/Controls/UIColorPicker.cs b/SunnyUI/Controls/UIColorPicker.cs index c97a349f..330da14f 100644 --- a/SunnyUI/Controls/UIColorPicker.cs +++ b/SunnyUI/Controls/UIColorPicker.cs @@ -29,6 +29,7 @@ using System; using System.ComponentModel; using System.Drawing; +using System.Windows.Forms; namespace Sunny.UI { @@ -46,7 +47,6 @@ namespace Sunny.UI this.Name = "UIColorPicker"; this.Padding = new System.Windows.Forms.Padding(0, 0, 30, 0); this.ButtonClick += new System.EventHandler(this.UIColorPicker_ButtonClick); - this.PaintOther += new System.Windows.Forms.PaintEventHandler(this.UIColorPicker_PaintOther); this.ResumeLayout(false); this.PerformLayout(); } @@ -58,7 +58,7 @@ namespace Sunny.UI public UIColorPicker() { InitializeComponent(); - ShowText = false; + //ShowText = false; Value = UIColor.Blue; } @@ -105,12 +105,16 @@ namespace Sunny.UI } } - private void UIColorPicker_PaintOther(object sender, System.Windows.Forms.PaintEventArgs e) + protected override void OnPaintFore(Graphics g, System.Drawing.Drawing2D.GraphicsPath path) { - var pathColor = e.Graphics.CreateRoundedRectanglePath(new Rectangle(3, 3, Width - 32, Height - 7), 5, - UICornerRadiusSides.All); - e.Graphics.FillPath(Value, pathColor); + base.OnPaintFore(g, path); + var pathColor = g.CreateRoundedRectanglePath(new Rectangle(3, 3, Width - 32, Height - 7), 5, UICornerRadiusSides.All); + g.FillPath(Value, pathColor); + } + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); if (DropDownStyle != UIDropDownStyle.DropDownList) DropDownStyle = UIDropDownStyle.DropDownList; } diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs index 8c2f15c1..3666bccd 100644 --- a/SunnyUI/Controls/UIControl.cs +++ b/SunnyUI/Controls/UIControl.cs @@ -194,6 +194,24 @@ namespace Sunny.UI } } + private bool showFill = true; + + /// + /// 是否显示填充 + /// + protected bool ShowFill + { + get => showFill; + set + { + if (showFill != value) + { + showFill = value; + Invalidate(); + } + } + } + /// /// 版本 /// @@ -311,7 +329,7 @@ namespace Sunny.UI GraphicsPath path = rect.CreateRoundedRectanglePath(radius, RadiusSides); //填充背景色 - if (fillColor.IsValid()) + if (ShowFill && fillColor.IsValid()) { OnPaintFill(e.Graphics, path); } @@ -329,13 +347,9 @@ namespace Sunny.UI } path.Dispose(); - - PaintOther?.Invoke(this, e); base.OnPaint(e); } - public event PaintEventHandler PaintOther; - /// /// 获取边框颜色 /// diff --git a/SunnyUI/Controls/UIDoubleUpDown.cs b/SunnyUI/Controls/UIDoubleUpDown.cs index 87783f08..4e8c4512 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.cs @@ -44,11 +44,10 @@ namespace Sunny.UI edit.BorderStyle = BorderStyle.None; edit.TextChanged += Edit_TextChanged; edit.Leave += Edit_Leave; - //edit.MouseLeave += Edit_Leave; - pnlValue.PaintOther += PnlValue_PaintOther; + pnlValue.Paint += PnlValue_Paint; } - private void PnlValue_PaintOther(object sender, PaintEventArgs e) + private void PnlValue_Paint(object sender, PaintEventArgs e) { if (Enabled) { diff --git a/SunnyUI/Controls/UIIntegerUpDown.cs b/SunnyUI/Controls/UIIntegerUpDown.cs index a7e2322a..fe83445c 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.cs @@ -44,12 +44,10 @@ namespace Sunny.UI edit.BorderStyle = BorderStyle.None; edit.TextChanged += Edit_TextChanged; edit.Leave += Edit_Leave; - //edit.MouseLeave += Edit_Leave; - - pnlValue.PaintOther += PnlValue_PaintOther; + pnlValue.Paint += PnlValue_Paint; } - private void PnlValue_PaintOther(object sender, PaintEventArgs e) + private void PnlValue_Paint(object sender, PaintEventArgs e) { if (Enabled) { diff --git a/SunnyUI/Controls/UIPanel.cs b/SunnyUI/Controls/UIPanel.cs index f97500e2..33469971 100644 --- a/SunnyUI/Controls/UIPanel.cs +++ b/SunnyUI/Controls/UIPanel.cs @@ -295,16 +295,33 @@ namespace Sunny.UI } } + private bool showFill = true; + + /// + /// 是否显示填充 + /// + protected bool ShowFill + { + get => showFill; + set + { + if (showFill != value) + { + showFill = value; + Invalidate(); + } + } + } + protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); if (!Visible || Width <= 0 || Height <= 0) return; Rectangle rect = new Rectangle(0, 0, Width - 1, Height - 1); GraphicsPath path = GDIEx.CreateRoundedRectanglePath(rect, radius, RadiusSides); //填充背景色 - if (fillColor.IsValid()) + if (ShowFill && fillColor.IsValid()) { OnPaintFill(e.Graphics, path); } @@ -321,13 +338,10 @@ namespace Sunny.UI OnPaintFore(e.Graphics, path); } - PaintOther?.Invoke(this, e); - path.Dispose(); + base.OnPaint(e); } - public event PaintEventHandler PaintOther; - protected virtual void OnPaintFore(Graphics g, GraphicsPath path) { g.DrawString(Text, Font, Enabled ? foreColor : foreDisableColor, Size, Padding, TextAlignment); @@ -451,14 +465,6 @@ namespace Sunny.UI g.FillPath(color, path); } - // protected override void WndProc(ref Message m) - // { - // if (m.Msg != 20) - // { - // base.WndProc(ref m); - // } - // } - protected virtual void AfterSetFillColor(Color color) { } diff --git a/SunnyUI/Controls/UIRadioButton.cs b/SunnyUI/Controls/UIRadioButton.cs index cd6cf66c..2bf95912 100644 --- a/SunnyUI/Controls/UIRadioButton.cs +++ b/SunnyUI/Controls/UIRadioButton.cs @@ -46,11 +46,11 @@ namespace Sunny.UI Size = new Size(150, 29); foreColor = UIStyles.Blue.CheckBoxForeColor; fillColor = UIStyles.Blue.CheckBoxColor; - PaintOther += UIRadioButton_PaintOther; } - private void UIRadioButton_PaintOther(object sender, PaintEventArgs e) + protected override void OnPaint(PaintEventArgs e) { + base.OnPaint(e); if (AutoSize) { SizeF sf = Text.MeasureString(Font); @@ -71,7 +71,7 @@ namespace Sunny.UI set { autoSize = value; - UIRadioButton_PaintOther(this, null); + Invalidate(); } } diff --git a/SunnyUI/Controls/UIRoundProcess.cs b/SunnyUI/Controls/UIRoundProcess.cs index 5cc7e7c8..c134bf4f 100644 --- a/SunnyUI/Controls/UIRoundProcess.cs +++ b/SunnyUI/Controls/UIRoundProcess.cs @@ -21,7 +21,6 @@ using System.ComponentModel; using System.Drawing; -using System.Drawing.Drawing2D; using System.Windows.Forms; namespace Sunny.UI @@ -43,6 +42,7 @@ namespace Sunny.UI base.BackColor = Color.Transparent; ShowText = false; ShowRect = false; + ShowFill = false; } public int Inner { get; set; } @@ -58,13 +58,8 @@ namespace Sunny.UI protected override void OnPaint(PaintEventArgs e) { base.OnPaint(e); - - } - - protected override void OnPaintFill(Graphics g, GraphicsPath path) - { - g.FillFan(ProcessBackColor, ClientRectangle.Center(), Inner, Outer, 0, 360); - g.FillFan(ProcessColor, ClientRectangle.Center(), Inner, Outer, -90, Value / 100.0f * 360); + e.Graphics.FillFan(ProcessBackColor, ClientRectangle.Center(), Inner, Outer, 0, 360); + e.Graphics.FillFan(ProcessColor, ClientRectangle.Center(), Inner, Outer, -90, Value / 100.0f * 360); } } } diff --git a/SunnyUI/Controls/UIWaitingBar.cs b/SunnyUI/Controls/UIWaitingBar.cs index 6ee3a2c4..9b27a480 100644 --- a/SunnyUI/Controls/UIWaitingBar.cs +++ b/SunnyUI/Controls/UIWaitingBar.cs @@ -37,8 +37,6 @@ namespace Sunny.UI Size = new Size(300, 29); ShowText = false; - PaintOther += UIWaitingBar_PaintOther; - fillColor = UIColor.LightBlue; foreColor = UIColor.Blue; timer.Interval = 200; @@ -52,8 +50,9 @@ namespace Sunny.UI timer.Dispose(); } - private void UIWaitingBar_PaintOther(object sender, PaintEventArgs e) + protected override void OnPaint(PaintEventArgs e) { + base.OnPaint(e); e.Graphics.FillRoundRectangle(rectColor, (int)dz + 1, 1, sliderWidth, Height - 3, Radius); }