diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-05-07 03:41:29 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-05-07 03:41:29 (GMT) |
| commit | 2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20 (patch) | |
| tree | 891d1a70a8bc576bb4af37b21d124e6c1ee0be94 | |
| parent | d2dbe01664c1adb8d1848b566621dbe4470f184b (diff) | |
| parent | 8abba3d2ec7f6520d87271a5b74ae7b021629784 (diff) | |
| download | Qt-2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20.zip Qt-2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20.tar.gz Qt-2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -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()); |