Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge r65001 from shell-experiments branch:

Browse source 
[user32]
- Properly notify the theme engine that the caption needs to be repainted on WM_SETICON
- Fixes a classic frame appearing when themes are enabled and we navigate to a different folder

svn path=/trunk/; revision=65077
This commit is contained in:
Giannis Adamopoulos 2014-10-28 17:32:01 +00:00
parent f5ca079e13
commit 2c3bb20acb
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
reactos/win32ss/user/user32/windows/defwnd.c
View file

@ -447,6 +447,27 @@ UserSendUiUpdateMsg(HWND hwnd, LPARAM lParam)
return TRUE;
}
static void
UserPaintCaption(HWND hwnd)
{
/* FIXME: this is not 100% correct */
/*
* When themes are not enabled we can go on and paint the non client area.
* However if we do that with themes enabled we will draw a classic frame.
* This is sovled by sending a themes specific message to notify the themes
* engine that the caption needs to be redrawn
*/
if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
{
SendMessage(hwnd, WM_NCUAHDRAWCAPTION,0,0);
}
else
{
DefWndNCPaint(hwnd, HRGN_WINDOW, -1);
}
}
// WM_SETICON
LRESULT FASTCALL
DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
@ -481,7 +502,7 @@ DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, hIconSmall);
if ((pWnd->style & WS_CAPTION ) == WS_CAPTION)
DefWndNCPaint(UserHMGetHandle(pWnd), HRGN_WINDOW, -1); /* Repaint caption */
UserPaintCaption(UserHMGetHandle(pWnd)); /* Repaint caption */
return (LRESULT)hIconOld;
}
@ -1454,17 +1475,7 @@ RealDefWindowProcA(HWND hWnd,
DefSetText(hWnd, (PCWSTR)lParam, TRUE);
if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
/* FIXME: this is not 100% correct */
if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
{
SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0);
}
else
{
DefWndNCPaint(hWnd, HRGN_WINDOW, -1);
}
}
UserPaintCaption(hWnd);
Result = 1;
break;
}
@ -1626,17 +1637,7 @@ RealDefWindowProcW(HWND hWnd,
DefSetText(hWnd, (PCWSTR)lParam, FALSE);
if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
/* FIXME: this is not 100% correct */
if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
{
SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0);
}
else
{
DefWndNCPaint(hWnd, HRGN_WINDOW, -1);
}
}
UserPaintCaption(hWnd);
Result = 1;
break;
}