From 27d954267c30930b77e66da949d3f99dd16e5892 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Tue, 9 Nov 2010 21:13:39 +0100 Subject: [PATCH] card drag item bug fix + minor visual change --- cockatrice/src/abstractcarddragitem.cpp | 4 ++-- cockatrice/src/messagelogwidget.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/abstractcarddragitem.cpp b/cockatrice/src/abstractcarddragitem.cpp index 7b4e93ef..42287038 100644 --- a/cockatrice/src/abstractcarddragitem.cpp +++ b/cockatrice/src/abstractcarddragitem.cpp @@ -8,7 +8,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPoint { if (parentDrag) { parentDrag->addChildDrag(this); - setZValue(1000000000 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000); + setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000); } else { if ((hotSpot.x() < 0) || (hotSpot.y() < 0)) { qDebug(QString("CardDragItem: coordinate overflow: x = %1, y = %2").arg(hotSpot.x()).arg(hotSpot.y()).toLatin1()); @@ -18,7 +18,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPoint hotSpot = QPointF(CARD_WIDTH, CARD_HEIGHT); } setCursor(Qt::ClosedHandCursor); - setZValue(1000000000); + setZValue(2000000007); } if (item->getTapped()) setTransform(QTransform().translate((float) CARD_WIDTH / 2, (float) CARD_HEIGHT / 2).rotate(90).translate((float) -CARD_WIDTH / 2, (float) -CARD_HEIGHT / 2)); diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp index 54059e3a..5353a324 100644 --- a/cockatrice/src/messagelogwidget.cpp +++ b/cockatrice/src/messagelogwidget.cpp @@ -379,9 +379,9 @@ void MessageLogWidget::logRevealCards(Player *player, CardZone *zone, int cardId void MessageLogWidget::logSetActivePlayer(Player *player) { - append("---"); - append("" + tr("It is now %1's turn.").arg(player->getName()) + ""); - append("---"); + append(QString()); + append("" + tr("It is now %1's turn.").arg(player->getName()) + ""); + append(QString()); } void MessageLogWidget::logSetActivePhase(int phase) @@ -400,7 +400,7 @@ void MessageLogWidget::logSetActivePhase(int phase) case 9: phaseName = tr("second main phase"); break; case 10: phaseName = tr("ending phase"); break; } - append("" + tr("It is now the %1.").arg(phaseName) + ""); + append("" + tr("It is now the %1.").arg(phaseName) + ""); } void MessageLogWidget::connectToPlayer(Player *player)