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

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

Browse Source
This commit is contained in:
Sunny 2021-07-05 22:09:10 +08:00
parent a596268209
commit 290d14f6de
19 changed files with 67 additions and 49 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/net45/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.

2
SunnyUI.Demo/Controls/FButton.Designer.cs generated
View File

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

10
SunnyUI/Controls/DropItem/UIDropControl.cs
View File

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

2
SunnyUI/Controls/DropItem/UIDropDown.cs
View File

@ -77,7 +77,7 @@ namespace Sunny.UI
private void DoValueChanged(object sender, object value)
{
ValueChanged?.Invoke(sender, value);
ValueChanged?.Invoke(this, value);
}
/// <summary>

2
SunnyUI/Controls/DropItem/UIDropDownItem.cs
View File

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

6
SunnyUI/Controls/UIComboBox.cs
View File

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

6
SunnyUI/Controls/UIListBox.cs
View File

@ -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;

24
SunnyUI/Controls/UIRichTextBox.cs
View File

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

26
SunnyUI/Controls/UITextBox.cs
View File

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

4
SunnyUI/Controls/UITransfer.cs
View File

@ -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;

26
SunnyUI/Controls/UITreeView.cs
View File

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

2
SunnyUI/Controls/UIWaitingBar.cs
View File

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

4
SunnyUI/Forms/UILoginForm.cs
View File

@ -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
{

2
SunnyUI/Frames/UIMainFrame.cs
View File

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