From e214d71862fb03bf006c5ff232857c9d9e363a22 Mon Sep 17 00:00:00 2001
From: Markus Hofknecht <Markus@Hofknecht.eu>
Date: Sat, 5 Feb 2022 13:13:11 +0100
Subject: [PATCH] [Feature] Fix warnings (#299, #313), version 1.2.3.8

---
 Business/App.cs | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/Business/App.cs b/Business/App.cs
index d55fb1b..5fb2f46 100644
--- a/Business/App.cs
+++ b/Business/App.cs
@@ -22,7 +22,7 @@ namespace SystemTrayMenu
         public App()
         {
             AppRestart.BeforeRestarting += Dispose;
-            SystemEvents.DisplaySettingsChanged += SystemEvents_DisplaySettingsChanged;
+            SystemEvents.DisplaySettingsChanged += (s, e) => SystemEvents_DisplaySettingsChanged();
             menus.LoadStarted += menuNotifyIcon.LoadingStart;
             menus.LoadStopped += menuNotifyIcon.LoadingStop;
             menuNotifyIcon.Click += () => menus.SwitchOpenClose(true);
@@ -32,6 +32,9 @@ namespace SystemTrayMenu
             if (Properties.Settings.Default.ShowInTaskbar)
             {
                 taskbarForm = new TaskbarForm();
+                taskbarForm.FormClosed += (s, e) => Application.Exit();
+                taskbarForm.Deactivate += (s, e) => SetStateNormal();
+                taskbarForm.Resize += (s, e) => SetStateNormal();
                 taskbarForm.Activated += TasbkarItemActivated;
                 void TasbkarItemActivated(object sender, EventArgs e)
                 {
@@ -40,19 +43,6 @@ namespace SystemTrayMenu
                     taskbarForm.Focus();
                     menus.SwitchOpenCloseByTaskbarItem();
                 }
-
-                taskbarForm.Resize += TaskbarForm_Resize;
-                taskbarForm.FormClosed += TaskbarForm_FormClosed;
-                static void TaskbarForm_FormClosed(object sender, FormClosedEventArgs e)
-                {
-                    Application.Exit();
-                }
-
-                taskbarForm.Deactivate += TaskbarForm_Deactivate;
-                void TaskbarForm_Resize(object sender, EventArgs e)
-                {
-                    SetStateNormal();
-                }
             }
 
             DllImports.NativeMethods.User32ShowInactiveTopmost(taskbarForm);
@@ -61,21 +51,16 @@ namespace SystemTrayMenu
         public void Dispose()
         {
             taskbarForm?.Dispose();
-            SystemEvents.DisplaySettingsChanged -= SystemEvents_DisplaySettingsChanged;
+            SystemEvents.DisplaySettingsChanged -= (s, e) => SystemEvents_DisplaySettingsChanged();
             menus.Dispose();
             menuNotifyIcon.Dispose();
         }
 
-        private void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
+        private void SystemEvents_DisplaySettingsChanged()
         {
             menus.ReAdjustSizeAndLocation();
         }
 
-        private void TaskbarForm_Deactivate(object sender, EventArgs e)
-        {
-            SetStateNormal();
-        }
-
         /// <summary>
         /// This ensures that next click on taskbaritem works as activate event/click event.
         /// </summary>