diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 9c9c58ff14dc86e315c786a54edbbf3723fb1711..886ddd1bed248543aa29b60ee9cab7f6748a4e9e 100644 (file)
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
Node *node_away = (this == &_parent->_front ? _parent->_prev() : _parent->_next());
if (_parent->type() == NODE_SMOOTH && Node::_is_line_segment(_parent, node_away)) {
- Inkscape::Snapper::ConstraintLine cl(_parent->position(),
+ Inkscape::Snapper::SnapConstraint cl(_parent->position(),
_parent->position() - node_away->position());
Inkscape::SnappedPoint p;
p = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos, SNAPSOURCE_NODE_HANDLE), cl);
// with Ctrl+Alt, constrain to handle lines
// project the new position onto a handle line that is closer
boost::optional<Geom::Point> front_point, back_point;
- boost::optional<Inkscape::Snapper::ConstraintLine> line_front, line_back;
+ boost::optional<Inkscape::Snapper::SnapConstraint> line_front, line_back;
if (_front.isDegenerate()) {
if (_is_line_segment(this, _next()))
front_point = _next()->position() - origin;
back_point = _back.relativePos();
}
if (front_point)
- line_front = Inkscape::Snapper::ConstraintLine(origin, *front_point);
+ line_front = Inkscape::Snapper::SnapConstraint(origin, *front_point);
if (back_point)
- line_back = Inkscape::Snapper::ConstraintLine(origin, *back_point);
+ line_back = Inkscape::Snapper::SnapConstraint(origin, *back_point);
// TODO: combine the snap and non-snap branches by modifying snap.h / snap.cpp
if (snap) {
// with Ctrl, constrain to axes
// TODO combine the two branches
if (snap) {
- Inkscape::Snapper::ConstraintLine line_x(origin, Geom::Point(1, 0));
- Inkscape::Snapper::ConstraintLine line_y(origin, Geom::Point(0, 1));
+ Inkscape::Snapper::SnapConstraint line_x(origin, Geom::Point(1, 0));
+ Inkscape::Snapper::SnapConstraint line_y(origin, Geom::Point(0, 1));
fp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), line_x);
bp = sm.constrainedSnap(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), line_y);
}