summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-02-19 09:52:46 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-02-19 09:52:46 +0000
commit80649bcd3a103bcfa2377f8d51522cb234d803ea (patch)
tree2ed5ca6a762ed07f941c06ff72b6aefd78d293f0 /src
parentNew submenu for tuning swatch appearance (diff)
downloadinkscape-80649bcd3a103bcfa2377f8d51522cb234d803ea.tar.gz
inkscape-80649bcd3a103bcfa2377f8d51522cb234d803ea.zip
Revert #17388 as per buliabyaks comment in LP
(bzr r4774)
Diffstat (limited to 'src')
-rw-r--r--src/dyna-draw-context.cpp3
-rw-r--r--src/pencil-context.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index d4cd49cac..666ea4d2d 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -888,8 +888,7 @@ 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) ||
- (event->button.state & GDK_LOCK_MASK)); // performs document_done
+ set_to_accumulated(dc, event->button.state & GDK_SHIFT_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 6bd4cd0b3..1088e19ed 100644
--- a/src/pencil-context.cpp
+++ b/src/pencil-context.cpp
@@ -238,8 +238,7 @@ 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) &&
- !(bevent.state & GDK_LOCK_MASK)) {
+ if (!(bevent.state & GDK_SHIFT_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