diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-02-19 01:42:46 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-02-19 01:42:46 +0000 |
| commit | 68bc931be9ef891e4605e063e0078dcfdd0ea8c9 (patch) | |
| tree | 1fba36e305c0813865251f97f30fb9aee221fc21 /src | |
| parent | Add zh_CN tutorial translations. (diff) | |
| download | inkscape-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')
| -rw-r--r-- | src/dyna-draw-context.cpp | 3 | ||||
| -rw-r--r-- | src/pencil-context.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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 |