summaryrefslogtreecommitdiffstats
path: root/src/pencil-context.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-02-19 01:42:46 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-02-19 01:42:46 +0000
commit68bc931be9ef891e4605e063e0078dcfdd0ea8c9 (patch)
tree1fba36e305c0813865251f97f30fb9aee221fc21 /src/pencil-context.cpp
parentAdd zh_CN tutorial translations. (diff)
downloadinkscape-68bc931be9ef891e4605e063e0078dcfdd0ea8c9.tar.gz
inkscape-68bc931be9ef891e4605e063e0078dcfdd0ea8c9.zip
Union paths automatically in pencil and calligraphy context when Shift-Lock is pressed (closes: LP 190846)
(bzr r4771)
Diffstat (limited to 'src/pencil-context.cpp')
-rw-r--r--src/pencil-context.cpp3
1 files changed, 2 insertions, 1 deletions
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