diff --git a/Bin/net40/SunnyUI.Common.dll b/Bin/net40/SunnyUI.Common.dll index c2fe506d..a6bc5532 100644 Binary files a/Bin/net40/SunnyUI.Common.dll and b/Bin/net40/SunnyUI.Common.dll differ diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 3a4d0a53..d39ab63a 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 2a77ee54..47cfed57 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.deps.json b/Bin/net5.0-windows/SunnyUI.deps.json index 124bf079..dff98673 100644 --- a/Bin/net5.0-windows/SunnyUI.deps.json +++ b/Bin/net5.0-windows/SunnyUI.deps.json @@ -8,17 +8,17 @@ ".NETCoreApp,Version=v5.0": { "SunnyUI/3.0.1": { "dependencies": { - "SunnyUI.Common": "3.0.0" + "SunnyUI.Common": "3.0.1" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.1": { "runtime": { "lib/net5.0/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.0.0", - "fileVersion": "3.0.0.0" + "assemblyVersion": "3.0.1.0", + "fileVersion": "3.0.1.0" } } } @@ -30,12 +30,12 @@ "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.1": { "type": "package", "serviceable": true, - "sha512": "sha512-ICXSap1LGOZtUH8bUTOEdRbukplX7c2LgqQfD4xbtfu6+/wz13KZxoZUDEq27K/GggfaISRqBUXGHZSxJtANGQ==", - "path": "sunnyui.common/3.0.0", - "hashPath": "sunnyui.common.3.0.0.nupkg.sha512" + "sha512": "sha512-w7R3+h0dSWI6/BAiY1D35z7iI8IWVOYZuntc/S2ywI7UUUn3XyBrLoTgn3QqCd/8/0bJUEgYNQCdysLVcmq1OA==", + "path": "sunnyui.common/3.0.1", + "hashPath": "sunnyui.common.3.0.1.nupkg.sha512" } } } \ No newline at end of file diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 9bfef84a..fbb03228 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 e0546ded..7b4dcbac 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.deps.json b/Bin/netcoreapp3.1/SunnyUI.deps.json index 2d6b1038..8c12ec55 100644 --- a/Bin/netcoreapp3.1/SunnyUI.deps.json +++ b/Bin/netcoreapp3.1/SunnyUI.deps.json @@ -8,17 +8,17 @@ ".NETCoreApp,Version=v3.1": { "SunnyUI/3.0.1": { "dependencies": { - "SunnyUI.Common": "3.0.0" + "SunnyUI.Common": "3.0.1" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.1": { "runtime": { "lib/netcoreapp3.1/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.0.0", - "fileVersion": "3.0.0.0" + "assemblyVersion": "3.0.1.0", + "fileVersion": "3.0.1.0" } } } @@ -30,12 +30,12 @@ "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.1": { "type": "package", "serviceable": true, - "sha512": "sha512-ICXSap1LGOZtUH8bUTOEdRbukplX7c2LgqQfD4xbtfu6+/wz13KZxoZUDEq27K/GggfaISRqBUXGHZSxJtANGQ==", - "path": "sunnyui.common/3.0.0", - "hashPath": "sunnyui.common.3.0.0.nupkg.sha512" + "sha512": "sha512-w7R3+h0dSWI6/BAiY1D35z7iI8IWVOYZuntc/S2ywI7UUUn3XyBrLoTgn3QqCd/8/0bJUEgYNQCdysLVcmq1OA==", + "path": "sunnyui.common/3.0.1", + "hashPath": "sunnyui.common.3.0.1.nupkg.sha512" } } } \ No newline at end of file diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index 8f522457..98738acb 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs b/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs index 5547e678..c348372e 100644 --- a/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs +++ b/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs @@ -43,6 +43,8 @@ namespace Sunny.UI.Demo this.uiHeaderButton5 = new Sunny.UI.Controls.UIHeaderButton(); this.uiHeaderButton3 = new Sunny.UI.Controls.UIHeaderButton(); this.uiHeaderButton2 = new Sunny.UI.Controls.UIHeaderButton(); + this.uiLine1 = new Sunny.UI.UILine(); + this.uiLine2 = new Sunny.UI.UILine(); this.PagePanel.SuspendLayout(); this.uiPanel1.SuspendLayout(); this.uiPanel2.SuspendLayout(); @@ -50,6 +52,8 @@ namespace Sunny.UI.Demo // // PagePanel // + this.PagePanel.Controls.Add(this.uiLine2); + this.PagePanel.Controls.Add(this.uiLine1); this.PagePanel.Controls.Add(this.uiPanel2); this.PagePanel.Controls.Add(this.uiPanel1); this.PagePanel.Size = new System.Drawing.Size(837, 501); @@ -64,11 +68,11 @@ namespace Sunny.UI.Demo this.uiPanel1.Controls.Add(this.uiHeaderButton1); this.uiPanel1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiPanel1.Location = new System.Drawing.Point(17, 57); + this.uiPanel1.Location = new System.Drawing.Point(30, 57); this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel1.Name = "uiPanel1"; - this.uiPanel1.Size = new System.Drawing.Size(737, 88); + this.uiPanel1.Size = new System.Drawing.Size(716, 88); this.uiPanel1.Style = Sunny.UI.UIStyle.Custom; this.uiPanel1.StyleCustomMode = true; this.uiPanel1.TabIndex = 0; @@ -77,22 +81,18 @@ namespace Sunny.UI.Demo // uiHeaderButton12 // this.uiHeaderButton12.CircleColor = System.Drawing.Color.Olive; - this.uiHeaderButton12.CircleSize = 50; this.uiHeaderButton12.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton12.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton12.ImageTop = 0; - this.uiHeaderButton12.Location = new System.Drawing.Point(616, 1); + this.uiHeaderButton12.Location = new System.Drawing.Point(600, 1); this.uiHeaderButton12.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton12.Name = "uiHeaderButton12"; this.uiHeaderButton12.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton12.PageIndex = 0; this.uiHeaderButton12.Radius = 0; this.uiHeaderButton12.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton12.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton12.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton12.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton12.Symbol = 61459; - this.uiHeaderButton12.SymbolColor = System.Drawing.Color.White; this.uiHeaderButton12.SymbolOffset = new System.Drawing.Point(1, 2); this.uiHeaderButton12.SymbolSize = 41; this.uiHeaderButton12.TabIndex = 5; @@ -101,22 +101,18 @@ namespace Sunny.UI.Demo // uiHeaderButton11 // this.uiHeaderButton11.CircleColor = System.Drawing.Color.Purple; - this.uiHeaderButton11.CircleSize = 50; this.uiHeaderButton11.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton11.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton11.ImageTop = 0; - this.uiHeaderButton11.Location = new System.Drawing.Point(516, 1); + this.uiHeaderButton11.Location = new System.Drawing.Point(500, 1); this.uiHeaderButton11.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton11.Name = "uiHeaderButton11"; this.uiHeaderButton11.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton11.PageIndex = 0; this.uiHeaderButton11.Radius = 0; this.uiHeaderButton11.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton11.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton11.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton11.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton11.Symbol = 61447; - this.uiHeaderButton11.SymbolColor = System.Drawing.Color.White; this.uiHeaderButton11.SymbolOffset = new System.Drawing.Point(1, 0); this.uiHeaderButton11.SymbolSize = 40; this.uiHeaderButton11.TabIndex = 4; @@ -125,22 +121,18 @@ namespace Sunny.UI.Demo // uiHeaderButton10 // this.uiHeaderButton10.CircleColor = System.Drawing.Color.Teal; - this.uiHeaderButton10.CircleSize = 50; this.uiHeaderButton10.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton10.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton10.ImageTop = 0; - this.uiHeaderButton10.Location = new System.Drawing.Point(416, 1); + this.uiHeaderButton10.Location = new System.Drawing.Point(400, 1); this.uiHeaderButton10.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton10.Name = "uiHeaderButton10"; this.uiHeaderButton10.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton10.PageIndex = 0; this.uiHeaderButton10.Radius = 0; this.uiHeaderButton10.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton10.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton10.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton10.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton10.Symbol = 62145; - this.uiHeaderButton10.SymbolColor = System.Drawing.Color.White; this.uiHeaderButton10.SymbolOffset = new System.Drawing.Point(1, 2); this.uiHeaderButton10.SymbolSize = 38; this.uiHeaderButton10.TabIndex = 3; @@ -149,22 +141,18 @@ namespace Sunny.UI.Demo // uiHeaderButton9 // this.uiHeaderButton9.CircleColor = System.Drawing.Color.DarkOrange; - this.uiHeaderButton9.CircleSize = 50; this.uiHeaderButton9.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton9.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton9.ImageTop = 0; - this.uiHeaderButton9.Location = new System.Drawing.Point(316, 1); + this.uiHeaderButton9.Location = new System.Drawing.Point(300, 1); this.uiHeaderButton9.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton9.Name = "uiHeaderButton9"; this.uiHeaderButton9.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton9.PageIndex = 0; this.uiHeaderButton9.Radius = 0; this.uiHeaderButton9.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton9.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton9.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton9.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton9.Symbol = 61664; - this.uiHeaderButton9.SymbolColor = System.Drawing.Color.White; this.uiHeaderButton9.SymbolOffset = new System.Drawing.Point(0, 1); this.uiHeaderButton9.SymbolSize = 40; this.uiHeaderButton9.TabIndex = 2; @@ -173,22 +161,18 @@ namespace Sunny.UI.Demo // uiHeaderButton8 // this.uiHeaderButton8.CircleColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.uiHeaderButton8.CircleSize = 50; this.uiHeaderButton8.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton8.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton8.ImageTop = 0; - this.uiHeaderButton8.Location = new System.Drawing.Point(216, 1); + this.uiHeaderButton8.Location = new System.Drawing.Point(200, 1); this.uiHeaderButton8.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton8.Name = "uiHeaderButton8"; this.uiHeaderButton8.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton8.PageIndex = 0; this.uiHeaderButton8.Radius = 0; this.uiHeaderButton8.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton8.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton8.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton8.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton8.Symbol = 62074; - this.uiHeaderButton8.SymbolColor = System.Drawing.Color.White; this.uiHeaderButton8.SymbolOffset = new System.Drawing.Point(1, 0); this.uiHeaderButton8.SymbolSize = 44; this.uiHeaderButton8.TabIndex = 1; @@ -197,23 +181,18 @@ namespace Sunny.UI.Demo // uiHeaderButton1 // this.uiHeaderButton1.CircleColor = System.Drawing.Color.RoyalBlue; - this.uiHeaderButton1.CircleSize = 50; this.uiHeaderButton1.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiHeaderButton1.ImageTop = 0; - this.uiHeaderButton1.Location = new System.Drawing.Point(116, 1); + this.uiHeaderButton1.Location = new System.Drawing.Point(100, 1); this.uiHeaderButton1.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton1.Name = "uiHeaderButton1"; this.uiHeaderButton1.Padding = new System.Windows.Forms.Padding(0, 8, 0, 3); - this.uiHeaderButton1.PageIndex = 0; this.uiHeaderButton1.Radius = 0; this.uiHeaderButton1.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.uiHeaderButton1.Size = new System.Drawing.Size(100, 88); this.uiHeaderButton1.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton1.Symbol = 61461; - this.uiHeaderButton1.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton1.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton1.TabIndex = 0; this.uiHeaderButton1.Text = "主页"; // @@ -228,12 +207,12 @@ namespace Sunny.UI.Demo this.uiPanel2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel2.ForeColor = System.Drawing.Color.Silver; - this.uiPanel2.Location = new System.Drawing.Point(17, 202); + this.uiPanel2.Location = new System.Drawing.Point(30, 202); this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1); this.uiPanel2.Name = "uiPanel2"; this.uiPanel2.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); - this.uiPanel2.Size = new System.Drawing.Size(737, 88); + this.uiPanel2.Size = new System.Drawing.Size(716, 88); this.uiPanel2.Style = Sunny.UI.UIStyle.Custom; this.uiPanel2.StyleCustomMode = true; this.uiPanel2.TabIndex = 1; @@ -241,8 +220,6 @@ namespace Sunny.UI.Demo // // uiHeaderButton6 // - this.uiHeaderButton6.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton6.CircleSize = 50; this.uiHeaderButton6.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton6.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -253,12 +230,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton6.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton6.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton6.Image = global::Sunny.UI.Demo.Properties.Resources._7; - this.uiHeaderButton6.ImageTop = 0; - this.uiHeaderButton6.Location = new System.Drawing.Point(616, 1); + this.uiHeaderButton6.Location = new System.Drawing.Point(600, 1); this.uiHeaderButton6.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton6.Name = "uiHeaderButton6"; this.uiHeaderButton6.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton6.PageIndex = 0; this.uiHeaderButton6.Radius = 0; this.uiHeaderButton6.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton6.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -266,15 +241,11 @@ namespace Sunny.UI.Demo this.uiHeaderButton6.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton6.StyleCustomMode = true; this.uiHeaderButton6.Symbol = 0; - this.uiHeaderButton6.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton6.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton6.TabIndex = 5; this.uiHeaderButton6.Text = "设置"; // // uiHeaderButton7 // - this.uiHeaderButton7.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton7.CircleSize = 50; this.uiHeaderButton7.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton7.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -285,12 +256,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton7.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton7.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton7.Image = global::Sunny.UI.Demo.Properties.Resources._5; - this.uiHeaderButton7.ImageTop = 0; - this.uiHeaderButton7.Location = new System.Drawing.Point(516, 1); + this.uiHeaderButton7.Location = new System.Drawing.Point(500, 1); this.uiHeaderButton7.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton7.Name = "uiHeaderButton7"; this.uiHeaderButton7.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton7.PageIndex = 0; this.uiHeaderButton7.Radius = 0; this.uiHeaderButton7.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton7.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -298,15 +267,11 @@ namespace Sunny.UI.Demo this.uiHeaderButton7.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton7.StyleCustomMode = true; this.uiHeaderButton7.Symbol = 0; - this.uiHeaderButton7.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton7.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton7.TabIndex = 4; this.uiHeaderButton7.Text = "朋友"; // // uiHeaderButton4 // - this.uiHeaderButton4.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton4.CircleSize = 50; this.uiHeaderButton4.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton4.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -317,12 +282,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton4.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton4.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton4.Image = global::Sunny.UI.Demo.Properties.Resources._4; - this.uiHeaderButton4.ImageTop = 0; - this.uiHeaderButton4.Location = new System.Drawing.Point(416, 1); + this.uiHeaderButton4.Location = new System.Drawing.Point(400, 1); this.uiHeaderButton4.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton4.Name = "uiHeaderButton4"; this.uiHeaderButton4.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton4.PageIndex = 0; this.uiHeaderButton4.Radius = 0; this.uiHeaderButton4.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton4.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -330,15 +293,11 @@ namespace Sunny.UI.Demo this.uiHeaderButton4.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton4.StyleCustomMode = true; this.uiHeaderButton4.Symbol = 0; - this.uiHeaderButton4.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton4.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton4.TabIndex = 3; this.uiHeaderButton4.Text = "手机"; // // uiHeaderButton5 // - this.uiHeaderButton5.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton5.CircleSize = 50; this.uiHeaderButton5.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton5.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -349,12 +308,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton5.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton5.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton5.Image = global::Sunny.UI.Demo.Properties.Resources._3; - this.uiHeaderButton5.ImageTop = 0; - this.uiHeaderButton5.Location = new System.Drawing.Point(316, 1); + this.uiHeaderButton5.Location = new System.Drawing.Point(300, 1); this.uiHeaderButton5.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton5.Name = "uiHeaderButton5"; this.uiHeaderButton5.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton5.PageIndex = 0; this.uiHeaderButton5.Radius = 0; this.uiHeaderButton5.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton5.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -362,15 +319,11 @@ namespace Sunny.UI.Demo this.uiHeaderButton5.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton5.StyleCustomMode = true; this.uiHeaderButton5.Symbol = 0; - this.uiHeaderButton5.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton5.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton5.TabIndex = 2; this.uiHeaderButton5.Text = "邮件"; // // uiHeaderButton3 // - this.uiHeaderButton3.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton3.CircleSize = 50; this.uiHeaderButton3.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -381,12 +334,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton3.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton3.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton3.Image = global::Sunny.UI.Demo.Properties.Resources._2; - this.uiHeaderButton3.ImageTop = 0; - this.uiHeaderButton3.Location = new System.Drawing.Point(216, 1); + this.uiHeaderButton3.Location = new System.Drawing.Point(200, 1); this.uiHeaderButton3.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton3.Name = "uiHeaderButton3"; this.uiHeaderButton3.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton3.PageIndex = 0; this.uiHeaderButton3.Radius = 0; this.uiHeaderButton3.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton3.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -394,15 +345,11 @@ namespace Sunny.UI.Demo this.uiHeaderButton3.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton3.StyleCustomMode = true; this.uiHeaderButton3.Symbol = 0; - this.uiHeaderButton3.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton3.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton3.TabIndex = 1; this.uiHeaderButton3.Text = "消息"; // // uiHeaderButton2 // - this.uiHeaderButton2.CircleColor = System.Drawing.Color.Bisque; - this.uiHeaderButton2.CircleSize = 50; this.uiHeaderButton2.Cursor = System.Windows.Forms.Cursors.Hand; this.uiHeaderButton2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); this.uiHeaderButton2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60))))); @@ -413,12 +360,10 @@ namespace Sunny.UI.Demo this.uiHeaderButton2.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton2.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.uiHeaderButton2.Image = global::Sunny.UI.Demo.Properties.Resources._1; - this.uiHeaderButton2.ImageTop = 0; - this.uiHeaderButton2.Location = new System.Drawing.Point(116, 1); + this.uiHeaderButton2.Location = new System.Drawing.Point(100, 1); this.uiHeaderButton2.MinimumSize = new System.Drawing.Size(1, 1); this.uiHeaderButton2.Name = "uiHeaderButton2"; this.uiHeaderButton2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3); - this.uiHeaderButton2.PageIndex = 0; this.uiHeaderButton2.Radius = 0; this.uiHeaderButton2.RadiusSides = Sunny.UI.UICornerRadiusSides.None; this.uiHeaderButton2.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; @@ -426,11 +371,31 @@ namespace Sunny.UI.Demo this.uiHeaderButton2.Style = Sunny.UI.UIStyle.Custom; this.uiHeaderButton2.StyleCustomMode = true; this.uiHeaderButton2.Symbol = 0; - this.uiHeaderButton2.SymbolColor = System.Drawing.Color.White; - this.uiHeaderButton2.SymbolOffset = new System.Drawing.Point(0, 0); this.uiHeaderButton2.TabIndex = 0; this.uiHeaderButton2.Text = "主页"; // + // uiLine1 + // + this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLine1.Location = new System.Drawing.Point(30, 20); + this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16); + this.uiLine1.Name = "uiLine1"; + this.uiLine1.Size = new System.Drawing.Size(716, 20); + this.uiLine1.TabIndex = 19; + this.uiLine1.Text = "UIHeaderButton 字体图标"; + this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // uiLine2 + // + this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLine2.Location = new System.Drawing.Point(30, 163); + this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16); + this.uiLine2.Name = "uiLine2"; + this.uiLine2.Size = new System.Drawing.Size(716, 20); + this.uiLine2.TabIndex = 20; + this.uiLine2.Text = "UIHeaderButton 透明图片"; + this.uiLine2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // FHeaderButton // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -462,5 +427,7 @@ namespace Sunny.UI.Demo private UI.Controls.UIHeaderButton uiHeaderButton10; private UI.Controls.UIHeaderButton uiHeaderButton9; private UI.Controls.UIHeaderButton uiHeaderButton8; + private UILine uiLine2; + private UILine uiLine1; } } \ No newline at end of file diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll index 1e382444..3b1a8952 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll differ diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe index bdefaafc..d3abecb3 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe differ diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json index cc6de40e..14df11c9 100644 --- a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json +++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json @@ -1,8 +1,9 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\Administrator\\.nuget\\packages" + "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Sunny\\.nuget\\packages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ] } } \ No newline at end of file diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll index 2295355e..bddfd973 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll differ diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index 042dcdd0..cf3c2e0b 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -54,7 +54,7 @@ - +