summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2009-11-09 17:14:07 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2009-11-09 17:14:07 +0000
commitf8320ca81e834951f4fb9b3d4dcf48f2db5d6fc3 (patch)
treec5a02f13b10c16db8ddda9f552646352e42e4a16 /src
parentPatch for 456148 by Johan (diff)
downloadinkscape-f8320ca81e834951f4fb9b3d4dcf48f2db5d6fc3.tar.gz
inkscape-f8320ca81e834951f4fb9b3d4dcf48f2db5d6fc3.zip
regression patch from 388257
(bzr r8826)
Diffstat (limited to 'src')
-rw-r--r--src/extension/internal/cairo-render-context.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 721d3addc..023a9b837 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -1541,17 +1541,14 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Matrix const *font_ma
} else {
bool fill = false, stroke = false, have_path = false;
if (style->fill.isColor() || style->fill.isPaintserver()) {
- // set fill style
- _setFillStyle(style, NULL);
fill = true;
}
if (style->stroke.isColor() || style->stroke.isPaintserver()) {
- // set stroke style
- _setStrokeStyle(style, NULL);
stroke = true;
}
if (fill) {
+ _setFillStyle(style, NULL);
if (_is_texttopath) {
_showGlyphs(_cr, font, glyphtext, true);
have_path = true;
@@ -1562,6 +1559,7 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Matrix const *font_ma
}
}
if (stroke) {
+ _setStrokeStyle(style, NULL);
if (!have_path) _showGlyphs(_cr, font, glyphtext, true);
cairo_stroke(_cr);
}