Kaydet (Commit) 4bd28a2f authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS fwk82_SRC680 (1.45.138); FILE MERGED

2008/01/07 14:57:58 cd 1.45.138.1: #i63848# Include modeless dialog class and resize operation into the asynchronous processing of window attribute persistence (Views.xcu)
üst 6b30ba5c
......@@ -4,9 +4,9 @@
*
* $RCSfile: dockwin.cxx,v $
*
* $Revision: 1.45 $
* $Revision: 1.46 $
*
* last change: $Author: ihi $ $Date: 2007-07-10 15:22:37 $
* last change: $Author: rt $ $Date: 2008-01-29 16:27:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -117,14 +117,8 @@ void SfxDockingWindow::Resize()
{
if ( IsFloatingMode() )
{
if( !GetFloatingWindow()->IsRollUp() )
SetFloatingSize( GetOutputSizePixel() );
pImp->aWinState = GetFloatingWindow()->GetWindowState();
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW;
if ( pImp->bSplitable )
eIdent = SFX_CHILDWIN_SPLITWINDOW;
pWorkWin->ConfigChild_Impl( eIdent, SFX_ALIGNDOCKINGWINDOW, pMgr->GetType() );
// start timer for saving window status information
pImp->aMoveTimer.Start();
}
else
{
......@@ -512,7 +506,6 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
}
SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() );
pWorkWin->ConfigChild_Impl( eIdent, SFX_ALIGNDOCKINGWINDOW, pMgr->GetType() );
}
//-------------------------------------------------------------------------
......@@ -1610,6 +1603,9 @@ IMPL_LINK( SfxDockingWindow, TimerHdl, Timer*, EMPTYARG)
pImp->aMoveTimer.Stop();
if ( IsReallyVisible() && IsFloatingMode() )
{
if( !GetFloatingWindow()->IsRollUp() )
SetFloatingSize( GetOutputSizePixel() );
pImp->aWinState = GetFloatingWindow()->GetWindowState();
SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW;
if ( pImp->bSplitable )
eIdent = SFX_CHILDWIN_SPLITWINDOW;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment