Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some bugs relating to child windows

Browse source 
svn path=/trunk/; revision=4802
This commit is contained in:
Gé van Geldorp 2003-05-31 08:51:58 +00:00
parent dea1b856c7
commit f0aa23eb97
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/ntuser/painting.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: painting.c,v 1.16 2003/05/27 07:23:05 gvg Exp $ /* $Id: painting.c,v 1.17 2003/05/31 08:51:58 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -414,6 +414,7 @@ PaintUpdateRgns(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags,
Total.y += Offset.y; Total.y += Offset.y;
} }
} }
ChildListEntry = ChildListEntry->Flink;
} }
W32kOffsetRgn(hRgn, Total.x, Total.y); W32kOffsetRgn(hRgn, Total.x, Total.y);
HasChildren = FALSE; HasChildren = FALSE;
@ -434,6 +435,7 @@ PaintUpdateRgns(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags,
{ {
PaintUpdateRgns(Child, hRgn, Flags, FALSE); PaintUpdateRgns(Child, hRgn, Flags, FALSE);
} }
ChildListEntry = ChildListEntry->Flink;
} }
} }

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.50 2003/05/26 10:52:15 rcampbell Exp $ /* $Id: window.c,v 1.51 2003/05/31 08:51:58 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -671,6 +671,17 @@ NtUserCreateWindowEx(DWORD dwExStyle,
W32kCallWindowProc(NULL, WindowObject->Self, WM_MOVE, 0, lParam); W32kCallWindowProc(NULL, WindowObject->Self, WM_MOVE, 0, lParam);
} }
/* Move from parent-client to screen coordinates */
if (0 != (WindowObject->Style & WS_CHILD))
{
W32kOffsetRect(&WindowObject->WindowRect,
ParentWindow->ClientRect.left,
ParentWindow->ClientRect.top);
W32kOffsetRect(&WindowObject->ClientRect,
ParentWindow->ClientRect.left,
ParentWindow->ClientRect.top);
}
/* Show or maybe minimize or maximize the window. */ /* Show or maybe minimize or maximize the window. */
if (WindowObject->Style & (WS_MINIMIZE | WS_MAXIMIZE)) if (WindowObject->Style & (WS_MINIMIZE | WS_MAXIMIZE))
{ {