summaryrefslogtreecommitdiffstats
path: root/src/seltrans.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2008-08-28 19:32:55 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2008-08-28 19:32:55 +0000
commite2a6ff85eaa5a4411ac70c642f78f4791d9d9d46 (patch)
tree2740560017f69a77edaf5ace7ad0705c9dc1b5df /src/seltrans.cpp
parentnull check fixes patch from bug 261475 (diff)
downloadinkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.tar.gz
inkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.zip
Modify the parameters required for setting up the SnapManager
(bzr r6722)
Diffstat (limited to 'src/seltrans.cpp')
-rw-r--r--src/seltrans.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 95c92ba69..d5e6afd8a 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -919,7 +919,7 @@ gboolean Inkscape::SelTrans::scaleRequest(NR::Point &pt, guint state)
} else {
// In all other cases we should try to snap now
SnapManager &m = _desktop->namedview->snap_manager;
- m.setup(NULL, _items_const);
+ m.setup(_desktop, false, _items_const);
Inkscape::SnappedPoint bb, sn;
NR::Coord bd(NR_HUGE);
@@ -1032,7 +1032,7 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR::
// In all other cases we should try to snap now
SnapManager &m = _desktop->namedview->snap_manager;
- m.setup(NULL, _items_const);
+ m.setup(_desktop, false, _items_const);
Inkscape::SnappedPoint bb, sn;
g_assert(bb.getSnapped() == false); // Check initialization to catch any regression
@@ -1156,7 +1156,7 @@ gboolean Inkscape::SelTrans::skewRequest(SPSelTransHandle const &handle, NR::Poi
// Snap to objects, grids, guides
SnapManager &m = _desktop->namedview->snap_manager;
- m.setup(NULL, _items_const);
+ m.setup(_desktop, false, _items_const);
Inkscape::Snapper::ConstraintLine const constraint(component_vectors[dim_b]);
NR::Point const s(skew[dim_a], scale[dim_a]);
@@ -1364,7 +1364,7 @@ void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &,
void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state)
{
SnapManager &m = _desktop->namedview->snap_manager;
- m.setup(_desktop, _items_const);
+ m.setup(_desktop, true, _items_const);
/* The amount that we've moved by during this drag */
Geom::Point dxy = to_2geom(xy - _point);