Merge remote-tracking branch 'origin/master' into fix-toggle-style-bug

Author: Stateford

.claude/settings.local.json

@@ -8,7 +8,22 @@
       "Bash(\"display-lock-unittests.exe\")",
       "Bash(\"./display-lock-unittests.exe\")",
       "Bash(xxd:*)",
-      "Bash(\"C:\\\\Users\\\\japos\\\\git\\\\Display-Lock\\\\build\\\\tests\\\\Debug\\\\display-lock-unittests.exe\")"
+      "Bash(\"C:\\\\Users\\\\japos\\\\git\\\\Display-Lock\\\\build\\\\tests\\\\Debug\\\\display-lock-unittests.exe\")",
+      "Bash(iconv:*)",
+      "Bash(powershell -ExecutionPolicy Bypass -File fix_resource.ps1)",
+      "Bash(powershell -Command \"Get-Content ''src/resources/resource.h'' -Encoding Unicode | Select-String ''TRAY_CLOSE''\")",
+      "Bash(git checkout:*)",
+      "Bash(python fix_resource.py:*)",
+      "Bash(python fix_resource_rc.py:*)",
+      "Bash(git diff:*)",
+      "Bash(python fix_resource_rc2.py:*)",
+      "Bash(powershell -Command \"Get-Content ''src/resources/resource.rc'' -Encoding Unicode | Select-String ''TRAY_CLOSE''\")",
+      "Bash(powershell -Command \"Get-Content ''src/resources/resource.rc'' -Encoding Unicode | Select-String ''STARTUP''\")",
+      "Bash(python fix_resource_rc3.py:*)",
+      "Bash(./build/tests/Release/display-lock-unittests.exe:*)",
+      "Bash(python:*)",
+      "Bash(ls:*)",
+      "Bash(./display-lock-unittests.exe:*)"
     ]
   }
 }

include/common.h

@@ -35,6 +35,7 @@
 
 #define NOTIFY_MSG (WM_USER + 0x1)
 #define APP_SETTINGS_INIT (WM_USER + 0x2)
+#define WM_FORCE_CLOSE (WM_USER + 0x3)
 
 #define NOTIFY_SETTINGS_CHANGED (NOTIFY_MSG + 0x1)
 
@@ -127,6 +128,7 @@ struct SETTINGS_VIEW_CONTROLS
     HWND fullScreen;
     HWND hotkey;
     HWND checkForUpdatesStartup;
+    HWND minimizeToTray;
 };
 
 struct MENU
@@ -146,6 +148,7 @@ struct SETTINGS
     BOOL borderless;
     BOOL fullScreen;
     BOOL checkUpdateStartup;
+    BOOL minimizeToTray;
 };
 
 struct ARGS

src/components/settings.c

@@ -29,6 +29,7 @@ void initalizeSettings(HWND hDlg, SETTINGS_VIEW_CONTROLS *settingsControls)
     settingsControls->fullScreen = GetDlgItem(hDlg, IDC_CHECK_SETTINGS_FULL_SCREEN);
     settingsControls->hotkey = GetDlgItem(hDlg, IDC_HOTKEY);
     settingsControls->checkForUpdatesStartup = GetDlgItem(hDlg, IDC_CHECK_STARTUP_UPDATES);
+    settingsControls->minimizeToTray = GetDlgItem(hDlg, IDC_CHECK_SETTINGS_TRAY_CLOSE);
     settingsControls->settingsChanged = FALSE;
 }
 
@@ -52,6 +53,7 @@ void defaultSettings(SETTINGS *settings, const wchar_t *versionStr)
     settings->fullScreen = FALSE;
     settings->minimize = TRUE;
     settings->checkUpdateStartup = TRUE;
+    settings->minimizeToTray = FALSE;
 }
 
 BOOL checkVersion(SETTINGS *settings, const wchar_t *versionStr)

src/main.c

@@ -138,7 +138,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
     hInst = hInstance; // Store instance handle in our global variable
 
     HWND hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU,
-                             CW_USEDEFAULT, 0, 300, 240, NULL, NULL, hInstance, NULL);
+                             CW_USEDEFAULT, 0, 300, 258, NULL, NULL, hInstance, NULL);
 
     if (!hWnd)
     {
@@ -236,7 +236,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             ShowWindow(hWnd, TRUE);
             break;
         case ID_CONTEXTMENU_EXIT:
-            SendMessage(hWnd, WM_CLOSE, 0, 0);
+            SendMessage(hWnd, WM_FORCE_CLOSE, 0, 0);
             break;
         case ID_CONTEXTMENU_SETTINGS_MINIMIZE:
             settings.minimize = !settings.minimize;
@@ -269,7 +269,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         }
         case IDM_EXIT:
         {
-            SendMessage(hWnd, WM_CLOSE, 0, 0);
+            SendMessage(hWnd, WM_FORCE_CLOSE, 0, 0);
             break;
         }
         default:
@@ -292,6 +292,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     break;
     case WM_CLOSE:
+        if (settings.minimizeToTray)
+        {
+            ShowWindow(hWnd, SW_HIDE);
+        }
+        else
+        {
+            Shell_NotifyIcon(NIM_DELETE, &sysTray);
+            shutDown(settings);
+            DestroyWindow(hWnd);
+        }
+        break;
+
+    case WM_FORCE_CLOSE:
         Shell_NotifyIcon(NIM_DELETE, &sysTray);
         shutDown(settings);
         DestroyWindow(hWnd);
@@ -481,6 +494,12 @@ INT_PTR CALLBACK settingsViewProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
             settings.checkUpdateStartup = (BOOL)SendMessage(settingsControls.checkForUpdatesStartup, BM_GETCHECK, 0, 0);
             break;
 
+        case IDC_CHECK_SETTINGS_TRAY_CLOSE:
+            EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SETTINGS_SAVE), TRUE);
+            settingsControls.settingsChanged = TRUE;
+            settings.minimizeToTray = (BOOL)SendMessage(settingsControls.minimizeToTray, BM_GETCHECK, 0, 0);
+            break;
+
         case IDC_HOTKEY:
             EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SETTINGS_SAVE), TRUE);
             settingsControls.settingsChanged = TRUE;

src/resources/resource.h

@@ -122,13 +122,15 @@ void settingsShowWindow(SETTINGS_VIEW_CONTROLS settingsControls, SETTINGS *setti
     SendMessage(settingsControls.fullScreen, BM_SETCHECK, settings->fullScreen, 0);
     SendMessage(settingsControls.minimize, BM_SETCHECK, settings->minimize, 0);
     SendMessage(settingsControls.checkForUpdatesStartup, BM_SETCHECK, settings->checkUpdateStartup, 0);
+    SendMessage(settingsControls.minimizeToTray, BM_SETCHECK, settings->minimizeToTray, 0);
 
     EnableWindow(settingsControls.borderless, !running);
     EnableWindow(settingsControls.foreground, !running);
     EnableWindow(settingsControls.fullScreen, !running);
     EnableWindow(settingsControls.minimize, !running);
     EnableWindow(settingsControls.hotkey, !running);
     EnableWindow(settingsControls.checkForUpdatesStartup, !running);
+    EnableWindow(settingsControls.minimizeToTray, !running);
 }
 
 void settingsSave(HWND hWnd, SETTINGS_VIEW_CONTROLS settingsControls, SETTINGS settings, SETTINGS *previousSettings)
@@ -138,6 +140,7 @@ void settingsSave(HWND hWnd, SETTINGS_VIEW_CONTROLS settingsControls, SETTINGS s
     settings.fullScreen = (BOOL)SendMessage(settingsControls.fullScreen, BM_GETCHECK, 0, 0);
     settings.minimize = (BOOL)SendMessage(settingsControls.minimize, BM_GETCHECK, 0, 0);
     settings.checkUpdateStartup = (BOOL)SendMessage(settingsControls.checkForUpdatesStartup, BM_GETCHECK, 0, 0);
+    settings.minimizeToTray = (BOOL)SendMessage(settingsControls.minimizeToTray, BM_GETCHECK, 0, 0);
 
     *previousSettings = settings;
 }
@@ -150,6 +153,7 @@ void settingsCancel(SETTINGS_VIEW_CONTROLS settingsControls, SETTINGS *settings,
     SendMessage(settingsControls.fullScreen, BM_SETCHECK, settings->fullScreen, 0);
     SendMessage(settingsControls.minimize, BM_SETCHECK, settings->minimize, 0);
     SendMessage(settingsControls.checkForUpdatesStartup, BM_SETCHECK, settings->checkUpdateStartup, 0);
+    SendMessage(settingsControls.minimizeToTray, BM_SETCHECK, settings->minimizeToTray, 0);
     // SendMessage(settingsControls.hotkey, HKM_SETHOTKEY, 0, 0);
 }