diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-09-18 17:48:42 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-09-18 17:48:42 +0000 |
| commit | 07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8 (patch) | |
| tree | 3a4c8c7f4f8de2878adbe5eabaf75460d35b8bcb /src/ui | |
| parent | NR ==> Geom conversion in sp-canvas (diff) | |
| download | inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.tar.gz inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.zip | |
Next roud of NR ==> Geom conversion
(bzr r6839)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/view/edit-widget.cpp | 10 | ||||
| -rw-r--r-- | src/ui/widget/zoom-status.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp index 423d8e820..bd6c5032c 100644 --- a/src/ui/view/edit-widget.cpp +++ b/src/ui/view/edit-widget.cpp @@ -1375,7 +1375,7 @@ EditWidget::updateRulers() //Geom::Point gridorigin = _namedview->gridorigin; /// \todo Why was the origin corrected for the grid origin? (johan) - Geom::Rect const viewbox = to_2geom(_svg_canvas.spobj()->getViewbox()); + Geom::Rect const viewbox = _svg_canvas.spobj()->getViewbox(); double lo, up, pos, max; double const scale = _desktop->current_zoom(); double s = viewbox.min()[Geom::X] / scale; //- gridorigin[Geom::X]; @@ -1408,10 +1408,10 @@ EditWidget::updateScrollbars (double scale) NR::Rect carea( Geom::Point(darea.min()[Geom::X] * scale - 64, darea.max()[Geom::Y] * -scale - 64), Geom::Point(darea.max()[Geom::X] * scale + 64, darea.min()[Geom::Y] * -scale + 64) ); - NR::Rect const viewbox = _svg_canvas.spobj()->getViewbox(); + Geom::Rect const viewbox = _svg_canvas.spobj()->getViewbox(); /* Viewbox is always included into scrollable region */ - carea = NR::union_bounds(carea, viewbox); + carea = NR::union_bounds(carea, from_2geom(viewbox)); Gtk::Adjustment *adj = _bottom_scrollbar.get_adjustment(); adj->set_value(viewbox.min()[Geom::X]); @@ -1642,14 +1642,14 @@ EditWidget::onWindowSizeAllocate (Gtk::Allocation &newall) return; } - Geom::Rect const area = to_2geom(_desktop->get_display_area()); + Geom::Rect const area = _desktop->get_display_area(); double zoom = _desktop->current_zoom(); if (_sticky_zoom.get_active()) { /* Calculate zoom per pixel */ double const zpsp = zoom / hypot(area.dimensions()[Geom::X], area.dimensions()[Geom::Y]); /* Find new visible area */ - Geom::Rect const newarea = to_2geom(_desktop->get_display_area()); + Geom::Rect const newarea = _desktop->get_display_area(); /* Calculate adjusted zoom */ zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]); } diff --git a/src/ui/widget/zoom-status.cpp b/src/ui/widget/zoom-status.cpp index fbe7c0642..7c1cf72d7 100644 --- a/src/ui/widget/zoom-status.cpp +++ b/src/ui/widget/zoom-status.cpp @@ -108,7 +108,7 @@ ZoomStatus::on_value_changed() _upd_f = true; g_assert(_dt); double zoom_factor = pow(2, get_value()); - Geom::Rect const d = to_2geom(_dt->get_display_area()); + Geom::Rect const d = _dt->get_display_area(); _dt->zoom_absolute(d.midpoint()[Geom::X], d.midpoint()[Geom::Y], zoom_factor); gtk_widget_grab_focus(static_cast<GtkWidget*>((void*)_dt->canvas)); /// \todo this no love song _upd_f = false; |