diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2012-12-24 07:07:34 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx.marker.es> | 2012-12-24 07:07:34 +0000 |
| commit | 151539ee2fdfdc417a691ba1d51e129036687cff (patch) | |
| tree | 6be4d0f9f0516f99083506feede6a0806c2b8537 /src/widgets/desktop-widget.cpp | |
| parent | Going to merge (diff) | |
| parent | extensions. function plotter. patch by ~suv for clip rectangle (Bug 492103) (diff) | |
| download | inkscape-151539ee2fdfdc417a691ba1d51e129036687cff.tar.gz inkscape-151539ee2fdfdc417a691ba1d51e129036687cff.zip | |
Merge from branch
(bzr r11950.1.6)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 0fd8fd010..b94a70417 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1717,12 +1717,8 @@ void SPDesktopWidget::viewSetPosition (Geom::Point p) { Geom::Point const origin = ( p - ruler_origin ); - gdouble hlower, hupper, hmax_range; - gdouble vlower, vupper, vmax_range; - sp_ruler_get_range(SP_RULER(hruler), &hlower, &hupper, NULL, &hmax_range); - sp_ruler_set_range(SP_RULER(hruler), hlower, hupper, origin[Geom::X], hmax_range); - sp_ruler_get_range(SP_RULER(vruler), &vlower, &vupper, NULL, &vmax_range); - sp_ruler_set_range(SP_RULER(vruler), vlower, vupper, origin[Geom::Y], vmax_range); + sp_ruler_set_position(SP_RULER(hruler), origin[Geom::X]); + sp_ruler_set_position(SP_RULER(vruler), origin[Geom::Y]); } void @@ -1741,13 +1737,11 @@ sp_desktop_widget_update_hruler (SPDesktopWidget *dtw) * coincides with the pixel buffer, everything will line up nicely. */ Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers(); - gdouble position; double const scale = dtw->desktop->current_zoom(); double s = viewbox.min()[Geom::X] / scale - dtw->ruler_origin[Geom::X]; double e = viewbox.max()[Geom::X] / scale - dtw->ruler_origin[Geom::X]; - sp_ruler_get_range(SP_RULER(dtw->hruler), NULL, NULL, &position, NULL); - sp_ruler_set_range(SP_RULER(dtw->hruler), s, e, position, (e - s)); + sp_ruler_set_range(SP_RULER(dtw->hruler), s, e, (e - s)); } void @@ -1759,13 +1753,11 @@ sp_desktop_widget_update_vruler (SPDesktopWidget *dtw) * coincides with the pixel buffer, everything will line up nicely. */ Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers(); - gdouble position; double const scale = dtw->desktop->current_zoom(); double s = viewbox.min()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y]; double e = viewbox.max()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y]; - sp_ruler_get_range(SP_RULER(dtw->vruler), NULL, NULL, &position, NULL); - sp_ruler_set_range(SP_RULER(dtw->vruler), s, e, position, (e - s)); + sp_ruler_set_range(SP_RULER(dtw->vruler), s, e, (e - s)); } |