← Back to branch summary

~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/node-context.cpp

  • Committer: Ted Gould
  • Date: 2008-11-21 05:24:08 UTC
  • Revision ID: ted@canonical.com-20081121052408-tilucis2pjrrpzxx
Merge from fe-moved

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/node-context.cpp
444
444
            if (event->type == GDK_BUTTON_RELEASE) {
445
445
                event_context->xp = event_context->yp = 0;
446
446
                if (event->button.button == 1) {
447
 
                    boost::optional<Geom::Rect> b = Inkscape::Rubberband::get(desktop)->getRectangle();
 
447
                    Geom::OptRect b = Inkscape::Rubberband::get(desktop)->getRectangle();
448
448
 
449
449
                    if (nc->shape_editor->hits_curve() && !event_context->within_tolerance) { //drag curve
450
450
                        nc->shape_editor->finish_drag();
634
634
                    break;
635
635
                case GDK_Escape:
636
636
                {
637
 
                    boost::optional<Geom::Rect> const b = Inkscape::Rubberband::get(desktop)->getRectangle();
 
637
                    Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle();
638
638
                    if (b) {
639
639
                        Inkscape::Rubberband::get(desktop)->stop();
640
640
                        nc->current_state = SP_NODE_CONTEXT_INACTIVE;