diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2012-10-14 18:06:40 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mail@diedenrezi.nl> | 2012-10-14 18:06:40 +0000 |
| commit | c524e974852c8bb0a356353e23702be96fff9b83 (patch) | |
| tree | 912dc655cad52123664b499d80e0ae0033509d26 /src/live_effects/lpe-parallel.cpp | |
| parent | Remove invalid return statements (diff) | |
| download | inkscape-c524e974852c8bb0a356353e23702be96fff9b83.tar.gz inkscape-c524e974852c8bb0a356353e23702be96fff9b83.zip | |
Fix "shift disables snapping" for LPEs and for editing objects
Fixed bugs:
- https://launchpad.net/bugs/1065931
(bzr r11800)
Diffstat (limited to 'src/live_effects/lpe-parallel.cpp')
| -rw-r--r-- | src/live_effects/lpe-parallel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp index a6b894ce3..5638bf6de 100644 --- a/src/live_effects/lpe-parallel.cpp +++ b/src/live_effects/lpe-parallel.cpp @@ -113,13 +113,13 @@ void LPEParallel::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *deskt namespace Pl { void -KnotHolderEntityLeftEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) +KnotHolderEntityLeftEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { using namespace Geom; LPEParallel *lpe = dynamic_cast<LPEParallel *>(_effect); - Geom::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p, state); double lambda = L2(s - lpe->offset_pt) * sgn(dot(s - lpe->offset_pt, lpe->dir)); lpe->length_left.param_set_value(-lambda); @@ -128,13 +128,13 @@ KnotHolderEntityLeftEnd::knot_set(Geom::Point const &p, Geom::Point const &/*ori } void -KnotHolderEntityRightEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) +KnotHolderEntityRightEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { using namespace Geom; LPEParallel *lpe = dynamic_cast<LPEParallel *>(_effect); - Geom::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p, state); double lambda = L2(s - lpe->offset_pt) * sgn(dot(s - lpe->offset_pt, lpe->dir)); lpe->length_right.param_set_value(lambda); |