55a2f75d16
* Make cards rounded Magic cards have rounded corners, and playing cards tend to have rounded corners as well, but Cockatrice currently displays rectangular cards. This can cause visual glitches when using image scans where the border does not extend in the corner, and for this reason Cockatrice always draws a (rectangular) border around the card to try and make it look a bit better. In this patch I take a different approach: rather than try to make rounded pegs, er, cards, go into a square hole, the hole is now rounded. More precisely, the AbstractCardItem now has a rounded rectangular shape (with a corner of 5% of the width of the card, identical to that of modern M:TG physical cards). As a side effect, the card drawing gets a bit simplified by getting rid of transformPainter() when drawing the card outline and using the QPainter::drawPixmap overloads that takes a target QRectF instead. This means we no longer have to bother about card rotation when painting since that's taken care of by the Graphics View framework (which transformPainter() undoes). * format * Also give PileZone rounded corners * Forgot untap status + bits of CardDragItem * fix deckviewcard calculations * Rounded CardInfoPicture
100 lines
3.3 KiB
C++
100 lines
3.3 KiB
C++
#include "carddragitem.h"
|
|
|
|
#include "carditem.h"
|
|
#include "cardzone.h"
|
|
#include "gamescene.h"
|
|
#include "tablezone.h"
|
|
#include "zoneviewzone.h"
|
|
|
|
#include <QCursor>
|
|
#include <QGraphicsSceneMouseEvent>
|
|
#include <QPainter>
|
|
|
|
CardDragItem::CardDragItem(CardItem *_item,
|
|
int _id,
|
|
const QPointF &_hotSpot,
|
|
bool _faceDown,
|
|
AbstractCardDragItem *parentDrag)
|
|
: AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), occupied(false), currentZone(0)
|
|
{
|
|
}
|
|
|
|
void CardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
|
|
{
|
|
AbstractCardDragItem::paint(painter, option, widget);
|
|
|
|
if (occupied)
|
|
painter->fillPath(shape(), QColor(200, 0, 0, 100));
|
|
}
|
|
|
|
void CardDragItem::updatePosition(const QPointF &cursorScenePos)
|
|
{
|
|
QList<QGraphicsItem *> colliding =
|
|
scene()->items(cursorScenePos, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder,
|
|
static_cast<GameScene *>(scene())->getViewTransform());
|
|
|
|
CardZone *cardZone = 0;
|
|
ZoneViewZone *zoneViewZone = 0;
|
|
for (int i = colliding.size() - 1; i >= 0; i--) {
|
|
CardZone *temp = qgraphicsitem_cast<CardZone *>(colliding.at(i));
|
|
if (!cardZone)
|
|
cardZone = temp;
|
|
if (!zoneViewZone)
|
|
zoneViewZone = qobject_cast<ZoneViewZone *>(temp);
|
|
}
|
|
CardZone *cursorZone = 0;
|
|
if (zoneViewZone)
|
|
cursorZone = zoneViewZone;
|
|
else if (cardZone)
|
|
cursorZone = cardZone;
|
|
if (!cursorZone)
|
|
return;
|
|
currentZone = cursorZone;
|
|
|
|
QPointF zonePos = currentZone->scenePos();
|
|
QPointF cursorPosInZone = cursorScenePos - zonePos;
|
|
QPointF cardTopLeft = cursorPosInZone - hotSpot;
|
|
QPointF closestGridPoint = cursorZone->closestGridPoint(cardTopLeft);
|
|
QPointF newPos = zonePos + closestGridPoint;
|
|
|
|
if (newPos != pos()) {
|
|
for (int i = 0; i < childDrags.size(); i++)
|
|
childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot());
|
|
setPos(newPos);
|
|
|
|
bool newOccupied = false;
|
|
TableZone *table = qobject_cast<TableZone *>(cursorZone);
|
|
if (table)
|
|
if (table->getCardFromCoords(closestGridPoint))
|
|
newOccupied = true;
|
|
if (newOccupied != occupied) {
|
|
occupied = newOccupied;
|
|
update();
|
|
}
|
|
}
|
|
}
|
|
|
|
void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
setCursor(Qt::OpenHandCursor);
|
|
QGraphicsScene *sc = scene();
|
|
QPointF sp = pos();
|
|
sc->removeItem(this);
|
|
|
|
QList<CardDragItem *> dragItemList;
|
|
CardZone *startZone = static_cast<CardItem *>(item)->getZone();
|
|
if (currentZone && !(static_cast<CardItem *>(item)->getAttachedTo() && (startZone == currentZone))) {
|
|
dragItemList.append(this);
|
|
for (int i = 0; i < childDrags.size(); i++) {
|
|
CardDragItem *c = static_cast<CardDragItem *>(childDrags[i]);
|
|
if (!(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone)) && !c->occupied)
|
|
dragItemList.append(c);
|
|
sc->removeItem(c);
|
|
}
|
|
}
|
|
|
|
if (currentZone)
|
|
currentZone->handleDropEvent(dragItemList, startZone, (sp - currentZone->scenePos()).toPoint());
|
|
|
|
event->accept();
|
|
}
|