diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-07 01:56:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-07 01:56:07 (GMT) |
| commit | 6f0a647810e5d826116590dd64aa5ddd87e61aad (patch) | |
| tree | f99f41843ad960271c30c0e35c7faefc72bc16d8 /src/declarative/fx | |
| parent | 5a99adc119c798276c5a14fbf3da250afeb3640a (diff) | |
| download | Qt-6f0a647810e5d826116590dd64aa5ddd87e61aad.zip Qt-6f0a647810e5d826116590dd64aa5ddd87e61aad.tar.gz Qt-6f0a647810e5d826116590dd64aa5ddd87e61aad.tar.bz2 | |
Layouts should only modify items in their direction of operation
Diffstat (limited to 'src/declarative/fx')
| -rw-r--r-- | src/declarative/fx/qfxlayouts.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index 85b198e..e95998b 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -361,7 +361,12 @@ void QFxBaseLayout::preLayout() if (item->isVisible()){ if (!d->_animated.contains(item)){ setMovingItem(item); - item->setPos(QPointF(item->x()+d->_margin, item->y()+d->_margin)); + QPointF p(item->x(), item->y()); + if(d->aut & Horizontal) + p.setX(p.x() + d->_margin); + if(d->aut & Vertical) + p.setY(p.y() + d->_margin); + item->setPos(p); setMovingItem(0); } width = qMax(width, item->x() + item->width()); |