vcl/source/window/builder.cxx | 6 ------ 1 file changed, 6 deletions(-)
New commits: commit c5ece70541f0bf492f1b98d90af5659d64f2aeb7 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed Jul 8 12:48:09 2020 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Jul 8 18:16:30 2020 +0200 prepareWidgetOwnScrolling already set WB_BORDER the pRealParent != pParent case already caused WB_BORDER to be set in prepareWidgetOwnScrolling Change-Id: Id33d9f8d10b8076a26b31e2dcdc70e3419bba5be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98376 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index c80672f0e0aa..1c93d0016df8 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1996,8 +1996,6 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; //IconView manages its own scrolling, vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); - if (pRealParent != pParent) - nWinStyle |= WB_BORDER; VclPtr<IconView> xBox = VclPtr<IconView>::Create(pRealParent, nWinStyle); xWindowForPackingProps = xBox; @@ -2037,8 +2035,6 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & } //ListBox/SvHeaderTabListBox manages its own scrolling, vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); - if (pRealParent != pParent) - nWinStyle |= WB_BORDER; if (m_bLegacy) { xWindow = VclPtr<ListBox>::Create(pRealParent, nWinStyle | WB_SIMPLEMODE); @@ -2185,8 +2181,6 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT; //VclMultiLineEdit manages its own scrolling, vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); - if (pRealParent != pParent) - nWinStyle |= WB_BORDER; xWindow = VclPtr<VclMultiLineEdit>::Create(pRealParent, nWinStyle); if (pRealParent != pParent) cleanupWidgetOwnScrolling(pParent, xWindow, rMap); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits