* UITextBox等组合控件将其回调事件的Sender设置为this，而不是其内置控件

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
             // 

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)]

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);
         }
 
         /// <summary>

SunnyUI/Controls/DropItem/UIDropDownItem.cs

@@ -58,7 +58,7 @@ namespace Sunny.UI
         /// <param name="value">数值</param>
         protected void DoValueChanged(object sender, object value)
         {
-            ValueChanged?.Invoke(sender, value);
+            ValueChanged?.Invoke(this, value);
         }
 
         /// <summary>

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)

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;

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("文字")]

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)]

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;

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()

SunnyUI/Controls/UIWaitingBar.cs

@@ -95,7 +95,7 @@ namespace Sunny.UI
 
             Invalidate();
 
-            Tick?.Invoke(sender, e);
+            Tick?.Invoke(this, e);
         }
 
         [DefaultValue(200)]

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
             {

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)