diff options
author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-11-20 16:21:17 +0000 |
---|---|---|
committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:35:04 +0000 |
commit | eef25e0e7c03b53881e19bedb20532950323ef09 (patch) | |
tree | d44b0a32f20ba1a09c62bbb9dfa296eb3b0a3463 /vcl | |
parent | 50fdcff56a863ef69245c628e68d8673830ebbaa (diff) |
changed timers to idles
Change-Id: Iaceef008e7df91f3a9ad54fdaec25f2170100ee0
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 26 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 14 |
2 files changed, 20 insertions, 20 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index d57ea8a78be2..62ee8e2d21f2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -42,8 +42,8 @@ class ImplDockFloatWin2 : public FloatingWindow private: ImplDockingWindowWrapper* mpDockWin; sal_uLong mnLastTicks; - Timer maDockTimer; - Timer maEndDockTimer; + Idle maDockIdle; + Idle maEndDockIdle; Point maDockPos; Rectangle maDockRect; bool mbInMove; @@ -91,10 +91,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, SetBackground( GetSettings().GetStyleSettings().GetFaceColor() ); - maDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); - maDockTimer.SetTimeout( 50 ); - maEndDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); - maEndDockTimer.SetTimeout( 50 ); + maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); + maDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM ); + maEndDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); + maEndDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM ); } ImplDockFloatWin2::~ImplDockFloatWin2() @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); - maDockTimer.Stop(); + maDockIdle.Stop(); PointerState aState = GetPointerState(); if( aState.mnState & KEY_MOD1 ) @@ -115,7 +115,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) // i43499 CTRL disables docking now mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) - maDockTimer.Start(); + maDockIdle.Start(); } else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { @@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) else { mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); - maDockTimer.Start(); + maDockIdle.Start(); } return 0; @@ -135,7 +135,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); - maEndDockTimer.Stop(); + maEndDockIdle.Stop(); PointerState aState = GetPointerState(); if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { @@ -144,7 +144,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) } else { - maEndDockTimer.Start(); + maEndDockIdle.Start(); } return 0; @@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) maDockRect.SetPos( mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ScreenToOutputPixel( maDockRect.TopLeft() ) ); mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); - maEndDockTimer.Stop(); + maEndDockIdle.Stop(); DockTimerHdl( this ); } else { mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); - maDockTimer.Stop(); + maDockIdle.Stop(); EndDockTimerHdl( this ); } } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 057a8c525504..ab3c3a8becb8 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -59,7 +59,7 @@ class ImplDockFloatWin : public FloatingWindow private: DockingWindow* mpDockWin; sal_uLong mnLastTicks; - Timer maDockTimer; + Idle maDockIdle; Point maDockPos; Rectangle maDockRect; bool mbInMove; @@ -103,8 +103,8 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, SetBackground(); - maDockTimer.SetTimeoutHdl( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); - maDockTimer.SetTimeout( 50 ); + maDockIdle.SetIdleHdl( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); + maDockIdle.SetPriority( VCL_IDLE_PRIORITY_MEDIUM ); } ImplDockFloatWin::~ImplDockFloatWin() @@ -117,7 +117,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); - maDockTimer.Stop(); + maDockIdle.Stop(); PointerState aState = GetPointerState(); if( aState.mnState & KEY_MOD1 ) @@ -126,7 +126,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->EndDocking( maDockRect, true ); if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) - maDockTimer.Start(); + maDockIdle.Start(); } else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { @@ -136,7 +136,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) else { mpDockWin->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_BIG | SHOWTRACK_WINDOW ); - maDockTimer.Start(); + maDockIdle.Start(); } return 0; @@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) else { mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); - maDockTimer.Stop(); + maDockIdle.Stop(); mpDockWin->EndDocking( maDockRect, true ); } } |