diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 57e2ee5f..bd3a3435 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 82688954..17550493 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index 23fa8877..90397f61 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 57e2ee5f..bd3a3435 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 7615aab7..34a8200f 100644 --- a/SunnyUI.Demo/Controls/FButton.Designer.cs +++ b/SunnyUI.Demo/Controls/FButton.Designer.cs @@ -612,9 +612,11 @@ this.uiSymbolButton7.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton7.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); 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, 280); 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)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton7.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); diff --git a/SunnyUI/Controls/UINavMenuHelper.cs b/SunnyUI/Controls/UINavMenuHelper.cs index fa2fd132..576e7ec8 100644 --- a/SunnyUI/Controls/UINavMenuHelper.cs +++ b/SunnyUI/Controls/UINavMenuHelper.cs @@ -285,10 +285,10 @@ namespace Sunny.UI if (pageIndex < 0) return; foreach (var item in PageItems) { - if (item.Value.PageIndex == pageIndex && item.Key!=null) + if (item.Value.PageIndex == pageIndex && item.Key != null) { - if (tabControl.TabPages.Contains(item.Key)) - tabControl.SelectTab(item.Key); + if (tabControl.TabPages.Contains(item.Key)) + tabControl.SelectTab(item.Key); } } }