diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2001-07-23 16:48:05 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2001-07-23 16:48:05 +0000 |
| commit | e29cd64b27dcd2f90304d6b73ac5a60b55fc1743 (patch) | |
| tree | f10a5159e2d01b5d3c320a6adfa8de96d66cf6a8 /vcl | |
| parent | c7f0b63107bb1497081ab60b0b3515147b9c2cfc (diff) | |
#90127# hide intro bitmap if still present when showing a frame
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 81fc7a74023d..a2e08618f3c0 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: cp $ $Date: 2001-07-19 14:14:12 $ + * last change: $Author: pl $ $Date: 2001-07-23 17:48:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,6 +158,8 @@ #define _IsMapped() maFrameData.bMapped_ static XLIB_Window hPresentationWindow = None; +static SalFrame* pIntroBitmap = NULL; +static bool bWasIntroBitmap = false; // -=-= C++ statics =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -602,6 +604,9 @@ SalFrame::SalFrame() : maFrameData( this ) {} // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= inline SalFrameData::~SalFrameData() { + if( pIntroBitmap == pFrame_ ) + pIntroBitmap = NULL; + NotifyDeleteData (); if ( mpInputContext != NULL ) @@ -795,6 +800,20 @@ void SalFrame::Show( BOOL bVisible ) maFrameData.bViewable_ = bVisible; if( bVisible ) { + if( ! bWasIntroBitmap && maFrameData.IsOverrideRedirect() ) + { + const Size& rScreenSize( maFrameData.pDisplay_->GetScreenSize() ); + if( maFrameData.aPosSize_.GetWidth() < rScreenSize.Width()-30 || + maFrameData.aPosSize_.GetHeight() < rScreenSize.Height()-30 ) + { + bWasIntroBitmap = true; + pIntroBitmap = this; + } + } + // look for intro bit map; if present, hide it + if( pIntroBitmap && pIntroBitmap != this ) + pIntroBitmap->Show( FALSE ); + if( maFrameData.nStyle_ & ( SAL_FRAME_STYLE_CHILD | SAL_FRAME_STYLE_FLOAT ) ) XtPopup( maFrameData.hShell_, XtGrabNone ); else |