From ce67a5f751e7dae96f135e9003a77665ef0f5e61 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 16 May 2019 11:18:40 +0200 Subject: Fork LPE if necesary also in LPEItem childs --- src/object/sp-lpe-item.cpp | 12 +++++++++++- src/object/sp-lpe-item.h | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src/object') diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp index f3dd5f05b..b43a0b926 100755 --- a/src/object/sp-lpe-item.cpp +++ b/src/object/sp-lpe-item.cpp @@ -1152,9 +1152,19 @@ void SPLPEItem::replacePathEffects( std::vector co * use this method instead. * Returns true if one or more effects were forked; returns false if nothing was done. */ -bool SPLPEItem::forkPathEffectsIfNecessary(unsigned int nr_of_allowed_users) +bool SPLPEItem::forkPathEffectsIfNecessary(unsigned int nr_of_allowed_users, bool recursive) { bool forked = false; + SPGroup * group = dynamic_cast(this); + if (group && recursive) { + std::vector item_list = sp_item_group_item_list(group); + for (auto child:item_list) { + SPLPEItem *lpeitem = dynamic_cast(child); + if (lpeitem && lpeitem->forkPathEffectsIfNecessary(nr_of_allowed_users, recursive)) { + forked = true; + } + } + } if ( this->hasPathEffect() ) { // If one of the path effects is used by 2 or more items, fork it diff --git a/src/object/sp-lpe-item.h b/src/object/sp-lpe-item.h index 55e32dad6..6ebd01fe3 100644 --- a/src/object/sp-lpe-item.h +++ b/src/object/sp-lpe-item.h @@ -99,7 +99,7 @@ public: void applyToMask(SPItem* to, Inkscape::LivePathEffect::Effect *lpe = nullptr); void applyToClipPath(SPItem* to, Inkscape::LivePathEffect::Effect *lpe = nullptr); void applyToClipPathOrMask(SPItem * clip_mask, SPItem* to, Inkscape::LivePathEffect::Effect *lpe = nullptr); - bool forkPathEffectsIfNecessary(unsigned int nr_of_allowed_users = 1); + bool forkPathEffectsIfNecessary(unsigned int nr_of_allowed_users = 1, bool recursive = true); void editNextParamOncanvas(SPDesktop *dt); }; -- cgit v1.2.3