summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-07-08 14:05:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-07-08 18:16:46 +0200
commitf70bd1aeee9360e29d42ff66acfce07d84047b25 (patch)
treef30e609f443059b6752c88833c8c8f8262be186f /vcl/source
parentc5ece70541f0bf492f1b98d90af5659d64f2aeb7 (diff)
drop WB_BORDER if the border style is invisible
Change-Id: Ie88818cb2b61d411f868f748d6a7c2fdf8028e65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98377 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/builder.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1c93d0016df8..259cc45fb432 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1579,7 +1579,9 @@ vcl::Window* VclBuilder::prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits
{
WinBits nScrollBits = pParent->GetStyle();
nScrollBits &= (WB_AUTOHSCROLL|WB_HSCROLL|WB_AUTOVSCROLL|WB_VSCROLL);
- rWinStyle |= nScrollBits | WB_BORDER;
+ rWinStyle |= nScrollBits;
+ if (static_cast<VclScrolledWindow*>(pParent)->HasVisibleBorder())
+ rWinStyle |= WB_BORDER;
pParent = pParent->GetParent();
}