diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-01-30 19:42:17 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-01 08:11:23 +0000 |
commit | aa09ea1ee2937a8933ea30e4cd86a55e473690e3 (patch) | |
tree | 3515ce23eb81f75b760d6709b12f1e9d064e30c2 | |
parent | b9532822b5958f71bbf2b968727731d8d221c0ee (diff) |
mpFirstBackWin is always null now
Change-Id: Ia03747824c7c6134bc91817538b3f79281aefb8b
-rw-r--r-- | vcl/inc/window.h | 1 | ||||
-rw-r--r-- | vcl/source/window/clipping.cxx | 25 | ||||
-rw-r--r-- | vcl/source/window/paint.cxx | 14 | ||||
-rw-r--r-- | vcl/source/window/stacking.cxx | 7 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 10 |
5 files changed, 0 insertions, 57 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 6911d0b8aba3..80d1d80c2698 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -117,7 +117,6 @@ struct ImplFrameData VclPtr<vcl::Window> mpFocusWin; //< focus window (is also set, when frame doesn't have the focus) VclPtr<vcl::Window> mpMouseMoveWin; //< last window, where MouseMove() called VclPtr<vcl::Window> mpMouseDownWin; //< last window, where MouseButtonDown() called - VclPtr<vcl::Window> mpFirstBackWin; //< first overlap-window with saved background ::std::vector<VclPtr<vcl::Window> > maOwnerDrawList; //< List of system windows with owner draw decoration PhysicalFontCollection* mpFontCollection; //< Font-List for this frame ImplFontCache* mpFontCache; //< Font-Cache for this frame diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index ee318e152f9a..31893b97ddbc 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -33,9 +33,6 @@ void Window::InitClipRegion() vcl::Region aRegion; - // Put back backed up background - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); if ( mpWindowImpl->mbInPaint ) aRegion = *(mpWindowImpl->mpPaintRegion); else @@ -321,9 +318,6 @@ bool Window::ImplSysObjClip( const vcl::Region* pOldRegion ) bUpdate = aNewRegion == *pWinChildClipRegion; } - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - vcl::Region aRegion = *pWinChildClipRegion; Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); vcl::Region aWinRectRegion( aWinRect ); @@ -809,25 +803,6 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, void Window::ImplInvalidateAllOverlapBackgrounds() { - vcl::Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; - if (pWindow) - { - if ( ImplIsWindowInFront( pWindow ) ) - { - Rectangle aRect1( Point( mnOutOffX, mnOutOffY ), - Size( mnOutWidth, mnOutHeight ) ); - Rectangle aRect2( Point( pWindow->mnOutOffX, pWindow->mnOutOffY ), - Size( pWindow->mnOutWidth, pWindow->mnOutHeight ) ); - aRect1.Intersection( aRect2 ); - if ( !aRect1.IsEmpty() ) - { - if ( !pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn ) - pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn = new vcl::Region( aRect2 ); - pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn->Exclude( aRect1 ); - } - - } - } } } /* namespace vcl */ diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 483a55c798d4..1c6500d99529 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -764,10 +764,6 @@ void Window::ImplInvalidateParentFrameRegion( vcl::Region& rRegion ) void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags nFlags ) { - // reset background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - // check what has to be redrawn bool bInvalidateAll = !pRegion; @@ -1060,9 +1056,6 @@ void Window::SetWindowRegionPixel() if ( IsReallyVisible() ) { - // restore background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); vcl::Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); @@ -1145,9 +1138,6 @@ void Window::SetWindowRegionPixel( const vcl::Region& rRegion ) if ( IsReallyVisible() ) { - // restore background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); vcl::Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); @@ -1546,10 +1536,6 @@ void Window::ImplScroll( const Rectangle& rRect, if ( !nHorzScroll && !nVertScroll ) return; - // restore background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - if ( mpWindowImpl->mpCursor ) mpWindowImpl->mpCursor->ImplSuspend(); diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 6f9ef3af5b7c..8418919b8b67 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -307,9 +307,6 @@ void Window::ImplToTop( ToTopFlags nFlags ) // recalculate ClipRegion of this and all overlapping windows if ( IsReallyVisible() ) { - // reset background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); mpWindowImpl->mpOverlapWindow->ImplSetClipFlagOverlapWindows(); } } @@ -546,10 +543,6 @@ void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) if ( IsReallyVisible() ) { - // restore background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - if ( mpWindowImpl->mbInitWinClipRegion || !mpWindowImpl->maWinClipRegion.IsEmpty() ) { bool bInitWinClipRegion = mpWindowImpl->mbInitWinClipRegion; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 856111e023aa..f845fc283222 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1027,7 +1027,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p mpWindowImpl->mpFrameData->mpFocusWin = nullptr; mpWindowImpl->mpFrameData->mpMouseMoveWin = nullptr; mpWindowImpl->mpFrameData->mpMouseDownWin = nullptr; - mpWindowImpl->mpFrameData->mpFirstBackWin = nullptr; mpWindowImpl->mpFrameData->mpFontCollection = pSVData->maGDIData.mpScreenFontList; mpWindowImpl->mpFrameData->mpFontCache = pSVData->maGDIData.mpScreenFontCache; mpWindowImpl->mpFrameData->mnFocusId = nullptr; @@ -1572,9 +1571,6 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( IsReallyVisible() ) { - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); - Rectangle aOldWinRect( Point( nOldOutOffX, nOldOutOffY ), Size( nOldOutWidth, nOldOutHeight ) ); pOldRegion = new vcl::Region( aOldWinRect ); @@ -1751,9 +1747,6 @@ void Window::ImplPosSizeWindow( long nX, long nY, { if ( bNewPos || bNewSize ) { - // reset background storage - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); // set Clip-Flag bUpdateSysObjClip = !ImplSetClipFlag( true ); } @@ -2507,9 +2500,6 @@ void Window::Show(bool bVisible, ShowFlags nFlags) if( aDogTag.IsDead() ) return; - // invalidate all saved backgrounds - if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - ImplInvalidateAllOverlapBackgrounds(); // the SHOW/HIDE events also serve as indicators to send child creation/destroy events to the access bridge // However, the access bridge only uses this event if the data member is not NULL (it's kind of a hack that |