~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/ui/view/edit-widget.cpp

Committer: cilix42
Date: 2008-09-18 17:48:42 UTC
Revision ID: cilix42@users.sourceforge.net-20080918174842-1ad33a7d7gqhv2hq

Next roud of NR ==> Geom conversion

files modified:
src/box3d.cpp

src/desktop-style.cpp

src/desktop.cpp

src/desktop.h

src/display/canvas-arena.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-axonomgrid.h

src/display/canvas-bpath.cpp

src/display/canvas-bpath.h

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/display/gnome-canvas-acetate.cpp

src/display/guideline.cpp

src/display/nr-arena-shape.cpp

src/display/sodipodi-ctrl.cpp

src/display/sodipodi-ctrl.h

src/display/sodipodi-ctrlrect.cpp

src/display/sodipodi-ctrlrect.h

src/display/sp-canvas-util.cpp

src/display/sp-canvas-util.h

src/display/sp-canvas.cpp

src/display/sp-canvas.h

src/display/sp-ctrlline.cpp

src/display/sp-ctrlline.h

src/display/sp-ctrlquadr.cpp

src/display/sp-ctrlquadr.h

src/document.cpp

src/document.h

src/dropper-context.cpp

src/dropper-context.h

src/dyna-draw-context.cpp

src/eraser-context.cpp

src/event-context.cpp

src/flood-context.cpp

src/gradient-context.cpp

src/gradient-context.h

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/libnr/nr-convert2geom.h

src/line-geometry.cpp

src/line-geometry.h

src/livarot/Shape.h

src/livarot/ShapeMisc.cpp

src/marker.cpp

src/marker.h

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/pencil-context.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/shape-editor.cpp

src/shape-editor.h

src/sp-flowtext.cpp

src/sp-image.cpp

src/sp-item-group.cpp

src/sp-item-group.h

src/sp-item.cpp

src/sp-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-root.cpp

src/sp-root.h

src/sp-shape.cpp

src/sp-symbol.cpp

src/sp-text.cpp

src/sp-tref.cpp

src/sp-tspan.cpp

src/sp-use.cpp

src/splivarot.cpp

src/text-context.cpp

src/text-editing.cpp

src/tweak-context.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/zoom-status.cpp

src/verbs.cpp

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

1375

//Geom::Point gridorigin = _namedview->gridorigin;

1376

/// \todo Why was the origin corrected for the grid origin? (johan)

1377

1378

Geom::Rect const viewbox = to_2geom(_svg_canvas.spobj()->getViewbox());

1378

Geom::Rect const viewbox = _svg_canvas.spobj()->getViewbox();

1379

double lo, up, pos, max;

1380

double const scale = _desktop->current_zoom();

1381

double s = viewbox.min()[Geom::X] / scale; //- gridorigin[Geom::X];

1408

NR::Rect carea( Geom::Point(darea.min()[Geom::X] * scale - 64, darea.max()[Geom::Y] * -scale - 64),

1409

Geom::Point(darea.max()[Geom::X] * scale + 64, darea.min()[Geom::Y] * -scale + 64) );

1410

1411

NR::Rect const viewbox = _svg_canvas.spobj()->getViewbox();

1411

Geom::Rect const viewbox = _svg_canvas.spobj()->getViewbox();

1412

1413

/* Viewbox is always included into scrollable region */

1414

carea = NR::union_bounds(carea, viewbox);

1414

carea = NR::union_bounds(carea, from_2geom(viewbox));

1415

1416

Gtk::Adjustment *adj = _bottom_scrollbar.get_adjustment();

1417

adj->set_value(viewbox.min()[Geom::X]);

1642

return;

1643

}

1644

1645

Geom::Rect const area = to_2geom(_desktop->get_display_area());

1645

Geom::Rect const area = _desktop->get_display_area();

1646

double zoom = _desktop->current_zoom();

1647

1648

if (_sticky_zoom.get_active()) {

1649

/* Calculate zoom per pixel */

1650

double const zpsp = zoom / hypot(area.dimensions()[Geom::X], area.dimensions()[Geom::Y]);

1651

/* Find new visible area */

1652

Geom::Rect const newarea = to_2geom(_desktop->get_display_area());

1652

Geom::Rect const newarea = _desktop->get_display_area();

1653

/* Calculate adjusted zoom */

1654

zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]);

1655

}

Older »