Ticket #8344: reselect_item_we_are_coming_from_in_parent_directory.patch

src/interface/LocalListView.cpp

@@ -318 +318 @@
             ExitComparisonMode();
 
         ClearSelection();
-        focused = _T("..");
+        focused = m_pState->GetLastLocalFocused();
 
         if (GetItemCount())
             EnsureVisible(0);
@@ -1538 +1538 @@
             if (data.name == focused)
             {
                 SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+                EnsureVisible(i);
                 return;
             }
         }
@@ -1555 +1556 @@
             if (data.name == focused)
             {
                 SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+                EnsureVisible(i);
                 focused = _T("");
             }
             if (data.dir && *iter == (_T("d") + data.name))

src/interface/state.h

@@ -163 +163 @@
     bool GetSecurityInfo(CSftpEncryptionNotification *& pInfo);
     void SetSecurityInfo(CCertificateNotification const& info);
     void SetSecurityInfo(CSftpEncryptionNotification const& info);
+
+    wxString GetLastLocalFocused() const { return m_last_local_focused_item_name; }
+    wxString GetLastRemoteFocused() const { return m_last_remote_focused_item_name; }
+
 protected:
     void SetServer(const CServer* server);
 
@@ -203 +207 @@
 
     CCertificateNotification* m_pCertificate;
     CSftpEncryptionNotification* m_pSftpEncryptionInfo;
+    
+    wxString m_last_local_focused_item_name;
+    wxString m_last_remote_focused_item_name;
 };
 
 class CStateEventHandler

src/interface/RemoteListView.cpp

@@ -719 +719 @@
 void CRemoteListView::SetDirectoryListing(const CSharedPointer<const CDirectoryListing> &pDirectoryListing, bool modified /*=false*/)
 {
     CancelLabelEdit();
+    
+    wxString prevFocused = m_pState->GetLastRemoteFocused();
+    std::list<wxString> selectedNames;
 
     bool reset = false;
     if (!pDirectoryListing || !m_pDirectoryListing)
@@ -741 +744 @@
             wxASSERT(CFilterManager::HasActiveFilters() || GetItemCount() == (int)m_fileData.size());
             wxASSERT(m_pDirectoryListing->GetCount() + 1 >= (unsigned int)GetItemCount());
             wxASSERT(m_indexMapping[0] == m_pDirectoryListing->GetCount());
+        
+            ReselectItems(selectedNames, prevFocused);
 
             RefreshListOnly();
 
@@ -748 +753 @@
         }
     }
 
-    wxString prevFocused;
-    std::list<wxString> selectedNames;
     if (reset)
     {
         ResetSearchPrefix();
@@ -2231 +2234 @@
             if ((*m_pDirectoryListing)[index].name == focused)
             {
                 SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+                EnsureVisible(i);
                 return;
             }
         }
@@ -2259 +2263 @@
             if (entry.name == focused)
             {
                 SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+                EnsureVisible(i);
                 focused = _T("");
             }
             if (entry.is_dir() && *iter == (_T("d") + entry.name))

src/interface/state.cpp

@@ -307 +307 @@
         }
     }
 
+    if (p == m_localDir.GetParent())
+        m_last_local_focused_item_name = m_localDir.GetLastSegment();
+    else
+        m_last_local_focused_item_name = _T("");
+    
+
     m_localDir = p;
 
     COptions::Get()->SetOption(OPTION_LASTLOCALDIR, m_localDir.GetPath());
@@ -333 +339 @@
     }
 
     wxASSERT(pDirectoryListing->m_firstListTime.IsValid());
+    
+    if (pDirectoryListing && m_pDirectoryListing &&
+        pDirectoryListing->path == m_pDirectoryListing->path.GetParent())
+        m_last_remote_focused_item_name = m_pDirectoryListing->path.GetLastSegment();
+    else
+        m_last_remote_focused_item_name = _T("");
 
+
     if (modified)
     {
         if (!m_pDirectoryListing || m_pDirectoryListing->path != pDirectoryListing->path)