jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prefer enabled sets when loading images; fix #1235

Browse source
This commit is contained in:
Fabio Bas 2015-07-22 17:35:44 +02:00
parent 0d5e169648
commit 90655ff631
3 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cockatrice/src/carddatabase.cpp
View file

@ -92,7 +92,7 @@ void CardSet::setIsKnown(bool _isknown)
settings.setValue("isknown", isknown);
}
class SetList::CompareFunctor {
class SetList::KeyCompareFunctor {
public:
inline bool operator()(CardSet *a, CardSet *b) const
{
@ -102,7 +102,39 @@ public:
void SetList::sortByKey()
{
qSort(begin(), end(), CompareFunctor());
qSort(begin(), end(), KeyCompareFunctor());
}
class SetList::EnabledAndKeyCompareFunctor {
public:
inline bool operator()(CardSet *a, CardSet *b) const
{
if(a->getEnabled())
{
if(b->getEnabled())
{
// both enabled: sort by key
return a->getSortKey() < b->getSortKey();
} else {
// only a enabled
return true;
}
} else {
if(b->getEnabled())
{
// only b enabled
return false;
} else {
// both disabled: sort by key
return a->getSortKey() < b->getSortKey();
}
}
}
};
void SetList::sortByEnabledAndKey()
{
qSort(begin(), end(), EnabledAndKeyCompareFunctor());
}
int SetList::getEnabledSetsNum()
@ -185,7 +217,7 @@ PictureToLoad::PictureToLoad(CardInfo *_card, bool _hq)
{
if (card) {
sortedSets = card->getSets();
sortedSets.sortByKey();
sortedSets.sortByEnabledAndKey();
}
}