[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/source

[Szymon Kłos (via logerrit)]

 vcl/source/control/PriorityMergedHBox.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit e76c651af0e4b77bc05c53191263ec49fc012e4c
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Feb 6 14:39:56 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Feb 13 11:59:14 2023 +0000

    tdf#147740 fix disappearing icons in groupbar
    
    Change-Id: Ia67b90d05bccbd4d2c2553109ea7372574ee21d8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146584
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    (cherry picked from commit 1e23e26d48eabb829c39304a78fad26b10f76d7f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146629
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    (cherry picked from commit db1c7c55fe0cd35ead3174b3eb7f0cdad1a475f3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146712
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/source/control/PriorityMergedHBox.cxx 
b/vcl/source/control/PriorityMergedHBox.cxx
index 75a26daa52c1..65d51cce378c 100644
--- a/vcl/source/control/PriorityMergedHBox.cxx
+++ b/vcl/source/control/PriorityMergedHBox.cxx
@@ -155,6 +155,15 @@ Size PriorityMergedHBox::calculateRequisition() const
         accumulateMaxes(aChildSize, aSize);
     }
 
+    // find max height
+    for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild;
+         pChild = pChild->GetWindow(GetWindowType::Next))
+    {
+        Size aChildSize = getLayoutRequisition(*pChild);
+        setPrimaryDimension(aChildSize, getPrimaryDimension(aSize));
+        accumulateMaxes(aChildSize, aSize);
+    }
+
     setPrimaryDimension(aSize, 200);
     return finalizeMaxes(aSize, nVisibleChildren);
 }