updated to latest trunk

(bzr r14876.2.3)

1 files changed, 26 insertions, 2 deletions

diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 7ea1d465c..bed191e83 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -73,7 +73,21 @@ PathParam::PathParam( const Glib::ustring& label, const Glib::ustring& tip,
 PathParam::~PathParam()
 {
     remove_link();
-
+    using namespace Inkscape::UI;
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if (desktop) {
+        if (tools_isactive(desktop, TOOLS_NODES)) {
+            SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
+            if (item != NULL) {
+                Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(desktop->event_context);
+                std::set<ShapeRecord> shapes;
+                ShapeRecord r;
+                r.item = item;
+                shapes.insert(r);
+                nt->_multipath->setItems(shapes);
+            }
+        }
+    }
     g_free(defvalue);
 }
 
@@ -207,6 +221,9 @@ PathParam::param_newWidget()
 void
 PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt)
 {
+    SPDocument *document = dt->getDocument();
+    bool saved = DocumentUndo::getUndoSensitive(document);
+    DocumentUndo::setUndoSensitive(document, false);
     using namespace Inkscape::UI;
 
     // TODO remove the tools_switch atrocity.
@@ -220,14 +237,20 @@ PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt)
 
     r.role = SHAPE_ROLE_LPE_PARAM;
     r.edit_transform = item->i2dt_affine(); // TODO is it right?
+    r.edit_transform *= item->transform.inverse();
     if (!href) {
         r.item = reinterpret_cast<SPItem*>(param_effect->getLPEObj());
         r.lpe_key = param_key;
+        Geom::PathVector stored_pv =  _pathvector;
+        param_write_to_repr("M0,0 L1,0");
+        const char *svgd = sp_svg_write_path(stored_pv);
+        param_write_to_repr(svgd);
     } else {
         r.item = ref.getObject();
     }
     shapes.insert(r);
     nt->_multipath->setItems(shapes);
+    DocumentUndo::setUndoSensitive(document, saved);
 }
 
 void
@@ -435,7 +458,8 @@ PathParam::paste_param_path(const char *svgd)
         SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
         if (item != NULL) {
             Geom::PathVector path_clipboard =  sp_svg_read_pathv(svgd);
-            path_clipboard *= item->i2doc_affine().inverse();
+            path_clipboard *= item->i2doc_affine().inverse() * item->transform;
+            path_clipboard *= Geom::Translate(path_clipboard.initialPoint() - _pathvector.initialPoint()).inverse();
             svgd = sp_svg_write_path( path_clipboard );
         }