← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inkscape/oneiric-updates

« back to all changes in this revision

Viewing changes to src/spiral-context.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/spiral-context.cpp
241
241
 
242
242
                SnapManager &m = desktop->namedview->snap_manager;
243
243
                m.setup(desktop);
244
 
                Geom::Point pt2g = to_2geom(sc->center);
245
 
                m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, pt2g, Inkscape::SNAPSOURCE_HANDLE);
246
 
                sc->center = from_2geom(pt2g);
 
244
                m.freeSnapReturnByRef(sc->center, Inkscape::SNAPSOURCE_NODE_HANDLE);
247
245
 
248
246
                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
249
247
                                    ( GDK_KEY_PRESS_MASK |
273
271
 
274
272
                SnapManager &m = desktop->namedview->snap_manager;
275
273
                m.setup(desktop, true, sc->item);
276
 
                m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, motion_dt, Inkscape::SNAPSOURCE_HANDLE);
 
274
                m.freeSnapReturnByRef(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
277
275
                sp_spiral_drag(sc, from_2geom(motion_dt), event->motion.state);
278
276
 
279
277
                gobble_motion_events(GDK_BUTTON1_MASK);
280
278
 
281
279
                ret = TRUE;
 
280
            } else if (!sp_event_context_knot_mouseover(sc)) {
 
281
                SnapManager &m = desktop->namedview->snap_manager;
 
282
                m.setup(desktop);
 
283
 
 
284
                Geom::Point const motion_w(event->motion.x, event->motion.y);
 
285
                Geom::Point motion_dt(desktop->w2d(motion_w));
 
286
                m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE));
282
287
            }
283
288
            break;
284
289
        case GDK_BUTTON_RELEASE:
424
429
    SnapManager &m = desktop->namedview->snap_manager;
425
430
    m.setup(desktop, true, sc->item);
426
431
    Geom::Point pt2g = to_2geom(p);
427
 
    m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, pt2g, Inkscape::SNAPSOURCE_HANDLE);
 
432
    m.freeSnapReturnByRef(pt2g, Inkscape::SNAPSOURCE_NODE_HANDLE);
428
433
 
429
434
    Geom::Point const p0 = desktop->dt2doc(sc->center);
430
435
    Geom::Point const p1 = desktop->dt2doc(pt2g);