diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-19 20:03:34 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-19 20:03:34 +0000 |
| commit | fa7621c1f6ff4a7203b05f43db348e48da31d211 (patch) | |
| tree | 2a6afca2b861f72494580e72b8a79462e58516f4 /src/display/drawing-text.cpp | |
| parent | Styling rotate (diff) | |
| parent | Fix bug:1634641 crash on delete (diff) | |
| download | inkscape-fa7621c1f6ff4a7203b05f43db348e48da31d211.tar.gz inkscape-fa7621c1f6ff4a7203b05f43db348e48da31d211.zip | |
Update to trunk
(bzr r15142.1.18)
Diffstat (limited to 'src/display/drawing-text.cpp')
| -rw-r--r-- | src/display/drawing-text.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index a0918e9f5..1280a2db9 100644 --- a/src/display/drawing-text.cpp +++ b/src/display/drawing-text.cpp @@ -592,17 +592,24 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are { Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - if (has_fill && fill_first) { _nrstyle.applyFill(dc); dc.fillPreserve(); } - + } + { + Inkscape::DrawingContext::Save save(dc); + if (!_style || ! _style->vector_effect.computed == SP_VECTOR_EFFECT_NON_SCALING_STROKE) { + dc.transform(_ctm); + } if (has_stroke) { _nrstyle.applyStroke(dc); dc.strokePreserve(); } - + } + { + Inkscape::DrawingContext::Save save(dc); + dc.transform(_ctm); if (has_fill && !fill_first) { _nrstyle.applyFill(dc); dc.fillPreserve(); |