summaryrefslogtreecommitdiffstats
path: root/src/display/snap-indicator.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2015-07-24 19:38:06 +0000
committerDiederik van Lierop <mail@diedenrezi.nl>2015-07-24 19:38:06 +0000
commitf873250f0c426d7b281acd37d65c4e549eb204a3 (patch)
tree384b4f74b13edfdfc67b2faf150d422277a05d63 /src/display/snap-indicator.cpp
parentFix a bug continuing a bezier path whith a LPE one like spiro or bspline on a... (diff)
downloadinkscape-f873250f0c426d7b281acd37d65c4e549eb204a3.tar.gz
inkscape-f873250f0c426d7b281acd37d65c4e549eb204a3.zip
Make persistence of snap indicator configurable, and clean up the snapping tab in the preferences dialog
Fixed bugs: - https://launchpad.net/bugs/1420301 (bzr r14253)
Diffstat (limited to 'src/display/snap-indicator.cpp')
-rw-r--r--src/display/snap-indicator.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index 926b35599..17deea16d 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -256,7 +256,12 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
"shape", SP_KNOT_SHAPE_CROSS,
NULL );
- const int timeout_val = 4000;
+ double timeout_val = prefs->getDouble("/options/snapindicatorpersistence/value", 2.0);
+ if (timeout_val < 0.1) {
+ timeout_val = 0.1; // a zero value would mean infinite persistence (i.e. until new snap occurs)
+ // Besides, negatives values would ....?
+ }
+
// The snap indicator will be deleted after some time-out, and sp_canvas_item_dispose
// will be called. This will set canvas->current_item to NULL if the snap indicator was
@@ -272,7 +277,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
SP_CTRL(canvasitem)->pickable = false;
SP_CTRL(canvasitem)->moveto(p.getPoint());
- _snaptarget = _desktop->add_temporary_canvasitem(canvasitem, timeout_val);
+ _snaptarget = _desktop->add_temporary_canvasitem(canvasitem, timeout_val*1000.0);
_snaptarget_is_presnap = pre_snap;
// Display the tooltip, which reveals the type of snap source and the type of snap target
@@ -307,7 +312,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
SP_CANVASTEXT(canvas_tooltip)->anchor_position = TEXT_ANCHOR_CENTER;
g_free(tooltip_str);
- _snaptarget_tooltip = _desktop->add_temporary_canvasitem(canvas_tooltip, timeout_val);
+ _snaptarget_tooltip = _desktop->add_temporary_canvasitem(canvas_tooltip, timeout_val*1000.0);
}
// Display the bounding box, if we snapped to one