diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 02:28:36 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 02:28:36 (GMT) |
| commit | 54e7c7d8990a792e7f5bb4429dd48fba108ba24a (patch) | |
| tree | f0426e5c1990fdfb3f44b6a67038dfaef742d946 /src/declarative/fx/qfxgridview.cpp | |
| parent | 9a69890dee24a26efde615e18f1ed7aa79eb441c (diff) | |
| parent | 1e71ce9f221c739f03c9e6d49faf7cd7b0c85ae2 (diff) | |
| download | Qt-54e7c7d8990a792e7f5bb4429dd48fba108ba24a.zip Qt-54e7c7d8990a792e7f5bb4429dd48fba108ba24a.tar.gz Qt-54e7c7d8990a792e7f5bb4429dd48fba108ba24a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxgridview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxgridview.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index acfb57e..9e6f2c9 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -319,6 +319,8 @@ void QFxGridViewPrivate::init() { Q_Q(QFxGridView); q->setOptions(QFxGridView::IsFocusRealm); + QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(sizeChange())); + QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(sizeChange())); } void QFxGridViewPrivate::clear() @@ -996,26 +998,9 @@ void QFxGridView::setCellHeight(int cellHeight) } } -/*! - \reimp -*/ -void QFxGridView::setHeight(int height) -{ - Q_D(QFxGridView); - QFxFlickable::setHeight(height); - if (isComponentComplete()) { - d->updateGrid(); - d->layout(); - } -} - -/*! - \reimp -*/ -void QFxGridView::setWidth(int width) +void QFxGridView::sizeChange() { Q_D(QFxGridView); - QFxFlickable::setWidth(width); if (isComponentComplete()) { d->updateGrid(); d->layout(); |