summaryrefslogtreecommitdiffstats
path: root/src/sp-text.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-09-20 17:09:19 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-09-20 17:09:19 +0000
commitcf74f053a081f6f4b460da9cd72afaab23d54d13 (patch)
tree427aa22ba3dcad9b55edb90522b5ab0208074e06 /src/sp-text.cpp
parentUsing inkscape compact settings to save the icons.svg file (diff)
parentMerge from trunk. (diff)
downloadinkscape-cf74f053a081f6f4b460da9cd72afaab23d54d13.tar.gz
inkscape-cf74f053a081f6f4b460da9cd72afaab23d54d13.zip
Merge Google Summer of Code unit improvement.
(bzr r12554)
Diffstat (limited to 'src/sp-text.cpp')
-rw-r--r--src/sp-text.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index afd4e304e..927536dde 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -377,8 +377,13 @@ void SPText::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::
Geom::Affine SPText::set_transform(Geom::Affine const &xform) {
// we cannot optimize textpath because changing its fontsize will break its match to the path
- if (SP_IS_TEXT_TEXTPATH (this))
- return xform;
+ if (SP_IS_TEXT_TEXTPATH (this)) {
+ if (!this->_optimizeTextpathText) {
+ return xform;
+ } else {
+ this->_optimizeTextpathText = false;
+ }
+ }
/* This function takes care of scaling & translation only, we return whatever parts we can't
handle. */