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

Allocated space for the menu

Browse source 
svn path=/trunk/; revision=4391
This commit is contained in:
Richard Campbell 2003-03-22 04:53:01 +00:00
parent 948bca0d7e
commit 87a1ef504f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/subsys/win32k/ntuser/window.c
View file

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.36 2003/03/22 03:05:26 rcampbell Exp $ /* $Id: window.c,v 1.37 2003/03/22 04:53:01 rcampbell Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -561,7 +561,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
WindowObject->ClientRect = WindowObject->WindowRect; WindowObject->ClientRect = WindowObject->WindowRect;
/* FIXME: Initialize the window menu. */ /* FIXME: Initialize the window menu. */
/* Initialize the window's scrollbars */ /* Initialize the window's scrollbars */
if (dwStyle & WS_VSCROLL) if (dwStyle & WS_VSCROLL)
SCROLL_CreateScrollBar(WindowObject, SB_VERT); SCROLL_CreateScrollBar(WindowObject, SB_VERT);
@ -621,6 +621,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
WindowObject->ClientRect.left, WindowObject->ClientRect.left,
WindowObject->ClientRect.bottom - WindowObject->ClientRect.bottom -
WindowObject->ClientRect.top); WindowObject->ClientRect.top);
DPRINT("NtUserCreateWindow(): About to send WM_SIZE\n"); DPRINT("NtUserCreateWindow(): About to send WM_SIZE\n");
W32kCallWindowProc(NULL, WindowObject->Self, WM_SIZE, SIZE_RESTORED, W32kCallWindowProc(NULL, WindowObject->Self, WM_SIZE, SIZE_RESTORED,
lParam); lParam);
@ -866,8 +867,8 @@ NtUserMoveWindow(
Window->ClientRect.right -= NtUserGetSystemMetrics(SM_CXSIZEFRAME); Window->ClientRect.right -= NtUserGetSystemMetrics(SM_CXSIZEFRAME);
} }
if (uStyle & WS_CAPTION) if (uStyle & WS_CAPTION)
Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYCAPTION); Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYCAPTION) + 1;
if (Window->Menu) if ( Window->Class->Class.lpszMenuName)
{ {
Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYMENU); Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYMENU);
} }