diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-08-28 19:32:55 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-08-28 19:32:55 +0000 |
| commit | e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46 (patch) | |
| tree | 2740560017f69a77edaf5ace7ad0705c9dc1b5df /src/snap.cpp | |
| parent | null check fixes patch from bug 261475 (diff) | |
| download | inkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.tar.gz inkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.zip | |
Modify the parameters required for setting up the SnapManager
(bzr r6722)
Diffstat (limited to 'src/snap.cpp')
| -rw-r--r-- | src/snap.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/snap.cpp b/src/snap.cpp index 9ae330b77..15bc8658d 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -871,11 +871,11 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo // Update the snap indicator, if requested - if (_desktop_for_snapindicator) { + if (_snapindicator) { if (bestSnappedPoint.getSnapped()) { - _desktop_for_snapindicator->snapindicator->set_new_snappoint(bestSnappedPoint); + _desktop->snapindicator->set_new_snappoint(bestSnappedPoint); } else { - _desktop_for_snapindicator->snapindicator->remove_snappoint(); + _desktop->snapindicator->remove_snappoint(); } } @@ -883,19 +883,23 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo return bestSnappedPoint; } -void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, SPItem const *item_to_ignore, std::vector<Geom::Point> *unselected_nodes) +void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem const *item_to_ignore, std::vector<Geom::Point> *unselected_nodes) { - _item_to_ignore = item_to_ignore; + g_assert(desktop != NULL); + _item_to_ignore = item_to_ignore; _items_to_ignore = NULL; - _desktop_for_snapindicator = desktop_for_snapindicator; + _desktop = desktop; + _snapindicator = snapindicator; _unselected_nodes = unselected_nodes; } -void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes) +void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes) { - _item_to_ignore = NULL; + g_assert(desktop != NULL); + _item_to_ignore = NULL; _items_to_ignore = &items_to_ignore; - _desktop_for_snapindicator = desktop_for_snapindicator; + _desktop = desktop; + _snapindicator = snapindicator; _unselected_nodes = unselected_nodes; } |