From 0a34d0739698ed8ca7f38fb10a0288eec6b61123 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Sun, 5 Nov 2023 15:03:12 +0100
Subject: [PATCH] Fix maximize restore

---
 .../SysTray-X-app/windowctrl-unix.cpp         | 40 ++++++++-----------
 app/SysTray-X/SysTray-X-app/windowctrl-unix.h |  6 +++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp
index 381c38a..d3963b4 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp
+++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp
@@ -40,6 +40,7 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent )
     m_tb_windows = QList< quint64 >();
     m_tb_window_positions = QMap< quint64, QPoint >();
     m_tb_window_states = QMap< quint64, Preferences::WindowState >();
+    m_tb_window_states_x11 = QMap< quint64, QStringList >();
     m_tb_window_hints = QMap< quint64, SizeHints >();
 
     /*
@@ -368,16 +369,9 @@ void    WindowCtrlUnix::minimizeWindowToTaskbar( quint64 window )
     GetWMNormalHints( m_display, window, &m_tb_window_hints[ window ] );
 
     /*
-     *  Get the X11 window state
+     *  Get and store the X11 window state
      */
-    QStringList atoms = getWindowStateX11( window );
-    if( atoms.contains( "_NET_WM_STATE_MAXIMIZED_VERT" ) && atoms.contains( "_NET_WM_STATE_MAXIMIZED_HORZ" ) )
-    {
-        /*
-         *  Window is maximized
-         */
-         m_tb_window_hints[ window ].flags = -1;
-    }
+    m_tb_window_states_x11[ window ] = getWindowStateX11( window );;
 
     /*
      *  Minimize the window
@@ -420,16 +414,9 @@ void    WindowCtrlUnix::minimizeWindowToTray( quint64 window )
     GetWMNormalHints( m_display, window, &m_tb_window_hints[ window ] );
 
     /*
-     *  Get the X11 window state
+     *  Get and store the X11 window state
      */
-    QStringList atoms = getWindowStateX11( window );
-    if( atoms.contains( "_NET_WM_STATE_MAXIMIZED_VERT" ) && atoms.contains( "_NET_WM_STATE_MAXIMIZED_HORZ" ) )
-    {
-        /*
-         *  Window is maximized
-         */
-         m_tb_window_hints[ window ].flags = -1;
-    }
+    m_tb_window_states_x11[ window ] = getWindowStateX11( window );;
 
     /*
      *  Set the flags (GNOME, Wayland?)
@@ -485,14 +472,21 @@ void    WindowCtrlUnix::normalizeWindow( quint64 window )
         /*
          *  Was the window maximized?
          */
-        if( m_tb_window_hints[ window ].flags == -1 )
+        if( m_tb_window_states_x11[ window ].contains( "_NET_WM_STATE_MAXIMIZED_VERT" ) &&
+                m_tb_window_states_x11[ window ].contains( "_NET_WM_STATE_MAXIMIZED_HORZ" ) )
         {
             SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_MAXIMIZED );
         }
-        else
-        {
-            SetWMNormalHints( m_display, window, m_tb_window_hints[ window ] );
-        }
+
+        /*
+         * Delete the X11 state
+         */
+        m_tb_window_states_x11.remove( window );
+
+        /*
+         *  Restore the size hints
+         */
+        SetWMNormalHints( m_display, window, m_tb_window_hints[ window ] );
 
         Flush( m_display );
     }
diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h
index 1829715..f81b196 100644
--- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.h
+++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.h
@@ -21,6 +21,7 @@
 #include <QList>
 #include <QMap>
 #include <QPoint>
+#include <QStringList>
 
 /*
  *  Predefines
@@ -341,6 +342,11 @@ class WindowCtrlUnix : public QObject
          */
         QMap< quint64, Preferences::WindowState >    m_tb_window_states;
 
+        /**
+         * @brief m_tb_window_states_x11. The Thunderbird window states X11.
+         */
+        QMap< quint64, QStringList >    m_tb_window_states_x11;
+
         /**
          * @brief m_tb_window_hints. The Thunderbird window hints.
          */