Ticket #1468: filezilla_size_5.patch

MainFrm.cpp

@@ -478 +478 @@
     {
         m_wndLocalSplitter.GetRowInfo(1,s2,temp);
         m_wndLocalSplitter.GetRowInfo(0,s1,temp);
-        if (s1>s2)
+        if (s1>s2) {
             m_wndLocalSplitter.SetRowInfo(0,(s1+s2)/2,1);
+            m_wndLocalSplitter.RecalcLayout();
+        }
     }
     else
     {
         m_wndLocalSplitter.GetColumnInfo(1,s2,temp);
         m_wndLocalSplitter.GetColumnInfo(0,s1,temp);
-        if (s1 > s2)
+        if (s1 > s2) {
             m_wndLocalSplitter.SetColumnInfo(0,(s1+s2)/2,1);
+            m_wndLocalSplitter.RecalcLayout();
+        }
     }
     
     if (!m_nRemoteTreeViewLocation)
     {
         m_wndRemoteSplitter.GetRowInfo(1, s2, temp);
         m_wndRemoteSplitter.GetRowInfo(0, s1, temp);
-        if (s1>s2)
+        if (s1>s2) {
             m_wndRemoteSplitter.SetRowInfo(0,(s1+s2)/2,1);
+            m_wndRemoteSplitter.RecalcLayout();
+        }
     }
     else
     {
         m_wndRemoteSplitter.GetColumnInfo(1, s2, temp);
         m_wndRemoteSplitter.GetColumnInfo(0, s1, temp);
-        if (s1>s2)
+        if (s1>s2) {
             m_wndRemoteSplitter.SetColumnInfo(0,(s1+s2)/2,1);
+            m_wndRemoteSplitter.RecalcLayout();
+        }
     }
 
 
@@ -514 +522 @@
     m_wndMainSplitter.GetColumnInfo(0,cx,temp);
     m_wndMainSplitter.GetColumnInfo(1,cx2,temp);
     m_wndMainSplitter.SetColumnInfo(0,(cx+cx2)/2,0);
+    m_wndMainSplitter.RecalcLayout();
     ((CQueueCtrl*)GetQueuePane()->GetListCtrl())->UpdateStatusbar();
 
-    //Restore window size and position
-    RestoreSize();
-
     //Hide panes disabled in options
     if (COptions::GetOptionVal(OPTION_SHOWNOTOOLBAR))
         OnViewToolbar();
@@ -549 +555 @@
     }
     SetLocalFolder(folder);
     
-    if (COptions::GetOptionVal(OPTION_SHOWSITEMANAGERONSTARTUP))
-    {
-        ShowWindow(SW_SHOW);
-        OnSitemanager();
-    }
-
     if (COptions::GetOptionVal(OPTION_ENABLEDEBUGMENU))
     {
         CMenu *pMenu=GetMenu();
@@ -593 +593 @@
         m_pMinTrayBtn->MinTrayBtnShow();
     }
 
+    //Restore window size and position
+    RestoreSize();
+
+    if (COptions::GetOptionVal(OPTION_SHOWSITEMANAGERONSTARTUP))
+        OnSitemanager();
+
     return 0;
 }
 
@@ -3259 +3265 @@
         m_wndLocalSplitter.SetColumnInfo(0,m_PosData.cy3,0);
     else
         m_wndLocalSplitter.SetRowInfo(0,m_PosData.cy3,0);
+    m_wndLocalSplitter.RecalcLayout();
     if (m_nRemoteTreeViewLocation)
         m_wndRemoteSplitter.SetColumnInfo(0,m_PosData.cy4,0);
     else
         m_wndRemoteSplitter.SetRowInfo(0,m_PosData.cy4,0);
+    m_wndRemoteSplitter.RecalcLayout();
     if (m_bSwitchPaneLayout)
     {
         int cx1, cx2, tmp;
@@ -3272 +3280 @@
     }
     else
         m_wndMainSplitter.SetColumnInfo(0, m_PosData.cx, 0);
+    m_wndMainSplitter.RecalcLayout();
     m_wndVertSplitter.RecalcLayout();
     
     return TRUE;
@@ -3598 +3607 @@
     {
         if (COptions::GetOptionVal(OPTION_MINIMIZETOTRAY) == 1)
         {
+            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();
@@ -3605 +3620 @@
     }
     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();
@@ -3794 +3815 @@
 void CMainFrame::OnTrayRestore() 
 {
     ShowWindow(SW_RESTORE);
-    ShowWindow(SW_SHOW);
+    if (m_bMaxBeforeTray)
+        ShowWindow(SW_SHOWMAXIMIZED);
+    else
+        ShowWindow(SW_SHOW);
     m_TrayIcon.HideIcon();
 }
 

MainFrm.h

@@ -161 +161 @@
     } m_PosData;
 
     // Minimize to tray button
+    BOOL m_bMaxBeforeTray;
     CMinTrayBtn *m_pMinTrayBtn;
 
     int m_nLocalTreeViewLocation;