[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/treelist/treelistbox.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8b07376f70f5e1192d9ac1e97bcf34de7a09a8a2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 27 11:15:02 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Feb 28 22:08:37 2019 +0100

    Resolves: tdf#123711 measure scrollbar for optimal width
    
    Change-Id: I30225124e44e8a6290270ecba5024f36508817d3
    Reviewed-on: https://gerrit.libreoffice.org/68429
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 6aea58ad91b4..0ece3b5eb793 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3133,6 +3133,10 @@ Size SvTreeListBox::GetOptimalSize() const
     }
     long nMinWidth = nMinWidthInChars * approximate_char_width();
     aRet.setWidth( std::max(aRet.Width(), nMinWidth) );
+
+    if (GetStyle() & WB_VSCROLL)
+        aRet.AdjustWidth(GetSettings().GetStyleSettings().GetScrollBarSize());
+
     return aRet;
 }