mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-09-21 11:52:04 +12:00
[Feature] When loading aborted clear selected row (#309), version 1.2.3.3
This commit is contained in:
parent
16c25df2b0
commit
754830eda4
2 changed files with 13 additions and 4 deletions
|
@ -222,11 +222,13 @@ namespace SystemTrayMenu.Business
|
|||
|
||||
Menu menuLoading = menus[menuData.Level];
|
||||
string userSearchText = string.Empty;
|
||||
bool closedLoadingMenu = false;
|
||||
if (menuLoading != null && menuLoading.IsLoadingMenu)
|
||||
{
|
||||
userSearchText = menuLoading.GetSearchText();
|
||||
menuLoading.HideWithFade();
|
||||
userSearchText = menuLoading.GetSearchText();
|
||||
menus[menuLoading.Level] = null;
|
||||
closedLoadingMenu = true;
|
||||
}
|
||||
|
||||
if (menuData.Validity != MenuDataValidity.AbortedOrUnknown &&
|
||||
|
@ -250,13 +252,20 @@ namespace SystemTrayMenu.Business
|
|||
menuData.RowDataParent.SubMenu = menu;
|
||||
if (menus[0].IsUsable)
|
||||
{
|
||||
ShowSubMenu(menu);
|
||||
if (!string.IsNullOrEmpty(userSearchText))
|
||||
{
|
||||
menu.SetSearchText(userSearchText);
|
||||
}
|
||||
|
||||
ShowSubMenu(menu);
|
||||
}
|
||||
}
|
||||
else if (closedLoadingMenu && menus[0].IsUsable)
|
||||
{
|
||||
menuData.RowDataParent.IsSelected = false;
|
||||
menuData.RowDataParent.IsMenuOpen = false;
|
||||
RefreshSelection(menus[menuLoading.Level - 1].GetDataGridView());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.3.2")]
|
||||
[assembly: AssemblyFileVersion("1.2.3.2")]
|
||||
[assembly: AssemblyVersion("1.2.3.3")]
|
||||
[assembly: AssemblyFileVersion("1.2.3.3")]
|
||||
|
|
Loading…
Reference in a new issue