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

Merge pull request #1034 from ZeldaZach/gamescene_fix

Browse source 
Fixed incorrect zone positioning
This commit is contained in:
Zach 2015-04-27 16:51:48 -04:00
commit 11c6e8ce34
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cockatrice/src/gamescene.cpp
View file

@ -114,14 +114,14 @@ void GameScene::rearrange()
void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards) void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards)
{ {
for (int i = 0; i < zoneViews.size(); i++) { for (int i = 0; i < zoneViews.size(); i++) {
ZoneViewZone *temp = zoneViews[i]->getZone(); ZoneViewZone *temp = zoneViews[i]->getZone();
if ((temp->getName() == zoneName) && (temp->getPlayer() == player)) { // view is already open if ((temp->getName() == zoneName) && (temp->getPlayer() == player)) { // view is already open
zoneViews[i]->close(); zoneViews[i]->close();
if (temp->getNumberCards() == numberCards) if (temp->getNumberCards() == numberCards)
return; return;
}
} }
}
ZoneViewWidget *item = new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false); ZoneViewWidget *item = new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false);
zoneViews.append(item); zoneViews.append(item);
@ -198,8 +198,13 @@ void GameScene::processViewSizeChange(const QSize &newSize)
qreal extraWidthPerColumn = (newWidth - minWidth) / playersByColumn.size(); qreal extraWidthPerColumn = (newWidth - minWidth) / playersByColumn.size();
for (int col = 0; col < playersByColumn.size(); ++col) 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); 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) void GameScene::updateHover(const QPointF &scenePos)
@ -285,4 +290,4 @@ void GameScene::resizeRubberBand(const QPointF &cursorPoint)
void GameScene::stopRubberBand() void GameScene::stopRubberBand()
{ {
emit sigStopRubberBand(); emit sigStopRubberBand();
} }