diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2009-04-24 20:31:23 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2009-04-24 20:31:23 +0000 |
| commit | ba5a49daeda8a7479226be6f01a1a94de849e7c4 (patch) | |
| tree | 23334a19a4976463641f439b2c73a7d53d019d47 | |
| parent | * [INTL: sk] Slovak translation update (trunk) (diff) | |
| download | inkscape-ba5a49daeda8a7479226be6f01a1a94de849e7c4.tar.gz inkscape-ba5a49daeda8a7479226be6f01a1a94de849e7c4.zip | |
Two minor snapping fixes
(bzr r7770)
| -rw-r--r-- | src/object-snapper.cpp | 10 | ||||
| -rw-r--r-- | src/sp-item.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 778928ae7..70377cb66 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -712,9 +712,15 @@ bool Inkscape::ObjectSnapper::ThisSnapperMightSnap() const return (_snap_enabled && _snapmanager->snapprefs.getSnapModeBBoxOrNodes() && snap_to_something); } -bool Inkscape::ObjectSnapper::GuidesMightSnap() const +bool Inkscape::ObjectSnapper::GuidesMightSnap() const // almost the same as ThisSnapperMightSnap above, but only looking at points (and not paths) { - bool snap_to_something = _snapmanager->snapprefs.getSnapToItemNode() || _snapmanager->snapprefs.getSnapToBBoxNode(); + bool snap_to_something = _snapmanager->snapprefs.getSnapToItemNode() + || _snapmanager->snapprefs.getSnapToPageBorder() + || (_snapmanager->snapprefs.getSnapModeBBox() && _snapmanager->snapprefs.getSnapToBBoxNode()) + || (_snapmanager->snapprefs.getSnapModeBBox() && (_snapmanager->snapprefs.getSnapBBoxEdgeMidpoints() || _snapmanager->snapprefs.getSnapBBoxMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && (_snapmanager->snapprefs.getSnapLineMidpoints() || _snapmanager->snapprefs.getSnapObjectMidpoints())) + || (_snapmanager->snapprefs.getSnapModeNode() && _snapmanager->snapprefs.getIncludeItemCenter()); + return (_snap_enabled && _snapmanager->snapprefs.getSnapModeGuide() && snap_to_something); } diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 996804cd3..ff3952c25 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -974,7 +974,7 @@ void sp_item_snappoints(SPItem const *item, bool const target, SnapPointsWithTyp // Get the snappoints at the item's center if (snapprefs != NULL && snapprefs->getIncludeItemCenter()) { - p.push_back(std::make_pair(item->getCenter(), target ? int(Inkscape::SNAPTARGET_OBJECT_MIDPOINT) : int(Inkscape::SNAPSOURCE_OBJECT_MIDPOINT))); + p.push_back(std::make_pair(item->getCenter(), target ? int(Inkscape::SNAPTARGET_ROTATION_CENTER) : int(Inkscape::SNAPSOURCE_ROTATION_CENTER))); } // Get the snappoints of clipping paths and mask, if any |