archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-15 03:08:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix game list ordering

Browse source 
Game ordering was broken when clicking on the name column or
adding/removing a favorite.

Unlike the standard lib's that requires a strict weak ordering
comparator, wxWidgets needs a compare function that returns a negative
number, 0 or a positive number when entries are respectively lower than,
equal to and greater than.

Fixed using C++20 comparison API.
This commit is contained in:
bitscher 2022-09-03 01:29:32 -07:00
parent 76126e69b2
commit 4a3b2e0381
1 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/gui/components/wxGameList.cpp
View file

@ -278,23 +278,27 @@ void wxGameList::UpdateItemColors(sint32 startIndex)
} }
} }
static inline int strongorder_to_int(const std::strong_ordering &wo)
{
/* No easy conversion seems to exists in C++20 */
if (wo < 0)
return -1;
else if (wo > 0)
return 1;
return 0;
}
int wxGameList::SortComparator(uint64 titleId1, uint64 titleId2, SortData* sortData) int wxGameList::SortComparator(uint64 titleId1, uint64 titleId2, SortData* sortData)
{ {
//if(sortData->column == ColumnGameStarted) const auto isFavoriteA = GetConfig().IsGameListFavorite(titleId1);
// return boost::ilexicographical_compare(name1, name2) ? 0 : 1; const auto isFavoriteB = GetConfig().IsGameListFavorite(titleId2);
const auto& name1 = GetNameByTitleId(titleId1);
const auto& name2 = GetNameByTitleId(titleId2);
if(sortData->dir > 0)
bool isFavoriteA = GetConfig().IsGameListFavorite(titleId1); return strongorder_to_int(std::tie(isFavoriteB, name1) <=> std::tie(isFavoriteA, name2));
bool isFavoriteB = GetConfig().IsGameListFavorite(titleId2); else
if (isFavoriteA != isFavoriteB) return strongorder_to_int(std::tie(isFavoriteB, name2) <=> std::tie(isFavoriteA, name1));
return isFavoriteB;
// default to name
std::string name1 = GetNameByTitleId(titleId1);
std::string name2 = GetNameByTitleId(titleId2);
if(sortData->dir)
return boost::ilexicographical_compare(name1, name2) ? 0 : 1;
return boost::ilexicographical_compare(name1, name2) ? 1 : 0;
} }
int wxGameList::SortFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData) int wxGameList::SortFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
@ -842,20 +846,13 @@ int wxGameList::FindInsertPosition(TitleId titleId)
if (itemCount == 0) if (itemCount == 0)
return 0; return 0;
// todo - optimize this with binary search // todo - optimize this with binary search
int linearScanIndex = 0;
if (SortComparator(titleId, (uint64)GetItemData(0), &data)) for (int i = 0; i < itemCount; i++)
{ {
linearScanIndex = itemCount; if (SortComparator(titleId, (uint64)GetItemData(i), &data) <= 0)
for (int i = 1; i < itemCount - 1; i++) return i;
{
if (!SortComparator(titleId, (uint64)GetItemData(i), &data))
{
linearScanIndex = i;
break;
}
}
} }
return linearScanIndex; return itemCount;
} }
void wxGameList::OnGameEntryUpdatedByTitleId(wxTitleIdEvent& event) void wxGameList::OnGameEntryUpdatedByTitleId(wxTitleIdEvent& event)