diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index e20e220c..ee06ac97 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 3ba7824e..57875d4e 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 6d0ee775..2c71bc09 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 a9503ece..e006f053 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.dll b/Bin/netcoreapp3.1/SunnyUI.dll index bb7b9b3d..10f70501 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index f18710e5..2b8279fa 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("主题"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("控件"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("窗体"); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图表"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("主题"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain)); this.uiLogo1 = new Sunny.UI.UILogo(); this.uiAvatar = new Sunny.UI.UIAvatar(); @@ -46,13 +46,11 @@ // // Aside // - this.Aside.ExpandSelectFirst = false; 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.Location = new System.Drawing.Point(2, 145); this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; - this.Aside.SecondBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(66)))), ((int)(((byte)(66))))); this.Aside.ShowOneNode = true; this.Aside.ShowSecondBackColor = true; this.Aside.ShowTips = true; @@ -65,20 +63,20 @@ this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); this.Header.Location = new System.Drawing.Point(2, 35); - treeNode5.ImageIndex = 1; - treeNode5.Name = "节点0"; - treeNode5.Text = "控件"; - treeNode6.Name = "节点1"; - treeNode6.Text = "窗体"; - treeNode7.Name = "节点2"; - treeNode7.Text = "图表"; - treeNode8.Name = "节点2"; - treeNode8.Text = "主题"; + treeNode9.ImageIndex = 1; + treeNode9.Name = "节点0"; + treeNode9.Text = "控件"; + treeNode10.Name = "节点1"; + treeNode10.Text = "窗体"; + treeNode11.Name = "节点2"; + treeNode11.Text = "图表"; + treeNode12.Name = "节点2"; + treeNode12.Text = "主题"; this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode5, - treeNode6, - treeNode7, - treeNode8}); + treeNode9, + treeNode10, + treeNode11, + treeNode12}); this.Header.SelectedIndex = 0; this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Style = Sunny.UI.UIStyle.Custom; diff --git a/SunnyUI.Net5.Demo/FMain.Designer.cs b/SunnyUI.Net5.Demo/FMain.Designer.cs index a7e412b4..4ea74a63 100644 --- a/SunnyUI.Net5.Demo/FMain.Designer.cs +++ b/SunnyUI.Net5.Demo/FMain.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("控件"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("窗体"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("图表"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("主题"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("主题"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain)); this.uiLogo1 = new Sunny.UI.UILogo(); this.uiAvatar = new Sunny.UI.UIAvatar(); @@ -47,7 +47,6 @@ this.Aside.LineColor = System.Drawing.Color.Black; this.Aside.Location = new System.Drawing.Point(2, 145); this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; - this.Aside.ShowOneNode = true; this.Aside.ShowTips = true; this.Aside.Size = new System.Drawing.Size(250, 573); this.Aside.Style = Sunny.UI.UIStyle.Custom; @@ -57,20 +56,20 @@ this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); this.Header.Location = new System.Drawing.Point(2, 35); - treeNode1.ImageIndex = 1; - treeNode1.Name = "节点0"; - treeNode1.Text = "控件"; - treeNode2.Name = "节点1"; - treeNode2.Text = "窗体"; - treeNode3.Name = "节点2"; - treeNode3.Text = "图表"; - treeNode4.Name = "节点2"; - treeNode4.Text = "主题"; + treeNode5.ImageIndex = 1; + treeNode5.Name = "节点0"; + treeNode5.Text = "控件"; + treeNode6.Name = "节点1"; + treeNode6.Text = "窗体"; + treeNode7.Name = "节点2"; + treeNode7.Text = "图表"; + treeNode8.Name = "节点2"; + treeNode8.Text = "主题"; this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4}); + treeNode5, + treeNode6, + treeNode7, + treeNode8}); this.Header.SelectedIndex = 0; this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Style = Sunny.UI.UIStyle.Custom; @@ -78,7 +77,7 @@ // // uiLogo1 // - this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLogo1.Location = new System.Drawing.Point(20, 15); this.uiLogo1.MaximumSize = new System.Drawing.Size(300, 80); this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80); @@ -91,7 +90,7 @@ // uiAvatar // this.uiAvatar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.uiAvatar.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiAvatar.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiAvatar.Location = new System.Drawing.Point(939, 25); this.uiAvatar.MinimumSize = new System.Drawing.Size(1, 1); this.uiAvatar.Name = "uiAvatar"; diff --git a/SunnyUI.Net5.Demo/FMain.resx b/SunnyUI.Net5.Demo/FMain.resx index 8afef9d3..24c27de7 100644 --- a/SunnyUI.Net5.Demo/FMain.resx +++ b/SunnyUI.Net5.Demo/FMain.resx @@ -1,64 +1,4 @@ - - - + @@ -117,11 +57,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - + + AAABAAcAMDAAAAEACACoDgAAdgAAACAgAAABAAgAqAgAAB4PAAAQEAAAAQAIAGgFAADGFwAASEgAAAEA IACIVAAALh0AADAwAAABACAAqCUAALZxAAAgIAAAAQAgAKgQAABelwAAEBAAAAEAIABoBAAABqgAACgA diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs index fa5dfc63..df68b57b 100644 --- a/SunnyUI/Controls/UINavMenu.cs +++ b/SunnyUI/Controls/UINavMenu.cs @@ -586,7 +586,7 @@ namespace Sunny.UI } } - [Description("展开节点后选中第一个子节点"), DefaultValue(true), Category("SunnyUI")] + [Description("展开节点后选中第一个子节点"), Category("SunnyUI")] public bool ExpandSelectFirst { get; set; } = true; public string Version { get; }