← Back to branch summary

~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/pen-context.cpp

  • Committer: JazzyNico
  • Date: 2011-08-29 20:25:30 UTC
  • Revision ID: nicoduf@yahoo.fr-20110829202530-6deuoz11q90usldv
Code refactoring and merging with trunk (revision 10599).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pen-context.cpp
31
31
#include "message-context.h"
32
32
#include "preferences.h"
33
33
#include "sp-path.h"
 
34
#include "display/sp-canvas.h"
34
35
#include "display/curve.h"
35
36
#include "pixmaps/cursor-pen.xpm"
36
37
#include "display/canvas-bpath.h"
37
38
#include "display/sp-ctrlline.h"
38
39
#include "display/sodipodi-ctrl.h"
39
40
#include <glibmm/i18n.h>
40
 
#include "libnr/nr-point-ops.h"
41
41
#include "helper/units.h"
42
42
#include "macros.h"
43
43
#include "context-fns.h"
476
476
                                    SnapManager &m = desktop->namedview->snap_manager;
477
477
                                    m.setup(desktop);
478
478
                                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_NODE_HANDLE);
 
479
                                    m.unSetup();
479
480
                                }
480
481
                              spdc_create_single_dot(event_context, p, "/tools/freehand/pen", bevent.state);
481
482
                              ret = TRUE;
633
634
                        SnapManager &m = dt->namedview->snap_manager;
634
635
                        m.setup(dt);
635
636
                        m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_NODE_HANDLE));
 
637
                        m.unSetup();
636
638
                    }
637
639
                    break;
638
640
                case SP_PEN_CONTEXT_CONTROL:
683
685
                            SnapManager &m = dt->namedview->snap_manager;
684
686
                            m.setup(dt);
685
687
                            m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_NODE_HANDLE));
 
688
                            m.unSetup();
686
689
                        }
687
690
                    }
688
691
                    break;
709
712
                        SnapManager &m = dt->namedview->snap_manager;
710
713
                        m.setup(dt);
711
714
                        m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_NODE_HANDLE));
 
715
                        m.unSetup();
712
716
                    }
713
717
                    break;
714
718
            }
908
912
    if (last_seg) {
909
913
        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const *>( last_seg );
910
914
        if ( cubic &&
911
 
             (*cubic)[2] != to_2geom(pc->p[0]) )
 
915
             (*cubic)[2] != pc->p[0] )
912
916
        {
913
917
            Geom::Point p2 = (*cubic)[2];
914
918
            SP_CTRL(pc->c0)->moveto(p2);
984
988
 
985
989
    gint ret = FALSE;
986
990
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
987
 
    gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px
 
991
    gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000, "px"); // in px
988
992
 
989
993
    switch (get_group0_keyval (&event->key)) {
990
994
 
1470
1474
        }
1471
1475
    } else {
1472
1476
        // Create a horizontal or vertical constraint line
1473
 
        Inkscape::Snapper::ConstraintLine cl(origin, next_dir ? Geom::Point(0, 1) : Geom::Point(1, 0));
 
1477
        Inkscape::Snapper::SnapConstraint cl(origin, next_dir ? Geom::Point(0, 1) : Geom::Point(1, 0));
1474
1478
 
1475
1479
        // Snap along the constraint line; if we didn't snap then still the constraint will be applied
1476
1480
        SnapManager &m = pc->desktop->namedview->snap_manager;
1481
1485
 
1482
1486
        m.setup(pc->desktop, true, selection->singleItem());
1483
1487
        m.constrainedSnapReturnByRef(pt, Inkscape::SNAPSOURCE_NODE_HANDLE, cl);
 
1488
        m.unSetup();
1484
1489
    }
1485
1490
}
1486
1491
 
1493
1498
  fill-column:99
1494
1499
  End:
1495
1500
*/
1496
 
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
 
1501
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :