diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-07 03:45:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-07 03:45:35 (GMT) |
| commit | acd9d0a135d054d9766e8c486c276c63c1771104 (patch) | |
| tree | 8d42e85304feac6470fda18590b3f1f5bbb26a5b /src/declarative/fx | |
| parent | 1d1acbdf3161bc5d79ddd73704687f1c604c766a (diff) | |
| parent | 2eb30b4a9c0176bdf8737f0ed8b1496770cc1d20 (diff) | |
| download | Qt-acd9d0a135d054d9766e8c486c276c63c1771104.zip Qt-acd9d0a135d054d9766e8c486c276c63c1771104.tar.gz Qt-acd9d0a135d054d9766e8c486c276c63c1771104.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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()); |