diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-05-13 19:10:22 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-05-13 19:10:22 +0000 |
| commit | 5a48f29aa0627244d73bcedf9b780607191990bb (patch) | |
| tree | 3ed25ec7b275133e1f67e6b079be09f58eb41823 /src/context-fns.cpp | |
| parent | Allow nested substitutions. Such as s="${a}" and a="${b}" and b="hello" (diff) | |
| download | inkscape-5a48f29aa0627244d73bcedf9b780607191990bb.tar.gz inkscape-5a48f29aa0627244d73bcedf9b780607191990bb.zip | |
Solve a snapping regression, which caused snapping of new items to (0,0) when there was in fact nothing to snap to...
(bzr r5671)
Diffstat (limited to 'src/context-fns.cpp')
| -rw-r--r-- | src/context-fns.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/context-fns.cpp b/src/context-fns.cpp index 61b6a2fc4..2ae4c3901 100644 --- a/src/context-fns.cpp +++ b/src/context-fns.cpp @@ -196,8 +196,12 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, /* There's no constraint on the corner point, so just snap it to anything */ p[0] = center; + p[1] = pt; + //std::cout << "pt = " << pt << std::endl; snappoint = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, pt); + //std::cout << "snappoint.getPoint() = " << snappoint.getPoint() << std::endl; if (snappoint.getSnapped()) { + //std::cout << "we snapped here ..." << std::endl; p[1] = snappoint.getPoint(); } } @@ -208,6 +212,8 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, p[0] = sp_desktop_dt2root_xy_point(desktop, p[0]); p[1] = sp_desktop_dt2root_xy_point(desktop, p[1]); + + //std::cout << "after: p[0] vs. p[1] = " << p[0] << " | " << p[1] << std::endl; return NR::Rect(NR::Point(MIN(p[0][NR::X], p[1][NR::X]), MIN(p[0][NR::Y], p[1][NR::Y])), NR::Point(MAX(p[0][NR::X], p[1][NR::X]), MAX(p[0][NR::Y], p[1][NR::Y]))); |