Marking the tests as failing.

[inkscape.git] / src / pencil-context.cpp

diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 3e3a95c24922eabbfebfcc9df048cfc2077da460..d6050ba04e9da0e8f495a334991af59887bffdfa 100644 (file)
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -255,15 +255,13 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
                 /* Set first point of sequence */
                SnapManager &m = desktop->namedview->snap_manager;
                                m.setup(desktop);
-                               sp_canvas_set_snap_delay_active(desktop->canvas, true);
 
                 if (bevent.state & GDK_CONTROL_MASK) {
-                       if (!(bevent.state & GDK_SHIFT_MASK)) {
-                               m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, p, Inkscape::SNAPSOURCE_HANDLE);
-                       }
-                                       spdc_create_single_dot(event_context, p, "/tools/freehand/pencil", bevent.state);
-                                       sp_canvas_set_snap_delay_active(desktop->canvas, false);
-                                       ret = true;
+                    if (!(bevent.state & GDK_SHIFT_MASK)) {
+                        m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, p, Inkscape::SNAPSOURCE_HANDLE);
+                         }
+                    spdc_create_single_dot(event_context, p, "/tools/freehand/pencil", bevent.state);
+                    ret = true;
                     break;
                 }
                 if (anchor) {
@@ -358,7 +356,7 @@ pencil_handle_motion_notify(SPPencilContext *const pc, GdkEventMotion const &mev
             /* We may be idle or already freehand */
             if ( mevent.state & GDK_BUTTON1_MASK && pc->is_drawing ) {
                 if (pc->state == SP_PENCIL_CONTEXT_IDLE) {
-                       sp_canvas_set_snap_delay_active(dt->canvas, false);
+                       sp_event_context_discard_delayed_snap_event(event_context);
                 }
                pc->state = SP_PENCIL_CONTEXT_FREEHAND;
 
@@ -428,7 +426,6 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
                 if (!(revent.state & GDK_CONTROL_MASK)) {
                     // Ctrl+click creates a single point so only set context in ADDLINE mode when Ctrl isn't pressed
                     pc->state = SP_PENCIL_CONTEXT_ADDLINE;
-                    //sp_canvas_set_snap_delay_active(dt->canvas, true);
                 }
                 ret = TRUE;
                 break;
@@ -443,7 +440,7 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
                 spdc_set_endpoint(pc, p);
                 spdc_finish_endpoint(pc);
                 pc->state = SP_PENCIL_CONTEXT_IDLE;
-                sp_canvas_set_snap_delay_active(dt->canvas, false);
+                sp_event_context_discard_delayed_snap_event(event_context);
                 ret = TRUE;
                 break;
             case SP_PENCIL_CONTEXT_FREEHAND:
@@ -457,7 +454,6 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
                     }
 
                     pc->state = SP_PENCIL_CONTEXT_SKETCH;
-                    //sp_canvas_set_snap_delay_active(dt->canvas, true);
                 } else {
                     /* Finish segment now */
                     /// \todo fixme: Clean up what follows (Lauris)
@@ -477,7 +473,6 @@ pencil_handle_button_release(SPPencilContext *const pc, GdkEventButton const &re
                         pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor);
                     }
                     pc->state = SP_PENCIL_CONTEXT_IDLE;
-                    // sp_canvas_set_snap_delay_active(dt->canvas, false);
                     // reset sketch mode too
                     pc->sketch_n = 0;
                 }
@@ -510,7 +505,7 @@ pencil_cancel (SPPencilContext *const pc)
 
     pc->is_drawing = false;
     pc->state = SP_PENCIL_CONTEXT_IDLE;
-    sp_canvas_set_snap_delay_active(pc->desktop->canvas, false);
+    sp_event_context_discard_delayed_snap_event(SP_EVENT_CONTEXT(pc));
 
     pc->red_curve->reset();
     sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), NULL);
@@ -601,7 +596,7 @@ pencil_handle_key_release(SPPencilContext *const pc, guint const keyval, guint c
                     pc->green_anchor = sp_draw_anchor_destroy(pc->green_anchor);
                 }
                 pc->state = SP_PENCIL_CONTEXT_IDLE;
-                sp_canvas_set_snap_delay_active(pc->desktop->canvas, false);
+                sp_event_context_discard_delayed_snap_event(SP_EVENT_CONTEXT(pc));
                 pc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing freehand sketch"));
                 ret = TRUE;
             }