kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ButtonGrid.cs

Browse Source 
Small refactoring for ButtonGrid
This commit is contained in:
FlorianDahn 2020-12-06 22:43:39 +01:00
parent 4336ff1681
commit 975a942993
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TelegramBotBase/Controls/ButtonGrid.cs
View File

@ -239,16 +239,22 @@ namespace TelegramBotBase.Controls
await result.ConfirmAction(this.ConfirmationText ?? "");
//Find clicked button depending on Text or Value (depending on markup type)
switch (this.KeyboardType)
{
case eKeyboardType.InlineKeyBoard:
if (this.KeyboardType != eKeyboardType.InlineKeyBoard)
return;
var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
?? ButtonsForm.ToList().FirstOrDefault(a => a.Value == result.RawData);
if (button == null)
if (button != null)
{
await OnButtonClicked(new ButtonClickedEventArgs(button));
result.Handled = true;
return;
}
switch (result.RawData)
{
case "$previous$":
@ -269,17 +275,6 @@ namespace TelegramBotBase.Controls
break;
}
return;
}
await OnButtonClicked(new ButtonClickedEventArgs(button));
result.Handled = true;
break;
}
}
/// <summary>