From 8ee975b5d67110166e7a6de111fe80d356d4233d Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 8 Aug 2023 22:38:19 +0200
Subject: [PATCH] Fix windows target

---
 .../SysTray-X-app/windowctrl-win.cpp          | 43 ++++++-------------
 app/SysTray-X/SysTray-X-app/windowctrl-win.h  | 22 +++++-----
 app/SysTray-X/SysTray-X-app/windowctrl.cpp    |  7 +--
 3 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-win.cpp b/app/SysTray-X/SysTray-X-app/windowctrl-win.cpp
index 3a80b83..87b1d20 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl-win.cpp
+++ b/app/SysTray-X/SysTray-X-app/windowctrl-win.cpp
@@ -292,9 +292,10 @@ void    WindowCtrlWin::displayWindowElements( const QString& title )
 {
     findWindow( title );
 
-    for( quint64 win_id: getWinIds() )
+    QList< quint64 > winIds = getWinIds();
+    for( int i = 0 ; i < winIds.length() ; i++ )
     {
-        emit signalConsole( QString( "Found: XID %1" ).arg( win_id ) );
+        emit signalConsole( QString( "Found: XID %1" ).arg( winIds[ i ] ) );
     }
 }
 
@@ -389,21 +390,22 @@ void    WindowCtrlWin::hookAction( HWND hWnd )
 
 
 /*
- *  Minimize a window
+ *  Minimize a window to the taskbar
  */
-void    WindowCtrlWin::minimizeWindow( quint64 window, int hide )
+void    WindowCtrlWin::minimizeWindowToTaskbar( quint64 window )
 {
-    if( !isThunderbird( getPpid() ) )
-    {
-        return;
-    }
+    ShowWindow( (HWND)window, SW_MINIMIZE );
+}
 
+
+/*
+ *  Minimize window to the tray
+ */
+void    WindowCtrlWin::minimizeWindowToTray( quint64 window )
+{
     ShowWindow( (HWND)window, SW_MINIMIZE );
 
-    if( hide )
-    {
-        hideWindow( (HWND)window );
-    }
+    hideWindow( (HWND)window );
 }
 
 
@@ -429,23 +431,6 @@ void    WindowCtrlWin::normalizeWindow( quint64 window )
 }
 
 
-/*
- *  Hide a window
- */
-void    WindowCtrlWin::hideWindow( quint64 window, bool state )
-{
-    if( !isThunderbird( getPpid() ) )
-    {
-        return;
-    }
-
-    if( state )
-    {
-        hideWindow( (HWND)window );
-    }
-}
-
-
 /*
  *  Hide a window
  */
diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-win.h b/app/SysTray-X/SysTray-X-app/windowctrl-win.h
index 941df13..7e31ff8 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl-win.h
+++ b/app/SysTray-X/SysTray-X-app/windowctrl-win.h
@@ -190,12 +190,18 @@ class WindowCtrlWin : public QObject
         QList< quint64 >   getWinIds();
 
         /**
-         * @brief minimizeWindow. Minimize window.
+         * @brief minimizeWindowToTaskbar. Minimize window to the taskbar.
          *
-         *  @param window   The window.
-         *  @param hide     Hide from taskbar
+         *  @param window       The window.
          */
-        void    minimizeWindow( quint64 window, int hide );
+        void    minimizeWindowToTaskbar( quint64 window );
+
+        /**
+         * @brief minimizeWindowToTray. Minimize window to the tray.
+         *
+         *  @param window       The window.
+         */
+        void    minimizeWindowToTray( quint64 window );
 
         /**
          * @brief normalizeWindow. Normalize window.
@@ -204,14 +210,6 @@ class WindowCtrlWin : public QObject
          */
         void    normalizeWindow( quint64 window );
 
-        /**
-         * @brief WindowCtrlWin::hideWindow
-         *
-         *  @param window   The window.
-         *  @param state    Hide from taskbar.
-         */
-        void    hideWindow( quint64 window , bool state );
-
         /**
          * @brief deleteWindow. Delete window.
          *
diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp
index 6cb8c05..cb98dd3 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp
+++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp
@@ -287,15 +287,16 @@ void    WindowCtrl::slotWindowState( Preferences::WindowState state )
             }
         }
     }
+#ifdef Q_OS_UNIX
     else
-    {        
+    {
         if( state == Preferences::STATE_MINIMIZED )
         {
             Preferences::MinimizeType minimizeType = getMinimizeType();
             if( minimizeType != Preferences::PREF_DEFAULT_MINIMIZE )
             {
                 QList< quint64 > win_ids = getWinIds();
-               for( int i = 0 ; i < win_ids.length() ; ++i )
+                for( int i = 0 ; i < win_ids.length() ; ++i )
                 {                   
                    /*
                     *  Hide the window
@@ -307,8 +308,8 @@ void    WindowCtrl::slotWindowState( Preferences::WindowState state )
                }
             }
         }
-
     }
+#endif
 
 #ifdef DEBUG_DISPLAY_ACTIONS
     emit signalConsole( "State change done" );