Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 23:51:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[User32]

Browse source 
- Add more to GetInsideRect NC.
- Sync port from wine with modifications.

svn path=/trunk/; revision=62611
This commit is contained in:
James Tabor 2014-04-04 14:59:19 +00:00
parent 82b5418f45
commit 6dfbda58e8
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,15 +123,13 @@ UserGetInsideRectNC(PWND Wnd, RECT *rect)
/* Remove frame from rectangle */ /* Remove frame from rectangle */
if (UserHasThickFrameStyle(Style, ExStyle )) if (UserHasThickFrameStyle(Style, ExStyle ))
{ {
InflateRect(rect, -GetSystemMetrics(SM_CXFRAME), InflateRect(rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME));
-GetSystemMetrics(SM_CYFRAME));
} }
else else
{ {
if (UserHasDlgFrameStyle(Style, ExStyle )) if (UserHasDlgFrameStyle(Style, ExStyle ))
{ {
InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME), InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME));
-GetSystemMetrics(SM_CYDLGFRAME));
/* FIXME: this isn't in NC_AdjustRect? why not? */ /* FIXME: this isn't in NC_AdjustRect? why not? */
if (ExStyle & WS_EX_DLGMODALFRAME) if (ExStyle & WS_EX_DLGMODALFRAME)
InflateRect( rect, -1, 0 ); InflateRect( rect, -1, 0 );
@ -140,11 +138,19 @@ UserGetInsideRectNC(PWND Wnd, RECT *rect)
{ {
if (UserHasThinFrameStyle(Style, ExStyle)) if (UserHasThinFrameStyle(Style, ExStyle))
{ {
InflateRect(rect, -GetSystemMetrics(SM_CXBORDER), InflateRect(rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
-GetSystemMetrics(SM_CYBORDER));
} }
} }
} }
/* We have additional border information if the window
* is a child (but not an MDI child) */
if ((Style & WS_CHILD) && !(ExStyle & WS_EX_MDICHILD))
{
if (ExStyle & WS_EX_CLIENTEDGE)
InflateRect (rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE));
if (ExStyle & WS_EX_STATICEDGE)
InflateRect (rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
}
} }
@ -1086,7 +1092,6 @@ DefWndScreenshot(HWND hWnd)
ReleaseDC(hWnd, hdc2); ReleaseDC(hWnd, hdc2);
CloseClipboard(); CloseClipboard();
} }