diff options
| author | Alvin Penner <penner@vaxxine.com> | 2014-09-27 11:39:25 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2014-09-27 11:39:25 +0000 |
| commit | 25a22169e6587f58856cc288b8967bc862013d26 (patch) | |
| tree | e8fda746fcd6c440f370dffc52fbacc01f1dd9f7 /src/sp-item.cpp | |
| parent | Translations. Updating the Czech translation file with the latest Inkscape st... (diff) | |
| download | inkscape-25a22169e6587f58856cc288b8967bc862013d26.tar.gz inkscape-25a22169e6587f58856cc288b8967bc862013d26.zip | |
transform text in text-on-path the same regardless of whether optimized or preserved (Bug 1279534)
Fixed bugs:
- https://launchpad.net/bugs/1279534
(bzr r13566)
Diffstat (limited to 'src/sp-item.cpp')
| -rw-r--r-- | src/sp-item.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 19dc71785..71cdfa394 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -44,6 +44,7 @@ #include "sp-rect.h" #include "sp-use.h" #include "sp-text.h" +#include "sp-textpath.h" #include "sp-item-rm-unsatisfied-cns.h" #include "sp-pattern.h" #include "sp-paint-server.h" @@ -1407,10 +1408,11 @@ void SPItem::doWriteTransform(Inkscape::XML::Node *repr, Geom::Affine const &tra // onSetTransform cannot be pure due to the fact that not all visible Items are transformable. if ( // run the object's set_transform (i.e. embed transform) only if: - !preserve && // user did not chose to preserve all transforms + SP_IS_TEXT_TEXTPATH(this) || + (!preserve && // user did not chose to preserve all transforms (!clip_ref || !clip_ref->getObject()) && // the object does not have a clippath (!mask_ref || !mask_ref->getObject()) && // the object does not have a mask - !(!transform.isTranslation() && style && style->getFilter()) // the object does not have a filter, or the transform is translation (which is supposed to not affect filters) + !(!transform.isTranslation() && style && style->getFilter())) // the object does not have a filter, or the transform is translation (which is supposed to not affect filters) ) { transform_attr = this->set_transform(transform); |
