diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 60fba47a..b5aa02c1 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index c98a8ab2..76da3322 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 1d9ccede..84b1fbe5 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 60fba47a..b5aa02c1 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FDataGridView.cs b/SunnyUI.Demo/Controls/FDataGridView.cs index 34bbd7de..3adc6bd5 100644 --- a/SunnyUI.Demo/Controls/FDataGridView.cs +++ b/SunnyUI.Demo/Controls/FDataGridView.cs @@ -10,12 +10,9 @@ namespace Sunny.UI.Demo InitializeComponent(); uiDataGridView1.AddColumn("Column1", "Column1", 100); - uiDataGridView1.AddColumn("Column2", "Column2").SetFixedMode(1000); + uiDataGridView1.AddColumn("Column2", "Column2").SetFixedMode(100); uiDataGridView1.AddColumn("Column3", "Column3").SetFixedMode(100); - //uiDataGridView1.AddColumn("Column4", "Column4", 20); - uiDataGridView1.ReadOnly = true; - uiDataGridView1.ScrollBars = ScrollBars.Both; } public override void Init() diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index 81a4250b..f5d9c75d 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -42,17 +42,19 @@ // // Aside // + this.Aside.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.Aside.ItemHeight = 36; this.Aside.LineColor = System.Drawing.Color.Black; + this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; this.Aside.ShowOneNode = true; this.Aside.ShowTips = true; this.Aside.Size = new System.Drawing.Size(250, 575); + this.Aside.Style = Sunny.UI.UIStyle.Custom; // // Header // this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); - this.Header.FillColor = System.Drawing.Color.Navy; treeNode1.Name = "节点0"; treeNode1.Text = "控件"; treeNode2.Name = "节点1"; @@ -68,6 +70,7 @@ treeNode4}); this.Header.SelectedIndex = 0; this.Header.Size = new System.Drawing.Size(1024, 110); + this.Header.Style = Sunny.UI.UIStyle.Custom; this.Header.MenuItemClick += new Sunny.UI.UINavBar.OnMenuItemClick(this.Header_MenuItemClick); // // uiLogo1 diff --git a/SunnyUI/Controls/UINavBar.cs b/SunnyUI/Controls/UINavBar.cs index fd238700..187ece3d 100644 --- a/SunnyUI/Controls/UINavBar.cs +++ b/SunnyUI/Controls/UINavBar.cs @@ -118,6 +118,7 @@ namespace Sunny.UI { foreColor = value; _menuStyle = UIMenuStyle.Custom; + _style = UIStyle.Custom; Invalidate(); } } @@ -126,6 +127,7 @@ namespace Sunny.UI { base.OnBackColorChanged(e); _menuStyle = UIMenuStyle.Custom; + _style = UIStyle.Custom; } private Color backColor = Color.FromArgb(56, 56, 56); @@ -138,19 +140,7 @@ namespace Sunny.UI { backColor = value; _menuStyle = UIMenuStyle.Custom; - Invalidate(); - } - } - - private Color fillColor = Color.FromArgb(56, 56, 56); - - [DefaultValue(typeof(Color), "56, 56, 56")] - public Color FillColor - { - get => fillColor; - set - { - fillColor = value; + _style = UIStyle.Custom; Invalidate(); } } @@ -293,8 +283,6 @@ namespace Sunny.UI base.OnPaint(e); e.Graphics.Clear(BackColor); - if (StyleCustomMode) e.Graphics.Clear(FillColor); - NodeX = 0; NodeY = Height - NodeSize.Height; diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs index c7846b26..cbdc06c2 100644 --- a/SunnyUI/Controls/UINavMenu.cs +++ b/SunnyUI/Controls/UINavMenu.cs @@ -77,6 +77,28 @@ namespace Sunny.UI [DefaultValue(null)] public string TagString { get; set; } + protected override void OnBackColorChanged(EventArgs e) + { + base.OnBackColorChanged(e); + menuStyle = UIMenuStyle.Custom; + _style = UIStyle.Custom; + } + + private Color backColor = Color.FromArgb(56, 56, 56); + + [DefaultValue(typeof(Color), "56, 56, 56")] + public override Color BackColor + { + get => backColor; + set + { + backColor = value; + menuStyle = UIMenuStyle.Custom; + _style = UIStyle.Custom; + Invalidate(); + } + } + private Color fillColor = Color.FromArgb(56, 56, 56); ///