diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:10:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:10:41 +0000 |
| commit | 12f8cf823665aac92a75af721d1f7f5a2372bbe0 (patch) | |
| tree | 30a32c53e459002128e972e2c7216d4b50818d39 /vcl | |
| parent | 1189199942f8f836a7d0f1d6c447ae1336712b92 (diff) | |
INTEGRATION: CWS vcl38 (1.114.54); FILE MERGED
2005/03/17 15:18:17 ssa 1.114.54.2: #i43250# do not adjust window position that was read by GetWindowRect
2005/03/17 09:02:56 pl 1.114.54.1: #i44325# save maximized size in window state to improve resizing behaviour
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 231e6093766f..a1636f846172 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.115 $ + * $Revision: 1.116 $ * - * last change: $Author: rt $ $Date: 2005-03-29 13:05:37 $ + * last change: $Author: rt $ $Date: 2005-03-30 09:10:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1452,8 +1452,11 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, } // #i3338# to be conformant to UNIX we must position the client window, ie without the decoration - nX += aWinRect.left; - nY += aWinRect.top; + // #i43250# if the position was read from the system (GetWindowRect(), see above), it must not be modified + if ( nFlags & SAL_FRAME_POSSIZE_X ) + nX += aWinRect.left; + if ( nFlags & SAL_FRAME_POSSIZE_Y ) + nY += aWinRect.top; int nScreenX; int nScreenY; |