summaryrefslogtreecommitdiffstats
path: root/src/knot-holder-entity.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
commitd2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch)
treee2703384779e83312c456399999997fcc289c5cf /src/knot-holder-entity.cpp
parentMerge branch 'master' into powerpencil (diff)
parentchange assignment to equality (diff)
downloadinkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz
inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/knot-holder-entity.cpp')
-rw-r--r--src/knot-holder-entity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp
index 8add35d46..bb7ef6eb3 100644
--- a/src/knot-holder-entity.cpp
+++ b/src/knot-holder-entity.cpp
@@ -84,7 +84,7 @@ KnotHolderEntity::update_knot()
{
Geom::Point knot_pos(knot_get());
if (knot_pos.isFinite()) {
- Geom::Point dp(knot_pos * item->i2dt_affine());
+ Geom::Point dp(knot_pos * parent_holder->getEditTranform() * item->i2dt_affine());
_moved_connection.block();
knot->setPosition(dp, SP_KNOT_STATE_NORMAL);
@@ -102,7 +102,7 @@ KnotHolderEntity::snap_knot_position(Geom::Point const &p, guint state)
return p;
}
- Geom::Affine const i2dt (item->i2dt_affine());
+ Geom::Affine const i2dt (parent_holder->getEditTranform() * item->i2dt_affine());
Geom::Point s = p * i2dt;
SnapManager &m = desktop->namedview->snap_manager;
@@ -120,7 +120,7 @@ KnotHolderEntity::snap_knot_position_constrained(Geom::Point const &p, Inkscape:
return p;
}
- Geom::Affine const i2d (item->i2dt_affine());
+ Geom::Affine const i2d (parent_holder->getEditTranform() * item->i2dt_affine());
Geom::Point s = p * i2d;
SnapManager &m = desktop->namedview->snap_manager;