summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 66c8851)
raw | patch | inline | side by side (parent: 66c8851)
author | buliabyak <buliabyak@users.sourceforge.net> | |
Sat, 22 Aug 2009 00:29:34 +0000 (00:29 +0000) | ||
committer | buliabyak <buliabyak@users.sourceforge.net> | |
Sat, 22 Aug 2009 00:29:34 +0000 (00:29 +0000) |
src/object-edit.cpp | patch | blob | history |
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index ac62a12db1549e2fe930d58a1cc95f62adc4e384..c8e3ab204d069c1ca51c1f4c459e1f9c13b7b575 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
* [control] constrain inner arg to round per PI/4
*/
void
-SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
int snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
@@ -1121,10 +1121,16 @@ SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &/
gdouble dx = p[Geom::X] - spiral->cx;
gdouble dy = p[Geom::Y] - spiral->cy;
+ gdouble moved_y = p[Geom::Y] - origin[Geom::Y];
+
if (state & GDK_MOD1_MASK) {
// adjust divergence by vertical drag, relative to rad
- double new_exp = (spiral->rad + dy)/(spiral->rad);
- spiral->exp = new_exp > 0? new_exp : 0;
+ if (spiral->rad > 0) {
+ double exp_delta = 0.1*moved_y/(spiral->rad); // arbitrary multiplier to slow it down
+ spiral->exp += exp_delta;
+ if (spiral->exp < 1e-3)
+ spiral->exp = 1e-3;
+ }
} else {
// roll/unroll from inside
gdouble arg_t0;