Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix MS17469: Fix conditionals for needing more paginated results when ListView changes

Browse source
This commit is contained in:
Zach Fox 2018-08-09 10:22:09 -07:00
parent 16b483b338
commit 4248f342b4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/models/PSFListModel.qml
View file

@ -57,9 +57,9 @@ ListModel {
// Not normally set directly, but rather by giving a truthy argument to getFirstPage(true); // Not normally set directly, but rather by giving a truthy argument to getFirstPage(true);
property bool delayedClear: false; property bool delayedClear: false;
function resetModel() { function resetModel() {
if (!delayedClear) { root.clear(); }
currentPageToRetrieve = 1; currentPageToRetrieve = 1;
retrievedAtLeastOnePage = false; retrievedAtLeastOnePage = false;
if (!delayedClear) { root.clear(); }
totalPages = 0; totalPages = 0;
totalEntries = 0; totalEntries = 0;
} }
@ -94,11 +94,13 @@ ListModel {
function needsMoreHorizontalResults() { function needsMoreHorizontalResults() {
return flickable return flickable
&& currentPageToRetrieve > 0 && currentPageToRetrieve > 0
&& retrievedAtLeastOnePage
&& flickable.contentWidth < flickable.width; && flickable.contentWidth < flickable.width;
} }
function needsMoreVerticalResults() { function needsMoreVerticalResults() {
return flickable return flickable
&& currentPageToRetrieve > 0 && currentPageToRetrieve > 0
&& retrievedAtLeastOnePage
&& flickable.contentHeight < flickable.height; && flickable.contentHeight < flickable.height;
} }
function getNextPageIfNotEnoughHorizontalResults() { function getNextPageIfNotEnoughHorizontalResults() {