diff --git a/Business/App.cs b/Business/App.cs
index 1eb10a5..699db34 100644
--- a/Business/App.cs
+++ b/Business/App.cs
@@ -1,12 +1,11 @@
//
// Copyright (c) PlaceholderCompany. All rights reserved.
//
-
namespace SystemTrayMenu
{
- using Microsoft.Win32;
using System;
using System.Windows.Forms;
+ using Microsoft.Win32;
using SystemTrayMenu.Business;
using SystemTrayMenu.UserInterface;
using SystemTrayMenu.Utilities;
@@ -61,6 +60,13 @@ namespace SystemTrayMenu
DllImports.NativeMethods.User32ShowInactiveTopmost(taskbarForm);
}
+ public void Dispose()
+ {
+ taskbarForm.Dispose();
+ menus.Dispose();
+ menuNotifyIcon.Dispose();
+ }
+
private void TaskbarForm_Deactivate(object sender, EventArgs e)
{
SetStateNormal();
@@ -76,12 +82,5 @@ namespace SystemTrayMenu
taskbarForm.WindowState = FormWindowState.Normal;
}
}
-
- public void Dispose()
- {
- taskbarForm.Dispose();
- menus.Dispose();
- menuNotifyIcon.Dispose();
- }
}
}
\ No newline at end of file
diff --git a/Business/KeyboardInput.cs b/Business/KeyboardInput.cs
index efcb4e0..3e00e8f 100644
--- a/Business/KeyboardInput.cs
+++ b/Business/KeyboardInput.cs
@@ -16,8 +16,6 @@ namespace SystemTrayMenu.Handler
internal class KeyboardInput : IDisposable
{
- internal bool InUse = false;
-
private readonly Menu[] menus;
private readonly KeyboardHook hook = new KeyboardHook();
@@ -41,6 +39,8 @@ namespace SystemTrayMenu.Handler
internal event EventHandlerEmpty Cleared;
+ internal bool InUse { get; set; } = false;
+
public void Dispose()
{
hook.Dispose();
@@ -205,6 +205,26 @@ namespace SystemTrayMenu.Handler
ClearIsSelectedByKey(iMenuKey, iRowKey);
}
+ internal void Select(DataGridView dgv, int i, bool refreshview)
+ {
+ int newiMenuKey = ((Menu)dgv.TopLevelControl).Level;
+ if (i != iRowKey || newiMenuKey != iMenuKey)
+ {
+ ClearIsSelectedByKey();
+ }
+
+ iRowKey = i;
+ iMenuKey = newiMenuKey;
+ DataGridViewRow row = dgv.Rows[i];
+ RowData rowData = (RowData)row.Cells[2].Value;
+ rowData.IsSelected = true;
+ if (refreshview)
+ {
+ row.Selected = false;
+ row.Selected = true;
+ }
+ }
+
private bool IsAnyMenuSelectedByKey(
ref DataGridView dgv,
ref Menu menuFromSelected,
@@ -453,26 +473,6 @@ namespace SystemTrayMenu.Handler
return found;
}
- public void Select(DataGridView dgv, int i, bool refreshview)
- {
- int newiMenuKey = ((Menu)dgv.TopLevelControl).Level;
- if (i != iRowKey || newiMenuKey != iMenuKey)
- {
- ClearIsSelectedByKey();
- }
-
- iRowKey = i;
- iMenuKey = newiMenuKey;
- DataGridViewRow row = dgv.Rows[i];
- RowData rowData = (RowData)row.Cells[2].Value;
- rowData.IsSelected = true;
- if (refreshview)
- {
- row.Selected = false;
- row.Selected = true;
- }
- }
-
private bool Select(DataGridView dgv, int i, string keyInput = "")
{
bool found = false;
diff --git a/Business/Menus.cs b/Business/Menus.cs
index 33b1ad7..4d0c94a 100644
--- a/Business/Menus.cs
+++ b/Business/Menus.cs
@@ -194,43 +194,6 @@ namespace SystemTrayMenu.Business
private List