diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-03-08 15:15:44 (GMT) |
---|---|---|
committer | Samuli Piippo <samuli.piippo@digia.com> | 2011-06-09 10:05:04 (GMT) |
commit | a6ea47b0ced2b07cc1b2ec3562e23fa3153dffb4 (patch) | |
tree | 2c71d165639f73af741918b8f25f7a74775ebfe0 /src/svg/qsvgstructure_p.h | |
parent | 902071c2233145453f15bbbded446ad294c9c4a1 (diff) | |
download | Qt-a6ea47b0ced2b07cc1b2ec3562e23fa3153dffb4.zip Qt-a6ea47b0ced2b07cc1b2ec3562e23fa3153dffb4.tar.gz Qt-a6ea47b0ced2b07cc1b2ec3562e23fa3153dffb4.tar.bz2 |
Fixed bounds calculation in QtSvg.
This commit fixes an auto-test failure after fixing QTBUG-8733.
The calculated element bounds should now be much tighter and
respect the width of non-cosmetic pens.
Task-number: QTBUG-8733
Reviewed-by: Trond
(cherry picked from commit ea9f2aeba6f18d19d6a82b3a829373ec032af14f)
Diffstat (limited to 'src/svg/qsvgstructure_p.h')
-rw-r--r-- | src/svg/qsvgstructure_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index 510b167..3052fde 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -74,14 +74,13 @@ public: ~QSvgStructureNode(); QSvgNode *scopeNode(const QString &id) const; void addChild(QSvgNode *child, const QString &id); - virtual QRectF bounds() const; + virtual QRectF bounds(QPainter *p, QSvgExtraStates &states) const; QSvgNode *previousSiblingNode(QSvgNode *n) const; QList<QSvgNode*> renderers() const { return m_renderers; } protected: QList<QSvgNode*> m_renderers; QHash<QString, QSvgNode*> m_scope; QList<QSvgStructureNode*> m_linkedScopes; - mutable QRectF m_bounds; }; class QSvgG : public QSvgStructureNode |