diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2007-11-18 19:14:14 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2007-11-18 19:14:14 +0000 |
| commit | 442bc01e1a2fc6f7e59fd6b8e70d609d3d0cce6d (patch) | |
| tree | 9353857defadc3d3d38cf4f32f72541b5649c6e5 /src/snapped-point.cpp | |
| parent | rename EditCloneOriginal to EditCloneSelectOriginal (diff) | |
| download | inkscape-442bc01e1a2fc6f7e59fd6b8e70d609d3d0cce6d.tar.gz inkscape-442bc01e1a2fc6f7e59fd6b8e70d609d3d0cce6d.zip | |
1) Improving snapping logic 2) When skewing, don't snap to selection itself
(bzr r4111)
Diffstat (limited to 'src/snapped-point.cpp')
| -rw-r--r-- | src/snapped-point.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
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 <mdimanche@free.fr> + * Diederik van Lierop <mail@diedenrezi.nl> * * Released under GNU GPL, read the file 'COPYING' for more information. */ #include "snapped-point.h" -#include <libnr/nr-values.h> -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; |