Ticket #8406: focus_newly_created_directory.patch

src/interface/LocalListView.cpp

@@ -317 +317 @@
             ExitComparisonMode();
 
         ClearSelection();
-        focused = m_pState->GetPreviouslyVisitedLocalSubdir();
+
+        CLocalPath lastFocusedPath(m_pState->GetPreviouslyVisitedLocalSubdir());
+        if (lastFocusedPath.GetParent() == dirname)
+            focused = lastFocusedPath.GetLastSegment();
+        
         ensureVisible = !focused.empty();
         if (focused.empty())
             focused = _T("..");
@@ -867 +871 @@
     wxString newdir = MenuMkdir();
     if (!newdir.empty()) {
         m_pState->RefreshLocal();
+
+        CLocalPath lp(newdir);
+        FocusSingleItem(lp.GetLastSegment());
     }
 }
 
@@ -1793 +1800 @@
         }
     }
 }
+
+void CLocalListView::FocusSingleItem(const wxString& itemName, long int state /*= wxLIST_STATE_FOCUSED*/)
+{
+    if (itemName == _T(""))
+        return;
+
+    for (unsigned int i = 0; i < m_indexMapping.size(); i++)
+    {
+        const CLocalFileData &data = m_fileData[m_indexMapping[i]];
+        if (data.name == itemName)
+        {
+            SetItemState(i, state, state);
+            EnsureVisible(i);
+        }
+        else
+            SetItemState(i, 0, state);
+    }
+    return;
+}

src/interface/LocalListView.h

@@ -53 +53 @@
     // ReselectItems
     void ReselectItems(const std::list<wxString>& selectedNames, wxString focused, bool ensureVisible = false);
 
+    // Set focus (or other) state on the named item, remove the same state from every other
+    void FocusSingleItem(const wxString& itemName, long int state = wxLIST_STATE_FOCUSED);
+
 #ifdef __WXMSW__
     void DisplayDrives();
     void DisplayShares(wxString computer);

src/interface/RemoteListView.cpp

@@ -754 +754 @@
 
         ClearSelection();
 
-        prevFocused = m_pState->GetPreviouslyVisitedRemoteSubdir();
+        CServerPath lastFocusedPath(m_pState->GetPreviouslyVisitedRemoteSubdir());
+        if (pDirectoryListing && lastFocusedPath.GetParent() == pDirectoryListing->path)
+            prevFocused = lastFocusedPath.GetLastSegment();
+
         ensureVisible = !prevFocused.empty();
     }
     else
@@ -761 +764 @@
     {
         // Remember which items were selected
         selectedNames = RememberSelectedItems(prevFocused);
+        // instead of the previously focused item use the PreviouslySelectedRemoteSubdir 
+        // if the m_pState have that information  
+        if (!m_pState->GetPreviouslyVisitedRemoteSubdir().IsEmpty())
+        {
+            CServerPath lastFocusedPath(m_pState->GetPreviouslyVisitedRemoteSubdir());
+            if (pDirectoryListing && lastFocusedPath.GetParent().GetPath() == pDirectoryListing->path.GetPath())
+                prevFocused = lastFocusedPath.GetLastSegment();
+        }
     }
 
     if (m_pFilelistStatusBar)
@@ -1358 +1369 @@
         return CServerPath();
     }
 
+    CServerPath cp(path); 
+    m_pState->SetPreviouslyVisitedRemoteSubdir(cp.GetPath()); 
+
     m_pState->m_pCommandQueue->ProcessCommand(new CMkdirCommand(path));
 
     // Return name of the New Directory

src/interface/state.cpp

@@ -298 +298 @@
 
     if (dir == m_localDir.GetParent() && rememberPreviousSubdir) {
 #ifdef __WXMSW__
-        if (dir.GetPath() == _T("\\")) {
-            m_previouslyVisitedLocalSubdir = m_localDir.GetPath();
-            m_previouslyVisitedLocalSubdir.RemoveLast();
-        }
+        if (dir.GetPath() == _T("\\"))
+            SetPreviouslyVisitedLocalSubdir(m_localDir.GetPath().RemoveLast());
         else
 #endif
-            m_previouslyVisitedLocalSubdir = m_localDir.GetLastSegment();
+            SetPreviouslyVisitedLocalSubdir(m_localDir.GetPath());
     }
     else
-        m_previouslyVisitedLocalSubdir = _T("");
+        SetPreviouslyVisitedLocalSubdir(_T(""));
 
 
     m_localDir = dir;
@@ -331 +329 @@
             m_pDirectoryListing = 0;
             NotifyHandlers(STATECHANGE_REMOTE_DIR);
         }
-        m_previouslyVisitedRemoteSubdir = _T("");
+        SetPreviouslyVisitedLocalSubdir(_T(""));
         return true;
     }
 
@@ -339 +337 @@
 
     if (pDirectoryListing && m_pDirectoryListing &&
         pDirectoryListing->path == m_pDirectoryListing->path.GetParent())
-        m_previouslyVisitedRemoteSubdir = m_pDirectoryListing->path.GetLastSegment();
-    else
-        m_previouslyVisitedRemoteSubdir = _T("");
+        SetPreviouslyVisitedRemoteSubdir(m_pDirectoryListing->path.GetPath()); 
+    else if (!modified)
+        SetPreviouslyVisitedRemoteSubdir(_T("")); 
 
     if (modified) {
         if (!m_pDirectoryListing || m_pDirectoryListing->path != pDirectoryListing->path) {

src/interface/state.h

@@ -169 +169 @@
     void SetSecurityInfo(CSftpEncryptionNotification const& info);
 
     // If the previously selected directory was a direct child of the current directory, this
-    // returns the relative name of the subdirectory.
+    // returns the full path of that subdirectory or an empty string otherwise.
     wxString GetPreviouslyVisitedLocalSubdir() const { return m_previouslyVisitedLocalSubdir; }
     wxString GetPreviouslyVisitedRemoteSubdir() const { return m_previouslyVisitedRemoteSubdir; }
-    void ClearPreviouslyVisitedLocalSubdir() { m_previouslyVisitedLocalSubdir = _T(""); }
-    void ClearPreviouslyVisitedRemoteSubdir() { m_previouslyVisitedRemoteSubdir = _T(""); }
+    void SetPreviouslyVisitedLocalSubdir(wxString path) { m_previouslyVisitedLocalSubdir = path; }
+    void SetPreviouslyVisitedRemoteSubdir(wxString path) { m_previouslyVisitedRemoteSubdir = path; }
 
 protected:
     void SetServer(const CServer* server);