diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-02-06 14:39:56 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-02-09 11:46:20 +0000 |
| commit | db1c7c55fe0cd35ead3174b3eb7f0cdad1a475f3 (patch) | |
| tree | 1455fe0ca9ec87f66fb5579c4cba9dc14faa9334 | |
| parent | tdf#152989 sc: fix oversized rectangle of edited embedded object (diff) | |
| download | core-db1c7c55fe0cd35ead3174b3eb7f0cdad1a475f3.tar.gz core-db1c7c55fe0cd35ead3174b3eb7f0cdad1a475f3.zip | |
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.klos@collabora.com>
(cherry picked from commit 1e23e26d48eabb829c39304a78fad26b10f76d7f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146629
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | vcl/source/control/PriorityMergedHBox.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
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); } |