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
425790e3
Commit
425790e3
authored
Apr 27, 2015
by
Zach H
Browse files
Fixed incorrect zone positioning
parent
1ca561de
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/gamescene.cpp
View file @
425790e3
...
...
@@ -114,14 +114,14 @@ void GameScene::rearrange()
void
GameScene
::
toggleZoneView
(
Player
*
player
,
const
QString
&
zoneName
,
int
numberCards
)
{
for
(
int
i
=
0
;
i
<
zoneViews
.
size
();
i
++
)
{
ZoneViewZone
*
temp
=
zoneViews
[
i
]
->
getZone
();
if
((
temp
->
getName
()
==
zoneName
)
&&
(
temp
->
getPlayer
()
==
player
))
{
// view is already open
zoneViews
[
i
]
->
close
();
if
(
temp
->
getNumberCards
()
==
numberCards
)
return
;
}
for
(
int
i
=
0
;
i
<
zoneViews
.
size
();
i
++
)
{
ZoneViewZone
*
temp
=
zoneViews
[
i
]
->
getZone
();
if
((
temp
->
getName
()
==
zoneName
)
&&
(
temp
->
getPlayer
()
==
player
))
{
// view is already open
zoneViews
[
i
]
->
close
();
if
(
temp
->
getNumberCards
()
==
numberCards
)
return
;
}
}
ZoneViewWidget
*
item
=
new
ZoneViewWidget
(
player
,
player
->
getZones
().
value
(
zoneName
),
numberCards
,
false
);
zoneViews
.
append
(
item
);
...
...
@@ -198,8 +198,13 @@ void GameScene::processViewSizeChange(const QSize &newSize)
qreal
extraWidthPerColumn
=
(
newWidth
-
minWidth
)
/
playersByColumn
.
size
();
for
(
int
col
=
0
;
col
<
playersByColumn
.
size
();
++
col
)
for
(
int
row
=
0
;
row
<
playersByColumn
[
col
].
size
();
++
row
)
for
(
int
row
=
0
;
row
<
playersByColumn
[
col
].
size
();
++
row
)
{
playersByColumn
[
col
][
row
]
->
processSceneSizeChange
(
minWidthByColumn
[
col
]
+
extraWidthPerColumn
);
if
(
col
==
0
)
playersByColumn
[
col
][
row
]
->
setPos
(
phasesToolbar
->
getWidth
(),
playersByColumn
[
col
][
row
]
->
y
());
else
playersByColumn
[
col
][
row
]
->
setPos
(
phasesToolbar
->
getWidth
()
+
(
newWidth
-
phasesToolbar
->
getWidth
())
/
2
,
playersByColumn
[
col
][
row
]
->
y
());
}
}
void
GameScene
::
updateHover
(
const
QPointF
&
scenePos
)
...
...
@@ -285,4 +290,4 @@ void GameScene::resizeRubberBand(const QPointF &cursorPoint)
void
GameScene
::
stopRubberBand
()
{
emit
sigStopRubberBand
();
}
}
\ No newline at end of file
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