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

Proper solution TM

Browse source
This commit is contained in:
Lukas Brübach 2025-01-20 15:59:42 +01:00
parent 06099000c5
commit 37c8f4245d
5 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
View file

@ -12,8 +12,6 @@ EdhrecCommanderApiResponseCardListDisplayWidget::EdhrecCommanderApiResponseCardL
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
auto header = new QLabel(this); auto header = new QLabel(this);
header->setText(toDisplay.header); header->setText(toDisplay.header);

3
cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
View file

@ -13,9 +13,6 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
setMinimumWidth(0);
auto commanderPicture = new CardInfoPictureWidget(this); auto commanderPicture = new CardInfoPictureWidget(this);
commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName())); commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName()));

2
cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
View file

@ -14,8 +14,6 @@ EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
setMinimumSize(QSize(0, 0));
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
layout->setAlignment(Qt::AlignHCenter); layout->setAlignment(Qt::AlignHCenter);
auto commanderPicture = new CardInfoPictureWidget(this); auto commanderPicture = new CardInfoPictureWidget(this);

19
cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
View file

@ -10,12 +10,11 @@
#include <QJsonObject> #include <QJsonObject>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QResizeEvent>
TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
{ {
setMinimumSize(0, 0); scrollArea = new QScrollArea(this);
scrollArea = new QScrollArea();
scrollArea->setWidgetResizable(true); scrollArea->setWidgetResizable(true);
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -30,6 +29,18 @@ TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *))); connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *)));
} }
void TabEdhRec::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
qDebug() << "resizeEvent: " << event->size();
if (scrollArea) {
if (scrollArea->widget()) {
scrollArea->widget()->resize(event->size());
}
}
}
void TabEdhRec::retranslateUi() void TabEdhRec::retranslateUi()
{ {
} }
@ -77,7 +88,7 @@ void TabEdhRec::processApiJson(QNetworkReply *reply)
EdhrecCommanderApiResponse deckData; EdhrecCommanderApiResponse deckData;
deckData.fromJson(jsonObj); deckData.fromJson(jsonObj);
displayWidget = new EdhrecCommanderApiResponseDisplayWidget(this, deckData); displayWidget = new EdhrecCommanderApiResponseDisplayWidget(scrollArea, deckData);
// flowWidget->addWidget(displayWidget); // flowWidget->addWidget(displayWidget);
scrollArea->setWidget(displayWidget); scrollArea->setWidget(displayWidget);

1
cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
View file

@ -14,6 +14,7 @@ class TabEdhRec : public Tab
Q_OBJECT Q_OBJECT
public: public:
explicit TabEdhRec(TabSupervisor *_tabSupervisor); explicit TabEdhRec(TabSupervisor *_tabSupervisor);
void resizeEvent(QResizeEvent *event);
void retranslateUi() override; void retranslateUi() override;
QString getTabText() const override QString getTabText() const override