diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-09-11 21:44:48 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-09-11 21:44:48 +0000 |
| commit | 4c9d5ef55883fd94094371813f80cfef0befcf74 (patch) | |
| tree | 2705753419ba635ce155a5821b55ec481af19125 /src/desktop.cpp | |
| parent | Make tooltip reflect the correct range for calligraphy angle fixation (diff) | |
| download | inkscape-4c9d5ef55883fd94094371813f80cfef0befcf74.tar.gz inkscape-4c9d5ef55883fd94094371813f80cfef0befcf74.zip | |
convert almost all libnrtype to Geom::
(bzr r6793)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 54285c083..476f1e3d7 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1038,7 +1038,7 @@ SPDesktop::scroll_world (double dx, double dy, bool is_scrolling) } bool -SPDesktop::scroll_to_point (NR::Point const *p, gdouble autoscrollspeed) +SPDesktop::scroll_to_point (Geom::Point const &p, gdouble autoscrollspeed) { gdouble autoscrolldistance = (gdouble) prefs_get_int_attribute_limited ("options.autoscrolldistance", "value", 0, -1000, 10000); @@ -1046,26 +1046,26 @@ SPDesktop::scroll_to_point (NR::Point const *p, gdouble autoscrollspeed) autoscrolldistance /= expansion(_d2w); NR::Rect const dbox = NR::expand(get_display_area(), -autoscrolldistance); - if (!((*p)[NR::X] > dbox.min()[NR::X] && (*p)[NR::X] < dbox.max()[NR::X]) || - !((*p)[NR::Y] > dbox.min()[NR::Y] && (*p)[NR::Y] < dbox.max()[NR::Y]) ) { + if (!(p[NR::X] > dbox.min()[NR::X] && p[NR::X] < dbox.max()[NR::X]) || + !(p[NR::Y] > dbox.min()[NR::Y] && p[NR::Y] < dbox.max()[NR::Y]) ) { - NR::Point const s_w( (*p) * _d2w ); + NR::Point const s_w( p * (Geom::Matrix)_d2w ); gdouble x_to; - if ((*p)[NR::X] < dbox.min()[NR::X]) + if (p[NR::X] < dbox.min()[NR::X]) x_to = dbox.min()[NR::X]; - else if ((*p)[NR::X] > dbox.max()[NR::X]) + else if (p[NR::X] > dbox.max()[NR::X]) x_to = dbox.max()[NR::X]; else - x_to = (*p)[NR::X]; + x_to = p[NR::X]; gdouble y_to; - if ((*p)[NR::Y] < dbox.min()[NR::Y]) + if (p[NR::Y] < dbox.min()[NR::Y]) y_to = dbox.min()[NR::Y]; - else if ((*p)[NR::Y] > dbox.max()[NR::Y]) + else if (p[NR::Y] > dbox.max()[NR::Y]) y_to = dbox.max()[NR::Y]; else - y_to = (*p)[NR::Y]; + y_to = p[NR::Y]; NR::Point const d_dt(x_to, y_to); NR::Point const d_w( d_dt * _d2w ); |