diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index a86347a6..fa1171f7 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 259f286e..0e52e555 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 787109b0..8f1c142b 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 bb90a85e..f3c754f3 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 60e3b45b..2547d2ef 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index 9717e4a0..a0c4e3b9 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -71,9 +71,9 @@ namespace Sunny.UI listbox.MouseDown += Listbox_MouseDown; listbox.MouseUp += Listbox_MouseUp; listbox.MouseMove += Listbox_MouseMove; - listbox.DataSourceChanged += Box_DataSourceChanged; - listbox.DisplayMemberChanged += Box_DisplayMemberChanged; - listbox.ValueMemberChanged += Box_ValueMemberChanged; + listbox.DataSourceChanged += Listbox_DataSourceChanged; + listbox.DisplayMemberChanged += Listbox_DisplayMemberChanged; + listbox.ValueMemberChanged += Listbox_ValueMemberChanged; listbox.ItemsClear += Listbox_ItemsClear; listbox.ItemsAdd += Listbox_ItemsAdd; listbox.ItemsRemove += Listbox_ItemsRemove; @@ -81,15 +81,29 @@ namespace Sunny.UI listbox.KeyPress += Listbox_KeyPress; listbox.KeyDown += Listbox_KeyDown; listbox.KeyUp += Listbox_KeyUp; + listbox.MouseEnter += Listbox_MouseEnter; + listbox.MouseLeave += Listbox_MouseLeave; timer.Tick += Timer_Tick; timer.Start(); } + public new EventHandler MouseLeave; + public new EventHandler MouseEnter; public new event KeyPressEventHandler KeyPress; public new event KeyEventHandler KeyDown; public new event KeyEventHandler KeyUp; + private void Listbox_MouseLeave(object sender, EventArgs e) + { + MouseLeave?.Invoke(this, e); + } + + private void Listbox_MouseEnter(object sender, EventArgs e) + { + MouseEnter?.Invoke(this, e); + } + private void Listbox_KeyUp(object sender, KeyEventArgs e) { KeyUp?.Invoke(this, e); @@ -518,17 +532,17 @@ namespace Sunny.UI set => listbox.DataSource = value; } - private void Box_ValueMemberChanged(object sender, EventArgs e) + private void Listbox_ValueMemberChanged(object sender, EventArgs e) { ValueMemberChanged?.Invoke(this, e); } - private void Box_DisplayMemberChanged(object sender, EventArgs e) + private void Listbox_DisplayMemberChanged(object sender, EventArgs e) { DisplayMemberChanged?.Invoke(this, e); } - private void Box_DataSourceChanged(object sender, EventArgs e) + private void Listbox_DataSourceChanged(object sender, EventArgs e) { DataSourceChanged?.Invoke(this, e); } diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index 732882eb..4ce8a5ef 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -59,10 +59,10 @@ namespace Sunny.UI edit.Width = Width - 8; edit.Text = String.Empty; edit.BorderStyle = BorderStyle.None; - edit.TextChanged += EditTextChanged; - edit.KeyDown += EditOnKeyDown; - edit.KeyUp += EditOnKeyUp; - edit.KeyPress += EditOnKeyPress; + edit.TextChanged += Edit_TextChanged; + edit.KeyDown += Edit_OnKeyDown; + edit.KeyUp += Edit_OnKeyUp; + edit.KeyPress += Edit_OnKeyPress; edit.MouseEnter += Edit_MouseEnter; edit.Click += Edit_Click; edit.DoubleClick += Edit_DoubleClick; @@ -71,6 +71,11 @@ namespace Sunny.UI edit.Validating += Edit_Validating; edit.GotFocus += Edit_GotFocus; edit.LostFocus += Edit_LostFocus; + edit.MouseLeave += Edit_MouseLeave; + edit.MouseWheel += Edit_MouseWheel; + edit.MouseDown += Edit_MouseDown; + edit.MouseUp += Edit_MouseUp; + edit.MouseMove += Edit_MouseMove; edit.Invalidate(); Controls.Add(edit); @@ -82,7 +87,6 @@ namespace Sunny.UI bar.Style = UIStyle.Custom; bar.Visible = false; bar.ValueChanged += Bar_ValueChanged; - edit.MouseWheel += OnMouseWheel; bar.MouseEnter += Bar_MouseEnter; TextAlignment = ContentAlignment.MiddleLeft; @@ -92,6 +96,30 @@ namespace Sunny.UI TextAlignmentChange += UITextBox_TextAlignmentChange; } + private void Edit_MouseMove(object sender, MouseEventArgs e) + { + MouseMove?.Invoke(this, e); + } + + private void Edit_MouseUp(object sender, MouseEventArgs e) + { + MouseUp?.Invoke(this, e); + } + + private void Edit_MouseDown(object sender, MouseEventArgs e) + { + 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); + } + public Control ExToolTipControl() { return edit; @@ -116,6 +144,7 @@ namespace Sunny.UI public new EventHandler LostFocus; public new CancelEventHandler Validating; public new event EventHandler Validated; + public new EventHandler MouseLeave; private void Edit_Validated(object sender, EventArgs e) { @@ -205,7 +234,7 @@ namespace Sunny.UI } } - private void OnMouseWheel(object sender, MouseEventArgs e) + private void Edit_MouseWheel(object sender, MouseEventArgs e) { base.OnMouseWheel(e); if (bar != null && bar.Visible && edit != null) @@ -302,12 +331,12 @@ namespace Sunny.UI edit.ScrollToCaret(); } - private void EditOnKeyPress(object sender, KeyPressEventArgs e) + private void Edit_OnKeyPress(object sender, KeyPressEventArgs e) { KeyPress?.Invoke(this, e); } - private void EditOnKeyDown(object sender, KeyEventArgs e) + private void Edit_OnKeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { @@ -319,7 +348,7 @@ namespace Sunny.UI public event EventHandler DoEnter; - private void EditOnKeyUp(object sender, KeyEventArgs e) + private void Edit_OnKeyUp(object sender, KeyEventArgs e) { KeyUp?.Invoke(this, e); } @@ -362,7 +391,7 @@ namespace Sunny.UI public new event EventHandler Leave; - private void EditTextChanged(object s, EventArgs e) + private void Edit_TextChanged(object s, EventArgs e) { TextChanged?.Invoke(this, e); SetScrollInfo(); diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index 3a444f87..16340145 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -32,7 +32,7 @@ using System.Windows.Forms; namespace Sunny.UI { - public sealed class UITreeView : UIPanel,IToolTip + public sealed class UITreeView : UIPanel, IToolTip { private UIScrollBar Bar; @@ -64,6 +64,9 @@ namespace Sunny.UI view.MouseMove += View_MouseMove; view.MouseEnter += View_MouseEnter; view.MouseLeave += View_MouseLeave; + view.KeyPress += View_KeyPress; + view.KeyDown += View_KeyDown; + view.KeyUp += View_KeyUp; } public Control ExToolTipControl() @@ -76,6 +79,25 @@ namespace Sunny.UI public new MouseEventHandler MouseMove; public new MouseEventHandler MouseDown; public new MouseEventHandler MouseUp; + public new event KeyPressEventHandler KeyPress; + public new event KeyEventHandler KeyDown; + public new event KeyEventHandler KeyUp; + + private void View_KeyUp(object sender, KeyEventArgs e) + { + KeyUp?.Invoke(this, e); + } + + private void View_KeyDown(object sender, KeyEventArgs e) + { + KeyDown?.Invoke(this, e); + } + + private void View_KeyPress(object sender, KeyPressEventArgs e) + { + KeyPress?.Invoke(this, e); + } + private void View_MouseLeave(object sender, EventArgs e) {