diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/gamescene.cpp index ff61e530..34f6c03e 100644 --- a/cockatrice/src/gamescene.cpp +++ b/cockatrice/src/gamescene.cpp @@ -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