Button.AsyncClick

This commit is contained in:
luxiaoqi 2023-11-23 15:24:27 +08:00
parent c439a46e38
commit bc5e6be81e

View File

@ -21,7 +21,7 @@ namespace CPF.Controls
} }
bool isMouseLeftButtonPressed; bool isMouseLeftButtonPressed;
protected override async void OnMouseDown(MouseButtonEventArgs e) protected override void OnMouseDown(MouseButtonEventArgs e)
{ {
base.OnMouseDown(e); base.OnMouseDown(e);
if (!e.Handled) if (!e.Handled)
@ -73,7 +73,7 @@ namespace CPF.Controls
try try
{ {
OnClick(); OnClick();
await OnAsyncClick(); OnAsyncClick();
exceptionThrown = false; exceptionThrown = false;
} }
finally finally
@ -102,7 +102,7 @@ namespace CPF.Controls
// e.Handled = true; // e.Handled = true;
// } // }
//} //}
protected override async void OnMouseUp(MouseButtonEventArgs e) protected override void OnMouseUp(MouseButtonEventArgs e)
{ {
base.OnMouseUp(e); base.OnMouseUp(e);
if (e.MouseButton == MouseButton.Left) if (e.MouseButton == MouseButton.Left)
@ -130,7 +130,7 @@ namespace CPF.Controls
if (l.X >= 0 && l.Y >= 0 && l.X <= r.Width && l.Y <= r.Height) if (l.X >= 0 && l.Y >= 0 && l.X <= r.Width && l.Y <= r.Height)
{ {
OnClick(); OnClick();
await OnAsyncClick(); OnAsyncClick();
} }
} }
} }
@ -139,7 +139,7 @@ namespace CPF.Controls
} }
bool IsSpaceKeyDown = false; bool IsSpaceKeyDown = false;
protected override async void OnKeyDown(KeyEventArgs e) protected override void OnKeyDown(KeyEventArgs e)
{ {
base.OnKeyDown(e); base.OnKeyDown(e);
if (ClickMode == ClickMode.Hover || e.Handled) if (ClickMode == ClickMode.Hover || e.Handled)
@ -162,7 +162,7 @@ namespace CPF.Controls
if (ClickMode == ClickMode.Press) if (ClickMode == ClickMode.Press)
{ {
OnClick(); OnClick();
await OnAsyncClick(); OnAsyncClick();
} }
e.Handled = true; e.Handled = true;
@ -181,7 +181,7 @@ namespace CPF.Controls
} }
OnClick(); OnClick();
await OnAsyncClick(); OnAsyncClick();
e.Handled = true; e.Handled = true;
} }
} }
@ -200,7 +200,7 @@ namespace CPF.Controls
} }
} }
protected override async void OnKeyUp(KeyEventArgs e) protected override void OnKeyUp(KeyEventArgs e)
{ {
base.OnKeyUp(e); base.OnKeyUp(e);
if (ClickMode == ClickMode.Hover || e.Handled) if (ClickMode == ClickMode.Hover || e.Handled)
@ -229,7 +229,7 @@ namespace CPF.Controls
if (shouldClick) if (shouldClick)
{ {
OnClick(); OnClick();
await OnAsyncClick(); OnAsyncClick();
} }
} }
else else