diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-13 04:17:37 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-13 04:17:37 +0000 |
| commit | 991279702f188995eaf339994394ba0ea4d9e7a6 (patch) | |
| tree | 4cda11330822097aae2cb256602343fe2a918f12 /src/snap.cpp | |
| parent | preliminary release of the EMF import text reassembly feature. (diff) | |
| parent | Migrate document metadata from NotbookPage to Gtk::Grid and drop dead code (diff) | |
| download | inkscape-991279702f188995eaf339994394ba0ea4d9e7a6.tar.gz inkscape-991279702f188995eaf339994394ba0ea4d9e7a6.zip | |
merge from trunk (r11952)
(bzr r11668.1.46)
Diffstat (limited to 'src/snap.cpp')
| -rw-r--r-- | src/snap.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/snap.cpp b/src/snap.cpp index 1ee55fcf8..695424194 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -77,9 +77,14 @@ SnapManager::SnapperList SnapManager::getGridSnappers() const return s; } -bool SnapManager::someSnapperMightSnap() const +bool SnapManager::someSnapperMightSnap(bool immediately) const { - if ( !snapprefs.getSnapEnabledGlobally() || snapprefs.getSnapPostponedGlobally() ) { + if ( !snapprefs.getSnapEnabledGlobally() ) { + return false; + } + + // If we're asking if some snapper might snap RIGHT NOW (without the snap being postponed)... + if ( immediately && snapprefs.getSnapPostponedGlobally() ) { return false; } |