diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-07-25 00:27:12 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-07-25 00:27:12 +0000 |
| commit | 97a575d4f1903b149ca3fa9ffcc50dac5bb94ffb (patch) | |
| tree | c1651b980810706a9e85a8e12ea3376a5fcb9051 /src/ui/tools | |
| parent | update to trunk (diff) | |
| parent | 3D box tool: the shift key must not prevent snapping of the vanishing point. ... (diff) | |
| download | inkscape-97a575d4f1903b149ca3fa9ffcc50dac5bb94ffb.tar.gz inkscape-97a575d4f1903b149ca3fa9ffcc50dac5bb94ffb.zip | |
update to trunk
(bzr r13682.1.28)
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/tool-base.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h index 7a6ab83e7..58eb6f88e 100644 --- a/src/ui/tools/tool-base.h +++ b/src/ui/tools/tool-base.h @@ -75,7 +75,12 @@ public: Inkscape::Preferences *prefs = Inkscape::Preferences::get(); double value = prefs->getDoubleLimited("/options/snapdelay/value", 0, 0, 1000); - _timer_id = g_timeout_add(value, &sp_event_context_snap_watchdog_callback, this); + // We used to have this specified in milliseconds; this has changed to seconds now for consistency's sake + if (value > 1) { // Apparently we have an old preference file, this value must have been in milliseconds; + value = value / 1000.0; // now convert this value to seconds + } + + _timer_id = g_timeout_add(value*1000.0, &sp_event_context_snap_watchdog_callback, this); _event = gdk_event_copy((GdkEvent*) event); ((GdkEventMotion *)_event)->time = GDK_CURRENT_TIME; |