mirror of
https://github.com/reactos/reactos.git
synced 2024-08-12 14:16:30 +00:00
[BROWSEUI]
* Disable the brandband again, since it doesn't look right in ros. * Fix the browse window styles so that it can properly open with system-provided default size. * Change the default view mode of the file list to Icons. CORE-7330 svn path=/branches/shell-experiments/; revision=63370
This commit is contained in:
parent
14c68ccd3f
commit
9276b066c7
|
@ -860,12 +860,14 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew()
|
||||||
hResult = menuOleWindow->GetWindow(&fMenuBandWindow);
|
hResult = menuOleWindow->GetWindow(&fMenuBandWindow);
|
||||||
fMenuBar.Attach(menuBar.Detach()); // transfer the ref count
|
fMenuBar.Attach(menuBar.Detach()); // transfer the ref count
|
||||||
|
|
||||||
|
#if 0
|
||||||
/* Create and attach the brand/logo to the rebar */
|
/* Create and attach the brand/logo to the rebar */
|
||||||
hResult = CreateBrandBand(&logoBar);
|
hResult = CreateBrandBand(&logoBar);
|
||||||
if (FAILED(hResult))
|
if (FAILED(hResult))
|
||||||
return hResult;
|
return hResult;
|
||||||
AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE);
|
AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE);
|
||||||
fLogoBar.Attach(logoBar.Detach()); // transfer the ref count
|
fLogoBar.Attach(logoBar.Detach()); // transfer the ref count
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Create and attach the standard toolbar to the rebar */
|
/* Create and attach the standard toolbar to the rebar */
|
||||||
hResult = CreateToolsBar(&toolsBar);
|
hResult = CreateToolsBar(&toolsBar);
|
||||||
|
|
|
@ -287,7 +287,7 @@ Switch to a new bar when it receives an Exec(CGID_IDeskBand, 1, 1, vaIn, NULL);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class CShellBrowser :
|
class CShellBrowser :
|
||||||
public CWindowImpl<CShellBrowser, CWindow, CControlWinTraits>,
|
public CWindowImpl<CShellBrowser, CWindow, CFrameWinTraits>,
|
||||||
public CComObjectRootEx<CComMultiThreadModelNoCS>,
|
public CComObjectRootEx<CComMultiThreadModelNoCS>,
|
||||||
public IShellBrowser,
|
public IShellBrowser,
|
||||||
public IDropTarget,
|
public IDropTarget,
|
||||||
|
@ -732,7 +732,6 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d)
|
||||||
CComPtr<IPersistStreamInit> persistStreamInit;
|
CComPtr<IPersistStreamInit> persistStreamInit;
|
||||||
CComPtr<IOleCommandTarget> commandTarget;
|
CComPtr<IOleCommandTarget> commandTarget;
|
||||||
CComPtr<IObjectWithSite> objectSite;
|
CComPtr<IObjectWithSite> objectSite;
|
||||||
RECT bounds = {0, 0, 800, 591};
|
|
||||||
HRESULT hResult;
|
HRESULT hResult;
|
||||||
|
|
||||||
_AtlInitialConstruct();
|
_AtlInitialConstruct();
|
||||||
|
@ -743,7 +742,7 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d)
|
||||||
}
|
}
|
||||||
|
|
||||||
// create window
|
// create window
|
||||||
Create(HWND_DESKTOP, bounds, NULL, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0U);
|
Create(HWND_DESKTOP);
|
||||||
if (m_hWnd == NULL)
|
if (m_hWnd == NULL)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
|
@ -808,11 +807,7 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d)
|
||||||
_AtlBaseModule.GetModuleInstance(), 0);
|
_AtlBaseModule.GetModuleInstance(), 0);
|
||||||
fStatusBarVisible = true;
|
fStatusBarVisible = true;
|
||||||
|
|
||||||
FOLDERSETTINGS newFolderSettings;
|
|
||||||
|
|
||||||
// browse
|
// browse
|
||||||
newFolderSettings.ViewMode = FVM_LIST;
|
|
||||||
newFolderSettings.fFlags = 0;
|
|
||||||
hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY);
|
hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY);
|
||||||
if (FAILED(hResult))
|
if (FAILED(hResult))
|
||||||
return hResult;
|
return hResult;
|
||||||
|
@ -831,7 +826,7 @@ HRESULT CShellBrowser::BrowseToPIDL(LPCITEMIDLIST pidl, long flags)
|
||||||
// called by shell view to browse to new folder
|
// called by shell view to browse to new folder
|
||||||
// also called by explorer band to navigate to new folder
|
// also called by explorer band to navigate to new folder
|
||||||
hResult = SHBindToFolder(pidl, &newFolder);
|
hResult = SHBindToFolder(pidl, &newFolder);
|
||||||
newFolderSettings.ViewMode = FVM_LIST;
|
newFolderSettings.ViewMode = FVM_ICON;
|
||||||
newFolderSettings.fFlags = 0;
|
newFolderSettings.fFlags = 0;
|
||||||
hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags);
|
hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags);
|
||||||
if (FAILED(hResult))
|
if (FAILED(hResult))
|
||||||
|
|
Loading…
Reference in a new issue