diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2014-05-15 10:02:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 13:34:44 +0200 |
commit | 297ee9cc2cfbc9e797aee3ce660484f682bb4e61 (patch) | |
tree | ec48d05058d1ee2fed06122cc6d24dc6422d6f4b /src/quick | |
parent | fea26bb2941c3f24c4a5f3ad5efc1b85e0123ff3 (diff) |
Make ItemViews displayMargin work correctly when set to negative values
We need to call forceLayoutPolish instead of refillOrLayout
so that the visibility is correctly updated. Also update one
line that sets visibility in GridView
Change-Id: I29fa67cdd5196a744fab9507b4104cb83ad4bf5e
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquickgridview.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemview.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index 2c03903f36..d5ca3a128e 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -640,8 +640,8 @@ void QQuickGridViewPrivate::layoutVisibleItems(int fromModelIndex) if (colPos != col * colSize()) { colPos = col * colSize(); firstItem->setPosition(colPos, rowPos); - firstItem->setVisible(firstItem->rowPos() + rowSize() >= from && firstItem->rowPos() <= to); } + firstItem->setVisible(firstItem->rowPos() + rowSize() >= from && firstItem->rowPos() <= to); for (int i = 1; i < visibleItems.count(); ++i) { FxGridItemSG *item = static_cast<FxGridItemSG*>(visibleItems.at(i)); if (++col >= columns) { diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 87e6728f86..94abbd0954 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -481,7 +481,7 @@ void QQuickItemView::setDisplayMarginBeginning(int margin) if (d->displayMarginBeginning != margin) { d->displayMarginBeginning = margin; if (isComponentComplete()) { - d->refillOrLayout(); + d->forceLayoutPolish(); } emit displayMarginBeginningChanged(); } @@ -499,7 +499,7 @@ void QQuickItemView::setDisplayMarginEnd(int margin) if (d->displayMarginEnd != margin) { d->displayMarginEnd = margin; if (isComponentComplete()) { - d->refillOrLayout(); + d->forceLayoutPolish(); } emit displayMarginEndChanged(); } |