disable by double-clicking the tray icon

Author: cafali

SnapKey.cpp

@@ -1,4 +1,4 @@
-// SnapKey 1.2.5
+// SnapKey 1.2.6
 // github.com/cafali/SnapKey
 
 #include <windows.h>
@@ -268,7 +268,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             HMENU hMenu = CreatePopupMenu();
             AppendMenu(hMenu, MF_STRING, ID_TRAY_REBIND_KEYS, TEXT("Rebind Keys"));
             AppendMenu(hMenu, MF_STRING | (isLocked ? MF_CHECKED : MF_UNCHECKED), ID_TRAY_LOCK_FUNCTION, TEXT("Disable SnapKey"));
-            AppendMenu(hMenu, MF_STRING, ID_TRAY_RESTART_SNAPKEY, TEXT("Restart SnapKey")); //SnapKey 1.2.5 
+            AppendMenu(hMenu, MF_STRING, ID_TRAY_RESTART_SNAPKEY, TEXT("Restart SnapKey"));
             AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
             AppendMenu(hMenu, MF_STRING, ID_TRAY_VERSION_INFO, TEXT("Version Info"));
             AppendMenu(hMenu, MF_STRING, ID_TRAY_EXIT_CONTEXT_MENU_ITEM, TEXT("Exit SnapKey"));
@@ -277,6 +277,35 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             TrackPopupMenu(hMenu, TPM_BOTTOMALIGN | TPM_LEFTALIGN, curPoint.x, curPoint.y, 0, hwnd, NULL);
             DestroyMenu(hMenu);
         }
+        else if (lParam == WM_LBUTTONDBLCLK) //double-click tray icon
+        {
+            // Toggle lock state
+            isLocked = !isLocked;
+
+            // Update the tray icon
+            if (isLocked)
+            {
+                // Load icon_off.ico (OFF)
+                HICON hIconOff = (HICON)LoadImage(NULL, TEXT("icon_off.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+                if (hIconOff)
+                {
+                    nid.hIcon = hIconOff;
+                    Shell_NotifyIcon(NIM_MODIFY, &nid);
+                    DestroyIcon(hIconOff);
+                }
+            }
+            else
+            {
+                // Load icon.ico (ON)
+                HICON hIconOn = (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+                if (hIconOn)
+                {
+                    nid.hIcon = hIconOn;
+                    Shell_NotifyIcon(NIM_MODIFY, &nid);
+                    DestroyIcon(hIconOn);
+                }
+            }
+        }
         break;
 
     case WM_COMMAND:
@@ -293,52 +322,29 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             break;
         case ID_TRAY_REBIND_KEYS:
             {
-                // Open the config file with the default text editor
                 ShellExecute(NULL, TEXT("open"), TEXT("config.cfg"), NULL, NULL, SW_SHOWNORMAL);
             }
             break;
-        case ID_TRAY_RESTART_SNAPKEY: //SnapKey 1.2.5 - Restart via context menu
+        case ID_TRAY_RESTART_SNAPKEY:
             {
-                // Restart
                 TCHAR szExeFileName[MAX_PATH];
                 GetModuleFileName(NULL, szExeFileName, MAX_PATH);
                 ShellExecute(NULL, NULL, szExeFileName, NULL, NULL, SW_SHOWNORMAL);
-
-                // Quit current SnapKey instance
                 PostQuitMessage(0);
             }
             break;
         case ID_TRAY_LOCK_FUNCTION:
             {
                 isLocked = !isLocked;
-
-                // Update the tray icon (Disable SnapKey) (OFF/ON)
-                if (isLocked)
+                HICON hIcon = isLocked
+                    ? (HICON)LoadImage(NULL, TEXT("icon_off.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE)
+                    : (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+                if (hIcon)
                 {
-                    // Load icon_off.ico (OFF)
-                    HICON hIconOff = (HICON)LoadImage(NULL, TEXT("icon_off.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-                    if (hIconOff)
-                    {
-                        nid.hIcon = hIconOff;
-                        Shell_NotifyIcon(NIM_MODIFY, &nid);
-                        DestroyIcon(hIconOff);
-                    }
+                    nid.hIcon = hIcon;
+                    Shell_NotifyIcon(NIM_MODIFY, &nid);
+                    DestroyIcon(hIcon);
                 }
-                else
-                {
-                    // Load icon.ico (ON)
-                    HICON hIconOn = (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-                    if (hIconOn)
-                    {
-                        nid.hIcon = hIconOn;
-                        Shell_NotifyIcon(NIM_MODIFY, &nid);
-                        DestroyIcon(hIconOn); 
-                    }
-                }
-
-                // Update the context menu item to reflect the new lock state
-                HMENU hMenu = GetSubMenu(GetMenu(hwnd), 0);
-                CheckMenuItem(hMenu, ID_TRAY_LOCK_FUNCTION, MF_BYCOMMAND | (isLocked ? MF_CHECKED : MF_UNCHECKED));
             }
             break;
         }
@@ -362,11 +368,11 @@ void RestoreConfigFromBackup(const std::string& backupFilename, const std::strin
 
     if (CopyFile(sourcePath.c_str(), destinationPath.c_str(), FALSE)) {
         // Copy successful
-        MessageBox(NULL, TEXT(" Default config restored from backup successfully."), TEXT("SnapKey"), MB_ICONINFORMATION | MB_OK);
+        MessageBox(NULL, TEXT("Default config restored from backup successfully."), TEXT("SnapKey"), MB_ICONINFORMATION | MB_OK);
     } else {
         // backup.snapkey copy failed
         DWORD error = GetLastError();
-        std::string errorMsg = " Failed to restore config from backup.";
+        std::string errorMsg = "Failed to restore config from backup.";
         MessageBox(NULL, errorMsg.c_str(), TEXT("SnapKey Error"), MB_ICONERROR | MB_OK);
     }
 }