From 754830eda4168c5ab164384830dd38188ed7295a Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Fri, 4 Feb 2022 15:49:45 +0100 Subject: [PATCH] [Feature] When loading aborted clear selected row (#309), version 1.2.3.3 --- Business/Menus.cs | 13 +++++++++++-- Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Business/Menus.cs b/Business/Menus.cs index f684a65..d01170c 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -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()); + } } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 792442d..3b63a5b 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -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")]