ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

svx: Set slot ID for DefaultShapesPanel IconView item ID

Browse Source 
Following

    Change-Id: I3cdb85a966693514521637f672255ba086b9eb19
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Tue Oct 6 09:33:08 2026 +0200

        svx: Port shapes panel from ValueSet to weld::IconView

, stop storing the slot IDs/UNO commands corresponding to the
items in the icon views in DefaultShapesPanel in a map and
instead store them as the ID of the items directly in the
weld::IconView, which simplifies the logic a bit.

Change-Id: I97643abd64436cf106b88f835edf6e5c8fb5f7c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211857
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-10-07 17:46:30 +02:00
parent 969a6481a4
commit 0cda587b29
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/source/inc/DefaultShapesPanel.hxx
+1 -1
View File
@@ -58,7 +58,7 @@ private:
std::unique_ptr<weld::IconView> m_p3DObjectIconView;
Reference< XFrame > mxFrame;
std::map<weld::IconView*, std::vector<OUString>> m_aShapesViewsMap;
std::vector<weld::IconView*> m_aShapesViews;
void Initialize();
DECL_LINK(ShapeActivatedHdl, const weld::TreeIter&, bool);
svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+19 -28
View File
@@ -64,18 +64,19 @@ std::unique_ptr<PanelLayout> DefaultShapesPanel::Create(
void DefaultShapesPanel::Initialize()
{
m_aShapesViewsMap = { { m_pLineArrowIconView.get(), m_aLineShapes },
{ m_pCurveIconView.get(), m_aCurveShapes },
{ m_pConnectorIconView.get(), m_aConnectorShapes },
{ m_pBasicShapeIconView.get(), m_aBasicShapes },
{ m_pSymbolShapeIconView.get(), m_aSymbolShapes },
{ m_pBlockArrowIconView.get(), m_aBlockArrowShapes },
{ m_pFlowchartIconView.get(), m_aFlowchartShapes },
{ m_pCalloutIconView.get(), m_aCalloutShapes },
{ m_pStarIconView.get(), m_aStarShapes },
{ m_p3DObjectIconView.get(), m_a3DShapes } };
const std::map<weld::IconView*, std::vector<OUString>> aShapesViewsMap
= { { m_pLineArrowIconView.get(), m_aLineShapes },
{ m_pCurveIconView.get(), m_aCurveShapes },
{ m_pConnectorIconView.get(), m_aConnectorShapes },
{ m_pBasicShapeIconView.get(), m_aBasicShapes },
{ m_pSymbolShapeIconView.get(), m_aSymbolShapes },
{ m_pBlockArrowIconView.get(), m_aBlockArrowShapes },
{ m_pFlowchartIconView.get(), m_aFlowchartShapes },
{ m_pCalloutIconView.get(), m_aCalloutShapes },
{ m_pStarIconView.get(), m_aStarShapes },
{ m_p3DObjectIconView.get(), m_a3DShapes } };
for (auto& rEntry : m_aShapesViewsMap)
for (auto& rEntry : aShapesViewsMap)
{
for (size_t i = 0; i < rEntry.second.size(); i++)
{
@@ -86,37 +87,27 @@ void DefaultShapesPanel::Initialize()
sSlotStr, vcl::CommandInfoProvider::GetModuleIdentifier(mxFrame));
const OUString sLabel
= vcl::CommandInfoProvider::GetTooltipForCommand(sSlotStr, aProperties, mxFrame);
rEntry.first->insert(i, nullptr, nullptr, &aSlotImage, nullptr);
rEntry.first->insert(i, nullptr, &sSlotStr, &aSlotImage, nullptr);
rEntry.first->set_item_accessible_name(i, sLabel);
rEntry.first->set_item_tooltip_text(i, sLabel);
}
rEntry.first->connect_item_activated(LINK(this, DefaultShapesPanel, ShapeActivatedHdl));
m_aShapesViews.push_back(rEntry.first);
}
}
DefaultShapesPanel::~DefaultShapesPanel()
{
m_aShapesViewsMap.clear();
}
DefaultShapesPanel::~DefaultShapesPanel() { m_aShapesViews.clear(); }
IMPL_LINK(DefaultShapesPanel, ShapeActivatedHdl, const weld::TreeIter&, rIter, bool)
{
const weld::ItemView& rActiveItemView = rIter.getItemView();
for (const auto& rEntry : m_aShapesViewsMap)
for (weld::IconView* pView : m_aShapesViews)
{
if (&rActiveItemView == rEntry.first)
{
const int nActivatedIndex = rActiveItemView.get_iter_index_in_parent(rIter);
assert(nActivatedIndex >= 0
&& o3tl::make_unsigned(nActivatedIndex) < rEntry.second.size()
&& "Invalid index");
comphelper::dispatchCommand(rEntry.second.at(nActivatedIndex), {});
}
if (&rActiveItemView == pView)
comphelper::dispatchCommand(rActiveItemView.get_id(rIter), {});
else
{
rEntry.first->unselect_all();
}
pView->unselect_all();
}
return true;