From 4b868e747800fa97bba7bf87cb055ad75cdaf2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sun, 16 Mar 2025 13:42:52 +0100
Subject: [PATCH] Pull out the main type filter.

---
 ...al_database_display_main_type_filter_widget.cpp | 14 +++++++++-----
 ...sual_database_display_main_type_filter_widget.h |  2 +-
 .../visual_database_display_widget.cpp             |  6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
index e350506aa..99c0def58 100644
--- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
@@ -14,10 +14,17 @@ VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWi
     allMainCardTypesWithCount = CardDatabaseManager::getInstance()->getAllMainCardTypesWithCount();
     // Get all main card types with their count
 
-    setMinimumWidth(300);
+    setMaximumHeight(75);
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
-    layout = new QVBoxLayout(this);
+    layout = new QHBoxLayout(this);
     setLayout(layout);
+    layout->setContentsMargins(0, 1, 0, 1);
+    layout->setSpacing(1);
+    layout->setAlignment(Qt::AlignTop);
+
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    layout->addWidget(flowWidget);
 
     // Create the spinbox
     spinBox = new QSpinBox(this);
@@ -28,9 +35,6 @@ VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWi
     connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeButtonsVisibility);
 
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
-    layout->addWidget(flowWidget);
-
     // Create the toggle button for Exact Match/Includes mode
     toggleButton = new QPushButton(this);
     toggleButton->setCheckable(true);
diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
index 74eb8b237..b13071825 100644
--- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
@@ -29,7 +29,7 @@ private:
     FilterTreeModel *filterModel;
     QMap<QString, int> allMainCardTypesWithCount;
     QSpinBox *spinBox;
-    QVBoxLayout *layout;
+    QHBoxLayout *layout;
     FlowWidget *flowWidget;
     QPushButton *toggleButton; // Mode switch button
 
diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
index 0f25b92a5..a41fd0d62 100644
--- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
@@ -37,6 +37,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     mainLayout = new QVBoxLayout(this);
     setLayout(mainLayout);
+    mainLayout->setSpacing(1);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
     cardSizeWidget = new CardSizeWidget(this, flowWidget);
@@ -99,7 +101,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
 
     quickFilterWidget->addSettingsWidget(saveLoadWidget);
     quickFilterWidget->addSettingsWidget(nameFilterWidget);
-    quickFilterWidget->addSettingsWidget(mainTypeFilterWidget);
+    // quickFilterWidget->addSettingsWidget(mainTypeFilterWidget);
     quickFilterWidget->addSettingsWidget(subTypeFilterWidget);
     quickFilterWidget->addSettingsWidget(setFilterWidget);
 
@@ -109,6 +111,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
 
     mainLayout->addWidget(searchContainer);
 
+    mainLayout->addWidget(mainTypeFilterWidget);
+
     mainLayout->addWidget(flowWidget);
 
     mainLayout->addWidget(cardSizeWidget);