diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2011-10-08 20:00:37 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2011-10-08 20:00:37 +0000 |
| commit | f4c59e50df9090a1a4801da06f9a0021b67ce7a2 (patch) | |
| tree | 825ce1a6b013c238a89f06c2fdf74cee0861e02b /src/pen-context.cpp | |
| parent | Doc. Keys and mouse reference update. (diff) | |
| download | inkscape-f4c59e50df9090a1a4801da06f9a0021b67ce7a2.tar.gz inkscape-f4c59e50df9090a1a4801da06f9a0021b67ce7a2.zip | |
1) make snapping to clip/mask paths optional (see document properties dialog -> snap tab)
2) for debugging purposes: code added for showing all snap candidates
3) groundwork for tangential/perpendicular snapping
(bzr r10672)
Diffstat (limited to 'src/pen-context.cpp')
| -rw-r--r-- | src/pen-context.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 19e0351a3..2be2fd87b 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -311,7 +311,8 @@ spdc_endpoint_snap(SPPenContext const *const pc, Geom::Point &p, guint const sta pen_set_to_nearest_horiz_vert(pc, p, state, true); } else { // snap freely - spdc_endpoint_snap_free(pc, p, state); + boost::optional<Geom::Point> origin = pc->npoints > 0 ? pc->p[0] : boost::optional<Geom::Point>(); + spdc_endpoint_snap_free(pc, p, origin, state); // pass the origin, to allow for perpendicular / tangential snapping } } } @@ -329,7 +330,8 @@ spdc_endpoint_snap_handle(SPPenContext const *const pc, Geom::Point &p, guint co spdc_endpoint_snap_rotation(pc, p, pc->p[pc->npoints - 2], state); } else { if (!(state & GDK_SHIFT_MASK)) { //SHIFT disables all snapping, except the angular snapping above - spdc_endpoint_snap_free(pc, p, state); + boost::optional<Geom::Point> origin = pc->p[pc->npoints - 2]; + spdc_endpoint_snap_free(pc, p, origin, state); } } } |