summaryrefslogtreecommitdiffstats
path: root/src/draw-context.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-07-04 11:32:17 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-07-04 11:32:17 +0000
commite9f717dfb78be5fa48a9b09b07d489c83a0c4f4d (patch)
treeaab06f1fb9e98fe13c0286ea808f834437508d78 /src/draw-context.cpp
parentRemove oncanvas_editable attribute for PointParams; use their internal shape ... (diff)
downloadinkscape-e9f717dfb78be5fa48a9b09b07d489c83a0c4f4d.tar.gz
inkscape-e9f717dfb78be5fa48a9b09b07d489c83a0c4f4d.zip
Make pen/pencil shapes work in spiro mode, too
(bzr r6152)
Diffstat (limited to 'src/draw-context.cpp')
-rw-r--r--src/draw-context.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index c946acabe..e8b755b9b 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -270,8 +270,11 @@ spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item)
using namespace Inkscape::LivePathEffect;
if (item) {
- int shape = prefs_get_int_attribute("tools.freehand", "shape", 0);
+ if (prefs_get_int_attribute("tools.freehand", "spiro-spline-mode", 0)) {
+ Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
+ }
+ int shape = prefs_get_int_attribute("tools.freehand", "shape", 0);
bool shape_applied = false;
SPCSSAttr *css_item = sp_css_attr_from_object (SP_OBJECT(item), SP_STYLE_FLAG_ALWAYS);
const char *cstroke = sp_repr_css_property(css_item, "stroke", "none");
@@ -335,10 +338,6 @@ spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item)
return;
}
- if (prefs_get_int_attribute("tools.freehand", "spiro-spline-mode", 0)) {
- Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
- return;
- }
if (dc->waiting_LPE_type != INVALID_LPE) {
Effect::createAndApply(dc->waiting_LPE_type, dc->desktop->doc(), item);
dc->waiting_LPE_type = INVALID_LPE;