~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/gradient-drag.cpp

Committer: Diederik van Lierop
Date: 2010-01-09 21:14:38 UTC
Revision ID: diederik_van_lierop_mail_at-sign_diedenrezi_dot_nl-20100109211438-ciqi6nxmir7zvv6x

Refactoring the snapping API (making it easier to maintain and understand for the devs)

files added:
src/snap-candidate.h

files modified:
src/context-fns.cpp

src/display/snap-indicator.cpp

src/display/snap-indicator.h

src/draw-context.cpp

src/gradient-drag.cpp

src/line-snapper.cpp

src/line-snapper.h

src/nodepath.cpp

src/object-snapper.cpp

src/object-snapper.h

src/satisfied-guide-cns.cpp

src/satisfied-guide-cns.h

src/selection.cpp

src/selection.h

src/seltrans.cpp

src/seltrans.h

src/snap.cpp

src/snap.h

src/snapped-point.cpp

src/snapped-point.h

src/snapper.cpp

src/snapper.h

src/sp-ellipse.cpp

src/sp-flowtext.cpp

src/sp-image.cpp

src/sp-item-group.cpp

src/sp-item-notify-moveto.cpp

src/sp-item-rm-unsatisfied-cns.cpp

src/sp-item-update-cns.cpp

src/sp-item.cpp

src/sp-item.h

src/sp-offset.cpp

src/sp-rect.cpp

src/sp-shape.cpp

src/sp-spiral.cpp

src/sp-star.cpp

src/sp-text.cpp

src/sp-use.cpp

Show diffs side-by-side

added added

removed removed

src/gradient-drag.cpp

596

597

m.setup(desktop);

598

if (!((state & GDK_SHIFT_MASK) || (state & GDK_CONTROL_MASK))) {

599

Inkscape::SnappedPoint s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_OTHER, p, Inkscape::SNAPSOURCE_HANDLE);

599

Inkscape::SnappedPoint s = m.freeSnap(Inkscape::SnapPreferences::SNAPPOINT_OTHER, Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_HANDLE));

600

if (s.getSnapped()) {

601

p = s.getPoint();

602

sp_knot_moveto (knot, p);

659

}

660

if (snap_vector) {

661

Inkscape::Snapper::ConstraintLine cl(dr_snap, p + *snap_vector - dr_snap);

662

Inkscape::SnappedPoint s = m.constrainedSnap(Inkscape::SnapPreferences::SNAPPOINT_OTHER, p + *snap_vector, Inkscape::SNAPSOURCE_HANDLE, cl);

662

Inkscape::SnappedPoint s = m.constrainedSnap(Inkscape::SnapPreferences::SNAPPOINT_OTHER, Inkscape::SnapCandidatePoint(p + *snap_vector, Inkscape::SNAPSOURCE_HANDLE), cl);

663

if (s.getSnapped()) {

664

s.setTransformation(s.getPoint() - p);

665

sc.points.push_back(s);

672

}

673

}

674

675

Inkscape::SnappedPoint bsp = m.findBestSnap(p, Inkscape::SNAPSOURCE_HANDLE, sc, true); // snap indicator will be displayed if needed

675

Inkscape::SnappedPoint bsp = m.findBestSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_HANDLE), sc, true); // snap indicator will be displayed if needed

676

677

if (bsp.getSnapped()) {

678

p += bsp.getTransformation();

Older »