From ecc57932f1e7d157950ada2901f6ea6f3acc8aad Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 28 Feb 2013 04:43:21 +0100
Subject: Fixed closed pc->ea

(bzr r11950.1.40)
---
 src/ui/tool/node.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/ui/tool/node.cpp')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index fef904006..4cac0e543 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -138,12 +138,14 @@ void Handle::move(Geom::Point const &new_pos)
     //BSpline
     bool isBSpline = false;
     double pos = 0;
-    Handle *h = this;
+    Handle *h = NULL;
+    Handle *h2 = NULL;
     if(_pm().isBSpline()){
         isBSpline = true;
-        _parent->_selection.insert(_parent);
-        //BSpline End
+        if(!_parent->selected())
+            _parent->_selection.insert(_parent);
     }
+    //BSpline End
 
     if (Geom::are_near(new_pos, _parent->position())) {
         // The handle becomes degenerate.
@@ -177,12 +179,11 @@ void Handle::move(Geom::Point const &new_pos)
         setPosition(new_pos);
         //BSpline
         if(isBSpline){
+            h = this;
             setPosition(_pm().BSplineHandleReposition(h));
             pos = _pm().BSplineHandlePosition(h);
-            other->setPosition(_pm().BSplineHandleReposition(other,pos));
-            if(pos == 0){
-                _parent->setPosition(h->position());
-            }
+            h2 = this->other();
+            this->other()->setPosition(_pm().BSplineHandleReposition(h2,pos));
         }
         //BSpline End
         return;
@@ -217,12 +218,11 @@ void Handle::move(Geom::Point const &new_pos)
     setPosition(new_pos);
     //BSpline
     if(isBSpline){
+        h = this;
         setPosition(_pm().BSplineHandleReposition(h));
         pos = _pm().BSplineHandlePosition(h);
-        other->setPosition(_pm().BSplineHandleReposition(other,pos));
-        if(pos == 0){
-            _parent->setPosition(h->position());
-        }
+        h2 = this->other();
+        this->other()->setPosition(_pm().BSplineHandleReposition(h2,pos));
     }
     //BSpline End
 }
@@ -588,21 +588,25 @@ void Node::move(Geom::Point const &new_pos)
         if(prevNode)
             prevPos = _pm().BSplineHandlePosition(prevNode->front());
         pos = _pm().BSplineHandlePosition(n->front());
+        if(pos == 0)
+            pos = _pm().BSplineHandlePosition(n->back());
         if(nextNode)
             nextPos = _pm().BSplineHandlePosition(nextNode->back());
     }
     //BSpline End
     setPosition(new_pos);
     //BSpline
-    if(prevNode){
+    if(prevNode)
         prevNode->front()->setPosition(_pm().BSplineHandleReposition(prevNode->front(),prevPos));
-    }
-    if(nextNode){
+    if(nextNode)
         nextNode->back()->setPosition(_pm().BSplineHandleReposition(nextNode->back(),nextPos));
-    }
     //BSpline End
     _front.setPosition(_front.position() + delta);
     _back.setPosition(_back.position() + delta);
+    //BSpline End
+    // if the node has a smooth handle after a line segment, it should be kept colinear
+    // with the segment
+    _fixNeighbors(old_pos, new_pos);
     //BSpline
     if(_pm().isBSpline()){
         Handle* front = &_front;
@@ -610,10 +614,6 @@ void Node::move(Geom::Point const &new_pos)
         _front.setPosition(_pm().BSplineHandleReposition(front,pos));
         _back.setPosition(_pm().BSplineHandleReposition(back,pos));
     }
-    //BSpline End
-    // if the node has a smooth handle after a line segment, it should be kept colinear
-    // with the segment
-    _fixNeighbors(old_pos, new_pos);
 }
 
 void Node::transform(Geom::Affine const &m)
-- 
cgit v1.2.3