From 25a22169e6587f58856cc288b8967bc862013d26 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sat, 27 Sep 2014 07:39:25 -0400 Subject: 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) --- src/sp-item.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3