aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make not set to untap normally more distinct (#2746)

Browse source
This commit is contained in:
Zach H 2017-06-04 14:02:35 -04:00 committed by GitHub
parent 0a57229886
commit 99e7458f9b
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cockatrice/src/carditem.cpp
View file

@ -90,7 +90,8 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
int i = 0;
QMapIterator<int, int> counterIterator(counters);
while (counterIterator.hasNext()) {
while (counterIterator.hasNext())
{
counterIterator.next();
QColor color;
color.setHsv(counterIterator.key() * 60, 150, 255);
@ -102,7 +103,8 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QSizeF translatedSize = getTranslatedSize(painter);
qreal scaleFactor = translatedSize.width() / boundingRect().width();
if (!pt.isEmpty()) {
if (!pt.isEmpty())
{
painter->save();
transformPainter(painter, translatedSize, tapAngle);
@ -115,7 +117,9 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->setPen(QColor(255, 150, 0));
else
painter->setPen(Qt::white);
} else {
}
else
{
painter->setPen(Qt::white);
}
painter->setBackground(Qt::black);
@ -124,7 +128,9 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 10 * scaleFactor, translatedSize.height() - 8 * scaleFactor), Qt::AlignRight | Qt::AlignBottom, pt);
painter->restore();
}
if (!annotation.isEmpty()) {
if (!annotation.isEmpty())
{
painter->save();
transformPainter(painter, translatedSize, tapAngle);
@ -135,9 +141,29 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 8 * scaleFactor, translatedSize.height() - 8 * scaleFactor), Qt::AlignCenter | Qt::TextWrapAnywhere, annotation);
painter->restore();
}
if (getBeingPointedAt())
{
painter->fillRect(boundingRect(), QBrush(QColor(255, 0, 0, 100)));
painter->restore();
painter->restore();
}
if (doesntUntap)
{
painter->save();
painter->setRenderHint(QPainter::Antialiasing, false);
transformPainter(painter, translatedSize, tapAngle);
QPen pen;
pen.setColor(Qt::magenta);
const int penWidth = 1;
pen.setWidth(penWidth);
painter->setPen(pen);
painter->drawRect(QRectF(0, 0, translatedSize.width() + penWidth, translatedSize.height() - penWidth));
painter->restore();
}
}
void CardItem::setAttacking(bool _attacking)
@ -164,6 +190,7 @@ void CardItem::setAnnotation(const QString &_annotation)
void CardItem::setDoesntUntap(bool _doesntUntap)
{
doesntUntap = _doesntUntap;
update();
}
void CardItem::setPT(const QString &_pt)