diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-05-16 21:53:27 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-05-16 21:53:27 +0000 |
| commit | a6f2609902125fe035cba64cc9431b0e83d9ab30 (patch) | |
| tree | 875773d5d31c34343c0e00966583eea6f66c7936 /src/seltrans.cpp | |
| parent | * share/extensions/Makefile.am: Don't run make in the Poly3DObjects (diff) | |
| download | inkscape-a6f2609902125fe035cba64cc9431b0e83d9ab30.tar.gz inkscape-a6f2609902125fe035cba64cc9431b0e83d9ab30.zip | |
Fix a regression in the snapper, caused by me. Sorry!
(bzr r5680)
Diffstat (limited to 'src/seltrans.cpp')
| -rw-r--r-- | src/seltrans.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 432b1e670..94baf12d7 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1261,7 +1261,7 @@ gboolean Inkscape::SelTrans::centerRequest(NR::Point &pt, guint state) { SnapManager &m = _desktop->namedview->snap_manager; m.setup(_desktop); - m.freeSnap(Snapper::SNAPPOINT_NODE, pt); + m.freeSnapReturnByRef(Snapper::SNAPPOINT_NODE, pt); if (state & GDK_CONTROL_MASK) { if ( fabs(_point[NR::X] - pt[NR::X]) > fabs(_point[NR::Y] - pt[NR::Y]) ) { @@ -1369,7 +1369,7 @@ void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state) ** FIXME: this will snap to more than just the grid, nowadays. */ - m.freeSnap(Snapper::SNAPPOINT_NODE, dxy); + m.freeSnapReturnByRef(Snapper::SNAPPOINT_NODE, dxy); } else if (!shift) { @@ -1434,14 +1434,14 @@ void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state) } } - if (control) { - /* Ensure that the horizontal and vertical constraint has been applied */ - if (fabs(dxy[NR::X]) > fabs(dxy[NR::Y])) { - dxy[NR::Y] = 0; - } else { - dxy[NR::X] = 0; - } - } + //if (control) { + // /* Ensure that the horizontal and vertical constraint has been applied */ + // if (fabs(dxy[NR::X]) > fabs(dxy[NR::Y])) { + // dxy[NR::Y] = 0; + // } else { + // dxy[NR::X] = 0; + // } + //} NR::Matrix const move((NR::translate(dxy))); NR::Point const norm(0, 0); |