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

Don't have widget hold pointer to state -> Copy what we need and subscribe to changes.

Browse source 
Took 12 minutes

Took 5 seconds
This commit is contained in:
Lukas Brübach 2026-05-21 06:42:07 +02:00
parent 2063be6fa0
commit 46e7455d09
4 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/game/board/counter_general.cpp
View file

@ -13,7 +13,7 @@ GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool us
QRectF GeneralCounter::boundingRect() const
{
return QRectF(0, 0, state->getRadius() * 2, state->getRadius() * 2);
return QRectF(0, 0, radius * 2, radius * 2);
}
void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@ -21,19 +21,19 @@ void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /
QRectF mapRect = painter->combinedTransform().mapRect(boundingRect());
int translatedHeight = mapRect.size().height();
qreal scaleFactor = translatedHeight / boundingRect().height();
QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, state->getName(), hovered);
QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, name, hovered);
painter->save();
resetPainterTransform(painter);
painter->drawPixmap(QPoint(0, 0), pixmap);
if (state->getValue()) {
if (value) {
QFont f("Serif");
f.setPixelSize(qMax((int)(state->getRadius() * scaleFactor), 10));
f.setPixelSize(qMax((int)(radius * scaleFactor), 10));
f.setWeight(QFont::Bold);
painter->setPen(Qt::black);
painter->setFont(f);
painter->drawText(mapRect, Qt::AlignCenter, QString::number(state->getValue()));
painter->drawText(mapRect, Qt::AlignCenter, QString::number(value));
}
painter->restore();
}