Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
27d95426
Commit
27d95426
authored
Nov 09, 2010
by
Max-Wilhelm Bruker
Browse files
card drag item bug fix + minor visual change
parent
179f1fe1
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/abstractcarddragitem.cpp
View file @
27d95426
...
@@ -8,7 +8,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPoint
...
@@ -8,7 +8,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPoint
{
{
if
(
parentDrag
)
{
if
(
parentDrag
)
{
parentDrag
->
addChildDrag
(
this
);
parentDrag
->
addChildDrag
(
this
);
setZValue
(
1
00000000
0
+
hotSpot
.
x
()
*
1000000
+
hotSpot
.
y
()
*
1000
+
1000
);
setZValue
(
2
00000000
7
+
hotSpot
.
x
()
*
1000000
+
hotSpot
.
y
()
*
1000
+
1000
);
}
else
{
}
else
{
if
((
hotSpot
.
x
()
<
0
)
||
(
hotSpot
.
y
()
<
0
))
{
if
((
hotSpot
.
x
()
<
0
)
||
(
hotSpot
.
y
()
<
0
))
{
qDebug
(
QString
(
"CardDragItem: coordinate overflow: x = %1, y = %2"
).
arg
(
hotSpot
.
x
()).
arg
(
hotSpot
.
y
()).
toLatin1
());
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
...
@@ -18,7 +18,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, const QPoint
hotSpot
=
QPointF
(
CARD_WIDTH
,
CARD_HEIGHT
);
hotSpot
=
QPointF
(
CARD_WIDTH
,
CARD_HEIGHT
);
}
}
setCursor
(
Qt
::
ClosedHandCursor
);
setCursor
(
Qt
::
ClosedHandCursor
);
setZValue
(
1
00000000
0
);
setZValue
(
2
00000000
7
);
}
}
if
(
item
->
getTapped
())
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
));
setTransform
(
QTransform
().
translate
((
float
)
CARD_WIDTH
/
2
,
(
float
)
CARD_HEIGHT
/
2
).
rotate
(
90
).
translate
((
float
)
-
CARD_WIDTH
/
2
,
(
float
)
-
CARD_HEIGHT
/
2
));
...
...
cockatrice/src/messagelogwidget.cpp
View file @
27d95426
...
@@ -379,9 +379,9 @@ void MessageLogWidget::logRevealCards(Player *player, CardZone *zone, int cardId
...
@@ -379,9 +379,9 @@ void MessageLogWidget::logRevealCards(Player *player, CardZone *zone, int cardId
void
MessageLogWidget
::
logSetActivePlayer
(
Player
*
player
)
void
MessageLogWidget
::
logSetActivePlayer
(
Player
*
player
)
{
{
append
(
"---"
);
append
(
QString
()
);
append
(
"<font color=
\"
green
\"
>"
+
tr
(
"It is now %1's turn."
).
arg
(
player
->
getName
())
+
"</font>"
);
append
(
"<font color=
\"
green
\"
>
<b>
"
+
tr
(
"It is now %1's turn."
).
arg
(
player
->
getName
())
+
"</
b></
font>"
);
append
(
"---"
);
append
(
QString
()
);
}
}
void
MessageLogWidget
::
logSetActivePhase
(
int
phase
)
void
MessageLogWidget
::
logSetActivePhase
(
int
phase
)
...
@@ -400,7 +400,7 @@ void MessageLogWidget::logSetActivePhase(int phase)
...
@@ -400,7 +400,7 @@ void MessageLogWidget::logSetActivePhase(int phase)
case
9
:
phaseName
=
tr
(
"second main phase"
);
break
;
case
9
:
phaseName
=
tr
(
"second main phase"
);
break
;
case
10
:
phaseName
=
tr
(
"ending phase"
);
break
;
case
10
:
phaseName
=
tr
(
"ending phase"
);
break
;
}
}
append
(
"<font color=
\"
green
\"
>"
+
tr
(
"It is now the %1."
).
arg
(
phaseName
)
+
"</font>"
);
append
(
"<font color=
\"
green
\"
>
<b>
"
+
tr
(
"It is now the %1."
).
arg
(
phaseName
)
+
"</
b></
font>"
);
}
}
void
MessageLogWidget
::
connectToPlayer
(
Player
*
player
)
void
MessageLogWidget
::
connectToPlayer
(
Player
*
player
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment