diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-11-05 17:10:22 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-11-05 17:10:22 +0000 |
| commit | 218c1acafd09c2b2469db082cf6e389869f9c48e (patch) | |
| tree | c7324d131df0a85effbc548e1ee35446aff25fdd /src/ui/tools/freehand-base.cpp | |
| parent | Fix angle constrain, thanks to vlada, Mc and LiamW (diff) | |
| parent | Move a header place (diff) | |
| download | inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.tar.gz inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.zip | |
Update to trunk
(bzr r15142.1.30)
Diffstat (limited to 'src/ui/tools/freehand-base.cpp')
| -rw-r--r-- | src/ui/tools/freehand-base.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 300324467..deb89b874 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -642,7 +642,10 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed) } // Step A - test, whether we ended on green anchor - if ( forceclosed || ( dc->green_anchor && dc->green_anchor->active ) ) { + if ( (forceclosed && + (!dc->sa || (dc->sa && dc->sa->curve->is_empty()))) || + ( dc->green_anchor && dc->green_anchor->active)) + { // We hit green anchor, closing Green-Blue-Red dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Path is closed.")); c->closepath_current(); @@ -724,7 +727,11 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed) e->unref(); } - + if (forceclosed) + { + dc->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Path is closed.")); + c->closepath_current(); + } spdc_flush_white(dc, c); c->unref(); |