* UIListBox: 修复Click,DoubleClick事件

* UIImageListBox: 修复Click,DoubleClick事件
This commit is contained in:
Sunny 2022-09-05 21:36:18 +08:00
parent 20c744994e
commit 77051a39aa
2 changed files with 26 additions and 12 deletions

View File

@ -22,6 +22,7 @@
* 2021-08-07: V3.0.5
* 2022-03-19: V3.1.1
* 2022-08-30: V3.2.3
* 2022-09-05: V3.2.3 ClickDoubleClick事件
******************************************************************************/
using System;
@ -68,6 +69,7 @@ namespace Sunny.UI
listbox.MouseMove += Listbox_MouseMove;
listbox.MouseClick += Listbox_MouseClick;
listbox.MouseDoubleClick += Listbox_MouseDoubleClick;
listbox.KeyPress += Listbox_KeyPress;
listbox.KeyDown += Listbox_KeyDown;
listbox.KeyUp += Listbox_KeyUp;
@ -84,6 +86,13 @@ namespace Sunny.UI
public new event KeyEventHandler KeyUp;
public new event MouseEventHandler MouseClick;
public new event MouseEventHandler MouseDoubleClick;
private void Listbox_MouseDoubleClick(object sender, MouseEventArgs e)
{
MouseDoubleClick?.Invoke(this, e);
}
private void Listbox_DrawItem(object sender, DrawItemEventArgs e)
{
DrawItem?.Invoke(sender, e);
@ -201,22 +210,20 @@ namespace Sunny.UI
private void Listbox_DoubleClick(object sender, EventArgs e)
{
if (SelectedItem != null)
ItemDoubleClick?.Invoke(this, e);
DoubleClick?.Invoke(this, e);
}
private void Listbox_Click(object sender, EventArgs e)
{
if (SelectedItem != null)
ItemClick?.Invoke(this, e);
Click?.Invoke(this, e);
}
[Browsable(false)]
public int Count => Items.Count;
public event EventHandler ItemClick;
public new event EventHandler Click;
public event EventHandler ItemDoubleClick;
public new event EventHandler DoubleClick;
public event EventHandler ItemsCountChange;

View File

@ -29,6 +29,7 @@
* 2022-03-08: V3.1.1
* 2022-03-19: V3.1.1
* 2022-05-15: V3.1.8
* 2022-09-05: V3.2.3 ClickDoubleClick事件
******************************************************************************/
using System;
@ -88,12 +89,20 @@ namespace Sunny.UI
listbox.MouseEnter += Listbox_MouseEnter;
listbox.MouseLeave += Listbox_MouseLeave;
listbox.DrawItem += Listbox_DrawItem;
listbox.MouseDoubleClick += Listbox_MouseDoubleClick;
timer = new Timer();
timer.Tick += Timer_Tick;
timer.Start();
}
public new event MouseEventHandler MouseDoubleClick;
private void Listbox_MouseDoubleClick(object sender, MouseEventArgs e)
{
MouseDoubleClick?.Invoke(this, e);
}
private Color scrollBarColor = Color.FromArgb(80, 160, 255);
/// <summary>
@ -402,19 +411,17 @@ namespace Sunny.UI
private void Listbox_DoubleClick(object sender, EventArgs e)
{
if (SelectedItem != null)
ItemDoubleClick?.Invoke(this, e);
DoubleClick?.Invoke(this, e);
}
private void Listbox_Click(object sender, EventArgs e)
{
if (SelectedItem != null)
ItemClick?.Invoke(this, e);
Click?.Invoke(this, e);
}
public event EventHandler ItemClick;
public new event EventHandler Click;
public event EventHandler ItemDoubleClick;
public new event EventHandler DoubleClick;
public event EventHandler ItemsCountChange;