Rename methods to make their purpose more obvious; slight code style changes

Author: Yusyuriv

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -66,7 +66,7 @@ public static unsafe bool DWMSetDarkModeForWindow(Window window, bool useDarkMod
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="window"></param>
         /// <param name="cornerType">DoNotRound, Round, RoundSmall, Default</param>
@@ -362,7 +362,7 @@ private static unsafe HKL FindEnglishKeyboardLayout()
             return HKL.Null;
         }
 
-        public static unsafe void SetEnglishKeyboardLayout(bool backupPrevious)
+        public static unsafe void SwitchToEnglishKeyboardLayout(bool backupPrevious)
         {
             // Find an installed English layout
             var enHKL = FindEnglishKeyboardLayout();
@@ -384,14 +384,12 @@ public static unsafe void SetEnglishKeyboardLayout(bool backupPrevious)
             PInvoke.ActivateKeyboardLayout(enHKL, 0);
         }
 
-        public static void SetPreviousKeyboardLayout()
+        public static void RestorePreviousKeyboardLayout()
         {
-            if (_previousLayout != HKL.Null)
-            {
-                PInvoke.ActivateKeyboardLayout(_previousLayout, 0);
+            if (_previousLayout == HKL.Null) return;
 
-                _previousLayout = HKL.Null;
-            }
+            PInvoke.ActivateKeyboardLayout(_previousLayout, 0);
+            _previousLayout = HKL.Null;
         }
 
         #endregion

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1376,7 +1376,7 @@ public void Show()
 
                 if (StartWithEnglishMode)
                 {
-                    Win32Helper.SetEnglishKeyboardLayout(true);
+                    Win32Helper.SwitchToEnglishKeyboardLayout(true);
                 }
             });
         }
@@ -1385,6 +1385,11 @@ public void Show()
 
         public async void Hide()
         {
+
+            if (StartWithEnglishMode)
+            {
+                Win32Helper.RestorePreviousKeyboardLayout();
+            }
             lastHistoryIndex = 1;
 
             if (ExternalPreviewVisible)
@@ -1447,11 +1452,6 @@ public async void Hide()
                 Win32Helper.DWMSetCloakForWindow(mainWindow, true);
             }
 
-            if (StartWithEnglishMode)
-            {
-                Win32Helper.SetPreviousKeyboardLayout();
-            }
-
             await Task.Delay(50);
 
             // Update WPF properties