diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-12-09 09:24:26 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-12-09 09:24:26 (GMT) |
| commit | 8a0d1d1b273fb2c0de4644d4060d8d5aae27c456 (patch) | |
| tree | 9f0c1c96d6b75d56de2be72ab3a4d1f130a5f407 /src/declarative | |
| parent | c55e7db991f7e4f7f5f443cf3ebebb709eca8d2d (diff) | |
| download | Qt-8a0d1d1b273fb2c0de4644d4060d8d5aae27c456.zip Qt-8a0d1d1b273fb2c0de4644d4060d8d5aae27c456.tar.gz Qt-8a0d1d1b273fb2c0de4644d4060d8d5aae27c456.tar.bz2 | |
Allow anchoring baseline to parent
Task-number: QT-2606
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsanchors.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp index 153149e4..b72f010 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp @@ -495,8 +495,12 @@ void QmlGraphicsAnchorsPrivate::updateVerticalAnchors() } } else if (usedAnchors & QmlGraphicsAnchors::HasBaselineAnchor) { //Handle baseline - if (baseline.item->parentItem() == item->parentItem()) { - setItemY(position(baseline.item, baseline.anchorLine) - item->baselineOffset() + baselineOffset); + if (baseline.item == item->parentItem()) { + setItemY(adjustedPosition(baseline.item, baseline.anchorLine) + - item->baselineOffset() + baselineOffset); + } else if (baseline.item->parentItem() == item->parentItem()) { + setItemY(position(baseline.item, baseline.anchorLine) + - item->baselineOffset() + baselineOffset); } } --updatingVerticalAnchor; |