nicer looking counters on cards

cockatrice/src/abstractgraphicsitem.cpp

 #include "abstractgraphicsitem.h"
 #include <QPainter>
 
-void AbstractGraphicsItem::paintNumberEllipse(int number, int fontSize, const QColor &color, int position, QPainter *painter)
+void AbstractGraphicsItem::paintNumberEllipse(int number, int fontSize, const QColor &color, int position, int count, QPainter *painter)
 {
 	painter->save();
 
@@ -31,8 +31,13 @@ void AbstractGraphicsItem::paintNumberEllipse(int number, int fontSize, const QC
 	if (position == -1)
 		textRect = QRectF((boundingRect().width() - w) / 2.0, (boundingRect().height() - h) / 2.0, w, h);
 	else {
-		qreal offset = boundingRect().width() / 20.0;
-		textRect = QRectF(offset, offset * (position + 1) + h * position, w, h);
+		qreal xOffset = 10;
+		qreal yOffset = 20;
+		qreal spacing = 2;
+		if (position < 2)
+			textRect = QRectF(count == 1 ? ((boundingRect().width() - w) / 2.0) : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)), yOffset, w, h);
+		else
+			textRect = QRectF(count == 3 ? ((boundingRect().width() - w) / 2.0) : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)), yOffset + (spacing + h) * (position / 2), w, h);
 	}
 	
 	painter->drawEllipse(textRect);

cockatrice/src/abstractgraphicsitem.h

@@ -5,7 +5,7 @@
 
 class AbstractGraphicsItem : public QGraphicsItem {
 protected:
-	void paintNumberEllipse(int number, int radius, const QColor &color, int position, QPainter *painter);
+	void paintNumberEllipse(int number, int radius, const QColor &color, int position, int count, QPainter *painter);
 public:
 	AbstractGraphicsItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent) { }
 };

cockatrice/src/carditem.cpp

@@ -34,7 +34,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 		QColor color;
 		color.setHsv(counterIterator.key() * 60, 150, 255);
 		
-		paintNumberEllipse(counterIterator.value(), 14, color, i, painter);
+		paintNumberEllipse(counterIterator.value(), 14, color, i, counters.size(), painter);
 		++i;
 	}
 	if (!pt.isEmpty()) {

cockatrice/src/handcounter.cpp

@@ -42,5 +42,5 @@ void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
 	painter->drawPixmap(cachedPixmap.rect(), cachedPixmap, cachedPixmap.rect());
 	painter->restore();
 	
-	paintNumberEllipse(number, 24, Qt::white, -1, painter);
+	paintNumberEllipse(number, 24, Qt::white, -1, -1, painter);
 }

cockatrice/src/pilezone.cpp

@@ -28,7 +28,7 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 		painter->restore();
 	}
 
-	paintNumberEllipse(cards.size(), 32, Qt::white, -1, painter);
+	paintNumberEllipse(cards.size(), 32, Qt::white, -1, -1, painter);
 	painter->drawRect(QRectF(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1));
 }