summaryrefslogtreecommitdiffstats
path: root/src/sp-flowtext.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-10-06 00:18:46 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-10-06 00:18:46 +0000
commit7d38f876e8a4c5ab60261f61452fa2bf8baf13f3 (patch)
tree8d93f93ef7634ca78637b55edb9de4401669b2bb /src/sp-flowtext.cpp
parentAdd missing file to CMakeLists (diff)
parentRemove unused functions. (diff)
downloadinkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.tar.gz
inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.zip
Update to trunk r13580
(bzr r13341.1.255)
Diffstat (limited to 'src/sp-flowtext.cpp')
-rw-r--r--src/sp-flowtext.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 7de65ccc3..72fe86daf 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -673,6 +673,21 @@ Geom::Affine SPFlowtext::set_transform (Geom::Affine const &xform)
return xform;
}
+ SPObject *region = NULL;
+ for ( SPObject *o = this->firstChild() ; o ; o = o->getNext() ) {
+ if (SP_IS_FLOWREGION(o)) {
+ region = o;
+ break;
+ }
+ }
+ if (region) {
+ if (SP_IS_RECT(region->firstChild())) {
+ SPRect *rect = SP_RECT(region->firstChild());
+ rect->set_i2d_affine(xform * rect->i2dt_affine());
+ rect->doWriteTransform(rect->getRepr(), rect->transform, NULL, true);
+ }
+ }
+
Geom::Affine ret(xform);
ret[0] /= ex;
ret[1] /= ex;
@@ -693,7 +708,7 @@ Geom::Affine SPFlowtext::set_transform (Geom::Affine const &xform)
this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG);
- return ret;
+ return Geom::Affine();
}
/*