Async invoke fixes and ButtonGrid update

- removing unused imports
- adding null check for async handler invokes
- fixing PageCount calculation on ButtonGrid
This commit is contained in:
FlorianDahn
2021-02-27 20:51:47 +01:00
parent 426bb078af
commit 91048b4f7c
6 changed files with 22 additions and 9 deletions
@@ -149,7 +149,10 @@ namespace TelegramBotBase.Controls.Hybrid
public async Task OnButtonClicked(ButtonClickedEventArgs e)
{
var handler = this.Events[__evButtonClicked].GetInvocationList().Cast<AsyncEventHandler<ButtonClickedEventArgs>>();
var handler = this.Events[__evButtonClicked]?.GetInvocationList().Cast<AsyncEventHandler<ButtonClickedEventArgs>>();
if (handler == null)
return;
foreach (var h in handler)
{
await Async.InvokeAllAsync<ButtonClickedEventArgs>(h, this, e);
@@ -6,7 +6,6 @@ using System.Text;
using System.Threading.Tasks;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using static TelegramBotBase.Base.Async;
namespace TelegramBotBase.Controls.Hybrid
{
@@ -160,7 +160,10 @@ namespace TelegramBotBase.Controls.Hybrid
public async Task OnButtonClicked(ButtonClickedEventArgs e)
{
var handler = this.Events[__evButtonClicked].GetInvocationList().Cast<AsyncEventHandler<ButtonClickedEventArgs>>();
var handler = this.Events[__evButtonClicked]?.GetInvocationList().Cast<AsyncEventHandler<ButtonClickedEventArgs>>();
if (handler == null)
return;
foreach (var h in handler)
{
await Async.InvokeAllAsync<ButtonClickedEventArgs>(h, this, e);
@@ -759,7 +762,7 @@ namespace TelegramBotBase.Controls.Hybrid
if (bf.Rows == 0)
return 1;
return (int)Math.Ceiling((decimal)(bf.Rows / (decimal)(MaximumRow - 3)));
return (int)Math.Ceiling((decimal)(bf.Rows / (decimal)(MaximumRow - this.LayoutRows)));
}
}