summaryrefslogtreecommitdiffstats
path: root/src/event-context.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-02-21 09:01:33 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-02-21 09:01:33 +0000
commit99c82c93cb8e9d023cb65f5e0f6ea357db5092ba (patch)
tree6f138974e9f0cd987a751c274bad9e73561f528d /src/event-context.cpp
parentFix a memory leak in the object-snapper (diff)
downloadinkscape-99c82c93cb8e9d023cb65f5e0f6ea357db5092ba.tar.gz
inkscape-99c82c93cb8e9d023cb65f5e0f6ea357db5092ba.zip
Make sure that guides always snap correctly when dropping them, and improve perseverance of snap-indicator
(bzr r9103)
Diffstat (limited to 'src/event-context.cpp')
-rw-r--r--src/event-context.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 397ec6b80..6184fb4c7 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -8,7 +8,7 @@
* Frank Felfe <innerspace@iname.com>
* bulia byak <buliabyak@users.sf.net>
*
- * Copyright (C) 1999-2005 authors
+ * Copyright (C) 1999-2010 authors
* Copyright (C) 2001-2002 Ximian, Inc.
*
* Released under GNU GPL, read the file 'COPYING' for more information
@@ -1194,8 +1194,7 @@ void sp_event_context_snap_delay_handler(SPEventContext *ec,
// Snap when speed drops below e.g. 0.02 px/msec, or when no motion events have occurred for some period.
// i.e. snap when we're at stand still. A speed threshold enforces snapping for tablets, which might never
// be fully at stand still and might keep spitting out motion events.
- ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(
- true); // put snapping on hold
+ ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(true); // put snapping on hold
Geom::Point event_pos(event->x, event->y);
guint32 event_t = gdk_event_get_time((GdkEvent *) event);
@@ -1331,6 +1330,7 @@ gboolean sp_event_context_snap_watchdog_callback(gpointer data) {
void sp_event_context_discard_delayed_snap_event(SPEventContext *ec) {
delete ec->_delayed_snap_event;
ec->_delayed_snap_event = NULL;
+ ec->desktop->namedview->snap_manager.snapprefs.setSnapPostponedGlobally(false);
}
/*