diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2007-12-17 14:42:10 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2007-12-17 14:42:10 +0000 |
| commit | 3441a69397c6967460b62f17bec6880c70399390 (patch) | |
| tree | 53bdfd3ac4d9dda6204b60d34c2aaf7fc4c69f41 /src/context-fns.cpp | |
| parent | CRLF fix (diff) | |
| download | inkscape-3441a69397c6967460b62f17bec6880c70399390.tar.gz inkscape-3441a69397c6967460b62f17bec6880c70399390.zip | |
Use golden ratio as additional constrained ratio during Ctrl+dragging rectangles (fixes bug/RFE #170540)
(bzr r4248)
Diffstat (limited to '')
| -rw-r--r-- | src/context-fns.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/context-fns.cpp b/src/context-fns.cpp index 8a131b081..c845fd275 100644 --- a/src/context-fns.cpp +++ b/src/context-fns.cpp @@ -13,6 +13,9 @@ #include "event-context.h" #include "sp-namedview.h" +static const double midpt_1_goldenratio = (1 + goldenratio) / 2; +static const double midpt_goldenratio_2 = (goldenratio + 2) / 2; + /* FIXME: could probably use a template here */ /** @@ -90,11 +93,25 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, /* Vector from the centre of the box to the point we are dragging to */ NR::Point delta = pt - center; - /* Round it so that we have an integer-ratio box */ + /* Round it so that we have an integer-ratio (or golden ratio) box */ if (fabs(delta[NR::X]) > fabs(delta[NR::Y]) && (delta[NR::Y] != 0.0)) { - delta[NR::X] = floor(delta[NR::X] / delta[NR::Y] + 0.5) * delta[NR::Y]; + double ratio = delta[NR::X] / delta[NR::Y]; + double ratioabs = fabs (ratio); + double sign = (ratio < 0 ? -1 : 1); + if (midpt_1_goldenratio < ratioabs && ratioabs < midpt_goldenratio_2) { + delta[NR::X] = sign * goldenratio * delta[NR::Y]; + } else { + delta[NR::X] = floor(ratio + 0.5) * delta[NR::Y]; + } } else if (delta[NR::X] != 0.0) { - delta[NR::Y] = floor(delta[NR::Y] / delta[NR::X] + 0.5) * delta[NR::X]; + double ratio = delta[NR::Y] / delta[NR::X]; + double ratioabs = fabs (ratio); + double sign = (ratio < 0 ? -1 : 1); + if (midpt_1_goldenratio < ratioabs && ratioabs < midpt_goldenratio_2) { + delta[NR::Y] = sign * goldenratio * delta[NR::X]; + } else { + delta[NR::Y] = floor(delta[NR::Y] / delta[NR::X] + 0.5) * delta[NR::X]; + } } /* p[1] is the dragged point with the integer-ratio constraint */ |