[gedmurphy] 51915: [SHELL32_NEW] - Merge 51322 and 51323 - Return 1 in WM_ERASEBKGND when desktop is painted - Fix background for desktop icons and their labels - Moreover fixes explorer_new backgr...

Author: gedmurphy
Date: Wed May 25 21:28:27 2011
New Revision: 51915

URL: http://svn.reactos.org/svn/reactos?rev=51915&view=rev
Log:
[SHELL32_NEW]
- Merge 51322 and 51323
- Return 1 in WM_ERASEBKGND when desktop is painted
- Fix background for desktop icons and their labels
- Moreover fixes explorer_new background
- Properly arrange icons in explorer shell view window. This also fixes navigating in files with keyboard arrows

Modified:
    branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp
    branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp

Modified: branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp [iso-8859-1] Wed May 25 21:28:27 2011
@@ -399,8 +399,7 @@
         switch (uMsg)
         {
             case WM_ERASEBKGND:
-                PaintDesktop((HDC)wParam);
-                break;
+                return (LRESULT)PaintDesktop((HDC)wParam);

case WM_GETISHELLBROWSER:
                 Ret = (LRESULT)((IShellBrowser *)pThis);

Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh...
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed May 25 21:28:27 2011
@@ -447,8 +447,13 @@
    TRACE("%p\n",this);

dwStyle = WS_TABSTOP | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
-		  LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_AUTOARRANGE;
+          LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_AUTOARRANGE;
         dwExStyle = WS_EX_CLIENTEDGE;
+
+    if (FolderSettings.fFlags & FWF_DESKTOP) 
+       dwStyle |= LVS_ALIGNLEFT;
+    else
+       dwStyle |= LVS_ALIGNTOP;

switch (FolderSettings.ViewMode)
    {
@@ -489,8 +494,11 @@
           * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow
           * and activate drop shadows if necessary
           */
-         if (0)
+         if (1)
+         {
            SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE);
+           SendMessageW(hWndList, LVM_SETBKCOLOR, 0, CLR_NONE);
+         }
          else
          {
            SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP));
@@ -840,7 +848,8 @@
 LRESULT CDefView::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
    if (FolderSettings.fFlags & (FWF_DESKTOP | FWF_TRANSPARENT))
-		return 1;
+		return SendMessageW(GetParent(), WM_ERASEBKGND, wParam, lParam); /* redirect to parent */
+
    bHandled = FALSE;
    return 0;
 }