diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2009-01-28 21:19:16 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2009-01-28 21:19:16 +0000 |
| commit | 12f5c40db64ee3500c72bc94688c802b1cedac79 (patch) | |
| tree | 69c2f3d3fca29a258162f0f85a36f670f07df145 /src/display | |
| parent | show waiting cursor while ExecutionEnv is working (diff) | |
| download | inkscape-12f5c40db64ee3500c72bc94688c802b1cedac79.tar.gz inkscape-12f5c40db64ee3500c72bc94688c802b1cedac79.zip | |
Add buttons for snapping to grids and/or guides
(bzr r7200)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 4 | ||||
| -rw-r--r-- | src/display/canvas-axonomgrid.h | 1 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 4b45eae33..283f58a01 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -748,6 +748,10 @@ void CanvasAxonomGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Poin sc.grid_lines.push_back(dummy); } +bool CanvasAxonomGridSnapper::ThisSnapperMightSnap() const +{ + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); +} }; // namespace Inkscape diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index 0654a9429..9067e2e13 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -71,6 +71,7 @@ class CanvasAxonomGridSnapper : public LineSnapper { public: CanvasAxonomGridSnapper(CanvasAxonomGrid *grid, SnapManager *sm, Geom::Coord const d); + bool ThisSnapperMightSnap() const; private: LineList _getSnapLines(Geom::Point const &p) const; diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index b03bfca9e..0d5cabd8d 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -999,7 +999,7 @@ void CanvasXYGridSnapper::_addSnappedLine(SnappedConstraints &sc, Geom::Point co */ bool CanvasXYGridSnapper::ThisSnapperMightSnap() const { - return _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); } } // namespace Inkscape |