diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-11-27 16:49:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-27 21:10:15 +0100 |
commit | f28ef77210b1a3cc737689c7a4ae099419cb0493 (patch) | |
tree | 50ea1fd4aefe3c36cc5dcc0ded325e4047ec8406 | |
parent | d510a9783d59acdc94b06257a0f0b5f03a10dab4 (diff) |
Related: tdf#144410 we don't want a gap in a multicol spanning separator
we would need another column to show a drop down indicator, and we don't
want the separators to have a visible gap in that case
Change-Id: Ib45b4cda41a09b631f3ea4d4427a8073a9e243d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125947
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index d1658582c5af..58a1a006d72e 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -2588,6 +2588,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, tools::Long nLine, vcl: Size aRectSize(0, nTempEntryHeight); SvViewDataEntry* pViewDataEntry = GetViewDataEntry( &rEntry ); + const bool bSeparator(rEntry.GetFlags() & SvTLEntryFlags::IS_SEPARATOR); const size_t nTabCount = aTabs.size(); const size_t nItemCount = rEntry.ItemCount(); @@ -2720,8 +2721,8 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, tools::Long nLine, vcl: rItem.Paint(aEntryPos, *this, rRenderContext, pViewDataEntry, rEntry); - // division line between tabs - if (pNextTab && rItem.GetType() == SvLBoxItemType::String && + // division line between tabs (but not if this is a separator line) + if (!bSeparator && pNextTab && rItem.GetType() == SvLBoxItemType::String && // not at the right edge of the window! aRect.Right() < nMaxRight) { |