diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-12 21:53:22 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-12 21:53:22 +0000 |
| commit | cfecf64d6adad14f73f9c169b181ec59bf54c8f3 (patch) | |
| tree | d976a56df96484ab7d4efe1565c372218db6fdae /src/ui/tools | |
| parent | Moving tolerance (diff) | |
| parent | Name a few more widgets. (diff) | |
| download | inkscape-cfecf64d6adad14f73f9c169b181ec59bf54c8f3.tar.gz inkscape-cfecf64d6adad14f73f9c169b181ec59bf54c8f3.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 7b4f67da9..79e1cbc10 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -1289,8 +1289,9 @@ void sp_event_context_snap_delay_handler(ToolBase *ec, // The snap delay will repeat the last motion event, which will lead to // erroneous points in the calligraphy context. And because we don't snap // in this context, we might just as well disable the snap delay all together + bool const c4 = ec->space_panning; // Don't snap while panning with the spacebar - if (c1 || c2 || c3) { + if (c1 || c2 || c3 || c4) { // Make sure that we don't send any pending snap events to a context if we know in advance // that we're not going to snap any way (e.g. while scrolling with middle mouse button) // Any motion event might affect the state of the context, leading to unexpected behavior |