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

Merge pull request #898 from poixen/sb_clean_lines

Browse source 
Refactored code and made lines cleaner
This commit is contained in:
Zach 2015-04-01 15:52:58 -04:00
commit 6c35253bcc
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/deckview.cpp
View file

@ -81,14 +81,12 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
AbstractCardItem::paint(painter, option, widget);
painter->save();
QPen pen;//(Qt::DotLine);
QPen pen;
pen.setWidth(3);
if (originZone == "main")
pen.setColor(QColor(0, 255, 0));
else
pen.setColor(QColor(255, 0, 0));
pen.setJoinStyle(Qt::MiterJoin);
pen.setColor(originZone == "main" ? Qt::green : Qt::red);
painter->setPen(pen);
painter->drawRect(QRectF(1.5, 1.5, CARD_WIDTH - 3, CARD_HEIGHT - 3));
painter->drawRect(QRectF(1, 1, CARD_WIDTH - 2, CARD_HEIGHT - 2.5));
painter->restore();
}

11
cockatrice/src/tab_game.cpp
View file

@ -73,11 +73,12 @@ void ToggleButton::paintEvent(QPaintEvent *event)
QPushButton::paintEvent(event);
QPainter painter(this);
if (state)
painter.setPen(QPen(Qt::green, 3));
else
painter.setPen(QPen(Qt::red, 3));
painter.drawRect(1, 1, width() - 3, height() - 3);
QPen pen;
pen.setWidth(3);
pen.setJoinStyle(Qt::MiterJoin);
pen.setColor(state ? Qt::green : Qt::red);
painter.setPen(pen);
painter.drawRect(QRect(1, 1, width() - 3, height() - 3));
}
void ToggleButton::setState(bool _state)