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

Address comments.

Browse source
This commit is contained in:
Lukas Brübach 2025-06-13 15:07:47 +02:00
parent bbac3e0de1
commit cd6693a956
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/ui/layouts/flow_layout.cpp
View file

@ -551,7 +551,10 @@ void FlowLayout::addItem(QLayoutItem *item)
void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index) void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
{ {
addChildWidget(toInsert); addChildWidget(toInsert);
items.insert(qBound(0, index, std::max(0, static_cast<int>(items.size()))), new QWidgetItem(toInsert));
// We don't want to fail on an index that violates the bounds, so we just clamp it.
int boundedIndex = qBound(0, index, qMax(0, static_cast<int>(items.size())));
items.insert(boundedIndex, new QWidgetItem(toInsert));
invalidate(); invalidate();
} }

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

@ -57,7 +57,7 @@ OverlapLayout::~OverlapLayout()
void OverlapLayout::insertWidgetAtIndex(QWidget *toInsert, int index) void OverlapLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
{ {
addChildWidget(toInsert); addChildWidget(toInsert);
int clampedIndex = qBound(0, index, std::max(0, static_cast<int>(itemList.size()))); int clampedIndex = qBound(0, index, qMax(0, static_cast<int>(itemList.size())));
itemList.insert(clampedIndex, new QWidgetItem(toInsert)); itemList.insert(clampedIndex, new QWidgetItem(toInsert));
for (int i = clampedIndex; i < itemList.size(); ++i) { for (int i = clampedIndex; i < itemList.size(); ++i) {

7
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -28,10 +28,10 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
layout->addWidget(banner); layout->addWidget(banner);
// CardGroupDisplayWidget::updateCardDisplays(); CardGroupDisplayWidget::updateCardDisplays();
// connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition); connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
// connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval); connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
} }
QWidget *CardGroupDisplayWidget::constructWidgetForIndex(int rowIndex) QWidget *CardGroupDisplayWidget::constructWidgetForIndex(int rowIndex)
@ -78,7 +78,6 @@ void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first
void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last) void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
{ {
Q_UNUSED(parent);
Q_UNUSED(first); Q_UNUSED(first);
Q_UNUSED(last); Q_UNUSED(last);
if (parent == trackedIndex) { if (parent == trackedIndex) {

1
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
View file

@ -39,7 +39,6 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
} }
FlatCardGroupDisplayWidget::updateCardDisplays(); FlatCardGroupDisplayWidget::updateCardDisplays();
// connect(deckListModel, &DeckListModel::dataChanged, this, &FlatCardGroupDisplayWidget::updateCardDisplays);
disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition); disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval); disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);