Ticket #1499: fz2224_restore.patch

MainFrm.cpp

@@ -3614 +3614 @@
         WINDOWPLACEMENT placement;
         placement.length = sizeof(WINDOWPLACEMENT);
         placement.rcNormalPosition = m_PosData.NormalRect;
-        placement.showCmd = SW_RESTORE;
+        if (m_bMaxBeforeTray)
+            placement.showCmd = SW_SHOWMAXIMIZED;
+        else
+            placement.showCmd = SW_RESTORE;
         SetWindowPlacement(&placement);
         m_PosData.state = 0;
     }
@@ -3633 +3636 @@
             ShowWindow(SW_HIDE);
             m_TrayIcon.AddIcon();
             m_TrayIcon.ShowIcon();
+        }
+        else if (m_PosData.state)
+        {
+            WINDOWPLACEMENT placement;
+            BOOL res=GetWindowPlacement(&placement);
+            if (placement.showCmd==SW_MAXIMIZE || placement.showCmd==SW_SHOWMAXIMIZED)
+                m_bMaxBeforeTray = true;
+            else
+                m_bMaxBeforeTray = false;
         }
     }
     else if (nID == SC_MINIMIZETRAY)