zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UINavMenu：修改一处可能引起的Bug

Browse Source
This commit is contained in:
Sunny 2021-03-13 10:02:10 +08:00
parent f5bbabf62f
commit 35356066eb
9 changed files with 40 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/ref/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/netcoreapp3.1/SunnyUI.dll
View File

Binary file not shown.

36
SunnyUI.Demo/FMain.Designer.cs generated
View File

@ -29,10 +29,10 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件"); System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("控件");
System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体"); System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("窗体");
System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表"); System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图表");
System.Windows.Forms.TreeNode treeNode8 = 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)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain));
this.uiLogo1 = new Sunny.UI.UILogo(); this.uiLogo1 = new Sunny.UI.UILogo();
this.uiAvatar = new Sunny.UI.UIAvatar(); this.uiAvatar = new Sunny.UI.UIAvatar();
@ -46,13 +46,11 @@
// //
// Aside // Aside
// //
this.Aside.ExpandSelectFirst = false;
this.Aside.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.Aside.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.Aside.ItemHeight = 36; this.Aside.ItemHeight = 36;
this.Aside.LineColor = System.Drawing.Color.Black; this.Aside.LineColor = System.Drawing.Color.Black;
this.Aside.Location = new System.Drawing.Point(2, 145); this.Aside.Location = new System.Drawing.Point(2, 145);
this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; 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.ShowOneNode = true;
this.Aside.ShowSecondBackColor = true; this.Aside.ShowSecondBackColor = true;
this.Aside.ShowTips = true; this.Aside.ShowTips = true;
@ -65,20 +63,20 @@
this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiAvatar);
this.Header.Controls.Add(this.uiLogo1); this.Header.Controls.Add(this.uiLogo1);
this.Header.Location = new System.Drawing.Point(2, 35); this.Header.Location = new System.Drawing.Point(2, 35);
treeNode5.ImageIndex = 1; treeNode9.ImageIndex = 1;
treeNode5.Name = "节点0"; treeNode9.Name = "节点0";
treeNode5.Text = "控件"; treeNode9.Text = "控件";
treeNode6.Name = "节点1"; treeNode10.Name = "节点1";
treeNode6.Text = "窗体"; treeNode10.Text = "窗体";
treeNode7.Name = "节点2"; treeNode11.Name = "节点2";
treeNode7.Text = "图表"; treeNode11.Text = "图表";
treeNode8.Name = "节点2"; treeNode12.Name = "节点2";
treeNode8.Text = "主题"; treeNode12.Text = "主题";
this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode5, treeNode9,
treeNode6, treeNode10,
treeNode7, treeNode11,
treeNode8}); treeNode12});
this.Header.SelectedIndex = 0; this.Header.SelectedIndex = 0;
this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Size = new System.Drawing.Size(1020, 110);
this.Header.Style = Sunny.UI.UIStyle.Custom; this.Header.Style = Sunny.UI.UIStyle.Custom;

39
SunnyUI.Net5.Demo/FMain.Designer.cs generated
View File

@ -29,10 +29,10 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("控件"); System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件");
System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("窗体"); System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体");
System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("图表"); System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表");
System.Windows.Forms.TreeNode treeNode4 = 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)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain));
this.uiLogo1 = new Sunny.UI.UILogo(); this.uiLogo1 = new Sunny.UI.UILogo();
this.uiAvatar = new Sunny.UI.UIAvatar(); this.uiAvatar = new Sunny.UI.UIAvatar();
@ -47,7 +47,6 @@
this.Aside.LineColor = System.Drawing.Color.Black; this.Aside.LineColor = System.Drawing.Color.Black;
this.Aside.Location = new System.Drawing.Point(2, 145); this.Aside.Location = new System.Drawing.Point(2, 145);
this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black;
this.Aside.ShowOneNode = true;
this.Aside.ShowTips = true; this.Aside.ShowTips = true;
this.Aside.Size = new System.Drawing.Size(250, 573); this.Aside.Size = new System.Drawing.Size(250, 573);
this.Aside.Style = Sunny.UI.UIStyle.Custom; this.Aside.Style = Sunny.UI.UIStyle.Custom;
@ -57,20 +56,20 @@
this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiAvatar);
this.Header.Controls.Add(this.uiLogo1); this.Header.Controls.Add(this.uiLogo1);
this.Header.Location = new System.Drawing.Point(2, 35); this.Header.Location = new System.Drawing.Point(2, 35);
treeNode1.ImageIndex = 1; treeNode5.ImageIndex = 1;
treeNode1.Name = "节点0"; treeNode5.Name = "节点0";
treeNode1.Text = "控件"; treeNode5.Text = "控件";
treeNode2.Name = "节点1"; treeNode6.Name = "节点1";
treeNode2.Text = "窗体"; treeNode6.Text = "窗体";
treeNode3.Name = "节点2"; treeNode7.Name = "节点2";
treeNode3.Text = "图表"; treeNode7.Text = "图表";
treeNode4.Name = "节点2"; treeNode8.Name = "节点2";
treeNode4.Text = "主题"; treeNode8.Text = "主题";
this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode1, treeNode5,
treeNode2, treeNode6,
treeNode3, treeNode7,
treeNode4}); treeNode8});
this.Header.SelectedIndex = 0; this.Header.SelectedIndex = 0;
this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Size = new System.Drawing.Size(1020, 110);
this.Header.Style = Sunny.UI.UIStyle.Custom; this.Header.Style = Sunny.UI.UIStyle.Custom;
@ -78,7 +77,7 @@
// //
// uiLogo1 // 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.Location = new System.Drawing.Point(20, 15);
this.uiLogo1.MaximumSize = new System.Drawing.Size(300, 80); this.uiLogo1.MaximumSize = new System.Drawing.Size(300, 80);
this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80); this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80);
@ -91,7 +90,7 @@
// uiAvatar // uiAvatar
// //
this.uiAvatar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 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.Location = new System.Drawing.Point(939, 25);
this.uiAvatar.MinimumSize = new System.Drawing.Size(1, 1); this.uiAvatar.MinimumSize = new System.Drawing.Size(1, 1);
this.uiAvatar.Name = "uiAvatar"; this.uiAvatar.Name = "uiAvatar";

69
SunnyUI.Net5.Demo/FMain.resx
View File

@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <root>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@ -117,11 +57,8 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="StyleManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <assembly alias="System.Drawing.Common" name="System.Drawing.Common, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<value>17, 17</value> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing.Common" mimetype="application/x-microsoft.net.object.bytearray.base64">
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAcAMDAAAAEACACoDgAAdgAAACAgAAABAAgAqAgAAB4PAAAQEAAAAQAIAGgFAADGFwAASEgAAAEA AAABAAcAMDAAAAEACACoDgAAdgAAACAgAAABAAgAqAgAAB4PAAAQEAAAAQAIAGgFAADGFwAASEgAAAEA
IACIVAAALh0AADAwAAABACAAqCUAALZxAAAgIAAAAQAgAKgQAABelwAAEBAAAAEAIABoBAAABqgAACgA IACIVAAALh0AADAwAAABACAAqCUAALZxAAAgIAAAAQAgAKgQAABelwAAEBAAAAEAIABoBAAABqgAACgA

2
SunnyUI/Controls/UINavMenu.cs
View File

@ -586,7 +586,7 @@ namespace Sunny.UI
} }
} }
[Description("展开节点后选中第一个子节点"), DefaultValue(true), Category("SunnyUI")] [Description("展开节点后选中第一个子节点"), Category("SunnyUI")]
public bool ExpandSelectFirst { get; set; } = true; public bool ExpandSelectFirst { get; set; } = true;
public string Version { get; } public string Version { get; }