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

economic layout bug fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-22 14:27:14 +02:00
parent 42363840be
commit 79a3a1a0b4
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cockatrice/src/tablezone.cpp
View file

@ -209,23 +209,21 @@ CardItem *TableZone::getCardFromCoords(const QPointF &point) const
QPointF TableZone::mapFromGrid(const QPoint &gridPoint) const QPointF TableZone::mapFromGrid(const QPoint &gridPoint) const
{ {
if ((gridPoint.y() == 3) && (settingsCache->getEconomicGrid())) qreal x, y;
return QPointF( if ((gridPoint.y() == 3) && (settingsCache->getEconomicGrid())) {
marginX + (CARD_WIDTH * gridPoint.x() + CARD_WIDTH * (gridPoint.x() / 3)) / 2, x = marginX + (CARD_WIDTH * gridPoint.x() + CARD_WIDTH * (gridPoint.x() / 3)) / 2;
boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y() + (gridPoint.x() % 3 * CARD_HEIGHT) / 3 y = boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y() + (gridPoint.x() % 3 * CARD_HEIGHT) / 3;
); } else {
else { x = marginX + 0.5 * CARD_WIDTH * gridPoint.x();
qreal x = marginX + 0.5 * CARD_WIDTH * gridPoint.x();
for (int i = 0; i < gridPoint.x(); ++i) for (int i = 0; i < gridPoint.x(); ++i)
x += gridPointWidth.value(gridPoint.y() * 1000 + i, CARD_WIDTH); x += gridPointWidth.value(gridPoint.y() * 1000 + i, CARD_WIDTH);
qreal y = boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y(); y = boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y();
if (player->getMirrored())
y = height - CARD_HEIGHT - y;
return QPointF(x, y);
} }
if (player->getMirrored())
y = height - CARD_HEIGHT - y;
return QPointF(x, y);
} }
QPoint TableZone::mapToGrid(const QPointF &mapPoint) const QPoint TableZone::mapToGrid(const QPointF &mapPoint) const