diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 0d7dffd0071472758f35f42a36bfb2862f723696..41e2cdb0708bc480366cda9317277bb9570ec661 100644 (file)
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
for (GSList const *l = _named_view->guides; l != NULL; l = l->next) {
SPGuide const *g = SP_GUIDE(l->data);
- NR::Point point_on_line = (g->normal == component_vectors[NR::X]) ? NR::Point(g->position, 0) : NR::Point(0, g->position);
- s.push_back(std::make_pair(g->normal, point_on_line));
+ s.push_back(std::make_pair(g->normal_to_line, g->point_on_line));
}
return s;
@@ -44,12 +43,12 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(NR::Point
*/
bool Inkscape::GuideSnapper::ThisSnapperMightSnap() const
{
- return _named_view == NULL ? false : (_enabled && _snap_from != 0 && _named_view->showguides);
+ return _named_view == NULL ? false : (_snap_enabled && _snap_from != 0 && _named_view->showguides);
}
void Inkscape::GuideSnapper::_addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const
{
- SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, normal_to_line, point_on_line);
+ SnappedLine dummy = SnappedLine(snapped_point, snapped_distance, getSnapperTolerance(), getSnapperAlwaysSnap(), normal_to_line, point_on_line);
sc.guide_lines.push_back(dummy);
}