diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-10-28 04:51:32 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-10-28 04:51:32 (GMT) |
commit | 1a50a1ca052e1f130c2cdbfbd67a3bfc3d6de0c8 (patch) | |
tree | e3a9008af95930c9609c636f23d0f11c6b076b1b /src/declarative | |
parent | da87fe823c6e249de20ea6a38482b387dcfbbef7 (diff) | |
parent | 1f8a4748e860d259d525e47426fd3a1072d9fb5c (diff) | |
download | Qt-1a50a1ca052e1f130c2cdbfbd67a3bfc3d6de0c8.zip Qt-1a50a1ca052e1f130c2cdbfbd67a3bfc3d6de0c8.tar.gz Qt-1a50a1ca052e1f130c2cdbfbd67a3bfc3d6de0c8.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/fx/qfxitem.cpp | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxpositioners.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index e714494..7d60336 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1199,7 +1199,7 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj) /*! \class QFxItem - \brief QFxItem is the most basic of all visual items in QML. + \brief The QFxItem class provides the most basic of all visual items in QML. All visual items in Qt Declarative inherit from QFxItem. Although QFxItem has no visual appearance, it defines all the properties that are diff --git a/src/declarative/fx/qfxpositioners.cpp b/src/declarative/fx/qfxpositioners.cpp index f8e7213..cc385e0 100644 --- a/src/declarative/fx/qfxpositioners.cpp +++ b/src/declarative/fx/qfxpositioners.cpp @@ -659,8 +659,10 @@ void QFxRow::doPositioning() child->setX(hoffset); setMovingItem(0); } - hoffset += child->width(); - hoffset += spacing(); + if(!child->width() || !child->height()){//don't advance for invisible children + hoffset += child->width(); + hoffset += spacing(); + } } } |