Merge pull request #73 from idietmoran/iss65

Iss65
Stateford · Oct 4, 2018 · e583d63 · e583d63
2 parents cd98efe + 9c11ed8
commit e583d63
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file
 ### Added
 - Added a system tray icon
     - Display Lock will now minimize to the system tray
+- Added support for hotkeys
+
+### Fixed
+- Fixed an issue where the minimize setting would not function properly
 
 # [2.0.1]
 ### Fixed

diff --git a/Display-Lock/DisplayLock.c b/Display-Lock/DisplayLock.c
@@ -302,14 +302,15 @@ INT_PTR CALLBACK windowViewProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
     static WINDOW_VIEW_CONTROLS windowControls;
     static MENU menu;
     static ARGS args;
-
+    static HWND parent;
 
     UNREFERENCED_PARAMETER(lParam);
     switch (message)
     {
     case WM_INITDIALOG:
         initalizeWindowView(hDlg, &menu, &settings, &running, &windowControls, &args);
-
+        parent = GetParent(GetParent(GetParent(hDlg)));
+        args.hWnd = parent;
         return (INT_PTR)TRUE;
 
     case WM_COMMAND:

diff --git a/dispLib/include/common.h b/dispLib/include/common.h
diff --git a/dispLib/src/win.c b/dispLib/src/win.c
@@ -134,13 +134,18 @@ int CALLBACK cursorLock(void* arguments)
     if (settings->fullScreen)
         enableFullScreen(selectedWindow, &previousRect);
 
+    if (settings->minimize)
+        ShowWindow(args->hWnd, SW_MINIMIZE);
+
     if (settings->foreground)
     {
         SetForegroundWindow(selectedWindow.hWnd);
         SetActiveWindow(selectedWindow.hWnd);
     }
 
 
+
+
     if (checkResizeStyle(selectedWindow.hWnd))
     {
         // TODO: might want to get error message here and check if elevated permissions are required