summaryrefslogtreecommitdiffstats
path: root/src/snap.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2007-04-13 20:49:26 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2007-04-13 20:49:26 +0000
commit0b9f1821ef6908d509c4b2a4c94fb0df35e6079a (patch)
treede3a332e27b3f0d9cca5f3fc63924bbc74a1509b /src/snap.cpp
parentAdd global preference for selector tool, chosing between GEOMETRIC_BBOX or VI... (diff)
downloadinkscape-0b9f1821ef6908d509c4b2a4c94fb0df35e6079a.tar.gz
inkscape-0b9f1821ef6908d509c4b2a4c94fb0df35e6079a.zip
New Grids are now ready to go. bug testing can start i think.
(bzr r2878)
Diffstat (limited to 'src/snap.cpp')
-rw-r--r--src/snap.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/snap.cpp b/src/snap.cpp
index e9bdb7063..4f871e736 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -23,6 +23,9 @@
#include "display/canvas-grid.h"
+#include "inkscape.h"
+#include "desktop.h"
+
/**
* Construct a SnapManager for a SPNamedView.
*
@@ -50,16 +53,14 @@ SnapManager::SnapperList SnapManager::getSnappers() const
s.push_back(&guide);
s.push_back(&object);
- //add new grid snappers that are active for this desktop
-// SPDesktop* desktop = SP_ACTIVE_DESKTOP;
-// if (desktop) {
-
+ //FIXME: this code should do this: add new grid snappers that are active for this desktop
+ SPDesktop* desktop = SP_ACTIVE_DESKTOP;
+ if (desktop && desktop->gridsEnabled()) {
for ( GSList const *l = _named_view->grids; l != NULL; l = l->next) {
Inkscape::CanvasGrid *grid = (Inkscape::CanvasGrid*) l->data;
s.push_back(grid->snapper);
}
-
-// }
+ }
return s;
}