diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-10-11 17:08:29 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-10-11 17:08:29 +0000 |
| commit | fbfe0357fd7f565a6da306972cea621bf4ace7ea (patch) | |
| tree | 91d91b2b7fcf26d99daaf597487b70975d2717ac /vcl/source/window | |
| parent | eb899a3cd292edc105ee702f325ae439713b6b7e (diff) | |
#94144#: care for minimized in window state
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index a8ea885e14b6..83c168b32b1d 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: syswin.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: ssa $ $Date: 2002-10-11 08:38:16 $ + * last change: $Author: mba $ $Date: 2002-10-11 18:08:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -692,7 +692,8 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize - //aState.mnState &= ~(WINDOWSTATE_STATE_MINIMIZED); + if ( !(nValidMask&WINDOWSTATE_STATE_MINIMIZED) ) + aState.mnState &= ~(WINDOWSTATE_STATE_MINIMIZED); rData.SetState( aState.mnState ); } } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 39d7936ccd54..ff5ce667ddfa 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrkwin.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pl $ $Date: 2002-03-15 17:10:25 $ + * last change: $Author: mba $ $Date: 2002-10-11 18:08:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -369,5 +369,8 @@ void WorkWindow::StartPresentationMode( BOOL bPresentation, USHORT nFlags ) BOOL WorkWindow::IsMinimized() const { - return mpFrameData->mbMinimized; + //return mpFrameData->mbMinimized; + SalFrameState aState; + mpFrame->GetWindowState(&aState); + return (( aState.mnState & SAL_FRAMESTATE_MINIMIZED ) != 0); } |