[dquintana] 63370: [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. * Cha...

Author: dquintana
Date: Mon May 19 12:05:24 2014
New Revision: 63370

URL: http://svn.reactos.org/svn/reactos?rev=63370&view=rev
Log:
[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

Modified:
    branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
    branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp

Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] Mon May 19 12:05:24 2014
@@ -860,12 +860,14 @@
     hResult = menuOleWindow->GetWindow(&fMenuBandWindow);
     fMenuBar.Attach(menuBar.Detach());                  // transfer the ref count

+#if 0
     /* Create and attach the brand/logo to the rebar */
     hResult = CreateBrandBand(&logoBar);
     if (FAILED(hResult))
         return hResult;
     AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE);
     fLogoBar.Attach(logoBar.Detach());                  // transfer the ref count
+#endif

/* Create and attach the standard toolbar to the rebar */
     hResult = CreateToolsBar(&toolsBar);

Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] Mon May 19 12:05:24 2014
@@ -287,7 +287,7 @@
 */

class CShellBrowser :
-    public CWindowImpl<CShellBrowser, CWindow, CControlWinTraits>,
+    public CWindowImpl<CShellBrowser, CWindow, CFrameWinTraits>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IShellBrowser,
     public IDropTarget,
@@ -732,7 +732,6 @@
     CComPtr<IPersistStreamInit>             persistStreamInit;
     CComPtr<IOleCommandTarget>              commandTarget;
     CComPtr<IObjectWithSite>                objectSite;
-    RECT                                    bounds = {0, 0, 800, 591};
     HRESULT                                 hResult;

_AtlInitialConstruct();
@@ -743,7 +742,7 @@
     }

// create window
-    Create(HWND_DESKTOP, bounds, NULL, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0U);
+    Create(HWND_DESKTOP);
     if (m_hWnd == NULL)
         return E_FAIL;

@@ -808,11 +807,7 @@
                     _AtlBaseModule.GetModuleInstance(), 0);
     fStatusBarVisible = true;

-    FOLDERSETTINGS                          newFolderSettings;
-
     // browse 
-    newFolderSettings.ViewMode = FVM_LIST;
-    newFolderSettings.fFlags = 0;
     hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY);
     if (FAILED(hResult))
         return hResult;
@@ -831,7 +826,7 @@
     // called by shell view to browse to new folder
     // also called by explorer band to navigate to new folder
     hResult = SHBindToFolder(pidl, &newFolder);
-    newFolderSettings.ViewMode = FVM_LIST;
+    newFolderSettings.ViewMode = FVM_ICON;
     newFolderSettings.fFlags = 0;
     hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags);
     if (FAILED(hResult))