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

Merge pull request #12258 from zfox23/commerce_fixSortingAgain

Browse source 
Fix Purchases sorting (again); Fix (i) icon loading
This commit is contained in:
Zach Fox 2018-01-25 17:35:26 -08:00 committed by GitHub
commit b41129f81b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/qml/hifi/commerce/common/SortableListModel.qml
View file

@ -22,7 +22,7 @@ ListModel {
function swap(a, b) { function swap(a, b) {
if (a < b) { if (a < b) {
move(a, b, 1); move(a, b, 1);
move (b - 1, a, 1); move(b - 1, a, 1);
} else if (a > b) { } else if (a > b) {
move(b, a, 1); move(b, a, 1);
move(a - 1, b, 1); move(a - 1, b, 1);
@ -34,16 +34,17 @@ ListModel {
var piv = get(pivot)[sortColumnName]; var piv = get(pivot)[sortColumnName];
swap(pivot, end - 1); swap(pivot, end - 1);
var store = begin; var store = begin;
var i;
for (var i = begin; i < end - 1; ++i) { for (i = begin; i < end - 1; ++i) {
var currentElement = get(i)[sortColumnName]; var currentElement = get(i)[sortColumnName];
if (isSortingDescending) { if (isSortingDescending) {
if (currentElement < piv) { if (currentElement > piv) {
swap(store, i); swap(store, i);
++store; ++store;
} }
} else { } else {
if (currentElement > piv) { if (currentElement < piv) {
swap(store, i); swap(store, i);
++store; ++store;
} }
@ -56,16 +57,17 @@ ListModel {
var piv = get(pivot)[sortColumnName].toLowerCase(); var piv = get(pivot)[sortColumnName].toLowerCase();
swap(pivot, end - 1); swap(pivot, end - 1);
var store = begin; var store = begin;
var i;
for (var i = begin; i < end - 1; ++i) { for (i = begin; i < end - 1; ++i) {
var currentElement = get(i)[sortColumnName].toLowerCase(); var currentElement = get(i)[sortColumnName].toLowerCase();
if (isSortingDescending) { if (isSortingDescending) {
if (currentElement < piv) { if (currentElement > piv) {
swap(store, i); swap(store, i);
++store; ++store;
} }
} else { } else {
if (currentElement > piv) { if (currentElement < piv) {
swap(store, i); swap(store, i);
++store; ++store;
} }

8
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -317,6 +317,7 @@ Rectangle {
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: filterBar; id: filterBar;
property string previousText: "";
colorScheme: hifi.colorSchemes.faintGray; colorScheme: hifi.colorSchemes.faintGray;
hasClearButton: true; hasClearButton: true;
hasRoundedBorder: true; hasRoundedBorder: true;
@ -329,6 +330,8 @@ Rectangle {
onTextChanged: { onTextChanged: {
buildFilteredPurchasesModel(); buildFilteredPurchasesModel();
purchasesContentsList.positionViewAtIndex(0, ListView.Beginning)
filterBar.previousText = filterBar.text;
} }
onAccepted: { onAccepted: {
@ -647,7 +650,8 @@ Rectangle {
function sortByDate() { function sortByDate() {
filteredPurchasesModel.sortColumnName = "purchase_date"; filteredPurchasesModel.sortColumnName = "purchase_date";
filteredPurchasesModel.isSortingDescending = false; filteredPurchasesModel.isSortingDescending = true;
filteredPurchasesModel.valuesAreNumerical = true;
filteredPurchasesModel.quickSort(); filteredPurchasesModel.quickSort();
} }
@ -677,7 +681,7 @@ Rectangle {
} }
} }
if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== "") { if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== filterBar.previousText) {
filteredPurchasesModel.clear(); filteredPurchasesModel.clear();
for (var i = 0; i < tempPurchasesModel.count; i++) { for (var i = 0; i < tempPurchasesModel.count; i++) {
filteredPurchasesModel.append(tempPurchasesModel.get(i)); filteredPurchasesModel.append(tempPurchasesModel.get(i));