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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8a9eda59e45c73d051eb1e0106ee4d663fec9ba6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 6 14:40:37 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Mar 7 20:27:13 2020 +0100

    set an initial height for widgets in toolbars
    
    Change-Id: I8722095bd6f36b80b841a4e3fe9841eb39c7ebcc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90162
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 194c1d4aacd9..7d7b87208dda 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2447,6 +2447,9 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
         // if the parent was a toolbox set it as an itemwindow for the latest itemid
         if (pToolBox)
         {
+            Size aSize(xWindow->GetSizePixel());
+            aSize.setHeight(xWindow->get_preferred_size().Height());
+            xWindow->SetSizePixel(aSize);
             pToolBox->SetItemWindow(m_pParserState->m_nLastToolbarId, xWindow);
             pToolBox->SetItemExpand(m_pParserState->m_nLastToolbarId, true);
         }