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

Lint.

Browse source
This commit is contained in:
Lukas Brübach 2025-04-07 20:30:43 +02:00
parent f91ae48589
commit d76854f381
2 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,15 +8,16 @@
#include <QResizeEvent> #include <QResizeEvent>
CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent, CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel, DeckListModel *_deckListModel,
QString _zoneName, QString _zoneName,
QString _cardGroupCategory, QString _cardGroupCategory,
QString _activeGroupCriteria, QString _activeGroupCriteria,
QStringList _activeSortCriteria, QStringList _activeSortCriteria,
int bannerOpacity, int bannerOpacity,
CardSizeWidget *_cardSizeWidget) CardSizeWidget *_cardSizeWidget)
: QWidget(parent), deckListModel(_deckListModel), zoneName(_zoneName), cardGroupCategory(_cardGroupCategory), : QWidget(parent), deckListModel(_deckListModel), zoneName(_zoneName), cardGroupCategory(_cardGroupCategory),
activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), cardSizeWidget(_cardSizeWidget) activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria),
cardSizeWidget(_cardSizeWidget)
{ {
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
@ -28,8 +29,8 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
updateCardDisplays(); updateCardDisplays();
} }
void CardGroupDisplayWidget::updateCardDisplays(){ void CardGroupDisplayWidget::updateCardDisplays()
{
} }
QList<CardInfoPtr> CardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort) QList<CardInfoPtr> CardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoPtr> cardsToSort)
@ -47,8 +48,8 @@ QList<CardInfoPtr> CardGroupDisplayWidget::getCardsMatchingGroup(QList<CardInfoP
} }
QList<CardInfoPtr> CardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> cardsToSort, QList<CardInfoPtr> CardGroupDisplayWidget::sortCardList(QList<CardInfoPtr> cardsToSort,
const QStringList properties, const QStringList properties,
Qt::SortOrder order = Qt::AscendingOrder) Qt::SortOrder order = Qt::AscendingOrder)
{ {
CardInfoComparator comparator(properties, order); CardInfoComparator comparator(properties, order);
std::sort(cardsToSort.begin(), cardsToSort.end(), comparator); std::sort(cardsToSort.begin(), cardsToSort.end(), comparator);

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

@ -8,14 +8,21 @@
#include <QResizeEvent> #include <QResizeEvent>
FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent, FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
DeckListModel *_deckListModel, DeckListModel *_deckListModel,
QString _zoneName, QString _zoneName,
QString _cardGroupCategory, QString _cardGroupCategory,
QString _activeGroupCriteria, QString _activeGroupCriteria,
QStringList _activeSortCriteria, QStringList _activeSortCriteria,
int bannerOpacity, int bannerOpacity,
CardSizeWidget *_cardSizeWidget) CardSizeWidget *_cardSizeWidget)
: CardGroupDisplayWidget(parent, _deckListModel, _zoneName, _cardGroupCategory, _activeGroupCriteria, _activeSortCriteria, bannerOpacity, _cardSizeWidget) : CardGroupDisplayWidget(parent,
_deckListModel,
_zoneName,
_cardGroupCategory,
_activeGroupCriteria,
_activeSortCriteria,
bannerOpacity,
_cardSizeWidget)
{ {
flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
banner->setBuddy(flowWidget); banner->setBuddy(flowWidget);
@ -66,7 +73,8 @@ void FlatCardGroupDisplayWidget::updateCardDisplays()
&FlatCardGroupDisplayWidget::onClick); &FlatCardGroupDisplayWidget::onClick);
connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this,
&FlatCardGroupDisplayWidget::onHover); &FlatCardGroupDisplayWidget::onHover);
connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor); connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget,
&CardInfoPictureWidget::setScaleFactor);
flowWidget->addWidget(widget); flowWidget->addWidget(widget);
} }