diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-02-02 16:35:28 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-02-03 07:56:35 +0000 |
| commit | bcf9e47791d5b3e1d6a75c73f3b8c9940abda8eb (patch) | |
| tree | 8a2f529c2f47d1ee882917e33ab6a42d1ec434a5 /vcl | |
| parent | c544f9ea78eab46c4f5230273a5a8571b28ea84d (diff) | |
tdf#153078: Revert "tdf#141684 fix disappearance of icons in Groupedbar and Groupedbar compact UI"
This reverts commit 801e6272dc299d4468ec094ce11b66494eb5018b.
Revert it for now, until a better solution for tdf#141684
is found
Change-Id: I6c9fd7fb12149b67fe572d64cf00e6a3ec98611f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146504
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/PriorityMergedHBox.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/source/control/PriorityMergedHBox.cxx b/vcl/source/control/PriorityMergedHBox.cxx index c5e21c7c002c..75a26daa52c1 100644 --- a/vcl/source/control/PriorityMergedHBox.cxx +++ b/vcl/source/control/PriorityMergedHBox.cxx @@ -27,7 +27,6 @@ #define DUMMY_WIDTH 50 #define BUTTON_WIDTH 30 -#define TEMP_WIDTH 200 /* * PriorityMergedHBox is a VclHBox which hides its own children if there is no sufficient space. @@ -58,9 +57,6 @@ void PriorityMergedHBox::Resize() } tools::Long nWidth = GetSizePixel().Width(); - if (nWidth <= 1 || nWidth == TEMP_WIDTH || nWidth == TEMP_WIDTH + 6) - return VclHBox::Resize(); - tools::Long nCurrentWidth = VclHBox::calculateRequisition().getWidth() + BUTTON_WIDTH; // Hide lower priority controls @@ -159,7 +155,7 @@ Size PriorityMergedHBox::calculateRequisition() const accumulateMaxes(aChildSize, aSize); } - setPrimaryDimension(aSize, TEMP_WIDTH); + setPrimaryDimension(aSize, 200); return finalizeMaxes(aSize, nVisibleChildren); } |