From 916380a6916f74d719f64d968b6044d892f034f0 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Tue, 26 Nov 2024 02:33:12 -0800 Subject: [PATCH] refactor again --- cockatrice/src/game/zones/view_zone.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 1e30dc6ea..aea6e0df2 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -161,13 +161,13 @@ void ZoneViewZone::reorganizeCards() } } + int totalRows = (pileView && sortByType) ? longestRow : rows; + int totalColumns = (pileView && sortByType) ? qMax(typeColumn + 1, 3) : qMax(cols, 1); + qreal aleft = 0; qreal atop = 0; - qreal awidth = (pileView && sortByType) - ? qMax(typeColumn + 1, 3) * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING - : qMax(cols, 1) * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING; - qreal aheight = (pileView && sortByType) ? (longestRow * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3 - : (rows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3; + qreal awidth = totalColumns * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING; + qreal aheight = (totalRows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3; optimumRect = QRectF(aleft, atop, awidth, aheight); updateGeometry();