diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-12-09 09:09:36 (GMT) |
| commit | 91518478d32a5d5ce188b02f92e744fc782dd687 (patch) | |
| tree | b1ac54dd94358b0ad406c22d80b40f871fd196eb /src/gui/graphicsview/qgridlayoutengine_p.h | |
| parent | 1e84041247505502fa3b3f4865126719321f70d3 (diff) | |
| parent | 40d8ec7118d5f39acec3f71d33a87f0483bd2b2b (diff) | |
| download | Qt-91518478d32a5d5ce188b02f92e744fc782dd687.zip Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.gz Qt-91518478d32a5d5ce188b02f92e744fc782dd687.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgridlayoutengine_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h index 02c74b0..44efbba 100644 --- a/src/gui/graphicsview/qgridlayoutengine_p.h +++ b/src/gui/graphicsview/qgridlayoutengine_p.h @@ -224,13 +224,16 @@ public: typedef QMap<QPair<int, int>, QGridLayoutMultiCellData> MultiCellMap; +class QGridLayoutRowInfo; + class QGridLayoutRowData { public: void reset(int count); - void distributeMultiCells(); + void distributeMultiCells(const QGridLayoutRowInfo &rowInfo); void calculateGeometries(int start, int end, qreal targetSize, qreal *positions, qreal *sizes, - qreal *descents, const QGridLayoutBox &totalBox); + qreal *descents, const QGridLayoutBox &totalBox, + const QGridLayoutRowInfo &rowInfo); QGridLayoutBox totalBox(int start, int end) const; void stealBox(int start, int end, int which, qreal *positions, qreal *sizes); |