diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-08 12:48:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-08 18:16:30 +0200 |
| commit | c5ece70541f0bf492f1b98d90af5659d64f2aeb7 (patch) | |
| tree | b4a3e661f2ab5aa9f7925feed5eeed1cee46d1cd /vcl/source/window | |
| parent | 6907817b83e37d40be491cc10b2e5b99cc0f48fc (diff) | |
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 <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/builder.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
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); |