From: cilix42 <cilix42@users.sourceforge.net>
Date: Tue, 19 Feb 2008 01:42:46 +0000 (+0000)
Subject: Union paths automatically in pencil and calligraphy context when Shift-Lock is presse... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16b0b62107d766d7f89abc2a8f152fc400954673;p=inkscape.git

Union paths automatically in pencil and calligraphy context when Shift-Lock is pressed (closes: LP 190846)
---

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 666ea4d2d..d4cd49cac 100644
--- 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 1088e19ed..6bd4cd0b3 100644
--- 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