summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-09-07 17:12:16 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-09-07 21:48:33 +0000
commit21b938c86ab0c1579d7a767936c633b275ace574 (patch)
tree2e46645f0cc09397aa8d504c40f5c022fccf7a20
parentPrepared for beta. Fixed blocking bug (diff)
downloadinkscape-21b938c86ab0c1579d7a767936c633b275ace574.tar.gz
inkscape-21b938c86ab0c1579d7a767936c633b275ace574.zip
Allow transforms in SVG2 flow elements
-rw-r--r--src/object/sp-text.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp
index 1111ec2ef..2ab4f96a3 100644
--- a/src/object/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -384,7 +384,16 @@ void SPText::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::
}
Geom::Affine SPText::set_transform(Geom::Affine const &xform) {
+ // See if 'shape-inside' has rectangle
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/text/use_svg2")) {
+ Inkscape::XML::Node* rectangle = get_first_rectangle();
+ if (rectangle) {
+ return xform;
+ }
+ }
// we cannot optimize textpath because changing its fontsize will break its match to the path
+
if (SP_IS_TEXT_TEXTPATH (this)) {
if (!this->_optimizeTextpathText) {
return xform;