diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-19 10:13:15 +0000 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-05-25 12:12:24 +0200 |
| commit | 89c79e462fd91912613c6710da8702e50281bf13 (patch) | |
| tree | 41a087195b58e0bbbae20e22c9a03c8d2ad13997 /sw | |
| parent | 985e2f7ce55badba09bae0187476a523f6d2527d (diff) | |
rename get_vscroll_width to get_scroll_thickness
and add split customize_scrollbars to form a separate set_scroll_thickness
Change-Id: Ia4b1c85d6ae85b0fb7aeb852d3a91b36b63143db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111207
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 0d086e9c8b29..2ef71463f870 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -388,7 +388,7 @@ void SwAddressPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re sal_uInt16 nStartRow = 0; if (m_xVScrollBar->get_vpolicy() != VclPolicyType::NEVER) { - aSize.AdjustWidth(-m_xVScrollBar->get_vscroll_width()); + aSize.AdjustWidth(-m_xVScrollBar->get_scroll_thickness()); nStartRow = m_xVScrollBar->vadjustment_get_value(); } Size aPartSize(aSize.Width() / pImpl->nColumns, diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 25ad2f03abe0..81a222959ee3 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -460,6 +460,9 @@ void SwAnnotationWin::Rescale() mxMetadataDate->set_font(aFont); if (mxMetadataResolved) mxMetadataResolved->set_font(aFont); + if (mxVScrollbar) + mxVScrollbar->set_scroll_thickness(GetPrefScrollbarWidth()); + } void SwAnnotationWin::SetPosAndSize() @@ -694,7 +697,7 @@ void SwAnnotationWin::DoResize() if (aTextHeight > aHeight) { // we need vertical scrollbars and have to reduce the width - aWidth -= mxVScrollbar->get_vscroll_width(); + aWidth -= mxVScrollbar->get_scroll_thickness(); mxVScrollbar->set_vpolicy(VclPolicyType::ALWAYS); } else @@ -821,8 +824,7 @@ void SwAnnotationWin::SetColor(Color aColorDark,Color aColorLight, Color aColorA mxVScrollbar->customize_scrollbars(mColorLight, mColorAnchor, - mColorDark, - GetPrefScrollbarWidth()); + mColorDark); } void SwAnnotationWin::SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition) |