From 442bc01e1a2fc6f7e59fd6b8e70d609d3d0cce6d Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Sun, 18 Nov 2007 19:14:14 +0000 Subject: 1) Improving snapping logic 2) When skewing, don't snap to selection itself (bzr r4111) --- src/snapped-point.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/snapped-point.cpp') diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp index ed82c47c0..d97abda1d 100644 --- a/src/snapped-point.cpp +++ b/src/snapped-point.cpp @@ -4,15 +4,15 @@ * * Authors: * Mathieu Dimanche + * Diederik van Lierop * * Released under GNU GPL, read the file 'COPYING' for more information. */ #include "snapped-point.h" -#include -Inkscape::SnappedPoint::SnappedPoint(NR::Point p, NR::Coord d, bool at_intersection) - : _distance(d), _point(p), _at_intersection(at_intersection) +Inkscape::SnappedPoint::SnappedPoint(NR::Point p, NR::Coord d, bool at_intersection, NR::Coord d2) + : _distance(d), _point(p), _at_intersection(at_intersection), _second_distance(d2) { } @@ -21,6 +21,7 @@ Inkscape::SnappedPoint::SnappedPoint() _distance = NR_HUGE; _point = NR::Point(0,0); _at_intersection = false; + _second_distance = NR_HUGE; } @@ -34,6 +35,12 @@ NR::Coord Inkscape::SnappedPoint::getDistance() const return _distance; } +NR::Coord Inkscape::SnappedPoint::getSecondDistance() const +{ + return _second_distance; +} + + NR::Point Inkscape::SnappedPoint::getPoint() const { return _point; -- cgit v1.2.3