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

some (but not all) compatibility changes for qt 4.6

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-12-02 22:48:19 +01:00
parent f4c52b8178
commit fb61b442ca
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cockatrice/src/handzone.cpp
View file

@ -31,29 +31,29 @@ void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option
void HandZone::reorganizeCards() void HandZone::reorganizeCards()
{ {
if (cards.isEmpty()) if (!cards.isEmpty()) {
return; const int cardCount = cards.size();
qreal totalWidth = boundingRect().width();
const int cardCount = cards.size(); qreal totalHeight = boundingRect().height();
qreal totalWidth = boundingRect().width(); qreal cardWidth = cards.at(0)->boundingRect().width();
qreal totalHeight = boundingRect().height(); qreal cardHeight = cards.at(0)->boundingRect().height();
qreal cardWidth = cards.at(0)->boundingRect().width(); qreal xspace = 5;
qreal cardHeight = cards.at(0)->boundingRect().height(); qreal x1 = xspace;
qreal xspace = 5; qreal x2 = totalWidth - xspace - cardWidth;
qreal x1 = xspace;
qreal x2 = totalWidth - xspace - cardWidth; for (int i = 0; i < cardCount; i++) {
CardItem *c = cards.at(i);
for (int i = 0; i < cardCount; i++) { qreal x = i % 2 ? x2 : x1;
CardItem *c = cards.at(i); // If the total height of the cards is smaller than the available height,
qreal x = i % 2 ? x2 : x1; // the cards do not need to overlap and are displayed in the center of the area.
// If the total height of the cards is smaller than the available height, if (cardHeight * cardCount > totalHeight)
// the cards do not need to overlap and are displayed in the center of the area. c->setPos(x, ((qreal) i) * (totalHeight - cardHeight) / (cardCount - 1));
if (cardHeight * cardCount > totalHeight) else
c->setPos(x, ((qreal) i) * (totalHeight - cardHeight) / (cardCount - 1)); c->setPos(x, ((qreal) i) * cardHeight + (totalHeight - cardCount * cardHeight) / 2);
else c->setZValue(i);
c->setPos(x, ((qreal) i) * cardHeight + (totalHeight - cardCount * cardHeight) / 2); }
c->setZValue(i);
} }
update();
} }
void HandZone::addCardImpl(CardItem *card, int x, int /*y*/) void HandZone::addCardImpl(CardItem *card, int x, int /*y*/)

1
cockatrice/src/tablezone.cpp
View file

@ -73,6 +73,7 @@ void TableZone::handleDropEventByGrid(int cardId, CardZone *startZone, const QPo
void TableZone::reorganizeCards() void TableZone::reorganizeCards()
{ {
update();
} }
void TableZone::toggleTapped() void TableZone::toggleTapped()

1
cockatrice/src/zoneviewzone.cpp
View file

@ -127,6 +127,7 @@ void ZoneViewZone::removeCard(int position)
void ZoneViewZone::setGeometry(const QRectF &rect) void ZoneViewZone::setGeometry(const QRectF &rect)
{ {
prepareGeometryChange();
setPos(rect.topLeft()); setPos(rect.topLeft());
height = rect.height(); height = rect.height();
reorganizeCards(); reorganizeCards();