mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-13 05:20:00 -08:00
Fix empty catalogue loaded state and compact Essence selection behavior
This commit is contained in:
parent
a7222c92f9
commit
5ebf12977d
1 changed files with 11 additions and 2 deletions
|
|
@ -110,6 +110,12 @@ void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar essence)
|
|||
}
|
||||
}
|
||||
|
||||
// The empty selection means "Any Essence", not "exclude everything".
|
||||
if (essencePicker->activeEssences().isEmpty()) {
|
||||
filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (currentMode) {
|
||||
case FilterMode::ExactMatch:
|
||||
case FilterMode::IncludeExclude:
|
||||
|
|
@ -136,8 +142,11 @@ void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
|
|||
filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor);
|
||||
|
||||
const QSet<QChar> selected = essencePicker->activeEssences();
|
||||
for (const QChar essence : Essence::symbols()) {
|
||||
handleColorToggled(essence, selected.contains(essence));
|
||||
// No selections should never generate 15 mutually excluding filters.
|
||||
if (!selected.isEmpty()) {
|
||||
for (const QChar essence : Essence::symbols()) {
|
||||
handleColorToggled(essence, selected.contains(essence));
|
||||
}
|
||||
}
|
||||
|
||||
filterModel->blockSignals(false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue