summaryrefslogtreecommitdiffstats
path: root/src/interface.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-25 01:06:47 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-25 01:06:47 +0000
commit4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3 (patch)
tree75853d8eec5e85fb93a2a798b57f072e3c9eeb99 /src/interface.cpp
parentReplace direct use of Cairo contexts and surfaces in the rendering tree (diff)
parentRevert workarounds from 10501 - no longer necessary (diff)
downloadinkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.tar.gz
inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.zip
Merge from trunk
(bzr r10347.1.18)
Diffstat (limited to 'src/interface.cpp')
-rw-r--r--src/interface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interface.cpp b/src/interface.cpp
index 9aa5cad31..25153097d 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -1261,7 +1261,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
( !item->style->stroke.isNone() ?
desktop->current_zoom() *
item->style->stroke_width.computed *
- item->i2d_affine().descrim() * 0.5
+ item->i2dt_affine().descrim() * 0.5
: 0.0)
+ prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
@@ -1364,7 +1364,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
( !item->style->stroke.isNone() ?
desktop->current_zoom() *
item->style->stroke_width.computed *
- item->i2d_affine().descrim() * 0.5
+ item->i2dt_affine().descrim() * 0.5
: 0.0)
+ prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);