[BROWSEUI]

- CExplorerBand: Navigate to the selected item when the selection changes.
- Part of the work submitted by Sylvain Deverre.
CORE-10838

svn path=/trunk/; revision=71510

diff --git a/reactos/dll/win32/browseui/explorerband.cpp b/reactos/dll/win32/browseui/explorerband.cpp
index d256640..d2b7266 100644 (file)
--- a/reactos/dll/win32/browseui/explorerband.cpp
+++ b/reactos/dll/win32/browseui/explorerband.cpp
@@ -142,6 +142,22 @@ CExplorerBand::NodeInfo* CExplorerBand::GetNodeInfo(HTREEITEM hItem)
     return reinterpret_cast<NodeInfo*>(tvItem.lParam);
 }
 
     return reinterpret_cast<NodeInfo*>(tvItem.lParam);
 }
 

+HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto)
+{
+    CComPtr<IShellBrowser>              pBrowserService;
+    HRESULT                             hr;
+
+    hr = IUnknown_QueryService(pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &pBrowserService));
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    hr = pBrowserService->BrowseObject(pidlGoto, SBSP_SAMEBROWSER | SBSP_ABSOLUTE);
+    if (FAILED_UNEXPECTEDLY(hr))
+        return hr;
+
+    return hr;
+}
+

 // *** notifications handling ***
 BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv)
 {
 // *** notifications handling ***
 BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv)
 {


@@ -177,6 +193,16 @@ BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv)
     return FALSE;
 }
 
     return FALSE;
 }
 

+void CExplorerBand::OnSelectionChanged(LPNMTREEVIEW pnmtv)
+{
+    NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem);
+
+    UpdateBrowser(pNodeInfo->absolutePidl);
+    SetFocus();
+    // Expand the node
+    //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND);
+}
+

 // *** Helper functions ***
 HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort)
 {
 // *** Helper functions ***
 HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort)
 {


@@ -558,6 +584,9 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
             case TVN_ITEMEXPANDING:
                 *theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam);
                 break;
             case TVN_ITEMEXPANDING:
                 *theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam);
                 break;

+            case TVN_SELCHANGED:
+                OnSelectionChanged((LPNMTREEVIEW)lParam);
+                break;

             default:
                 break;
         }
             default:
                 break;
         }

diff --git a/reactos/dll/win32/browseui/explorerband.h b/reactos/dll/win32/browseui/explorerband.h
index 94f0853..6644199 100644 (file)
--- a/reactos/dll/win32/browseui/explorerband.h
+++ b/reactos/dll/win32/browseui/explorerband.h
@@ -69,9 +69,11 @@ private:
     void DestroyExplorerBand();
 
     BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv);
     void DestroyExplorerBand();
 
     BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv);

+    void OnSelectionChanged(LPNMTREEVIEW pnmtv);

 
     // *** Helper functions ***
     NodeInfo* GetNodeInfo(HTREEITEM hItem);
 
     // *** Helper functions ***
     NodeInfo* GetNodeInfo(HTREEITEM hItem);

+    HRESULT UpdateBrowser(LPITEMIDLIST pidlGoto);

     HTREEITEM InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort);
     BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo); 
 
     HTREEITEM InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort);
     BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo);