[Libreoffice-commits] core.git: vcl/source

[Libreoffice Gerrit user]

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

New commits:
commit a212011f37d457092e422cba331ca19394d3d97f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 27 11:15:02 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 27 14:11:46 2019 +0100

    Resolves: tdf#123711 measure scrollbar for optimal width
    
    Change-Id: I30225124e44e8a6290270ecba5024f36508817d3
    Reviewed-on: https://gerrit.libreoffice.org/68428
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 6c45fc325ebe..cfacceac46c5 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3089,6 +3089,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;
 }