Ticket #1499: filezilla_2.2.25_restore_max.patch

MainFrm.cpp

@@ -254 +254 @@
     m_pDragWnd = NULL;
     m_DropTarget = _T("");
 
+    m_bMaxBeforeTray = false;
+
     m_bSwitchPaneLayout = FALSE;
 }
 
@@ -3614 +3616 @@
         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;
     }
     else
-        CFrameWnd::OnSysCommand( nID, lParam );
-    if (nID == SC_MINIMIZE)
     {
-        if (COptions::GetOptionVal(OPTION_MINIMIZETOTRAY) == 1)
+        if (nID == SC_MINIMIZE || nID == SC_MINIMIZETRAY)
         {
             WINDOWPLACEMENT placement;
             BOOL res=GetWindowPlacement(&placement);
@@ -3630 +3633 @@
                 m_bMaxBeforeTray = true;
             else
                 m_bMaxBeforeTray = false;
+        }
+        CFrameWnd::OnSysCommand( nID, lParam );
+    }
+    if (nID == SC_MINIMIZE)
+    {
+        if (COptions::GetOptionVal(OPTION_MINIMIZETOTRAY) == 1)
+        {
             ShowWindow(SW_HIDE);
             m_TrayIcon.AddIcon();
             m_TrayIcon.ShowIcon();
@@ -3637 +3647 @@
     }
     else if (nID == SC_MINIMIZETRAY)
     {
-        WINDOWPLACEMENT placement;
-        BOOL res=GetWindowPlacement(&placement);
-        if (placement.showCmd==SW_MAXIMIZE || placement.showCmd==SW_SHOWMAXIMIZED)
-            m_bMaxBeforeTray = true;
-        else
-            m_bMaxBeforeTray = false;
         ShowWindow(SW_HIDE);
         m_TrayIcon.AddIcon();
         m_TrayIcon.ShowIcon();
     }
     else if (nID == SC_RESTORE)
     {
-        ShowWindow(SW_SHOW);
+        if (m_bMaxBeforeTray)
+            ShowWindow(SW_SHOWMAXIMIZED);
+        else
+            ShowWindow(SW_SHOW);
+        m_bMaxBeforeTray = false;
         m_TrayIcon.HideIcon();
     }
 }
@@ -3845 +3853 @@
         ShowWindow(SW_SHOWMAXIMIZED);
     else
         ShowWindow(SW_SHOW);
+    m_bMaxBeforeTray = false;
     m_TrayIcon.HideIcon();
 }