jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-21 01:42:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use rows as unit

Browse source
This commit is contained in:
RickyRister 2024-12-10 22:48:28 -08:00
parent 0225c0bc76
commit 41291fecb5
7 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/game/zones/view_zone_widget.cpp
View file

@ -254,6 +254,16 @@ void ZoneViewWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
scrollBar->setMaximum(totalZoneHeight - newZoneHeight);
}
/**
* Calculates the max initial height from the settings.
* The max initial height setting is given as number of rows, so we need to map it to a height.
**/
static qreal calcMaxInitialHeight()
{
const qreal cardsHeight = (SettingsCache::instance().getCardViewInitialRowsMax() + 1) * CARD_HEIGHT * 0.33;
return cardsHeight + 2; // +2 padding to make the cutoff look nicer
}
void ZoneViewWidget::resizeToZoneContents()
{
QRectF zoneRect = zone->getOptimumRect();
@ -265,8 +275,7 @@ void ZoneViewWidget::resizeToZoneContents()
QSizeF maxSize(width, zoneRect.height() + extraHeight + 10);
setMaximumSize(maxSize);
qreal initialZoneHeight =
qMin(zoneRect.height(), static_cast<qreal>(SettingsCache::instance().getCardViewInitialHeight()));
qreal initialZoneHeight = qMin(zoneRect.height(), calcMaxInitialHeight());
QSizeF initialSize(width, initialZoneHeight + extraHeight + 10);
resize(initialSize);