diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-08 15:36:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-08 16:43:41 +0100 |
| commit | af8c151f0af0aca74d6bde7132fae4098064d02f (patch) | |
| tree | b72050632bbf612f4942ac0eb2cdf3231b0dad59 | |
| parent | ddc6fe92a6d0b8f85260a25d7097ec821c4b54db (diff) | |
ScrollFlags::NoErase is never set
Change-Id: I0cd0140b26100c6cd6d91ad060526310ef2ba7f6
| -rw-r--r-- | include/vcl/window.hxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/paint.cxx | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 96e97a2bfd8b..e4f13771c2f7 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -254,13 +254,12 @@ enum class ScrollFlags Clip = 0x0001, Children = 0x0002, NoChildren = 0x0004, - NoErase = 0x0008, - UseClipRegion = 0x0010, - Update = 0x0020, + UseClipRegion = 0x0008, + Update = 0x0010, }; namespace o3tl { - template<> struct typed_flags<ScrollFlags> : is_typed_flags<ScrollFlags, 0x003f> {}; + template<> struct typed_flags<ScrollFlags> : is_typed_flags<ScrollFlags, 0x001f> {}; } // Flags for ParentClipMode diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index dafc4aa22125..e927e6a86485 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1542,7 +1542,6 @@ void Window::ImplScroll( const Rectangle& rRect, vcl::Region aInvalidateRegion; bool bScrollChildren(nFlags & ScrollFlags::Children); - bool bErase(!(nFlags & ScrollFlags::NoErase)); if ( !mpWindowImpl->mpFirstChild ) bScrollChildren = false; @@ -1572,7 +1571,6 @@ void Window::ImplScroll( const Rectangle& rRect, if (!aInvalidateRegion.IsEmpty()) { aInvalidateRegion.Move(bReMirror ? -nHorzScroll : nHorzScroll, nVertScroll); - bErase = true; } Rectangle aDestRect(aRectMirror); @@ -1661,8 +1659,6 @@ void Window::ImplScroll( const Rectangle& rRect, mpWindowImpl->mnPaintFlags |= IMPL_PAINT_CHECKRTL; InvalidateFlags nPaintFlags = InvalidateFlags::Children; - if ( !bErase ) - nPaintFlags |= InvalidateFlags::NoErase; if ( !bScrollChildren ) { if ( nOrgFlags & ScrollFlags::NoChildren ) |