jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 19:47:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nullcheck printing's set in home tab background art crop (#6646)

Browse source 
* nullcheck printing's set in home tab background art crop

* set warning and properly set timer

* fix merge
This commit is contained in:
ebbit1q 2026-03-04 00:49:50 +01:00 • committed by GitHub
parent 566c876bdc
commit b36ab66583
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

46
cockatrice/src/interface/widgets/general/home_widget.cpp
View file

@ -58,21 +58,24 @@ void HomeWidget::initializeBackgroundFromSource()
auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource()); auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
cardChangeTimer->stop();
switch (backgroundSourceType) { switch (backgroundSourceType) {
case BackgroundSources::Theme: case BackgroundSources::Theme:
cardChangeTimer->stop();
background = QPixmap("theme:backgrounds/home"); background = QPixmap("theme:backgrounds/home");
backgroundSourceDeck = DeckList();
backgroundSourceCard->setCard(ExactCard()); backgroundSourceCard->setCard(ExactCard());
updateButtonsToBackgroundColor(); updateButtonsToBackgroundColor();
update(); update();
break; break;
case BackgroundSources::RandomCardArt: case BackgroundSources::RandomCardArt:
cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000); backgroundSourceDeck = DeckList();
updateRandomCard();
onBackgroundShuffleFrequencyChanged();
break; break;
case BackgroundSources::DeckFileArt: case BackgroundSources::DeckFileArt:
loadBackgroundSourceDeck(); loadBackgroundSourceDeck();
cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000); updateRandomCard();
onBackgroundShuffleFrequencyChanged();
break; break;
} }
} }
@ -84,6 +87,20 @@ void HomeWidget::loadBackgroundSourceDeck()
backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList(); backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList();
} }
void HomeWidget::setRandomCard(ExactCard &newCard)
{
static constexpr int ATTEMPTS = 10;
for (int i = 0; i < ATTEMPTS; ++i) {
ExactCard tmpCard = CardDatabaseManager::query()->getRandomCard();
if (tmpCard != backgroundSourceCard->getCard() && tmpCard.getCardPtr()->getProperty("layout") == "normal" &&
tmpCard.getPrinting().getSet() != nullptr) {
newCard = tmpCard;
return;
}
}
qWarning() << "failed to set random card image after" << ATTEMPTS << "attempts";
}
void HomeWidget::updateRandomCard() void HomeWidget::updateRandomCard()
{ {
auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource()); auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
@ -94,10 +111,7 @@ void HomeWidget::updateRandomCard()
case BackgroundSources::Theme: case BackgroundSources::Theme:
break; break;
case BackgroundSources::RandomCardArt: case BackgroundSources::RandomCardArt:
do { setRandomCard(newCard);
newCard = CardDatabaseManager::query()->getRandomCard();
} while (newCard == backgroundSourceCard->getCard() &&
newCard.getCardPtr()->getProperty("layout") != "normal");
break; break;
case BackgroundSources::DeckFileArt: case BackgroundSources::DeckFileArt:
QList<CardRef> cardRefs = backgroundSourceDeck.getCardRefList(); QList<CardRef> cardRefs = backgroundSourceDeck.getCardRefList();
@ -126,19 +140,14 @@ void HomeWidget::updateRandomCard()
connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties); connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
backgroundSourceCard->setCard(newCard); backgroundSourceCard->setCard(newCard);
background = backgroundSourceCard->getBackground(); background = backgroundSourceCard->getBackground();
if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
cardChangeTimer->stop();
}
} }
void HomeWidget::onBackgroundShuffleFrequencyChanged() void HomeWidget::onBackgroundShuffleFrequencyChanged()
{ {
cardChangeTimer->stop(); cardChangeTimer->stop();
if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) { if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() > 0) {
return; cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
} }
cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
} }
void HomeWidget::updateBackgroundProperties() void HomeWidget::updateBackgroundProperties()
@ -325,8 +334,11 @@ void HomeWidget::paintEvent(QPaintEvent *event)
QString cardName; QString cardName;
ExactCard card = backgroundSourceCard->getCard(); ExactCard card = backgroundSourceCard->getCard();
if (card) { if (card) {
cardName = card.getCardPtr()->getName() + " (" + card.getPrinting().getSet()->getCorrectedShortName() + ") " + cardName = card.getCardPtr()->getName();
card.getPrinting().getProperty("num"); if (card.getPrinting().getSet() != nullptr) {
cardName += " (" + card.getPrinting().getSet()->getCorrectedShortName() + ") " +
card.getPrinting().getProperty("num");
}
} }
if (!cardName.isEmpty() && SettingsCache::instance().getHomeTabDisplayCardName()) { if (!cardName.isEmpty() && SettingsCache::instance().getHomeTabDisplayCardName()) {

1
cockatrice/src/interface/widgets/general/home_widget.h
View file

@ -45,6 +45,7 @@ private:
QPair<QColor, QColor> gradientColors; QPair<QColor, QColor> gradientColors;
HomeStyledButton *connectButton; HomeStyledButton *connectButton;
void setRandomCard(ExactCard &newCard);
void loadBackgroundSourceDeck(); void loadBackgroundSourceDeck();
}; };