diff --git a/.gitignore b/.gitignore index 516d9be6..c7c5b3d2 100644 --- a/.gitignore +++ b/.gitignore @@ -214,6 +214,9 @@ _pkginfo.txt # Others ClientBin/ +[Bb]in/net462/ +[Bb]in/net5.0-windows/ +[Bb]in/netcoreapp3.1/ ~$* *~ *.dbmdl diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 74bc891c..003e9b33 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 cc4fb350..9155a8c0 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net462/SunnyUI.dll b/Bin/net462/SunnyUI.dll index 8c1b539a..5843031e 100644 Binary files a/Bin/net462/SunnyUI.dll and b/Bin/net462/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 1e8acece..d558a6a1 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 5633667f..d15a6ee3 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 d5880e0b..e2716dc8 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI/Controls/UIComboBox.cs b/SunnyUI/Controls/UIComboBox.cs index ac245311..5c6bd112 100644 --- a/SunnyUI/Controls/UIComboBox.cs +++ b/SunnyUI/Controls/UIComboBox.cs @@ -100,7 +100,7 @@ namespace Sunny.UI edit.Text = ""; } - public new EventHandler TextChanged; + public new event EventHandler TextChanged; private void Edit_TextChanged(object sender, EventArgs e) { diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index 185a68e1..47ea197e 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -95,8 +95,8 @@ namespace Sunny.UI timer?.Dispose(); } - public new EventHandler MouseLeave; - public new EventHandler MouseEnter; + public new event EventHandler MouseLeave; + public new event EventHandler MouseEnter; public new event KeyPressEventHandler KeyPress; public new event KeyEventHandler KeyDown; public new event KeyEventHandler KeyUp; diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index 4ce8a5ef..bbd83c19 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -111,10 +111,6 @@ namespace Sunny.UI MouseDown?.Invoke(this, e); } - public new event MouseEventHandler MouseDown; - public new event MouseEventHandler MouseUp; - public new event MouseEventHandler MouseMove; - private void Edit_MouseLeave(object sender, EventArgs e) { MouseLeave?.Invoke(this, e); @@ -140,11 +136,22 @@ namespace Sunny.UI Validating?.Invoke(this, e); } - public new EventHandler GotFocus; - public new EventHandler LostFocus; - public new CancelEventHandler Validating; + public new event MouseEventHandler MouseDown; + public new event MouseEventHandler MouseUp; + public new event MouseEventHandler MouseMove; + public new event EventHandler GotFocus; + public new event EventHandler LostFocus; + public new event CancelEventHandler Validating; public new event EventHandler Validated; - public new EventHandler MouseLeave; + public new event EventHandler MouseLeave; + public new event EventHandler DoubleClick; + public new event EventHandler Click; + [Browsable(true)] + public new event EventHandler TextChanged; + public new event KeyEventHandler KeyDown; + public new event KeyEventHandler KeyUp; + public new event KeyPressEventHandler KeyPress; + public new event EventHandler Leave; private void Edit_Validated(object sender, EventArgs e) { @@ -203,8 +210,7 @@ namespace Sunny.UI DoubleClick?.Invoke(this, e); } - public new event EventHandler DoubleClick; - public new event EventHandler Click; + private void Edit_Click(object sender, EventArgs e) { @@ -380,17 +386,6 @@ namespace Sunny.UI edit.CheckMaxMin(); } - [Browsable(true)] - public new event EventHandler TextChanged; - - public new event KeyEventHandler KeyDown; - - public new event KeyEventHandler KeyUp; - - public new event KeyPressEventHandler KeyPress; - - public new event EventHandler Leave; - private void Edit_TextChanged(object s, EventArgs e) { TextChanged?.Invoke(this, e); diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index 86abbea7..6fa36bbd 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -71,6 +71,12 @@ namespace Sunny.UI view.KeyPress += View_KeyPress; view.KeyDown += View_KeyDown; view.KeyUp += View_KeyUp; + view.AfterLabelEdit += View_AfterLabelEdit; + } + + private void View_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) + { + AfterLabelEdit?.Invoke(this, e); } public Control ExToolTipControl() @@ -78,11 +84,12 @@ namespace Sunny.UI return view; } - public new EventHandler MouseLeave; - public new EventHandler MouseEnter; - public new MouseEventHandler MouseMove; - public new MouseEventHandler MouseDown; - public new MouseEventHandler MouseUp; + public event NodeLabelEditEventHandler AfterLabelEdit; + public new event EventHandler MouseLeave; + public new event EventHandler MouseEnter; + public new event MouseEventHandler MouseMove; + public new event MouseEventHandler MouseDown; + public new event MouseEventHandler MouseUp; public new event KeyPressEventHandler KeyPress; public new event KeyEventHandler KeyDown; public new event KeyEventHandler KeyUp;