From 914002f8467e35070a545879d9bfd35b735106b5 Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:08:07 -0800
Subject: [PATCH] use grid instead of FlowWidget for PrintingSelector display
 options (#5341)

* use grid instead of FlowWidget for PrintingSelector display options

* remove one level of nesting
---
 .../printing_selector_view_options_widget.cpp | 30 ++++++++-----------
 .../printing_selector_view_options_widget.h   |  3 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
index e04f1e38d..fa173834f 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
@@ -15,15 +15,12 @@ PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *pa
                                                                      PrintingSelector *_printingSelector)
     : QWidget(parent), printingSelector(_printingSelector)
 {
-    // Set up the layout for the widget
-    layout = new QHBoxLayout(this);
-    setLayout(layout);
-
-    // Create the flow widget to hold the checkboxes
-    flowWidget = new FlowWidget(this, Qt::ScrollBarPolicy::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
+    // Create the grid to hold the checkboxes
+    gridLayout = new QGridLayout(this);
+    setLayout(gridLayout);
 
     // Create the checkbox for sorting options visibility
-    sortCheckBox = new QCheckBox(flowWidget);
+    sortCheckBox = new QCheckBox(this);
     sortCheckBox->setText(tr("Display Sorting Options"));
     sortCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorSortOptionsVisible());
     connect(sortCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
@@ -32,7 +29,7 @@ PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *pa
             &SettingsCache::setPrintingSelectorSortOptionsVisible);
 
     // Create the checkbox for search bar visibility
-    searchCheckBox = new QCheckBox(flowWidget);
+    searchCheckBox = new QCheckBox(this);
     searchCheckBox->setText(tr("Display Search Bar"));
     searchCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorSearchBarVisible());
     connect(searchCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
@@ -41,7 +38,7 @@ PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *pa
             &SettingsCache::setPrintingSelectorSearchBarVisible);
 
     // Create the checkbox for card size slider visibility
-    cardSizeCheckBox = new QCheckBox(flowWidget);
+    cardSizeCheckBox = new QCheckBox(this);
     cardSizeCheckBox->setText(tr("Display Card Size Slider"));
     cardSizeCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorCardSizeSliderVisible());
     connect(cardSizeCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
@@ -50,7 +47,7 @@ PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *pa
             &SettingsCache::setPrintingSelectorCardSizeSliderVisible);
 
     // Create the checkbox for navigation buttons visibility
-    navigationCheckBox = new QCheckBox(flowWidget);
+    navigationCheckBox = new QCheckBox(this);
     navigationCheckBox->setText(tr("Display Navigation Buttons"));
     navigationCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
     connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
@@ -58,12 +55,9 @@ PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *pa
     connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
             &SettingsCache::setPrintingSelectorNavigationButtonsVisible);
 
-    // Add checkboxes to the flow widget
-    flowWidget->addWidget(sortCheckBox);
-    flowWidget->addWidget(searchCheckBox);
-    flowWidget->addWidget(cardSizeCheckBox);
-    flowWidget->addWidget(navigationCheckBox);
-
-    // Add flow widget to the main layout
-    layout->addWidget(flowWidget);
+    // Add checkboxes to the grid
+    gridLayout->addWidget(sortCheckBox, 0, 0);
+    gridLayout->addWidget(searchCheckBox, 0, 1);
+    gridLayout->addWidget(cardSizeCheckBox, 1, 0);
+    gridLayout->addWidget(navigationCheckBox, 1, 1);
 }
diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.h
index 16d12d0b9..3d0dec77e 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.h
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.h
@@ -16,8 +16,7 @@ public:
     explicit PrintingSelectorViewOptionsWidget(QWidget *parent, PrintingSelector *_printingSelector);
 
 private:
-    QHBoxLayout *layout;
-    FlowWidget *flowWidget;
+    QGridLayout *gridLayout;
     PrintingSelector *printingSelector;
     QCheckBox *sortCheckBox;
     QCheckBox *searchCheckBox;