diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-06-08 23:33:44 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-07-20 00:25:44 +1000 |
| commit | 30c9d3b0caaff3b0fa92ad0dbabc4f499c5308d7 (patch) | |
| tree | d213bc9492716df5bc82276d57c8ff4555bf71c5 /vcl/source/window/stacking.cxx | |
| parent | 8122d35376edb660ddccde4c6765b0df196937e5 (diff) | |
vcl: migrate rest of clipping functions from clipping.hxx into clipmgr.hxx
Change-Id: If4646d96bafb113004dd6965d26f29e2194d237e
Diffstat (limited to 'vcl/source/window/stacking.cxx')
| -rw-r--r-- | vcl/source/window/stacking.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 66cab1377d73..cc85232344d7 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -216,7 +216,9 @@ void Window::ImplToBottomChild() void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { - DBG_ASSERT( ClipManager::GetInstance()->IsOverlapWindow(this), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); + ClipManager *clipMgr = ClipManager::GetInstance(); + + DBG_ASSERT( clipMgr->IsOverlapWindow(this), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); if ( !mpWindowImpl->mbFrame ) { @@ -227,7 +229,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); Region aInvalidateRegion; - ImplCalcOverlapRegionOverlaps( aRegion, aInvalidateRegion ); + clipMgr->CalcOverlapRegionOverlaps( this, aRegion, aInvalidateRegion ); if ( !aInvalidateRegion.IsEmpty() ) { @@ -243,7 +245,9 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) void Window::ImplToTop( sal_uInt16 nFlags ) { - DBG_ASSERT( ClipManager::GetInstance()->IsOverlapWindow(this), "Window::ImplToTop(): Is not a OverlapWindow" ); + ClipManager *clipMgr = ClipManager::GetInstance(); + + DBG_ASSERT( clipMgr->IsOverlapWindow(this), "Window::ImplToTop(): Is not a OverlapWindow" ); if ( mpWindowImpl->mbFrame ) { @@ -324,8 +328,8 @@ void Window::ImplToTop( sal_uInt16 nFlags ) { // reset background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - mpWindowImpl->mpOverlapWindow->ImplSetClipFlagOverlapWindows(); + clipMgr->InvalidateAllOverlapBackgrounds( this ); + clipMgr->SetClipFlagOverlapWindows( mpWindowImpl->mpOverlapWindow ); } } } @@ -566,12 +570,12 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { // restore background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); + clipMgr->InvalidateAllOverlapBackgrounds( this ); if ( mpWindowImpl->mbInitWinClipRegion || !mpWindowImpl->maWinClipRegion.IsEmpty() ) { bool bInitWinClipRegion = mpWindowImpl->mbInitWinClipRegion; - ImplSetClipFlag(); + clipMgr->SetClipFlag( this ); // When ClipRegion was not initialised, assume // the window has not been sent, therefore do not |