1) Improve the way the distance to the pointer is taken into account when finding the best snap

2) Use this distance also when snapping nodes in the path editor
3) Add a slider in the preferences dialog to control the weighing of this distance

(bzr r6895)

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index a436ce867..e78d51af4 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -208,7 +208,12 @@ void InkscapePreferences::initPageSnapping()
 	    
 	_snap_delay.init("/options/snapdelay/value", 0, 1000, 50, 100, 300, 0);
 	_page_snapping.add_line( false, _("Delay (in msec):"), _snap_delay, "",
-                     _("Postpone snapping as long as the mouse is moving, and then wait an additional fraction of a second. This additional delay is specified here. When set to zero or to a very small number, snapping will be immediate"), true);
+			_("Postpone snapping as long as the mouse is moving, and then wait an additional fraction of a second. This additional delay is specified here. When set to zero or to a very small number, snapping will be immediate"), true);
+	
+	_snap_weight.init("/options/snapweight/value", 0, 1, 0.1, 0.2, 0.5, 1);
+	_page_snapping.add_line( false, _("Weight factor:"), _snap_weight, "",
+			_("When multiple snap solutions are found, then Inkscape can either prefer the closest transformation (when set to 0), or prefer the node that was initially the closest to the pointer (when set to 1)"), true);
+		
 
 	this->AddPage(_page_snapping, _("Snapping"), PREFS_PAGE_SNAPPING);
 }
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index a957ce657..c62919c45 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -176,7 +176,7 @@ protected:
 
     PrefSpinButton  _importexport_export, _misc_recent, _misc_simpl;
     ZoomCorrRulerSlider _ui_zoom_correction;
-    PrefSlider		_snap_delay;
+    PrefSlider		_snap_delay, _snap_weight;
     PrefSpinButton  _misc_latency_skew;
     PrefCheckButton _misc_comment, _misc_forkvectors, _misc_scripts, _misc_namedicon_delay;
     PrefCombo       _misc_small_toolbar;