diff options
| author | Suneel BS <suneel.b-s@nokia.com> | 2009-07-07 14:57:02 +0530 |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-07-09 13:10:18 +0200 |
| commit | 1c6edd28d528dbb946fcf2a9e0d4349075ca6f9b (patch) | |
| tree | e9222ab8448a7427e133f116bf92ddcb9f5efcbe /src/svg/qsvgstyle.cpp | |
| parent | 6574240d8ea657d02c3d5bf5567da7d28f42d69b (diff) | |
Fixed inheritence of SVG fill attributes.
Fixed inheritence of fill-opacity, fill-rule and fill. Autotest
included.
Reviewed-by: Kim
Diffstat (limited to 'src/svg/qsvgstyle.cpp')
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 556201b789..4c8247b5d5 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -81,12 +81,12 @@ void QSvgQualityStyle::revert(QPainter *, QSvgExtraStates &) } QSvgFillStyle::QSvgFillStyle(const QBrush &brush) - : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillOpacitySet(false), m_gradientResolved (true) + : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true) { } QSvgFillStyle::QSvgFillStyle(QSvgStyleProperty *style) - : m_style(style), m_fillRuleSet(false), m_fillOpacitySet(false), m_gradientResolved (true) + : m_style(style), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true) { } @@ -102,6 +102,16 @@ void QSvgFillStyle::setFillOpacity(qreal opacity) m_fillOpacity = opacity; } +void QSvgFillStyle::setFillStyle(QSvgStyleProperty* style) +{ + m_style = style; +} + +void QSvgFillStyle::setBrush(QBrush brush) +{ + m_fill = brush; +} + static void recursivelySetFill(QSvgNode *node, Qt::FillRule f) { if (node->type() == QSvgNode::PATH) { |