Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32_NEW]

Browse source 
- 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

svn path=/branches/shell32_new-bringup/; revision=51915
This commit is contained in:
Ged Murphy 2011-05-25 21:28:27 +00:00
parent 4324e5e4e1
commit 83c347aaef
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dll/win32/shell32/desktop.cpp
View file

@ -399,8 +399,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
switch (uMsg) switch (uMsg)
{ {
case WM_ERASEBKGND: case WM_ERASEBKGND:
PaintDesktop((HDC)wParam); return (LRESULT)PaintDesktop((HDC)wParam);
break;
case WM_GETISHELLBROWSER: case WM_GETISHELLBROWSER:
Ret = (LRESULT)((IShellBrowser *)pThis); Ret = (LRESULT)((IShellBrowser *)pThis);

15
dll/win32/shell32/shlview.cpp
View file

@ -447,9 +447,14 @@ BOOL CDefView::CreateList()
TRACE("%p\n",this); TRACE("%p\n",this);
dwStyle = WS_TABSTOP | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | 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; dwExStyle = WS_EX_CLIENTEDGE;
if (FolderSettings.fFlags & FWF_DESKTOP)
dwStyle |= LVS_ALIGNLEFT;
else
dwStyle |= LVS_ALIGNTOP;
switch (FolderSettings.ViewMode) switch (FolderSettings.ViewMode)
{ {
case FVM_ICON: dwStyle |= LVS_ICON; break; case FVM_ICON: dwStyle |= LVS_ICON; break;
@ -489,8 +494,11 @@ BOOL CDefView::CreateList()
* HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow
* and activate drop shadows if necessary * and activate drop shadows if necessary
*/ */
if (0) if (1)
{
SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE);
SendMessageW(hWndList, LVM_SETBKCOLOR, 0, CLR_NONE);
}
else else
{ {
SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); SendMessageW(hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP));
@ -840,7 +848,8 @@ LRESULT CDefView::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
LRESULT CDefView::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CDefView::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{ {
if (FolderSettings.fFlags & (FWF_DESKTOP | FWF_TRANSPARENT)) if (FolderSettings.fFlags & (FWF_DESKTOP | FWF_TRANSPARENT))
return 1; return SendMessageW(GetParent(), WM_ERASEBKGND, wParam, lParam); /* redirect to parent */
bHandled = FALSE; bHandled = FALSE;
return 0; return 0;
} }