diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe
index 8ac7bfd2..5b695fd9 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll
index 78af613a..0bafd249 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Controls/FButton.Designer.cs b/SunnyUI.Demo/Controls/FButton.Designer.cs
index 2287bad0..4718c05f 100644
--- a/SunnyUI.Demo/Controls/FButton.Designer.cs
+++ b/SunnyUI.Demo/Controls/FButton.Designer.cs
@@ -440,12 +440,10 @@ namespace Sunny.UI.Demo
this.uiSymbolButton7.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.uiSymbolButton7.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.uiSymbolButton7.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiSymbolButton7.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.uiSymbolButton7.IsCircle = true;
this.uiSymbolButton7.Location = new System.Drawing.Point(235, 265);
this.uiSymbolButton7.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton7.Name = "uiSymbolButton7";
- this.uiSymbolButton7.Padding = new System.Windows.Forms.Padding(7, 7, 4, 4);
this.uiSymbolButton7.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80)))));
this.uiSymbolButton7.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(115)))), ((int)(((byte)(115)))));
this.uiSymbolButton7.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
@@ -466,12 +464,10 @@ namespace Sunny.UI.Demo
this.uiSymbolButton8.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
this.uiSymbolButton8.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
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, 265);
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)(227)))), ((int)(((byte)(175)))), ((int)(((byte)(83)))));
this.uiSymbolButton8.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(124)))), ((int)(((byte)(32)))));
@@ -492,12 +488,10 @@ namespace Sunny.UI.Demo
this.uiSymbolButton9.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
this.uiSymbolButton9.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
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, 265);
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)(139)))), ((int)(((byte)(203)))), ((int)(((byte)(83)))));
this.uiSymbolButton9.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(88)))), ((int)(((byte)(152)))), ((int)(((byte)(32)))));
@@ -513,12 +507,10 @@ namespace Sunny.UI.Demo
//
this.uiSymbolButton10.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiSymbolButton10.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiSymbolButton10.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.uiSymbolButton10.IsCircle = true;
this.uiSymbolButton10.Location = new System.Drawing.Point(112, 265);
this.uiSymbolButton10.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolButton10.Name = "uiSymbolButton10";
- this.uiSymbolButton10.Padding = new System.Windows.Forms.Padding(6, 9, 0, 0);
this.uiSymbolButton10.Size = new System.Drawing.Size(35, 35);
this.uiSymbolButton10.Style = Sunny.UI.UIStyle.Custom;
this.uiSymbolButton10.StyleCustomMode = true;
@@ -534,12 +526,10 @@ namespace Sunny.UI.Demo
this.uiSymbolButton11.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.uiSymbolButton11.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
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, 265);
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)(235)))), ((int)(((byte)(115)))), ((int)(((byte)(115)))));
this.uiSymbolButton11.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(184)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
diff --git a/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs b/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs
index ac382685..af2941bd 100644
--- a/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs
+++ b/SunnyUI.Demo/Controls/FHeaderButton.Designer.cs
@@ -45,6 +45,11 @@ namespace Sunny.UI.Demo
this.uiHeaderButton9 = new Sunny.UI.UIHeaderButton();
this.uiHeaderButton8 = new Sunny.UI.UIHeaderButton();
this.uiHeaderButton1 = new Sunny.UI.UIHeaderButton();
+ this.uiHeaderButton13 = new Sunny.UI.UIHeaderButton();
+ this.uiHeaderButton14 = new Sunny.UI.UIHeaderButton();
+ this.uiHeaderButton15 = new Sunny.UI.UIHeaderButton();
+ this.uiHeaderButton16 = new Sunny.UI.UIHeaderButton();
+ this.uiLine3 = new Sunny.UI.UILine();
this.uiPanel2.SuspendLayout();
this.uiPanel1.SuspendLayout();
this.SuspendLayout();
@@ -52,7 +57,6 @@ namespace Sunny.UI.Demo
// uiLine2
//
this.uiLine2.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiLine2.IsScaled = false;
this.uiLine2.Location = new System.Drawing.Point(30, 198);
this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine2.Name = "uiLine2";
@@ -64,7 +68,6 @@ namespace Sunny.UI.Demo
// uiLine1
//
this.uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiLine1.IsScaled = false;
this.uiLine1.Location = new System.Drawing.Point(30, 55);
this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine1.Name = "uiLine1";
@@ -84,7 +87,6 @@ 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.IsScaled = false;
this.uiPanel2.Location = new System.Drawing.Point(30, 237);
this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
@@ -109,7 +111,6 @@ 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.IsScaled = false;
this.uiHeaderButton6.Location = new System.Drawing.Point(600, 1);
this.uiHeaderButton6.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton6.Name = "uiHeaderButton6";
@@ -137,7 +138,6 @@ 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.IsScaled = false;
this.uiHeaderButton7.Location = new System.Drawing.Point(500, 1);
this.uiHeaderButton7.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton7.Name = "uiHeaderButton7";
@@ -165,7 +165,6 @@ 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.IsScaled = false;
this.uiHeaderButton4.Location = new System.Drawing.Point(400, 1);
this.uiHeaderButton4.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton4.Name = "uiHeaderButton4";
@@ -193,7 +192,6 @@ 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.IsScaled = false;
this.uiHeaderButton5.Location = new System.Drawing.Point(300, 1);
this.uiHeaderButton5.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton5.Name = "uiHeaderButton5";
@@ -221,7 +219,6 @@ 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.IsScaled = false;
this.uiHeaderButton3.Location = new System.Drawing.Point(200, 1);
this.uiHeaderButton3.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton3.Name = "uiHeaderButton3";
@@ -249,7 +246,6 @@ 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.IsScaled = false;
this.uiHeaderButton2.Location = new System.Drawing.Point(100, 1);
this.uiHeaderButton2.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton2.Name = "uiHeaderButton2";
@@ -275,7 +271,6 @@ 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.IsScaled = false;
this.uiPanel1.Location = new System.Drawing.Point(30, 92);
this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
@@ -292,7 +287,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton12.CircleColor = System.Drawing.Color.Olive;
this.uiHeaderButton12.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton12.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton12.IsScaled = false;
this.uiHeaderButton12.Location = new System.Drawing.Point(600, 1);
this.uiHeaderButton12.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton12.Name = "uiHeaderButton12";
@@ -303,7 +297,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton12.Size = new System.Drawing.Size(100, 88);
this.uiHeaderButton12.Style = Sunny.UI.UIStyle.Custom;
this.uiHeaderButton12.Symbol = 61459;
- this.uiHeaderButton12.SymbolOffset = new System.Drawing.Point(1, 2);
this.uiHeaderButton12.SymbolSize = 41;
this.uiHeaderButton12.TabIndex = 5;
this.uiHeaderButton12.Text = "设置";
@@ -314,7 +307,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton11.CircleColor = System.Drawing.Color.Purple;
this.uiHeaderButton11.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton11.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton11.IsScaled = false;
this.uiHeaderButton11.Location = new System.Drawing.Point(500, 1);
this.uiHeaderButton11.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton11.Name = "uiHeaderButton11";
@@ -325,7 +317,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton11.Size = new System.Drawing.Size(100, 88);
this.uiHeaderButton11.Style = Sunny.UI.UIStyle.Custom;
this.uiHeaderButton11.Symbol = 61447;
- this.uiHeaderButton11.SymbolOffset = new System.Drawing.Point(1, 0);
this.uiHeaderButton11.SymbolSize = 40;
this.uiHeaderButton11.TabIndex = 4;
this.uiHeaderButton11.Text = "朋友";
@@ -336,7 +327,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton10.CircleColor = System.Drawing.Color.Teal;
this.uiHeaderButton10.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton10.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton10.IsScaled = false;
this.uiHeaderButton10.Location = new System.Drawing.Point(400, 1);
this.uiHeaderButton10.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton10.Name = "uiHeaderButton10";
@@ -347,7 +337,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton10.Size = new System.Drawing.Size(100, 88);
this.uiHeaderButton10.Style = Sunny.UI.UIStyle.Custom;
this.uiHeaderButton10.Symbol = 62145;
- this.uiHeaderButton10.SymbolOffset = new System.Drawing.Point(1, 2);
this.uiHeaderButton10.SymbolSize = 38;
this.uiHeaderButton10.TabIndex = 3;
this.uiHeaderButton10.Text = "手机";
@@ -358,7 +347,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton9.CircleColor = System.Drawing.Color.DarkOrange;
this.uiHeaderButton9.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton9.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton9.IsScaled = false;
this.uiHeaderButton9.Location = new System.Drawing.Point(300, 1);
this.uiHeaderButton9.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton9.Name = "uiHeaderButton9";
@@ -369,7 +357,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton9.Size = new System.Drawing.Size(100, 88);
this.uiHeaderButton9.Style = Sunny.UI.UIStyle.Custom;
this.uiHeaderButton9.Symbol = 61664;
- this.uiHeaderButton9.SymbolOffset = new System.Drawing.Point(0, 1);
this.uiHeaderButton9.SymbolSize = 40;
this.uiHeaderButton9.TabIndex = 2;
this.uiHeaderButton9.Text = "邮件";
@@ -380,7 +367,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton8.CircleColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.uiHeaderButton8.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton8.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton8.IsScaled = false;
this.uiHeaderButton8.Location = new System.Drawing.Point(200, 1);
this.uiHeaderButton8.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton8.Name = "uiHeaderButton8";
@@ -391,7 +377,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton8.Size = new System.Drawing.Size(100, 88);
this.uiHeaderButton8.Style = Sunny.UI.UIStyle.Custom;
this.uiHeaderButton8.Symbol = 62074;
- this.uiHeaderButton8.SymbolOffset = new System.Drawing.Point(1, 0);
this.uiHeaderButton8.SymbolSize = 44;
this.uiHeaderButton8.TabIndex = 1;
this.uiHeaderButton8.Text = "消息";
@@ -403,7 +388,6 @@ namespace Sunny.UI.Demo
this.uiHeaderButton1.CircleHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
this.uiHeaderButton1.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiHeaderButton1.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.uiHeaderButton1.IsScaled = false;
this.uiHeaderButton1.Location = new System.Drawing.Point(100, 1);
this.uiHeaderButton1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiHeaderButton1.Name = "uiHeaderButton1";
@@ -421,11 +405,109 @@ namespace Sunny.UI.Demo
this.uiHeaderButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiHeaderButton1.TipsText = "12";
//
+ // uiHeaderButton13
+ //
+ this.uiHeaderButton13.CircleColor = System.Drawing.Color.Teal;
+ this.uiHeaderButton13.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiHeaderButton13.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiHeaderButton13.Location = new System.Drawing.Point(460, 387);
+ this.uiHeaderButton13.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiHeaderButton13.Name = "uiHeaderButton13";
+ this.uiHeaderButton13.Padding = new System.Windows.Forms.Padding(6);
+ this.uiHeaderButton13.Radius = 0;
+ this.uiHeaderButton13.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+ this.uiHeaderButton13.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+ this.uiHeaderButton13.Size = new System.Drawing.Size(110, 88);
+ this.uiHeaderButton13.Symbol = 62145;
+ this.uiHeaderButton13.SymbolSize = 38;
+ this.uiHeaderButton13.TabIndex = 28;
+ this.uiHeaderButton13.Text = "手机";
+ this.uiHeaderButton13.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
+ this.uiHeaderButton13.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ //
+ // uiHeaderButton14
+ //
+ this.uiHeaderButton14.CircleColor = System.Drawing.Color.DarkOrange;
+ this.uiHeaderButton14.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiHeaderButton14.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiHeaderButton14.Location = new System.Drawing.Point(304, 387);
+ this.uiHeaderButton14.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiHeaderButton14.Name = "uiHeaderButton14";
+ this.uiHeaderButton14.Padding = new System.Windows.Forms.Padding(6);
+ this.uiHeaderButton14.Radius = 0;
+ this.uiHeaderButton14.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+ this.uiHeaderButton14.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+ this.uiHeaderButton14.Size = new System.Drawing.Size(110, 88);
+ this.uiHeaderButton14.Symbol = 61664;
+ this.uiHeaderButton14.SymbolSize = 40;
+ this.uiHeaderButton14.TabIndex = 27;
+ this.uiHeaderButton14.Text = "邮件";
+ this.uiHeaderButton14.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+ this.uiHeaderButton14.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ //
+ // uiHeaderButton15
+ //
+ this.uiHeaderButton15.CircleColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.uiHeaderButton15.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiHeaderButton15.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiHeaderButton15.Location = new System.Drawing.Point(172, 387);
+ this.uiHeaderButton15.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiHeaderButton15.Name = "uiHeaderButton15";
+ this.uiHeaderButton15.Padding = new System.Windows.Forms.Padding(6);
+ this.uiHeaderButton15.Radius = 0;
+ this.uiHeaderButton15.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+ this.uiHeaderButton15.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+ this.uiHeaderButton15.Size = new System.Drawing.Size(100, 88);
+ this.uiHeaderButton15.Symbol = 62074;
+ this.uiHeaderButton15.SymbolSize = 44;
+ this.uiHeaderButton15.TabIndex = 26;
+ this.uiHeaderButton15.Text = "消息";
+ this.uiHeaderButton15.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+ this.uiHeaderButton15.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ //
+ // uiHeaderButton16
+ //
+ this.uiHeaderButton16.CircleColor = System.Drawing.Color.RoyalBlue;
+ this.uiHeaderButton16.CircleHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+ this.uiHeaderButton16.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.uiHeaderButton16.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiHeaderButton16.Location = new System.Drawing.Point(30, 387);
+ this.uiHeaderButton16.MinimumSize = new System.Drawing.Size(1, 1);
+ this.uiHeaderButton16.Name = "uiHeaderButton16";
+ this.uiHeaderButton16.Padding = new System.Windows.Forms.Padding(6);
+ this.uiHeaderButton16.Radius = 0;
+ this.uiHeaderButton16.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+ this.uiHeaderButton16.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+ this.uiHeaderButton16.ShowCircleHoverColor = true;
+ this.uiHeaderButton16.ShowTips = true;
+ this.uiHeaderButton16.Size = new System.Drawing.Size(100, 88);
+ this.uiHeaderButton16.Symbol = 61461;
+ this.uiHeaderButton16.TabIndex = 25;
+ this.uiHeaderButton16.Text = "主页";
+ this.uiHeaderButton16.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.uiHeaderButton16.TipsText = "12";
+ //
+ // uiLine3
+ //
+ this.uiLine3.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiLine3.Location = new System.Drawing.Point(30, 350);
+ this.uiLine3.MinimumSize = new System.Drawing.Size(16, 16);
+ this.uiLine3.Name = "uiLine3";
+ this.uiLine3.Size = new System.Drawing.Size(716, 20);
+ this.uiLine3.TabIndex = 29;
+ this.uiLine3.Text = "UIHeaderButton 图片与文字位置";
+ this.uiLine3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
// FHeaderButton
//
this.AllowShowTitle = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(800, 450);
+ this.ClientSize = new System.Drawing.Size(800, 574);
+ this.Controls.Add(this.uiLine3);
+ this.Controls.Add(this.uiHeaderButton13);
+ this.Controls.Add(this.uiHeaderButton14);
+ this.Controls.Add(this.uiHeaderButton15);
+ this.Controls.Add(this.uiHeaderButton16);
this.Controls.Add(this.uiLine2);
this.Controls.Add(this.uiLine1);
this.Controls.Add(this.uiPanel2);
@@ -459,5 +541,10 @@ namespace Sunny.UI.Demo
private UIHeaderButton uiHeaderButton9;
private UIHeaderButton uiHeaderButton8;
private UIHeaderButton uiHeaderButton1;
+ private UIHeaderButton uiHeaderButton13;
+ private UIHeaderButton uiHeaderButton14;
+ private UIHeaderButton uiHeaderButton15;
+ private UIHeaderButton uiHeaderButton16;
+ private UILine uiLine3;
}
}
\ No newline at end of file
diff --git a/SunnyUI.Demo/Controls/FLabel.Designer.cs b/SunnyUI.Demo/Controls/FLabel.Designer.cs
index 238f5c19..f51a095c 100644
--- a/SunnyUI.Demo/Controls/FLabel.Designer.cs
+++ b/SunnyUI.Demo/Controls/FLabel.Designer.cs
@@ -91,9 +91,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine4.Location = new System.Drawing.Point(30, 208);
this.uiLine4.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine4.Name = "uiLine4";
@@ -120,7 +118,6 @@ namespace Sunny.UI.Demo
this.uiSymbolLabel2.Location = new System.Drawing.Point(139, 169);
this.uiSymbolLabel2.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolLabel2.Name = "uiSymbolLabel2";
- this.uiSymbolLabel2.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
this.uiSymbolLabel2.Size = new System.Drawing.Size(91, 24);
this.uiSymbolLabel2.Symbol = 61453;
this.uiSymbolLabel2.TabIndex = 40;
@@ -133,7 +130,6 @@ namespace Sunny.UI.Demo
this.uiSymbolLabel1.Location = new System.Drawing.Point(42, 169);
this.uiSymbolLabel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiSymbolLabel1.Name = "uiSymbolLabel1";
- this.uiSymbolLabel1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
this.uiSymbolLabel1.Size = new System.Drawing.Size(91, 24);
this.uiSymbolLabel1.TabIndex = 39;
this.uiSymbolLabel1.Text = "OK";
@@ -141,9 +137,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine3.Location = new System.Drawing.Point(30, 133);
this.uiLine3.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine3.Name = "uiLine3";
@@ -154,9 +148,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine2.Location = new System.Drawing.Point(381, 55);
this.uiLine2.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine2.Name = "uiLine2";
@@ -167,9 +159,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine1.Location = new System.Drawing.Point(30, 55);
this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine1.Name = "uiLine1";
@@ -184,7 +174,6 @@ namespace Sunny.UI.Demo
this.uiLinkLabel1.AutoSize = true;
this.uiLinkLabel1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiLinkLabel1.LinkBehavior = System.Windows.Forms.LinkBehavior.AlwaysUnderline;
- 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.Name = "uiLinkLabel1";
this.uiLinkLabel1.Size = new System.Drawing.Size(146, 21);
@@ -240,9 +229,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine5.Location = new System.Drawing.Point(30, 290);
this.uiLine5.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine5.Name = "uiLine5";
@@ -253,16 +240,17 @@ namespace Sunny.UI.Demo
//
// 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("Segoe Script", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.uiSmoothLabel1.Location = new System.Drawing.Point(381, 313);
this.uiSmoothLabel1.Name = "uiSmoothLabel1";
+ this.uiSmoothLabel1.RectSize = 3;
this.uiSmoothLabel1.Size = new System.Drawing.Size(258, 66);
this.uiSmoothLabel1.TabIndex = 53;
this.uiSmoothLabel1.Text = "SunnyUI";
//
// uiSmoothLabel2
//
- this.uiSmoothLabel2.Font = new System.Drawing.Font("Jokerman", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.uiSmoothLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.uiSmoothLabel2.Location = new System.Drawing.Point(381, 386);
this.uiSmoothLabel2.Name = "uiSmoothLabel2";
this.uiSmoothLabel2.Size = new System.Drawing.Size(284, 83);
@@ -271,9 +259,7 @@ namespace Sunny.UI.Demo
//
// 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.LineDashStyle = Sunny.UI.UILineDashStyle.None;
this.uiLine6.Location = new System.Drawing.Point(381, 290);
this.uiLine6.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine6.Name = "uiLine6";
diff --git a/SunnyUI.Demo/Controls/FListBox.cs b/SunnyUI.Demo/Controls/FListBox.cs
index 8abc09fb..170fb503 100644
--- a/SunnyUI.Demo/Controls/FListBox.cs
+++ b/SunnyUI.Demo/Controls/FListBox.cs
@@ -18,7 +18,7 @@ namespace Sunny.UI.Demo
if (text.Contains("6"))
{
e.Graphics.FillRectangle(UIColor.Green, e.Bounds);
- e.Graphics.DrawString(text, e.Font, Color.Blue, e.Bounds);
+ e.Graphics.DrawString(text, e.Font, Color.Blue, e.Bounds, ContentAlignment.MiddleLeft);
}
}
diff --git a/SunnyUI.Demo/Properties/AssemblyInfo.cs b/SunnyUI.Demo/Properties/AssemblyInfo.cs
index 1bc88af1..51881825 100644
--- a/SunnyUI.Demo/Properties/AssemblyInfo.cs
+++ b/SunnyUI.Demo/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.5.0")]
-[assembly: AssemblyFileVersion("3.3.5.0")]
+[assembly: AssemblyVersion("3.3.7.0")]
+[assembly: AssemblyFileVersion("3.3.7.0")]
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index e8a62b85..806d185c 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -41,8 +41,8 @@
app.manifest
-
- ..\packages\SunnyUI.3.3.6\lib\net472\SunnyUI.dll
+
+ ..\packages\SunnyUI.3.3.7\lib\net472\SunnyUI.dll
..\packages\SunnyUI.Common.3.3.2\lib\net472\SunnyUI.Common.dll
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
index 2aa21966..e61a99cb 100644
--- a/SunnyUI.Demo/packages.config
+++ b/SunnyUI.Demo/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file