jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 02:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[PrintingSelector] Properly clamp text size to picture on load (#6576)

Browse source
This commit is contained in:
RickyRister 2026-01-27 17:49:54 -08:00 • committed by GitHub
parent 7b64970e97
commit 165c4ddd2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
View file

@ -223,7 +223,6 @@ void PrintingSelector::getAllSetsForCurrentCard()
auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(this, deckEditor, deckStateManager, auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(this, deckEditor, deckStateManager,
cardSizeWidget->getSlider(), card); cardSizeWidget->getSlider(), card);
flowWidget->addWidget(cardDisplayWidget); flowWidget->addWidget(cardDisplayWidget);
cardDisplayWidget->clampSetNameToPicture();
cardDisplayWidget->updateCardAmounts(uuidToAmounts); cardDisplayWidget->updateCardAmounts(uuidToAmounts);
connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this, connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this,
&PrintingSelector::updateDisplay); &PrintingSelector::updateDisplay);

6
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
View file

@ -70,3 +70,9 @@ void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap<QString, QP
auto [main, side] = uuidToAmounts.value(rootCard.getPrinting().getUuid()); auto [main, side] = uuidToAmounts.value(rootCard.getPrinting().getUuid());
overlayWidget->updateCardAmounts(main, side); overlayWidget->updateCardAmounts(main, side);
} }
void PrintingSelectorCardDisplayWidget::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
clampSetNameToPicture();
}

2
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
View file

@ -29,6 +29,8 @@ public slots:
void clampSetNameToPicture(); void clampSetNameToPicture();
void updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts); void updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts);
void resizeEvent(QResizeEvent *event) override;
signals: signals:
void cardPreferenceChanged(); void cardPreferenceChanged();

6
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
View file

@ -60,12 +60,6 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
allZonesCardAmountWidget->raise(); // Ensure it's on top of the picture allZonesCardAmountWidget->raise(); // Ensure it's on top of the picture
// Attempt to cast the parent to PrintingSelectorCardDisplayWidget
if (const auto *parentWidget = qobject_cast<PrintingSelectorCardDisplayWidget *>(parent)) {
connect(cardInfoPicture, &CardInfoPictureWidget::cardScaleFactorChanged, parentWidget,
&PrintingSelectorCardDisplayWidget::clampSetNameToPicture);
}
connect(cardSizeSlider, &QSlider::valueChanged, cardInfoPicture, &CardInfoPictureWidget::setScaleFactor); connect(cardSizeSlider, &QSlider::valueChanged, cardInfoPicture, &CardInfoPictureWidget::setScaleFactor);
} }