Minor

rampaa · Oct 13, 2024 · efa8ed1 · efa8ed1
1 parent e230ea8
commit efa8ed1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/JL.Windows/ConfigManager.cs b/JL.Windows/ConfigManager.cs
@@ -450,7 +450,7 @@ public static void ApplyPreferences()
             ? MainWindowBackgroundOpacityOnUnhover / 100
             : MainWindow.Instance.OpacitySlider.Value / 100;
 
-        WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+        WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         KeyGestureUtils.GlobalKeyGestureDict.Clear();
         KeyGestureUtils.GlobalKeyGestureNameToIntDict.Clear();
 
@@ -520,7 +520,7 @@ public static void ApplyPreferences()
 
         if (GlobalHotKeys && !DisableHotkeys)
         {
-            WinApi.RegisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.RegisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         MainWindow.Instance.AddNameMenuItem.SetInputGestureText(ShowAddNameWindowKeyGesture);

diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs
@@ -474,16 +474,16 @@ public async Task HandleHotKey(KeyGesture keyGesture, KeyEventArgs? e)
                 {
                     if (KeyGestureUtils.GlobalKeyGestureNameToIntDict.TryGetValue(nameof(ConfigManager.DisableHotkeys), out int id))
                     {
-                        WinApi.UnregisterAllHotKeys(WindowHandle, id);
+                        WinApi.UnregisterAllGlobalHotKeys(WindowHandle, id);
                     }
                     else
                     {
-                        WinApi.UnregisterAllHotKeys(WindowHandle);
+                        WinApi.UnregisterAllGlobalHotKeys(WindowHandle);
                     }
                 }
                 else
                 {
-                    WinApi.RegisterAllHotKeys(WindowHandle);
+                    WinApi.RegisterAllGlobalHotKeys(WindowHandle);
                 }
             }
         }
@@ -1624,11 +1624,11 @@ private void Window_StateChanged(object sender, EventArgs e)
 
                 if (keyGestureIdsToIgnore.Count > 0)
                 {
-                    WinApi.UnregisterAllHotKeys(WindowHandle, keyGestureIdsToIgnore);
+                    WinApi.UnregisterAllGlobalHotKeys(WindowHandle, keyGestureIdsToIgnore);
                 }
                 else
                 {
-                    WinApi.UnregisterAllHotKeys(WindowHandle);
+                    WinApi.UnregisterAllGlobalHotKeys(WindowHandle);
                 }
             }
         }
@@ -1643,7 +1643,7 @@ private void Window_StateChanged(object sender, EventArgs e)
 
             if (ConfigManager.GlobalHotKeys)
             {
-                WinApi.RegisterAllHotKeys(WindowHandle);
+                WinApi.RegisterAllGlobalHotKeys(WindowHandle);
             }
 
             if (SizeToContent is SizeToContent.Manual && (ConfigManager.MainWindowDynamicHeight || ConfigManager.MainWindowDynamicWidth))

diff --git a/JL.Windows/GUI/PopupWindow.xaml.cs b/JL.Windows/GUI/PopupWindow.xaml.cs
@@ -1299,11 +1299,11 @@ public async Task HandleHotKey(KeyGesture keyGesture, KeyEventArgs? e)
             {
                 if (ConfigManager.DisableHotkeys)
                 {
-                    WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+                    WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
                 }
                 else
                 {
-                    WinApi.RegisterAllHotKeys(MainWindow.Instance.WindowHandle);
+                    WinApi.RegisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
                 }
             }
         }

diff --git a/JL.Windows/Utilities/KeyGestureUtils.cs b/JL.Windows/Utilities/KeyGestureUtils.cs
@@ -181,7 +181,7 @@ public static KeyGesture GetKeyGestureFromConfig(SqliteConnection connection, st
             KeyGesture newKeyGesture = (KeyGesture)keyGestureConverter.ConvertFromInvariantString(keyGestureString)!;
             if (ConfigManager.GlobalHotKeys)
             {
-                WinApi.AddHotKeyToKeyGestureDict(keyGestureName, newKeyGesture);
+                WinApi.AddHotKeyToGlobalKeyGestureDict(keyGestureName, newKeyGesture);
             }
 
             return newKeyGesture;
@@ -190,7 +190,7 @@ public static KeyGesture GetKeyGestureFromConfig(SqliteConnection connection, st
         ConfigDBManager.InsertSetting(connection, keyGestureName, defaultKeyGesture.ToFormattedString());
         if (ConfigManager.GlobalHotKeys)
         {
-            WinApi.AddHotKeyToKeyGestureDict(keyGestureName, defaultKeyGesture);
+            WinApi.AddHotKeyToGlobalKeyGestureDict(keyGestureName, defaultKeyGesture);
         }
 
         return defaultKeyGesture;

diff --git a/JL.Windows/Utilities/WindowsUtils.cs b/JL.Windows/Utilities/WindowsUtils.cs
@@ -150,7 +150,7 @@ public static void ShowAddNameWindow(Window owner, string? selectedText, string
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = addNameWindowInstance.ShowDialog();
@@ -166,7 +166,7 @@ public static void ShowAddWordWindow(Window owner, string? selectedText)
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = addWordWindowInstance.ShowDialog();
@@ -182,7 +182,7 @@ public static void ShowPreferencesWindow()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = preferencesWindow.ShowDialog();
@@ -214,7 +214,7 @@ public static async Task ShowManageDictionariesWindow()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = manageDictionariesWindow.ShowDialog();
@@ -234,7 +234,7 @@ public static async Task ShowManageFrequenciesWindow()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = manageFrequenciesWindow.ShowDialog();
@@ -251,7 +251,7 @@ public static void ShowStatsWindow()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = statsWindow.ShowDialog();
@@ -271,7 +271,7 @@ public static async Task ShowManageAudioSourcesWindow()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.UnregisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.UnregisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
 
         _ = manageAudioSourcesWindow.ShowDialog();
@@ -702,7 +702,7 @@ public static void UpdateMainWindowVisibility()
 
         if (ConfigManager.GlobalHotKeys && !ConfigManager.DisableHotkeys)
         {
-            WinApi.RegisterAllHotKeys(MainWindow.Instance.WindowHandle);
+            WinApi.RegisterAllGlobalHotKeys(MainWindow.Instance.WindowHandle);
         }
     }
 

diff --git a/JL.Windows/WinApi.cs b/JL.Windows/WinApi.cs
@@ -186,7 +186,7 @@ public static ulong GetClipboardSequenceNo()
         return GetClipboardSequenceNumber();
     }
 
-    public static void AddHotKeyToKeyGestureDict(string hotkeyName, KeyGesture keyGesture)
+    public static void AddHotKeyToGlobalKeyGestureDict(string hotkeyName, KeyGesture keyGesture)
     {
         int id = KeyGestureUtils.GlobalKeyGestureDict.Count;
 
@@ -208,23 +208,23 @@ public static void AddHotKeyToKeyGestureDict(string hotkeyName, KeyGesture keyGe
         }
     }
 
-    public static void RegisterAllHotKeys(nint windowHandle)
+    public static void RegisterAllGlobalHotKeys(nint windowHandle)
     {
         foreach (KeyValuePair<int, KeyGesture> keyValuePair in KeyGestureUtils.GlobalKeyGestureDict)
         {
             _ = RegisterHotKey(windowHandle, keyValuePair.Key, (uint)keyValuePair.Value.Modifiers | MOD_NOREPEAT, (uint)KeyInterop.VirtualKeyFromKey(keyValuePair.Value.Key));
         }
     }
 
-    public static void UnregisterAllHotKeys(nint windowHandle)
+    public static void UnregisterAllGlobalHotKeys(nint windowHandle)
     {
         foreach (int id in KeyGestureUtils.GlobalKeyGestureDict.Keys)
         {
             _ = UnregisterHotKey(windowHandle, id);
         }
     }
 
-    public static void UnregisterAllHotKeys(nint windowHandle, int keyGestureIdToIgnore)
+    public static void UnregisterAllGlobalHotKeys(nint windowHandle, int keyGestureIdToIgnore)
     {
         foreach (int id in KeyGestureUtils.GlobalKeyGestureDict.Keys)
         {
@@ -237,7 +237,7 @@ public static void UnregisterAllHotKeys(nint windowHandle, int keyGestureIdToIgn
         }
     }
 
-    public static void UnregisterAllHotKeys(nint windowHandle, List<int> keyGestureIdsToIgnore)
+    public static void UnregisterAllGlobalHotKeys(nint windowHandle, List<int> keyGestureIdsToIgnore)
     {
         foreach (int id in KeyGestureUtils.GlobalKeyGestureDict.Keys)
         {