mirror of
https://github.com/reactos/reactos.git
synced 2025-08-04 03:15:43 +00:00
Fix maximizing problem introduced by r17764
svn path=/trunk/; revision=17771
This commit is contained in:
parent
ae5de0886a
commit
a2c38b8cdd
1 changed files with 6 additions and 6 deletions
|
@ -361,8 +361,8 @@ co_WinPosMinMaximize(PWINDOW_OBJECT Window, UINT ShowFlag, RECT* NewPos)
|
||||||
|
|
||||||
case SW_MAXIMIZE:
|
case SW_MAXIMIZE:
|
||||||
{
|
{
|
||||||
co_WinPosGetMinMaxInfo(Window, &Size, &InternalPos->MaxPos,
|
co_WinPosGetMinMaxInfo(Window, NULL, &InternalPos->MaxPos,
|
||||||
NULL, NULL);
|
NULL, &Size);
|
||||||
DPRINT("Maximize: %d,%d %dx%d\n",
|
DPRINT("Maximize: %d,%d %dx%d\n",
|
||||||
InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y);
|
InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y);
|
||||||
if (Window->Style & WS_MINIMIZE)
|
if (Window->Style & WS_MINIMIZE)
|
||||||
|
@ -382,8 +382,8 @@ co_WinPosMinMaximize(PWINDOW_OBJECT Window, UINT ShowFlag, RECT* NewPos)
|
||||||
Window->Style &= ~WS_MINIMIZE;
|
Window->Style &= ~WS_MINIMIZE;
|
||||||
if (Window->Flags & WINDOWOBJECT_RESTOREMAX)
|
if (Window->Flags & WINDOWOBJECT_RESTOREMAX)
|
||||||
{
|
{
|
||||||
co_WinPosGetMinMaxInfo(Window, &Size,
|
co_WinPosGetMinMaxInfo(Window, NULL,
|
||||||
&InternalPos->MaxPos, NULL, NULL);
|
&InternalPos->MaxPos, NULL, &Size);
|
||||||
Window->Style |= WS_MAXIMIZE;
|
Window->Style |= WS_MAXIMIZE;
|
||||||
IntGdiSetRect(NewPos, InternalPos->MaxPos.x,
|
IntGdiSetRect(NewPos, InternalPos->MaxPos.x,
|
||||||
InternalPos->MaxPos.y, Size.x, Size.y);
|
InternalPos->MaxPos.y, Size.x, Size.y);
|
||||||
|
@ -437,8 +437,8 @@ WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info)
|
||||||
Info->ptMaxTrackSize.y = Info->ptMaxSize.y;
|
Info->ptMaxTrackSize.y = Info->ptMaxSize.y;
|
||||||
|
|
||||||
IntGetWindowBorderMeasures(Window, &XInc, &YInc);
|
IntGetWindowBorderMeasures(Window, &XInc, &YInc);
|
||||||
Info->ptMaxSize.x += 2 * XInc;
|
Info->ptMaxTrackSize.x += 2 * XInc;
|
||||||
Info->ptMaxSize.y += 2 * YInc;
|
Info->ptMaxTrackSize.y += 2 * YInc;
|
||||||
|
|
||||||
if (Window->InternalPos != NULL)
|
if (Window->InternalPos != NULL)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue