summaryrefslogtreecommitdiffstats
path: root/src/svg/qsvgstyle_p.h
diff options
context:
space:
mode:
authorSuneel BS <suneel.b-s@nokia.com>2009-07-07 09:27:02 (GMT)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2009-07-09 11:10:18 (GMT)
commit1c6edd28d528dbb946fcf2a9e0d4349075ca6f9b (patch)
treee9222ab8448a7427e133f116bf92ddcb9f5efcbe /src/svg/qsvgstyle_p.h
parent6574240d8ea657d02c3d5bf5567da7d28f42d69b (diff)
downloadQt-1c6edd28d528dbb946fcf2a9e0d4349075ca6f9b.zip
Qt-1c6edd28d528dbb946fcf2a9e0d4349075ca6f9b.tar.gz
Qt-1c6edd28d528dbb946fcf2a9e0d4349075ca6f9b.tar.bz2
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_p.h')
-rw-r--r--src/svg/qsvgstyle_p.h28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index f1d0811..ac5e109 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -224,12 +224,29 @@ public:
void setFillRule(Qt::FillRule f);
void setFillOpacity(qreal opacity);
+ void setFillStyle(QSvgStyleProperty* style);
+ void setBrush(QBrush brush);
const QBrush & qbrush() const
{
return m_fill;
}
+ qreal fillOpacity() const
+ {
+ return m_fillOpacity;
+ }
+
+ Qt::FillRule fillRule() const
+ {
+ return m_fillRule;
+ }
+
+ QSvgStyleProperty* style() const
+ {
+ return m_style;
+ }
+
void setGradientId(const QString &Id)
{
m_gradientId = Id;
@@ -240,7 +257,6 @@ public:
return m_gradientId;
}
-
void setGradientResolved(bool resolved)
{
m_gradientResolved = resolved;
@@ -251,16 +267,6 @@ public:
return m_gradientResolved;
}
- void setFillStyle(QSvgStyleProperty* style)
- {
- m_style = style;
- }
-
- void setBrush(QBrush brush)
- {
- m_fill = brush;
- }
-
private:
// fill v v 'inherit' | <Paint.datatype>
// fill-opacity v v 'inherit' | <OpacityValue.datatype>