diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-04-06 11:56:51 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 13:39:34 +0200 |
| commit | f18fc2ef12d8004ce28b4412f5ceca77d68605c6 (patch) | |
| tree | 959df43c2b6ae1923deb12ce6a79a22e5b24eb8f /vcl/aqua/source/window | |
| parent | b7e00ffeaace7a35b5e69fb23b97d2d486221c90 (diff) | |
ooo34gsl10: #i117587# handle application resigning/becoming active during presentation [hg:98a8c4a45d03]
Diffstat (limited to 'vcl/aqua/source/window')
| -rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 8749774459d3..eec0a0ec3602 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -120,6 +120,7 @@ AquaSalFrame::~AquaSalFrame() SalData* pSalData = GetSalData(); pSalData->maFrames.remove( this ); pSalData->maFrameCheck.erase( this ); + pSalData->maPresentationFrames.remove( this ); DBG_ASSERT( this != s_pCaptureFrame, "capture frame destroyed" ); if( this == s_pCaptureFrame ) @@ -853,13 +854,15 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart ) if( bStart ) { + GetSalData()->maPresentationFrames.push_back( this ); mpActivityTimer.reset( new PreventSleepTimer() ); - [mpWindow setLevel: NSScreenSaverWindowLevel]; + [mpWindow setLevel: NSPopUpMenuWindowLevel]; if( mbShown ) [mpWindow makeMainWindow]; } else { + GetSalData()->maPresentationFrames.remove( this ); mpActivityTimer.reset(); [mpWindow setLevel: NSNormalWindowLevel]; } |