X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fobject-edit.cpp;h=8f9bf378c706353ed5ee15ad77f739b88f977329;hb=144c1b594591ba3d62513b126ca87a5f242b2f2b;hp=8d8be4b85752a073d3fa0107f6d871d8d19881d1;hpb=1e944d29efb206f5d0b5d1069cb098e22169d548;p=inkscape.git diff --git a/src/object-edit.cpp b/src/object-edit.cpp index 8d8be4b85..8f9bf378c 100644 --- a/src/object-edit.cpp +++ b/src/object-edit.cpp @@ -56,8 +56,8 @@ static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop) KnotHolder *knot_holder = new KnotHolder(desktop, item, NULL); Inkscape::LivePathEffect::Effect *effect = sp_lpe_item_get_current_lpe(SP_LPE_ITEM(item)); -// effect->addPointParamHandles(knot_holder, desktop, item); - effect->addKnotHolderHandles(knot_holder, desktop, item); + effect->addPointParamHandles(knot_holder, desktop, item); + effect->addHandles(knot_holder, desktop, item); return knot_holder; } @@ -129,7 +129,7 @@ public: static NR::Point snap_knot_position(SPItem *item, NR::Point const &p) { SPDesktop const *desktop = inkscape_active_desktop(); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); NR::Point s = p * i2d; SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop, item); @@ -464,7 +464,7 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, NR:: g_assert(item != NULL); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); Box3D::Axis movement; if ((knot_id < 4) != (state & GDK_SHIFT_MASK)) { @@ -640,7 +640,7 @@ Box3DKnotHolderEntityCenter::knot_set(NR::Point const &new_pos, NR::Point const NR::Point const s = snap_knot_position(item, new_pos); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); box3d_set_center (SP_BOX3D(item), s * i2d, origin * i2d, !(state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z, state & GDK_CONTROL_MASK);