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

Change some overlap logic (It's still stupid)

Browse source
This commit is contained in:
Lukas Brübach 2025-03-02 00:27:26 +01:00
parent c34844c9eb
commit 96738c3354
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/client/ui/layouts/overlap_layout.cpp
View file

@ -162,6 +162,9 @@ void OverlapLayout::setGeometry(const QRect &rect)
// Use the smaller of maxColumns and availableColumns. // Use the smaller of maxColumns and availableColumns.
qCDebug(OverlapLayoutLog) << " Max Columns " << maxColumns << " available columns " << availableColumns; qCDebug(OverlapLayoutLog) << " Max Columns " << maxColumns << " available columns " << availableColumns;
columns = qMin(maxColumns, availableColumns); columns = qMin(maxColumns, availableColumns);
if (columns < 1) {
columns = 1;
}
} else { } else {
// If no maxColumns constraint, allow as many columns as possible. // If no maxColumns constraint, allow as many columns as possible.
columns = INT_MAX; columns = INT_MAX;
@ -180,6 +183,9 @@ void OverlapLayout::setGeometry(const QRect &rect)
// Use the smaller of maxRows and availableRows. // Use the smaller of maxRows and availableRows.
qCDebug(OverlapLayoutLog) << " Max Rows " << maxRows << " available rows " << availableRows; qCDebug(OverlapLayoutLog) << " Max Rows " << maxRows << " available rows " << availableRows;
rows = qMin(maxRows, availableRows); rows = qMin(maxRows, availableRows);
if (rows < 1) {
rows = 1;
}
} else { } else {
// If no maxRows constraint, allow as many rows as possible. // If no maxRows constraint, allow as many rows as possible.
rows = INT_MAX; rows = INT_MAX;
@ -204,16 +210,17 @@ void OverlapLayout::setGeometry(const QRect &rect)
const int yPos = rect.top() + currentRow * (maxItemHeight - overlapOffsetHeight); const int yPos = rect.top() + currentRow * (maxItemHeight - overlapOffsetHeight);
item->setGeometry(QRect(xPos, yPos, maxItemWidth, maxItemHeight)); item->setGeometry(QRect(xPos, yPos, maxItemWidth, maxItemHeight));
// TODO: Figure this out properly or maybe adjust size hint to account for this?
// Update row and column indices based on the layout direction. // Update row and column indices based on the layout direction.
if (flowDirection == Qt::Horizontal) { if (overlapDirection == Qt::Horizontal) {
currentColumn++; currentColumn++;
if (currentColumn >= columns) { if (currentColumn > qCeil(itemList.size() / rows)) {
currentColumn = 0; currentColumn = 0;
currentRow++; currentRow++;
} }
} else { } else {
currentRow++; currentRow++;
if (currentRow >= rows) { if (currentRow > qCeil(itemList.size() / columns)) {
currentRow = 0; currentRow = 0;
currentColumn++; currentColumn++;
} }