X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcontext-fns.cpp;h=15138a10b6f9f188de86ce7b794526e33691b5bd;hb=35957e2d2b07f0179430b23187555e56f82c4597;hp=5db98ec16955f107703ecf5296ef4a6f601d5de2;hpb=d2378b62d2e48da3d7b23df2be3cf42184293299;p=inkscape.git diff --git a/src/context-fns.cpp b/src/context-fns.cpp index 5db98ec16..15138a10b 100644 --- a/src/context-fns.cpp +++ b/src/context-fns.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "sp-item.h" #include "desktop.h" @@ -108,12 +112,12 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, Inkscape::SnappedPoint s[2]; /* Try to snap p[0] (the opposite corner) along the constraint vector */ - s[0] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, - p[0], p[0] - p[1], item); + s[0] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, p[0], + Inkscape::Snapper::ConstraintLine(p[0] - p[1]), item); /* Try to snap p[1] (the dragged corner) along the constraint vector */ - s[1] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, - p[1], p[1] - p[0], item); + s[1] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, p[1], + Inkscape::Snapper::ConstraintLine(p[1] - p[0]), item); /* Choose the best snap and update points accordingly */ if (s[0].getDistance() < s[1].getDistance()) { @@ -128,7 +132,8 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, /* Our origin is the opposite corner. Snap the drag point along the constraint vector */ p[0] = center; - p[1] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, p[1], p[1] - p[0], item).getPoint(); + p[1] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, p[1], + Inkscape::Snapper::ConstraintLine(p[1] - p[0]), item).getPoint(); } } else if (shift) {