From d8e0be0d2228f3b3c1112c2db862e6293c80162c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sun, 2 Feb 2025 17:45:24 +0100
Subject: [PATCH] Clamp scrollArea widget to viewport width on showEvent to
 prevent widget being instantiated with wrong width when not visible.

---
 .../visual_deck_storage/visual_deck_storage_widget.cpp   | 9 +++++++++
 .../visual_deck_storage/visual_deck_storage_widget.h     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index f76278409..293ed22a4 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -69,6 +69,15 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     }
 }
 
+void VisualDeckStorageWidget::showEvent(QShowEvent *event)
+{
+    QWidget::showEvent(event);
+    if (scrollArea->widget() == folderWidget) {
+        scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
+        scrollArea->widget()->adjustSize();
+    }
+}
+
 void VisualDeckStorageWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
index 563b269d0..5f190f40f 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -37,6 +37,7 @@ public slots:
     void updateSearchFilter();
     void updateSortOrder();
     void resizeEvent(QResizeEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 
 signals:
     void bannerCardsRefreshed();