Merge pull request #1731 from henkdegroot/Win-Click-Server-Tray

Add Single Click on Win OS Server System Tray Icon
jamulussoftware · Jun 4, 2021 · c5ba362 · c5ba362
2 parents d6acd63 + 790cc98
commit c5ba362
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
@@ -593,8 +593,13 @@ void CServerDlg::OnClearRecordingDirClicked()
 
 void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
 {
-    // on double click on the icon, show window in fore ground
+    #ifdef _WIN32
+    // on single or double click on the icon, show window in foreground for windows only
+    if ( ActReason == QSystemTrayIcon::Trigger || ActReason == QSystemTrayIcon::DoubleClick )
+    #else
+    // on double click on the icon, show window in foreground for all
     if ( ActReason == QSystemTrayIcon::DoubleClick )
+    #endif
     {
         ShowWindowInForeground();
     }

diff --git a/src/serverdlg.h b/src/serverdlg.h
@@ -73,6 +73,7 @@ class CServerDlg : public CBaseDlg, private Ui_CServerDlgBase
     {
         showNormal();
         raise();
+        activateWindow();
     }
     void ModifyAutoStartEntry ( const bool bDoAutoStart );
     void UpdateRecorderStatus ( QString sessionDir );