jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-23 10:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use max/min

Browse source
This commit is contained in:
RickyRister 2024-11-28 04:39:26 -08:00
parent f7a7342344
commit 923240e956
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/game/zones/view_zone.cpp
View file

@ -161,12 +161,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, bo
return GridSize{longestRow, qMax(col + 1, 3)}; return GridSize{longestRow, qMax(col + 1, 3)};
} else { } else {
int cols = qFloor(qSqrt((double)cardCount / 2)); int cols = qMin(qFloor(qSqrt((double)cardCount / 2)), 7);
if (cols > 7) int rows = qMax(qCeil((double)cardCount / cols), 1);
cols = 7;
int rows = qCeil((double)cardCount / cols);
if (rows < 1)
rows = 1;
if (minRows == 0) if (minRows == 0)
minRows = rows; minRows = rows;
else if (rows < minRows) { else if (rows < minRows) {