Kaydet (Commit) eef25e0e authored tarafından Tobias Madl's avatar Tobias Madl

changed timers to idles

Change-Id: Iaceef008e7df91f3a9ad54fdaec25f2170100ee0
üst 50fdcff5
...@@ -183,7 +183,7 @@ namespace formula ...@@ -183,7 +183,7 @@ namespace formula
bool bStructUpdate; bool bStructUpdate;
MultiLineEdit* pMEdit; MultiLineEdit* pMEdit;
bool bUserMatrixFlag; bool bUserMatrixFlag;
Timer aTimer; Idle aIdle;
const OUString aTitle1; const OUString aTitle1;
const OUString aTitle2; const OUString aTitle2;
...@@ -353,11 +353,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent ...@@ -353,11 +353,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
FormulaDlg_Impl::~FormulaDlg_Impl() FormulaDlg_Impl::~FormulaDlg_Impl()
{ {
if(aTimer.IsActive()) if(aIdle.IsActive())
{ {
aTimer.SetTimeoutHdl(Link()); aIdle.SetIdleHdl(Link());
aTimer.Stop(); aIdle.Stop();
}// if(aTimer.IsActive()) }// if(aIdle.IsActive())
bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus. bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus.
m_pTabCtrl->RemovePage(TP_FUNCTION); m_pTabCtrl->RemovePage(TP_FUNCTION);
...@@ -412,7 +412,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) ...@@ -412,7 +412,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
FormEditData* pData = m_pHelper->getFormEditData(); FormEditData* pData = m_pHelper->getFormEditData();
if (pData && !aTimer.IsActive()) // won't be destroyed via Close if (pData && !aIdle.IsActive()) // won't be destroyed via Close
{ {
pData->SetUniqueId(aActivWinId); pData->SetUniqueId(aActivWinId);
} }
...@@ -1773,9 +1773,9 @@ OUString FormulaDlg::GetMeText() const ...@@ -1773,9 +1773,9 @@ OUString FormulaDlg::GetMeText() const
void FormulaDlg::Update() void FormulaDlg::Update()
{ {
m_pImpl->Update(); m_pImpl->Update();
m_pImpl->aTimer.SetTimeout(200); m_pImpl->aIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER);
m_pImpl->aTimer.SetTimeoutHdl(LINK( this, FormulaDlg, UpdateFocusHdl)); m_pImpl->aIdle.SetIdleHdl(LINK( this, FormulaDlg, UpdateFocusHdl));
m_pImpl->aTimer.Start(); m_pImpl->aIdle.Start();
} }
void FormulaDlg::DoEnter(bool _bOk) void FormulaDlg::DoEnter(bool _bOk)
......
...@@ -455,15 +455,13 @@ void EditBox::UpdateOldSel() ...@@ -455,15 +455,13 @@ void EditBox::UpdateOldSel()
// class RefEdit // class RefEdit
#define SC_ENABLE_TIME 100
RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle ) RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle )
: Edit( _pParent, nStyle ) : Edit( _pParent, nStyle )
, pAnyRefDlg( NULL ) , pAnyRefDlg( NULL )
, pLabelWidget(pShrinkModeLabel) , pLabelWidget(pShrinkModeLabel)
{ {
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME ); aIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
} }
RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
...@@ -472,8 +470,8 @@ RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, ...@@ -472,8 +470,8 @@ RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
, pAnyRefDlg( pParent ) , pAnyRefDlg( pParent )
, pLabelWidget(pShrinkModeLabel) , pLabelWidget(pShrinkModeLabel)
{ {
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME ); aIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
} }
extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *pParent, VclBuilder::stringmap &) extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *pParent, VclBuilder::stringmap &)
...@@ -483,8 +481,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p ...@@ -483,8 +481,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p
RefEdit::~RefEdit() RefEdit::~RefEdit()
{ {
aTimer.SetTimeoutHdl( Link() ); aIdle.SetIdleHdl( Link() );
aTimer.Stop(); aIdle.Stop();
} }
void RefEdit::SetRefString( const OUString& rStr ) void RefEdit::SetRefString( const OUString& rStr )
...@@ -509,12 +507,12 @@ void RefEdit::SetRefValid(bool bValid) ...@@ -509,12 +507,12 @@ void RefEdit::SetRefValid(bool bValid)
void RefEdit::SetText(const OUString& rStr) void RefEdit::SetText(const OUString& rStr)
{ {
Edit::SetText( rStr ); Edit::SetText( rStr );
UpdateHdl( &aTimer ); UpdateHdl( &aIdle );
} }
void RefEdit::StartUpdateData() void RefEdit::StartUpdateData()
{ {
aTimer.Start(); aIdle.Start();
} }
void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel ) void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel )
...@@ -524,13 +522,13 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel ...@@ -524,13 +522,13 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel
if( pDlg ) if( pDlg )
{ {
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME ); aIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
} }
else else
{ {
aTimer.SetTimeoutHdl( Link() ); aIdle.SetIdleHdl( Link() );
aTimer.Stop(); aIdle.Stop();
} }
} }
......
...@@ -32,7 +32,7 @@ class IControlReferenceHandler; ...@@ -32,7 +32,7 @@ class IControlReferenceHandler;
class FORMULA_DLLPUBLIC RefEdit : public Edit class FORMULA_DLLPUBLIC RefEdit : public Edit
{ {
private: private:
Timer aTimer; Idle aIdle;
IControlReferenceHandler* pAnyRefDlg; // parent dialog IControlReferenceHandler* pAnyRefDlg; // parent dialog
vcl::Window* pLabelWidget; vcl::Window* pLabelWidget;
......
...@@ -166,8 +166,8 @@ class SvxIconChoiceCtrl_Impl ...@@ -166,8 +166,8 @@ class SvxIconChoiceCtrl_Impl
std::vector<Rectangle*> aSelectedRectList; std::vector<Rectangle*> aSelectedRectList;
Idle aEditIdle; // for editing in place Idle aEditIdle; // for editing in place
Idle aAutoArrangeIdle; Idle aAutoArrangeIdle;
Timer aDocRectChangedTimer; Idle aDocRectChangedIdle;
Timer aVisRectChangedTimer; Idle aVisRectChangedIdle;
Idle aCallSelectHdlIdle; Idle aCallSelectHdlIdle;
Size aVirtOutputSize; Size aVirtOutputSize;
Size aImageSize; Size aImageSize;
...@@ -308,8 +308,8 @@ class SvxIconChoiceCtrl_Impl ...@@ -308,8 +308,8 @@ class SvxIconChoiceCtrl_Impl
{ {
return (ePositionMode == IcnViewPositionModeAutoAdjust); return (ePositionMode == IcnViewPositionModeAutoAdjust);
} }
void DocRectChanged() { aDocRectChangedTimer.Start(); } void DocRectChanged() { aDocRectChangedIdle.Start(); }
void VisRectChanged() { aVisRectChangedTimer.Start(); } void VisRectChanged() { aVisRectChangedIdle.Start(); }
void SetOrigin( const Point&, bool bDoNotUpdateWallpaper = false ); void SetOrigin( const Point&, bool bDoNotUpdateWallpaper = false );
DECL_LINK(TextEditEndedHdl, void *); DECL_LINK(TextEditEndedHdl, void *);
......
...@@ -142,10 +142,10 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( ...@@ -142,10 +142,10 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aCallSelectHdlIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST ); aCallSelectHdlIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
aCallSelectHdlIdle.SetIdleHdl( LINK(this,SvxIconChoiceCtrl_Impl,CallSelectHdlHdl)); aCallSelectHdlIdle.SetIdleHdl( LINK(this,SvxIconChoiceCtrl_Impl,CallSelectHdlHdl));
aDocRectChangedTimer.SetTimeout( 50 ); aDocRectChangedIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
aDocRectChangedTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,DocRectChangedHdl)); aDocRectChangedIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,DocRectChangedHdl));
aVisRectChangedTimer.SetTimeout( 50 ); aVisRectChangedIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
aVisRectChangedTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl)); aVisRectChangedIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( true ); Clear( true );
...@@ -2895,14 +2895,14 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl) ...@@ -2895,14 +2895,14 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl)
IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl) IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl)
{ {
aVisRectChangedTimer.Stop(); aVisRectChangedIdle.Stop();
pView->VisibleRectChanged(); pView->VisibleRectChanged();
return 0; return 0;
} }
IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl) IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl)
{ {
aDocRectChangedTimer.Stop(); aDocRectChangedIdle.Stop();
pView->DocumentRectChanged(); pView->DocumentRectChanged();
return 0; return 0;
} }
......
...@@ -210,8 +210,8 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window ...@@ -210,8 +210,8 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
m_pCbbTarget->Disable(); m_pCbbTarget->Disable();
pOwnData->bExecState = false; pOwnData->bExecState = false;
pOwnData->aTimer.SetTimeout( 100 ); pOwnData->aIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) ); pOwnData->aIdle.SetIdleHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
m_pTbxIMapDlg1->EnableItem( mnActiveId, false ); m_pTbxIMapDlg1->EnableItem( mnActiveId, false );
m_pTbxIMapDlg1->EnableItem( mnMacroId, false ); m_pTbxIMapDlg1->EnableItem( mnMacroId, false );
...@@ -318,7 +318,7 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap, ...@@ -318,7 +318,7 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap,
pOwnData->aUpdateTargetList.push_back( aTargetList[ i ] ); pOwnData->aUpdateTargetList.push_back( aTargetList[ i ] );
} }
pOwnData->aTimer.Start(); pOwnData->aIdle.Start();
} }
...@@ -687,7 +687,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl) ...@@ -687,7 +687,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl) IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
{ {
pOwnData->aTimer.Stop(); pOwnData->aIdle.Stop();
if ( pOwnData->pUpdateEditingObject != pCheckObj ) if ( pOwnData->pUpdateEditingObject != pCheckObj )
{ {
......
...@@ -29,7 +29,7 @@ class IMapOwnData ...@@ -29,7 +29,7 @@ class IMapOwnData
{ {
public: public:
Timer aTimer; Idle aIdle;
Timer aTbxTimer; Timer aTbxTimer;
Graphic aUpdateGraphic; Graphic aUpdateGraphic;
ImageMap aUpdateImageMap; ImageMap aUpdateImageMap;
......
...@@ -42,8 +42,8 @@ class ImplDockFloatWin2 : public FloatingWindow ...@@ -42,8 +42,8 @@ class ImplDockFloatWin2 : public FloatingWindow
private: private:
ImplDockingWindowWrapper* mpDockWin; ImplDockingWindowWrapper* mpDockWin;
sal_uLong mnLastTicks; sal_uLong mnLastTicks;
Timer maDockTimer; Idle maDockIdle;
Timer maEndDockTimer; Idle maEndDockIdle;
Point maDockPos; Point maDockPos;
Rectangle maDockRect; Rectangle maDockRect;
bool mbInMove; bool mbInMove;
...@@ -91,10 +91,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ...@@ -91,10 +91,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,
SetBackground( GetSettings().GetStyleSettings().GetFaceColor() ); SetBackground( GetSettings().GetStyleSettings().GetFaceColor() );
maDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, DockTimerHdl ) );
maDockTimer.SetTimeout( 50 ); maDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
maEndDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); maEndDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) );
maEndDockTimer.SetTimeout( 50 ); maEndDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
} }
ImplDockFloatWin2::~ImplDockFloatWin2() ImplDockFloatWin2::~ImplDockFloatWin2()
...@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) ...@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
{ {
DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" );
maDockTimer.Stop(); maDockIdle.Stop();
PointerState aState = GetPointerState(); PointerState aState = GetPointerState();
if( aState.mnState & KEY_MOD1 ) if( aState.mnState & KEY_MOD1 )
...@@ -115,7 +115,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) ...@@ -115,7 +115,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
// i43499 CTRL disables docking now // i43499 CTRL disables docking now
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking();
if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
maDockTimer.Start(); maDockIdle.Start();
} }
else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) )
{ {
...@@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) ...@@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
else else
{ {
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW );
maDockTimer.Start(); maDockIdle.Start();
} }
return 0; return 0;
...@@ -135,7 +135,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) ...@@ -135,7 +135,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl)
{ {
DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" );
maEndDockTimer.Stop(); maEndDockIdle.Stop();
PointerState aState = GetPointerState(); PointerState aState = GetPointerState();
if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) )
{ {
...@@ -144,7 +144,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) ...@@ -144,7 +144,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl)
} }
else else
{ {
maEndDockTimer.Start(); maEndDockIdle.Start();
} }
return 0; return 0;
...@@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) ...@@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl)
maDockRect.SetPos( mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ScreenToOutputPixel( maDockRect.SetPos( mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ScreenToOutputPixel(
maDockRect.TopLeft() ) ); maDockRect.TopLeft() ) );
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW );
maEndDockTimer.Stop(); maEndDockIdle.Stop();
DockTimerHdl( this ); DockTimerHdl( this );
} }
else else
{ {
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking();
maDockTimer.Stop(); maDockIdle.Stop();
EndDockTimerHdl( this ); EndDockTimerHdl( this );
} }
} }
......
...@@ -59,7 +59,7 @@ class ImplDockFloatWin : public FloatingWindow ...@@ -59,7 +59,7 @@ class ImplDockFloatWin : public FloatingWindow
private: private:
DockingWindow* mpDockWin; DockingWindow* mpDockWin;
sal_uLong mnLastTicks; sal_uLong mnLastTicks;
Timer maDockTimer; Idle maDockIdle;
Point maDockPos; Point maDockPos;
Rectangle maDockRect; Rectangle maDockRect;
bool mbInMove; bool mbInMove;
...@@ -103,8 +103,8 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, ...@@ -103,8 +103,8 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,
SetBackground(); SetBackground();
maDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin, DockTimerHdl ) );
maDockTimer.SetTimeout( 50 ); maDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM );
} }
ImplDockFloatWin::~ImplDockFloatWin() ImplDockFloatWin::~ImplDockFloatWin()
...@@ -117,7 +117,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) ...@@ -117,7 +117,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
{ {
DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" );
maDockTimer.Stop(); maDockIdle.Stop();
PointerState aState = GetPointerState(); PointerState aState = GetPointerState();
if( aState.mnState & KEY_MOD1 ) if( aState.mnState & KEY_MOD1 )
...@@ -126,7 +126,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) ...@@ -126,7 +126,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking();
mpDockWin->EndDocking( maDockRect, true ); mpDockWin->EndDocking( maDockRect, true );
if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
maDockTimer.Start(); maDockIdle.Start();
} }
else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) )
{ {
...@@ -136,7 +136,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) ...@@ -136,7 +136,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
else else
{ {
mpDockWin->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); mpDockWin->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW );
maDockTimer.Start(); maDockIdle.Start();
} }
return 0; return 0;
...@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) ...@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl)
else else
{ {
mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking();
maDockTimer.Stop(); maDockIdle.Stop();
mpDockWin->EndDocking( maDockRect, true ); mpDockWin->EndDocking( maDockRect, true );
} }
} }
......
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