From 471b048f838b2dd0b1143a1e2458af651a160742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Mon, 10 Feb 2025 14:23:04 +0100
Subject: [PATCH] Fix some warnings by containerizing layouts because
 addChildLayout is silly.

---
 .../ui/widgets/printing_selector/printing_selector.cpp   | 9 ++++++---
 .../ui/widgets/printing_selector/printing_selector.h     | 2 ++
 .../visual_deck_storage/visual_deck_storage_widget.cpp   | 6 ++++--
 .../visual_deck_storage/visual_deck_storage_widget.h     | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
index fe6e98ec5..8a55ff520 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
@@ -29,8 +29,9 @@ PrintingSelector::PrintingSelector(QWidget *parent,
     : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    layout = new QVBoxLayout();
+    layout = new QVBoxLayout(this);
     setLayout(layout);
+
     widgetLoadingBufferTimer = new QTimer(this);
 
     displayOptionsWidget = new SettingsButtonWidget(this);
@@ -43,12 +44,14 @@ PrintingSelector::PrintingSelector(QWidget *parent,
     sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     sortToolBar->setVisible(SettingsCache::instance().getPrintingSelectorSortOptionsVisible());
 
-    auto sortAndOptionsLayout = new QHBoxLayout(this);
+    sortAndOptionsContainer = new QWidget(this);
+    sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer);
+    sortAndOptionsContainer->setLayout(sortAndOptionsLayout);
 
     sortAndOptionsLayout->addWidget(sortToolBar);
     sortAndOptionsLayout->addWidget(displayOptionsWidget);
 
-    layout->addLayout(sortAndOptionsLayout);
+    layout->addWidget(sortAndOptionsContainer);
 
     searchBar = new PrintingSelectorCardSearchWidget(this);
     searchBar->setVisible(SettingsCache::instance().getPrintingSelectorSearchBarVisible());
diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h
index b0a259626..db190eb32 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h
@@ -44,6 +44,8 @@ private slots:
 private:
     QVBoxLayout *layout;
     SettingsButtonWidget *displayOptionsWidget;
+    QWidget *sortAndOptionsContainer;
+    QHBoxLayout *sortAndOptionsLayout;
     PrintingSelectorViewOptionsWidget *viewOptionsToolbar;
     PrintingSelectorCardSortingWidget *sortToolBar;
     PrintingSelectorCardSearchWidget *searchBar;
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 4be53cf18..aabf311f1 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
@@ -25,9 +25,11 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     setLayout(layout);
 
     // search bar row
-    searchAndSortLayout = new QHBoxLayout(this);
+    searchAndSortContainer = new QWidget(this);
+    searchAndSortLayout = new QHBoxLayout(searchAndSortContainer);
     searchAndSortLayout->setSpacing(3);
     searchAndSortLayout->setContentsMargins(9, 0, 9, 0);
+    searchAndSortContainer->setLayout(searchAndSortLayout);
 
     deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this);
     sortWidget = new VisualDeckStorageSortWidget(this);
@@ -77,7 +79,7 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     scrollArea->setWidgetResizable(true);
 
     // putting everything together
-    layout->addLayout(searchAndSortLayout);
+    layout->addWidget(searchAndSortContainer);
     layout->addWidget(tagFilterWidget);
     layout->addWidget(scrollArea);
     layout->addWidget(cardSizeWidget);
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 5aa45f4ed..67bfac760 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
@@ -56,6 +56,7 @@ signals:
 
 private:
     QVBoxLayout *layout;
+    QWidget *searchAndSortContainer;
     QHBoxLayout *searchAndSortLayout;
     DeckListModel *deckListModel;
     QLabel *databaseLoadIndicator;