diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-05-16 09:18:40 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-05-16 09:18:40 +0000 |
| commit | ce67a5f751e7dae96f135e9003a77665ef0f5e61 (patch) | |
| tree | ebd6dc91b49f54f3f39dd6751febc66319d88f1a /clang_format_diff | |
| parent | Add new mode to Clone LPE to allow custom clones locked. Also fix to handle S... (diff) | |
| download | inkscape-ce67a5f751e7dae96f135e9003a77665ef0f5e61.tar.gz inkscape-ce67a5f751e7dae96f135e9003a77665ef0f5e61.zip | |
Fork LPE if necesary also in LPEItem childs
Diffstat (limited to 'clang_format_diff')
| -rw-r--r-- | clang_format_diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/clang_format_diff b/clang_format_diff new file mode 100644 index 000000000..fa4e0bee3 --- /dev/null +++ b/clang_format_diff @@ -0,0 +1,40 @@ +--- src/live_effects/lpe-clone-original.cpp (before formatting) ++++ src/live_effects/lpe-clone-original.cpp (after formatting) +@@ -36,13 +36,16 @@ + }; + static const Util::EnumDataConverter<Clonelpemethod> CLMConverter(ClonelpemethodData, CLM_END); + +-LPECloneOriginal::LPECloneOriginal(LivePathEffectObject *lpeobject) : +- Effect(lpeobject), +- linkeditem(_("Linked Item:"), _("Item from which to take the original data"), "linkeditem", &wr, this), +- method(_("Shape linked"), _("Shape linked"), "method", CLMConverter, &wr, this, CLM_D), +- attributes("Attributes linked", "Attributes linked, comma separated attributes like trasform, X, Y...", "attributes", &wr, this,""), +- style_attributes("Style attributes linked", "Style attributes linked, comma separated attributes like fill, filter, opacity...", "style_attributes", &wr, this,""), +- allow_transforms(_("Allow transforms"), _("Allow transforms"), "allow_transforms", &wr, this, true) ++LPECloneOriginal::LPECloneOriginal(LivePathEffectObject *lpeobject) ++ : Effect(lpeobject) ++ , linkeditem(_("Linked Item:"), _("Item from which to take the original data"), "linkeditem", &wr, this) ++ , method(_("Shape linked"), _("Shape linked"), "method", CLMConverter, &wr, this, CLM_D) ++ , attributes("Attributes linked", "Attributes linked, comma separated attributes like trasform, X, Y...", ++ "attributes", &wr, this, "") ++ , style_attributes("Style attributes linked", ++ "Style attributes linked, comma separated attributes like fill, filter, opacity...", ++ "style_attributes", &wr, this, "") ++ , allow_transforms(_("Allow transforms"), _("Allow transforms"), "allow_transforms", &wr, this, true) + { + //0.92 compatibility + const gchar * linkedpath = this->getRepr()->attribute("linkedpath"); +@@ -175,11 +178,8 @@ + dest->getRepr()->setAttribute(attribute, nullptr); + } + } else { +- if (!(SP_IS_GROUP(dest) && +- dest->getId() == sp_lpe_item->getId() && +- !strcmp(attribute, "transform") && +- allow_transforms)) +- { ++ if (!(SP_IS_GROUP(dest) && dest->getId() == sp_lpe_item->getId() && !strcmp(attribute, "transform") && ++ allow_transforms)) { + dest->getRepr()->setAttribute(attribute, origin->getRepr()->attribute(attribute)); + } + } |