diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-05-04 18:29:38 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-05-04 18:29:38 +0000 |
| commit | c6e6a641344a9d14272d1d90a8aa3b28440d341e (patch) | |
| tree | 8e2cdeef2db9295d42afb5aaa9eee41b6ebf86fa /src/display/drawing-text.cpp | |
| parent | Fix an issue with doOnRemove not being called (diff) | |
| parent | Fix bounding box cache issues in general, and prevent the selector tool from ... (diff) | |
| download | inkscape-c6e6a641344a9d14272d1d90a8aa3b28440d341e.tar.gz inkscape-c6e6a641344a9d14272d1d90a8aa3b28440d341e.zip | |
Update to trunk
(bzr r13090.1.71)
Diffstat (limited to 'src/display/drawing-text.cpp')
| -rw-r--r-- | src/display/drawing-text.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index a280e221a..4178cb1d8 100644 --- a/src/display/drawing-text.cpp +++ b/src/display/drawing-text.cpp @@ -451,7 +451,6 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); -#ifdef WITH_SVG2 // Text doesn't have markers, we can do paint-order quick and dirty. bool fill_first = false; if( _nrstyle.paint_order_layer[0] == NRStyle::PAINT_ORDER_NORMAL || @@ -461,22 +460,20 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are } // Won't get "stroke fill stroke" but that isn't 'valid' if (has_fill && fill_first) { -#else - if (has_fill) { -#endif _nrstyle.applyFill(dc); dc.fillPreserve(); } + if (has_stroke) { _nrstyle.applyStroke(dc); dc.strokePreserve(); } -#ifdef WITH_SVG2 + if (has_fill && !fill_first) { _nrstyle.applyFill(dc); dc.fillPreserve(); } -#endif + dc.newPath(); // clear path // draw text decoration |