[Feature] Do not close menu when contextmenu copy item was used (#367)…

…, version 1.2.9.0
Hofknecht · Feb 27, 2022 · ca85237 · ca85237
1 parent 37ec270
commit ca85237
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/Business/Menus.cs b/Business/Menus.cs
@@ -16,6 +16,7 @@ namespace SystemTrayMenu.Business
     using SystemTrayMenu.DataClasses;
     using SystemTrayMenu.Handler;
     using SystemTrayMenu.Helper;
+    using SystemTrayMenu.UserInterface;
     using SystemTrayMenu.Utilities;
     using Menu = SystemTrayMenu.UserInterface.Menu;
     using Timer = System.Windows.Forms.Timer;
@@ -827,12 +828,6 @@ private static RowData ReadRowData(string fileName, bool isResolvedLnk, bool con
             return rowData;
         }
 
-        private static bool IsActive()
-        {
-            return Form.ActiveForm is Menu ||
-                Form.ActiveForm is UserInterface.TaskbarForm;
-        }
-
         private static void OpenFolder(string pathToFolder = "")
         {
             string path = pathToFolder;
@@ -858,6 +853,36 @@ private static void InvalidateRowIfIndexInRange(DataGridView dgv, int rowIndex)
             }
         }
 
+        private bool IsActive()
+        {
+            bool IsShellContextMenuOpen()
+            {
+                bool isShellContextMenuOpen = false;
+                foreach (Menu menu in menus.Where(m => m != null))
+                {
+                    DataGridView dgv = menu.GetDataGridView();
+                    foreach (DataGridViewRow row in dgv.Rows)
+                    {
+                        RowData rowData = (RowData)row.Cells[2].Value;
+                        if (rowData != null && rowData.IsContextMenuOpen)
+                        {
+                            isShellContextMenuOpen = true;
+                            break;
+                        }
+                    }
+
+                    if (isShellContextMenuOpen)
+                    {
+                        break;
+                    }
+                }
+
+                return isShellContextMenuOpen;
+            }
+
+            return Form.ActiveForm is Menu or TaskbarForm || IsShellContextMenuOpen();
+        }
+
         private Menu Create(MenuData menuData, string title = null)
         {
             Menu menu = new();

diff --git a/Packaging/Package.appxmanifest b/Packaging/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="49543SystemTrayMenu.SystemTrayMenu"
     Publisher="CN=5884501C-92ED-45DE-9508-9D987C314243"
-    Version="1.2.8.0" />
+    Version="1.2.9.0" />
 
   <Properties>
     <DisplayName>SystemTrayMenu</DisplayName>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@
 // 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.8.11")]
-[assembly: AssemblyFileVersion("1.2.8.11")]
+[assembly: AssemblyVersion("1.2.9.0")]
+[assembly: AssemblyFileVersion("1.2.9.0")]