From 6e620bdb227e499d6422e680cc63d67079ddd154 Mon Sep 17 00:00:00 2001 From: Attila Szűcs Date: Fri, 26 Feb 2021 21:09:10 +0100 Subject: tdf#140136 sc: fix tree list expansion in AutoFilter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now clicking on +/- buttons (i.e. before the checkbox) only expands/collapses the tree without toggling the associated checkboxes, using the new GetItemPos() to get the position (and width) of the checkbox in the actual list item. Regression from commit 2471d6f44c7e8ecbe86a90eeb593b899a08a7408 "tdf#116675 vcl tree list: toggle by label click (e.g. in AutoFilter)". Note: Use generic VCL plugin to test it on Linux: SAL_USE_VCLPLUGIN=gen instdir/program/soffice Co-authored-by: Tibor Nagy (NISZ) Change-Id: Iceb17bc9b235d297c313361429ee89f04d809e96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111668 Tested-by: László Németh Reviewed-by: László Németh (cherry picked from commit 216f32464ccb0f096e5fdf77f82baf30ae7bab5f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112308 Tested-by: Jenkins Reviewed-by: Attila Szűcs Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 8265193e3dd350ce48119c85d09f058aa58a5542) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112429 Reviewed-by: Xisco Fauli Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier --- include/vcl/toolkit/treelistbox.hxx | 1 + vcl/source/treelist/treelistbox.cxx | 41 ++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 199f37c093e8..7f3bf814bd19 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -635,6 +635,7 @@ public: void InvalidateEntry( SvTreeListEntry* ); SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX, SvLBoxTab** ppTab); SvLBoxItem* GetItem( SvTreeListEntry*, tools::Long nX ); + std::pair GetItemPos(SvTreeListEntry* pEntry, sal_uInt16 nTabIdx); void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index bbafb2a4ba95..ba24d0e6cc73 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -2302,7 +2302,7 @@ void SvTreeListBox::MouseButtonUp( const MouseEvent& rMEvt ) { SvLBoxButton* pItemCheckBox = static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button)); - if (pItemCheckBox) + if (pItemCheckBox && GetItemPos(pEntry, 0).first < aPnt.X() - GetMapMode().GetOrigin().X()) { pItemCheckBox->ClickHdl(pEntry); InvalidateEntry(pEntry); @@ -3033,6 +3033,45 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, tools::Long nX return pItemClicked; } +std::pair SvTreeListBox::GetItemPos(SvTreeListEntry* pEntry, sal_uInt16 nTabIdx) +{ + sal_uInt16 nTabCount = aTabs.size(); + sal_uInt16 nItemCount = pEntry->ItemCount(); + if (nTabIdx >= nItemCount || nTabIdx >= nTabCount) + return std::make_pair(-1, -1); + + SvLBoxTab* pTab = aTabs.front().get(); + SvLBoxItem* pItem = &pEntry->GetItem(nTabIdx); + sal_uInt16 nNextItem = nTabIdx + 1; + + tools::Long nRealWidth = pImpl->GetOutputSize().Width(); + nRealWidth -= GetMapMode().GetOrigin().X(); + + SvLBoxTab* pNextTab = nNextItem < nTabCount ? aTabs[nNextItem].get() : nullptr; + tools::Long nStart = GetTabPos(pEntry, pTab); + + tools::Long nNextTabPos; + if (pNextTab) + nNextTabPos = GetTabPos(pEntry, pNextTab); + else + { + nNextTabPos = nRealWidth; + if (nStart > nRealWidth) + nNextTabPos += 50; + } + + auto nItemWidth(pItem->GetWidth(this, pEntry)); + nStart += pTab->CalcOffset(nItemWidth, nNextTabPos - nStart); + auto nLen = nItemWidth; + if (pNextTab) + { + tools::Long nTabWidth = GetTabPos(pEntry, pNextTab) - nStart; + if (nTabWidth < nLen) + nLen = nTabWidth; + } + return std::make_pair(nStart, nLen); +} + tools::Long SvTreeListBox::getPreferredDimensions(std::vector &rWidths) const { tools::Long nHeight = 0; -- cgit