From 4b6620f3ed40dadba7f517f8321dedacbe48d393 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mailat-signdiedenrezidotnl>
Date: Sun, 24 Oct 2010 13:14:28 +0200
Subject: Fix paraxial pen tool: apply constraint even if we didn't snap

(bzr r9847)
---
 src/snapped-point.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/snapped-point.cpp')

diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index 48efa10e6..22daf9103 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -100,7 +100,7 @@ Inkscape::SnappedPoint::~SnappedPoint()
 {
 }
 
-void Inkscape::SnappedPoint::getPoint(Geom::Point &p) const
+void Inkscape::SnappedPoint::getPointIfSnapped(Geom::Point &p) const
 {
     // When we have snapped
     if (getSnapped()) {
-- 
cgit v1.2.3


From ffba6ae904deaef040defebcc0ff6f7458dbb969 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mailat-signdiedenrezidotnl>
Date: Sat, 30 Oct 2010 00:07:10 +0200
Subject: - Constrained snap: proper implementation of the preference to snap
 the mouse pointer or handle itself (instead of projecting it first onto the
 constraint) - Fix a crash in SnapManager::multipleConstrainedSnaps

(bzr r9866)
---
 src/snapped-point.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/snapped-point.cpp')

diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index 22daf9103..8f774f793 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -61,7 +61,7 @@ Inkscape::SnappedPoint::SnappedPoint()
 {
     _point = Geom::Point(0,0);
     _source = SNAPSOURCE_UNDEFINED,
-    _source_num = 0,
+    _source_num = -1,
     _target = SNAPTARGET_UNDEFINED,
     _at_intersection = false;
     _constrained_snap = false;
@@ -81,7 +81,7 @@ Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p)
 {
     _point = p;
     _source = SNAPSOURCE_UNDEFINED,
-    _source_num = 0,
+    _source_num = -1,
     _target = SNAPTARGET_UNDEFINED,
     _at_intersection = false;
     _fully_constrained = false;
-- 
cgit v1.2.3


From a99ac9bf6ca7af0a92c48974daf98f393fa387e5 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mailat-signdiedenrezidotnl>
Date: Tue, 16 Nov 2010 22:33:00 +0100
Subject: Fix display of snap source indicator for constrained snapping in the
 selector tool

(bzr r9898)
---
 src/snapped-point.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/snapped-point.cpp')

diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp
index 8f774f793..52f0a7839 100644
--- a/src/snapped-point.cpp
+++ b/src/snapped-point.cpp
@@ -127,7 +127,7 @@ bool getClosestSP(std::list<Inkscape::SnappedPoint> const &list, Inkscape::Snapp
 bool Inkscape::SnappedPoint::isOtherSnapBetter(Inkscape::SnappedPoint const &other_one, bool weighted) const
 {
 
-    if (!other_one.getSnapped()) {
+    if (getSnapped() && !other_one.getSnapped()) {
         return false;
     }
 
-- 
cgit v1.2.3