jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't snap already-expanded cardview windows (#5265)

Browse source
This commit is contained in:
RickyRister 2024-12-18 18:27:40 -08:00 • committed by GitHub
parent 27e5d21b6b
commit e588917f6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -253,7 +253,8 @@ void ZoneViewWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
void ZoneViewWidget::resizeScrollbar(const qreal newZoneHeight) void ZoneViewWidget::resizeScrollbar(const qreal newZoneHeight)
{ {
qreal totalZoneHeight = zone->getOptimumRect().height(); qreal totalZoneHeight = zone->getOptimumRect().height();
scrollBar->setMaximum(totalZoneHeight - newZoneHeight); qreal newMax = qMax(totalZoneHeight - newZoneHeight, 0.0);
scrollBar->setMaximum(newMax);
} }
/** /**
@ -266,6 +267,20 @@ static qreal calcMaxInitialHeight()
return cardsHeight + 5; // +5 padding to make the cutoff look nicer return cardsHeight + 5; // +5 padding to make the cutoff look nicer
} }
/**
* @brief Handles edge cases in determining the next default zone height. We want the height to snap when the number of
* rows changes, but not if the player has already expanded the window.
*/
static qreal determineNewZoneHeight(qreal oldZoneHeight)
{
// don't snap if window is taller than max initial height
if (oldZoneHeight > calcMaxInitialHeight()) {
return oldZoneHeight;
}
return calcMaxInitialHeight();
}
void ZoneViewWidget::resizeToZoneContents() void ZoneViewWidget::resizeToZoneContents()
{ {
QRectF zoneRect = zone->getOptimumRect(); QRectF zoneRect = zone->getOptimumRect();
@ -275,12 +290,15 @@ void ZoneViewWidget::resizeToZoneContents()
zoneRect.width() + scrollBar->width() + 10); zoneRect.width() + scrollBar->width() + 10);
QSizeF maxSize(width, zoneRect.height() + extraHeight + 10); QSizeF maxSize(width, zoneRect.height() + extraHeight + 10);
setMaximumSize(maxSize);
qreal initialZoneHeight = qMin(zoneRect.height(), calcMaxInitialHeight()); qreal currentZoneHeight = rect().height() - extraHeight - 10;
QSizeF initialSize(width, initialZoneHeight + extraHeight + 10); qreal newZoneHeight = determineNewZoneHeight(currentZoneHeight);
QSizeF initialSize(width, newZoneHeight + extraHeight + 10);
setMaximumSize(maxSize);
resize(initialSize); resize(initialSize);
resizeScrollbar(initialZoneHeight); resizeScrollbar(newZoneHeight);
zone->setGeometry(QRectF(0, -scrollBar->value(), zoneContainer->size().width(), totalZoneHeight)); zone->setGeometry(QRectF(0, -scrollBar->value(), zoneContainer->size().width(), totalZoneHeight));