diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 805b358e..3291a711 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 cb555f5f..389d635b 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net45/SunnyUI.dll b/Bin/net45/SunnyUI.dll index 852e10b1..2bfe8a94 100644 Binary files a/Bin/net45/SunnyUI.dll and b/Bin/net45/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 454bdf51..e0e79923 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 7944dc2b..2200b3c9 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 a5fb8856..7418a792 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FButton.Designer.cs b/SunnyUI.Demo/Controls/FButton.Designer.cs index 2e5067c3..d43180bd 100644 --- a/SunnyUI.Demo/Controls/FButton.Designer.cs +++ b/SunnyUI.Demo/Controls/FButton.Designer.cs @@ -1059,10 +1059,12 @@ namespace Sunny.UI.Demo this.uiButton2.Name = "uiButton2"; this.uiButton2.RectSelectedColor = System.Drawing.Color.Empty; this.uiButton2.ShowFocusLine = true; + this.uiButton2.ShowTips = true; this.uiButton2.Size = new System.Drawing.Size(100, 35); this.uiButton2.StyleCustomMode = true; this.uiButton2.TabIndex = 60; this.uiButton2.Text = "Blue"; + this.uiButton2.TipsText = "16"; // // uiButton1 // diff --git a/SunnyUI/Controls/DropItem/UIDropControl.cs b/SunnyUI/Controls/DropItem/UIDropControl.cs index e1c70a0d..e7d4b11c 100644 --- a/SunnyUI/Controls/DropItem/UIDropControl.cs +++ b/SunnyUI/Controls/DropItem/UIDropControl.cs @@ -105,7 +105,7 @@ namespace Sunny.UI private void Edit_LostFocus(object sender, EventArgs e) { - EditorLostFocus?.Invoke(sender, e); + EditorLostFocus?.Invoke(this, e); } public event EventHandler EditorLostFocus; @@ -121,7 +121,7 @@ namespace Sunny.UI private void EditOnKeyPress(object sender, KeyPressEventArgs e) { - KeyPress?.Invoke(sender, e); + KeyPress?.Invoke(this, e); } public event EventHandler DoEnter; @@ -130,15 +130,15 @@ namespace Sunny.UI { if (e.KeyCode == Keys.Enter) { - DoEnter?.Invoke(sender, e); + DoEnter?.Invoke(this, e); } - KeyDown?.Invoke(sender, e); + KeyDown?.Invoke(this, e); } private void EditOnKeyUp(object sender, KeyEventArgs e) { - KeyUp?.Invoke(sender, e); + KeyUp?.Invoke(this, e); } [DefaultValue(null)] diff --git a/SunnyUI/Controls/DropItem/UIDropDown.cs b/SunnyUI/Controls/DropItem/UIDropDown.cs index dbdd43d2..48518097 100644 --- a/SunnyUI/Controls/DropItem/UIDropDown.cs +++ b/SunnyUI/Controls/DropItem/UIDropDown.cs @@ -77,7 +77,7 @@ namespace Sunny.UI private void DoValueChanged(object sender, object value) { - ValueChanged?.Invoke(sender, value); + ValueChanged?.Invoke(this, value); } /// diff --git a/SunnyUI/Controls/DropItem/UIDropDownItem.cs b/SunnyUI/Controls/DropItem/UIDropDownItem.cs index fca26606..160885ee 100644 --- a/SunnyUI/Controls/DropItem/UIDropDownItem.cs +++ b/SunnyUI/Controls/DropItem/UIDropDownItem.cs @@ -58,7 +58,7 @@ namespace Sunny.UI /// 数值 protected void DoValueChanged(object sender, object value) { - ValueChanged?.Invoke(sender, value); + ValueChanged?.Invoke(this, value); } /// diff --git a/SunnyUI/Controls/UIComboBox.cs b/SunnyUI/Controls/UIComboBox.cs index 4a9b357a..9a415a3e 100644 --- a/SunnyUI/Controls/UIComboBox.cs +++ b/SunnyUI/Controls/UIComboBox.cs @@ -61,17 +61,17 @@ namespace Sunny.UI private void Box_ValueMemberChanged(object sender, EventArgs e) { - ValueMemberChanged?.Invoke(sender, e); + ValueMemberChanged?.Invoke(this, e); } private void Box_DisplayMemberChanged(object sender, EventArgs e) { - DisplayMemberChanged?.Invoke(sender, e); + DisplayMemberChanged?.Invoke(this, e); } private void Box_DataSourceChanged(object sender, EventArgs e) { - DataSourceChanged?.Invoke(sender, e); + DataSourceChanged?.Invoke(this, e); } private void Box_SelectedIndexChanged(object sender, EventArgs e) diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs index eb2135d8..ed63c092 100644 --- a/SunnyUI/Controls/UIListBox.cs +++ b/SunnyUI/Controls/UIListBox.cs @@ -352,17 +352,17 @@ namespace Sunny.UI private void Box_ValueMemberChanged(object sender, EventArgs e) { - ValueMemberChanged?.Invoke(sender, e); + ValueMemberChanged?.Invoke(this, e); } private void Box_DisplayMemberChanged(object sender, EventArgs e) { - DisplayMemberChanged?.Invoke(sender, e); + DisplayMemberChanged?.Invoke(this, e); } private void Box_DataSourceChanged(object sender, EventArgs e) { - DataSourceChanged?.Invoke(sender, e); + DataSourceChanged?.Invoke(this, e); } public event EventHandler DataSourceChanged; diff --git a/SunnyUI/Controls/UIRichTextBox.cs b/SunnyUI/Controls/UIRichTextBox.cs index 8c2f2dac..02d37487 100644 --- a/SunnyUI/Controls/UIRichTextBox.cs +++ b/SunnyUI/Controls/UIRichTextBox.cs @@ -74,47 +74,47 @@ namespace Sunny.UI private void Edit_SelectionChanged(object sender, EventArgs e) { - SelectionChanged?.Invoke(sender, e); + SelectionChanged?.Invoke(this, e); } private void Edit_Protected(object sender, EventArgs e) { - Protected?.Invoke(sender, e); + Protected?.Invoke(this, e); } private void Edit_LinkClicked(object sender, LinkClickedEventArgs e) { - LinkClicked?.Invoke(sender, e); + LinkClicked?.Invoke(this, e); } private void Edit_QueryContinueDrag(object sender, QueryContinueDragEventArgs e) { - QueryContinueDrag?.Invoke(sender, e); + QueryContinueDrag?.Invoke(this, e); } private void Edit_GiveFeedback(object sender, GiveFeedbackEventArgs e) { - GiveFeedback?.Invoke(sender, e); + GiveFeedback?.Invoke(this, e); } private void Edit_DragOver(object sender, DragEventArgs e) { - DragOver?.Invoke(sender, e); + DragOver?.Invoke(this, e); } private void Edit_DragLeave(object sender, EventArgs e) { - DragLeave?.Invoke(sender, e); + DragLeave?.Invoke(this, e); } private void Edit_DragEnter(object sender, DragEventArgs e) { - DragEnter?.Invoke(sender, e); + DragEnter?.Invoke(this, e); } private void Edit_DragDrop(object sender, DragEventArgs e) { - DragDrop?.Invoke(sender, e); + DragDrop?.Invoke(this, e); } public new event KeyEventHandler KeyDown; @@ -167,17 +167,17 @@ namespace Sunny.UI private void EditOnKeyPress(object sender, KeyPressEventArgs e) { - KeyPress?.Invoke(sender, e); + KeyPress?.Invoke(this, e); } private void EditOnKeyDown(object sender, KeyEventArgs e) { - KeyDown?.Invoke(sender, e); + KeyDown?.Invoke(this, e); } private void EditOnKeyUp(object sender, KeyEventArgs e) { - KeyUp?.Invoke(sender, e); + KeyUp?.Invoke(this, e); } [Category("SunnyUI"), Browsable(true), DefaultValue(""), Description("文字")] diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index 09666738..c594dc63 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -61,6 +61,8 @@ namespace Sunny.UI edit.Click += Edit_Click; edit.DoubleClick += Edit_DoubleClick; edit.Leave += Edit_Leave; + edit.Validated += Edit_Validated; + edit.Validating += Edit_Validating; edit.Invalidate(); Controls.Add(edit); @@ -82,12 +84,26 @@ namespace Sunny.UI TextAlignmentChange += UITextBox_TextAlignmentChange; } + private void Edit_Validating(object sender, CancelEventArgs e) + { + Validating?.Invoke(this, e); + } + + + public new CancelEventHandler Validating; + public new event EventHandler Validated; + + private void Edit_Validated(object sender, EventArgs e) + { + Validated?.Invoke(this, e); + } + [Browsable(false)] public TextBox TextBox => edit; private void Edit_Leave(object sender, EventArgs e) { - Leave?.Invoke(sender, e); + Leave?.Invoke(this, e); } protected override void OnEnabledChanged(EventArgs e) @@ -261,24 +277,24 @@ namespace Sunny.UI private void EditOnKeyPress(object sender, KeyPressEventArgs e) { - KeyPress?.Invoke(sender, e); + KeyPress?.Invoke(this, e); } private void EditOnKeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { - DoEnter?.Invoke(sender, e); + DoEnter?.Invoke(this, e); } - KeyDown?.Invoke(sender, e); + KeyDown?.Invoke(this, e); } public event EventHandler DoEnter; private void EditOnKeyUp(object sender, KeyEventArgs e) { - KeyUp?.Invoke(sender, e); + KeyUp?.Invoke(this, e); } [DefaultValue(null)] diff --git a/SunnyUI/Controls/UITransfer.cs b/SunnyUI/Controls/UITransfer.cs index d9ae0412..4cffe69b 100644 --- a/SunnyUI/Controls/UITransfer.cs +++ b/SunnyUI/Controls/UITransfer.cs @@ -48,12 +48,12 @@ namespace Sunny.UI private void L2_ItemsCountChange(object sender, EventArgs e) { - ItemsRightCountChange?.Invoke(sender, e); + ItemsRightCountChange?.Invoke(this, e); } private void L1_ItemsCountChange(object sender, EventArgs e) { - ItemsLeftCountChange?.Invoke(sender, e); + ItemsLeftCountChange?.Invoke(this, e); } public event EventHandler ItemsLeftCountChange; diff --git a/SunnyUI/Controls/UITreeView.cs b/SunnyUI/Controls/UITreeView.cs index 85b89bb8..62922547 100644 --- a/SunnyUI/Controls/UITreeView.cs +++ b/SunnyUI/Controls/UITreeView.cs @@ -317,67 +317,67 @@ namespace Sunny.UI private void View_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) { - NodeMouseDoubleClick?.Invoke(sender, e); + NodeMouseDoubleClick?.Invoke(this, e); } private void View_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { - NodeMouseClick?.Invoke(sender, e); + NodeMouseClick?.Invoke(this, e); } private void View_AfterSelect(object sender, TreeViewEventArgs e) { - AfterSelect?.Invoke(sender, e); + AfterSelect?.Invoke(this, e); } private void View_BeforeSelect(object sender, TreeViewCancelEventArgs e) { - BeforeSelect?.Invoke(sender, e); + BeforeSelect?.Invoke(this, e); } private void View_NodeMouseHover(object sender, TreeNodeMouseHoverEventArgs e) { - NodeMouseHover?.Invoke(sender, e); + NodeMouseHover?.Invoke(this, e); } private void View_ItemDrag(object sender, ItemDragEventArgs e) { - ItemDrag?.Invoke(sender, e); + ItemDrag?.Invoke(this, e); } private void View_DrawNode(object sender, DrawTreeNodeEventArgs e) { - DrawNode?.Invoke(sender, e); + DrawNode?.Invoke(this, e); } private void View_AfterExpand(object sender, TreeViewEventArgs e) { - AfterExpand?.Invoke(sender, e); + AfterExpand?.Invoke(this, e); } private void View_BeforeExpand(object sender, TreeViewCancelEventArgs e) { - BeforeExpand?.Invoke(sender, e); + BeforeExpand?.Invoke(this, e); } private void View_AfterCollapse(object sender, TreeViewEventArgs e) { - AfterCollapse?.Invoke(sender, e); + AfterCollapse?.Invoke(this, e); } private void View_BeforeCollapse(object sender, TreeViewCancelEventArgs e) { - BeforeCollapse?.Invoke(sender, e); + BeforeCollapse?.Invoke(this, e); } private void View_AfterCheck(object sender, TreeViewEventArgs e) { - AfterCheck?.Invoke(sender, e); + AfterCheck?.Invoke(this, e); } private void View_BeforeCheck(object sender, TreeViewCancelEventArgs e) { - BeforeCheck?.Invoke(sender, e); + BeforeCheck?.Invoke(this, e); } public void BeginUpdate() diff --git a/SunnyUI/Controls/UIWaitingBar.cs b/SunnyUI/Controls/UIWaitingBar.cs index ac006354..6ee4c809 100644 --- a/SunnyUI/Controls/UIWaitingBar.cs +++ b/SunnyUI/Controls/UIWaitingBar.cs @@ -95,7 +95,7 @@ namespace Sunny.UI Invalidate(); - Tick?.Invoke(sender, e); + Tick?.Invoke(this, e); } [DefaultValue(200)] diff --git a/SunnyUI/Forms/UILoginForm.cs b/SunnyUI/Forms/UILoginForm.cs index 7bd0dbbf..e033406b 100644 --- a/SunnyUI/Forms/UILoginForm.cs +++ b/SunnyUI/Forms/UILoginForm.cs @@ -66,7 +66,7 @@ namespace Sunny.UI private void btnCancel_Click(object sender, EventArgs e) { if (ButtonCancelClick != null) - ButtonCancelClick?.Invoke(sender, e); + ButtonCancelClick?.Invoke(this, e); else Close(); } @@ -75,7 +75,7 @@ namespace Sunny.UI { if (ButtonLoginClick != null) { - ButtonLoginClick?.Invoke(sender, e); + ButtonLoginClick?.Invoke(this, e); } else { diff --git a/SunnyUI/Frames/UIMainFrame.cs b/SunnyUI/Frames/UIMainFrame.cs index c43f5e33..91c9a536 100644 --- a/SunnyUI/Frames/UIMainFrame.cs +++ b/SunnyUI/Frames/UIMainFrame.cs @@ -49,7 +49,7 @@ namespace Sunny.UI private void MainContainer_AfterRemoveTabPage(object sender, int index) { - AfterRemoveTabPage?.Invoke(sender, index); + AfterRemoveTabPage?.Invoke(this, index); } private bool MainContainer_BeforeRemoveTabPage(object sender, int index)