diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2011-06-26 20:00:36 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2011-06-26 20:00:36 +0000 |
| commit | bdf703831ff93438d49324ab842052ccaf390a5d (patch) | |
| tree | f98f378da026d6c5699b0565e2735c02f4f1620c /src/display | |
| parent | Documentation. Tutorials translation update. (diff) | |
| download | inkscape-bdf703831ff93438d49324ab842052ccaf390a5d.tar.gz inkscape-bdf703831ff93438d49324ab842052ccaf390a5d.zip | |
- Add a third group of snap sources/targets, called ¨others¨ (before we had only ¨bounding box¨ and nodes (see bug #788178)
- Fix the display of the snap source
- Fix snapping of guides to other guides & grids
(bzr r10372)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 2 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 2 | ||||
| -rw-r--r-- | src/display/snap-indicator.cpp | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index a9893f09d..dbf7b424d 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -769,7 +769,7 @@ void CanvasAxonomGridSnapper::_addSnappedPoint(SnappedConstraints &sc, Geom::Poi bool CanvasAxonomGridSnapper::ThisSnapperMightSnap() const { - return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeAny(); } diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 9a12a1d90..2a9e50e3d 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -1072,7 +1072,7 @@ void CanvasXYGridSnapper::_addSnappedPoint(SnappedConstraints &sc, Geom::Point c */ bool CanvasXYGridSnapper::ThisSnapperMightSnap() const { - return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeBBoxOrNodes(); + return _snap_enabled && _snapmanager->snapprefs.getSnapToGrids() && _snapmanager->snapprefs.getSnapModeAny(); } } // namespace Inkscape diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp index c3198cd37..ec4b7e28f 100644 --- a/src/display/snap-indicator.cpp +++ b/src/display/snap-indicator.cpp @@ -138,9 +138,6 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap case SNAPTARGET_ELLIPSE_QUADRANT_POINT: target_name = _("quadrant point"); break; - case SNAPTARGET_CENTER: - target_name = _("center"); - break; case SNAPTARGET_CORNER: target_name = _("corner"); break; @@ -206,9 +203,6 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap case SNAPSOURCE_ELLIPSE_QUADRANT_POINT: source_name = _("Quadrant point"); break; - case SNAPSOURCE_CENTER: - source_name = _("Center"); - break; case SNAPSOURCE_CORNER: source_name = _("Corner"); break; |