summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-01-27 10:45:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2022-01-27 18:24:37 +0100
commit40456ff3d26c7edc2eb49c14077b2cbfa492af3c (patch)
tree5ec456083055d487bdfdd87504b0297624f6d8a5 /vcl
parent53b979fc1fff8a1e16cc84b956b022cc2672de2f (diff)
tdf#144166 use border drawing style for VclScrolledWindow
to avoid rounded rectangles on Windows. Change-Id: I29b9631ec0f3d125cbf103b0c12580a41f9b9264 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129030 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/layout.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 91dcc41c5a01..da259ec40c63 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1815,7 +1815,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent)
: VclBin(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL | WB_TABSTOP)
, m_bUserManagedScrolling(false)
, m_eDrawFrameStyle(DrawFrameStyle::NONE)
- , m_eDrawFrameFlags(DrawFrameFlags::NONE)
+ , m_eDrawFrameFlags(DrawFrameFlags::WindowBorder)
, m_pVScroll(VclPtr<ScrollBar>::Create(this, WB_HIDE | WB_VERT))
, m_pHScroll(VclPtr<ScrollBar>::Create(this, WB_HIDE | WB_HORZ))
, m_aScrollBarBox(VclPtr<ScrollBarBox>::Create(this, WB_HIDE))
@@ -2066,7 +2066,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OUString &rValue
}
else if (rKey == "name")
{
- m_eDrawFrameFlags = rValue == "monoborder" ? DrawFrameFlags::Mono : DrawFrameFlags::NONE;
+ m_eDrawFrameFlags = DrawFrameFlags::WindowBorder;
+ if (rValue == "monoborder")
+ m_eDrawFrameFlags |= DrawFrameFlags::Mono;
}
auto nBorderWidth = CalcBorderWidth();