summaryrefslogtreecommitdiffstats
path: root/src/draw-context.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-06-12 13:23:48 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-06-12 13:23:48 +0000
commitec95a6057c8f6facbd4f39d8f213585c4b4a5b78 (patch)
tree665545b66c35f3fad94992dc46a37ce288973da4 /src/draw-context.cpp
parentMore infrastructure to have waiting LPEs that are freshly created and applied... (diff)
downloadinkscape-ec95a6057c8f6facbd4f39d8f213585c4b4a5b78.tar.gz
inkscape-ec95a6057c8f6facbd4f39d8f213585c4b4a5b78.zip
When expecting mouse clicks for a LPE in pen context, don't concatenate with or continue existing paths
(bzr r5904)
Diffstat (limited to 'src/draw-context.cpp')
-rw-r--r--src/draw-context.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index de030c7d5..a79be9fe7 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -138,6 +138,8 @@ sp_draw_context_dispose(GObject *object)
dc->selection = NULL;
}
+ dc->waiting_LPE_type = Inkscape::LivePathEffect::INVALID_LPE;
+
spdc_free_colors(dc);
G_OBJECT_CLASS(draw_parent_class)->dispose(object);
@@ -252,6 +254,9 @@ spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item)
{
using namespace Inkscape::LivePathEffect;
+ if (!SP_IS_PEN_CONTEXT(dc))
+ return;
+
if (item) {
if (prefs_get_int_attribute("tools.freehand", "spiro-spline-mode", 0)) {
Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
@@ -259,7 +264,9 @@ spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item)
}
if (dc->waiting_LPE_type != INVALID_LPE) {
Effect::createAndApply(dc->waiting_LPE_type, dc->desktop->doc(), item);
+ dc->waiting_LPE_type = INVALID_LPE;
}
+ SP_PEN_CONTEXT(dc)->polylines_only = false;
}
}