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

- Small bugfixes.

Browse source 
svn path=/trunk/; revision=6486
This commit is contained in:
Filip Navara 2003-11-01 04:06:59 +00:00
parent ba98b29885
commit 7e110a9faa
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/lib/user32/windows/nonclient.c
View file

@ -418,7 +418,7 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn)
CaptionFlags |= DC_ACTIVE; CaptionFlags |= DC_ACTIVE;
} }
if (Style & WS_EX_TOOLWINDOW) if (ExStyle & WS_EX_TOOLWINDOW)
{ {
CaptionFlags |= DC_SMALLCAP; CaptionFlags |= DC_SMALLCAP;
TempRect.bottom = TempRect.top + GetSystemMetrics(SM_CYSMCAPTION) - 1; TempRect.bottom = TempRect.top + GetSystemMetrics(SM_CYSMCAPTION) - 1;
@ -524,7 +524,12 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE); UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE);
InflateRect(Rect, -WindowBorders.cx, -WindowBorders.cy); InflateRect(Rect, -WindowBorders.cx, -WindowBorders.cy);
if ((Style & WS_CAPTION) == WS_CAPTION) if ((Style & WS_CAPTION) == WS_CAPTION)
Rect->top += GetSystemMetrics(SM_CYCAPTION); {
if (ExStyle & WS_EX_TOOLWINDOW)
Rect->top += GetSystemMetrics(SM_CYSMCAPTION);
else
Rect->top += GetSystemMetrics(SM_CYCAPTION);
}
if (UserHasMenu(hWnd, Style)) if (UserHasMenu(hWnd, Style))
Rect->top += MenuGetMenuBarHeight(hWnd, Rect->right - Rect->left, Rect->left, Rect->top); Rect->top += MenuGetMenuBarHeight(hWnd, Rect->right - Rect->left, Rect->left, Rect->top);
@ -1063,7 +1068,7 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
if (Style & WS_SYSMENU) if (Style & WS_SYSMENU)
{ {
r.right -= 3 + ButtonWidth; r.right -= 3 + ButtonWidth;
if (! (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) if (! (uFlags & DC_SMALLCAP))
{ {
if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) if(Style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX))
r.right -= 2 + 2 * ButtonWidth; r.right -= 2 + 2 * ButtonWidth;
@ -1077,8 +1082,7 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup; if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nclm, 0)) goto cleanup;
SetBkMode( MemDC, TRANSPARENT ); SetBkMode( MemDC, TRANSPARENT );
if (Style & WS_EX_TOOLWINDOW) if (uFlags & DC_SMALLCAP)
// if (uFlags & DC_SMALLCAP) // incorrect
hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont);
else else
hFont = CreateFontIndirectW(&nclm.lfCaptionFont); hFont = CreateFontIndirectW(&nclm.lfCaptionFont);