mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-05-16 02:13:39 +12:00
[Feature] Do not close menu when contextmenu copy item was used (#367), version 1.2.9.0
This commit is contained in:
parent
37ec270c25
commit
ca8523752e
|
@ -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 @@ namespace SystemTrayMenu.Business
|
|||
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 @@ namespace SystemTrayMenu.Business
|
|||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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.8.11")]
|
||||
[assembly: AssemblyFileVersion("1.2.8.11")]
|
||||
[assembly: AssemblyVersion("1.2.9.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.9.0")]
|
||||
|
|
Loading…
Reference in a new issue