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
40d292c4
Commit
40d292c4
authored
Jul 02, 2009
by
Max-Wilhelm Bruker
Browse files
really fixed zone view bug
parent
f308e9ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
40d292c4
...
...
@@ -4,6 +4,7 @@
#include
"playerarea.h"
#include
"counter.h"
#include
"zoneviewzone.h"
#include
"zoneviewwidget.h"
#include
"game.h"
#include
<QGraphicsScene>
#include
<QMenu>
...
...
@@ -157,7 +158,7 @@ void Player::gameEvent(const ServerEventData &event)
// Clean up existing zones first
for
(
int
i
=
0
;
i
<
zones
.
size
();
i
++
)
{
if
(
ZoneViewZone
*
view
=
zones
.
at
(
i
)
->
getView
())
emit
closeZoneView
(
view
);
((
ZoneViewWidget
*
)
view
->
parentItem
())
->
close
(
);
zones
.
at
(
i
)
->
clearContents
();
}
...
...
cockatrice/src/zoneviewlayout.cpp
View file @
40d292c4
...
...
@@ -36,7 +36,7 @@ void ZoneViewLayout::toggleZoneView(Player *player, const QString &zoneName, int
for
(
int
i
=
0
;
i
<
views
.
size
();
i
++
)
{
ZoneViewZone
*
temp
=
views
[
i
]
->
getZone
();
if
((
temp
->
getName
()
==
zoneName
)
&&
(
temp
->
getPlayer
()
==
player
))
{
// view is already open
removeItem
(
views
[
i
]);
views
[
i
]
->
close
(
);
if
(
temp
->
getNumberCards
()
==
numberCards
)
return
;
}
...
...
@@ -51,7 +51,7 @@ void ZoneViewLayout::toggleZoneView(Player *player, const QString &zoneName, int
void
ZoneViewLayout
::
removeItem
(
ZoneViewWidget
*
item
)
{
qDebug
(
"ZoneViewLayout::removeItem"
);
delete
views
.
tak
eAt
(
views
.
indexOf
(
item
));
views
.
remov
eAt
(
views
.
indexOf
(
item
));
reorganize
();
}
...
...
cockatrice/src/zoneviewwidget.cpp
View file @
40d292c4
...
...
@@ -69,5 +69,6 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
if
(
shuffleCheckBox
->
isChecked
())
player
->
client
->
shuffle
();
emit
closePressed
(
this
);
deleteLater
();
event
->
accept
();
}
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