From 37c8f4245d569b074ffb4b4b3a80f46772e299f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Mon, 20 Jan 2025 15:59:42 +0100
Subject: [PATCH] Proper solution TM

---
 ..._api_response_card_list_display_widget.cpp |  2 --
 ...ponse_commander_details_display_widget.cpp |  3 ---
 ..._commander_api_response_display_widget.cpp |  2 --
 .../src/client/tabs/api/edhrec/tab_edhrec.cpp | 19 +++++++++++++++----
 .../src/client/tabs/api/edhrec/tab_edhrec.h   |  1 +
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
index d3a25e7f9..0ede07892 100644
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
@@ -12,8 +12,6 @@ EdhrecCommanderApiResponseCardListDisplayWidget::EdhrecCommanderApiResponseCardL
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-
     auto header = new QLabel(this);
     header->setText(toDisplay.header);
 
diff --git a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
index 5ddbbaa32..72a671633 100644
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
@@ -13,9 +13,6 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    setMinimumWidth(0);
-
     auto commanderPicture = new CardInfoPictureWidget(this);
     commanderPicture->setCard(CardDatabaseManager::getInstance()->getCard(commanderDetails.getName()));
 
diff --git a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
index d7850d1a1..ddf1e1749 100644
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
@@ -14,8 +14,6 @@ EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    setMinimumSize(QSize(0, 0));
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout->setAlignment(Qt::AlignHCenter);
 
     auto commanderPicture = new CardInfoPictureWidget(this);
diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
index 5b6859b45..80033b5c7 100644
--- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.cpp
@@ -10,12 +10,11 @@
 #include <QJsonObject>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QResizeEvent>
 
 TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
-    setMinimumSize(0, 0);
-
-    scrollArea = new QScrollArea();
+    scrollArea = new QScrollArea(this);
     scrollArea->setWidgetResizable(true);
     scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -30,6 +29,18 @@ TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
     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()
 {
 }
@@ -77,7 +88,7 @@ void TabEdhRec::processApiJson(QNetworkReply *reply)
     EdhrecCommanderApiResponse deckData;
     deckData.fromJson(jsonObj);
 
-    displayWidget = new EdhrecCommanderApiResponseDisplayWidget(this, deckData);
+    displayWidget = new EdhrecCommanderApiResponseDisplayWidget(scrollArea, deckData);
     // flowWidget->addWidget(displayWidget);
     scrollArea->setWidget(displayWidget);
 
diff --git a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
index c2af8283f..ff0a3fcd0 100644
--- a/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/client/tabs/api/edhrec/tab_edhrec.h
@@ -14,6 +14,7 @@ class TabEdhRec : public Tab
     Q_OBJECT
 public:
     explicit TabEdhRec(TabSupervisor *_tabSupervisor);
+    void resizeEvent(QResizeEvent *event);
 
     void retranslateUi() override;
     QString getTabText() const override