* Sync with recent trunk (r52637).

[reactos.git] / base / shell / explorer / desktop / desktop.cpp

diff --git a/base/shell/explorer/desktop/desktop.cpp b/base/shell/explorer/desktop/desktop.cpp
index 99b990b..52c5dce 100644 (file)
--- a/base/shell/explorer/desktop/desktop.cpp
+++ b/base/shell/explorer/desktop/desktop.cpp
@@ -464,11 +464,12 @@ LRESULT DesktopWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
                goto def;
 
          case WM_SYSCOLORCHANGE:
-                // redraw background window
-               InvalidateRect(g_Globals._hwndShellView, NULL, TRUE);
+               // redraw background window - it's done by system
+               //InvalidateRect(g_Globals._hwndShellView, NULL, TRUE);
 
-                // forward message to shell view window to redraw icon backgrounds
-               SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, wparam, lparam);
+                // forward message to common controls
+               SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, 0, 0);
+               SendMessage(_desktopBar, WM_SYSCOLORCHANGE, 0, 0);
                break;
 
          default: def:
@@ -496,8 +497,6 @@ DesktopShellView::DesktopShellView(HWND hwnd, IShellView* pShellView)
 {
        _hwndListView = GetNextWindow(hwnd, GW_CHILD);
 
-       SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE);
-
         // work around for Windows NT, Win 98, ...
         // Without this the desktop has mysteriously only a size of 800x600 pixels.
        ClientRect rect(hwnd);
@@ -506,9 +505,8 @@ DesktopShellView::DesktopShellView(HWND hwnd, IShellView* pShellView)
         // subclass background window
        new BackgroundWindow(_hwndListView);
 
-       _icon_algo = 1; // default icon arrangement
+       _icon_algo = 0; // default icon arrangement
 
-       PositionIcons();
        InitDragDrop();
 }
 
@@ -737,6 +735,9 @@ void DesktopShellView::PositionIcons(int dir)
        RECT work_area;
        SystemParametersInfo(SPI_GETWORKAREA, 0, &work_area, 0);
 
+       /* disable default allignment */
+       SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE);
+
        const POINTS& dir1 = s_align_dir1[_icon_algo];
        const POINTS& dir2 = s_align_dir2[_icon_algo];
        const POINTS& start_pos = s_align_start[_icon_algo];