Union paths automatically in pencil and calligraphy context when Shift-Lock is presse...

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 666ea4d2da0132db2bb9ea3b55df7c03be703b0b..d4cd49cac05593ce647e170ad4eb56078e84283c 100644 (file)
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -888,7 +888,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             /* Create object */
             fit_and_split(dc, TRUE);
             accumulate_calligraphic(dc);
-            set_to_accumulated(dc, event->button.state & GDK_SHIFT_MASK); // performs document_done
+            set_to_accumulated(dc, (event->button.state & GDK_SHIFT_MASK) ||
+                                   (event->button.state & GDK_LOCK_MASK)); // performs document_done
 
             /* reset accumulated curve */
             sp_curve_reset(dc->accumulated);

diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp
index 1088e19ed9f3a299a5d9881cc08b18776f0d8a2d..6bd4cd0b3fb5f2f398b5310d30d1f326b08b7659 100644 (file)
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -238,7 +238,8 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve
                     desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Continuing selected path"));
                 } else {
 
-                    if (!(bevent.state & GDK_SHIFT_MASK)) {
+                    if (!(bevent.state & GDK_SHIFT_MASK) &&
+                        !(bevent.state & GDK_LOCK_MASK)) {
 
                         // This is the first click of a new curve; deselect item so that
                         // this curve is not combined with it (unless it is drawn from its