mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 09:50:07 +00:00
[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 svn path=/branches/shell32_new-bringup/; revision=51915
This commit is contained in:
parent
4324e5e4e1
commit
83c347aaef
|
@ -399,8 +399,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
|
|||
switch (uMsg)
|
||||
{
|
||||
case WM_ERASEBKGND:
|
||||
PaintDesktop((HDC)wParam);
|
||||
break;
|
||||
return (LRESULT)PaintDesktop((HDC)wParam);
|
||||
|
||||
case WM_GETISHELLBROWSER:
|
||||
Ret = (LRESULT)((IShellBrowser *)pThis);
|
||||
|
|
|
@ -447,9 +447,14 @@ BOOL CDefView::CreateList()
|
|||
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)
|
||||
{
|
||||
case FVM_ICON: dwStyle |= LVS_ICON; break;
|
||||
|
@ -489,8 +494,11 @@ BOOL CDefView::CreateList()
|
|||
* 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::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue