diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:04 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:04 (GMT) |
| commit | d2eb1ed680353dc326b68119c384d0f09d4aae62 (patch) | |
| tree | cac4b62d51bd6732ab48527d71843496636a8844 /src/gui/graphicsview/qgridlayoutengine.cpp | |
| parent | c7bf2d79f37ac302dad9a5782645bd3f465bb47d (diff) | |
| parent | c1f9978c9d61bcbdb2f280185a3abdea13d7f532 (diff) | |
| download | Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.zip Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.tar.gz Qt-d2eb1ed680353dc326b68119c384d0f09d4aae62.tar.bz2 | |
Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7
Diffstat (limited to 'src/gui/graphicsview/qgridlayoutengine.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index 98e6781..f8cd593 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -306,20 +306,19 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz ultimatePreferredSize = ultimatePreferredSize * 3 / 2; ultimateSumPreferredSizes = ultimateSumPreferredSizes * 3 / 2; - qreal ultimateFactor = (stretch * ultimateSumPreferredSizes - / sumStretches) - - (box.q_preferredSize); - qreal transitionalFactor = sumCurrentAvailable - * (ultimatePreferredSize - box.q_preferredSize) - / (ultimateSumPreferredSizes - - sumPreferredSizes); - - qreal alpha = qMin(sumCurrentAvailable, - ultimateSumPreferredSizes - sumPreferredSizes); qreal beta = ultimateSumPreferredSizes - sumPreferredSizes; + if (!beta) { + factors[i] = 1; + } else { + qreal alpha = qMin(sumCurrentAvailable, beta); + qreal ultimateFactor = (stretch * ultimateSumPreferredSizes / sumStretches) + - (box.q_preferredSize); + qreal transitionalFactor = sumCurrentAvailable * (ultimatePreferredSize - box.q_preferredSize) / beta; + + factors[i] = ((alpha * ultimateFactor) + + ((beta - alpha) * transitionalFactor)) / beta; + } - factors[i] = ((alpha * ultimateFactor) - + ((beta - alpha) * transitionalFactor)) / beta; } sumFactors += factors[i]; if (desired < sumCurrentAvailable) |