diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 3564a414..60fba47a 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 50b163e6..c98a8ab2 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 9a265478..1d9ccede 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 3564a414..60fba47a 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index c5f66b20..81a4250b 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -52,7 +52,7 @@ // this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); - this.Header.MenuStyle = Sunny.UI.UIMenuStyle.Custom; + this.Header.FillColor = System.Drawing.Color.Navy; treeNode1.Name = "节点0"; treeNode1.Text = "控件"; treeNode2.Name = "节点1"; diff --git a/SunnyUI/Controls/UINavBar.cs b/SunnyUI/Controls/UINavBar.cs index 0eeefa8a..fd238700 100644 --- a/SunnyUI/Controls/UINavBar.cs +++ b/SunnyUI/Controls/UINavBar.cs @@ -130,6 +130,7 @@ namespace Sunny.UI private Color backColor = Color.FromArgb(56, 56, 56); + [DefaultValue(typeof(Color), "56, 56, 56")] public override Color BackColor { get => backColor; @@ -141,6 +142,19 @@ namespace Sunny.UI } } + private Color fillColor = Color.FromArgb(56, 56, 56); + + [DefaultValue(typeof(Color), "56, 56, 56")] + public Color FillColor + { + get => fillColor; + set + { + fillColor = value; + Invalidate(); + } + } + private void SetMenuStyle(UIMenuColor uiColor) { foreColor = uiColor.UnSelectedForeColor; @@ -279,6 +293,8 @@ namespace Sunny.UI base.OnPaint(e); e.Graphics.Clear(BackColor); + if (StyleCustomMode) e.Graphics.Clear(FillColor); + NodeX = 0; NodeY = Height - NodeSize.Height;