From 1090b825ec36a1874adb12c14cc61027cdda6ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Mon, 10 Feb 2025 16:33:11 +0100
Subject: [PATCH] Improve layout, add a gray border.

---
 .../widgets/printing_selector/printing_selector.cpp   |  2 ++
 .../printing_selector_card_sorting_widget.cpp         |  1 -
 .../widgets/quick_settings/settings_popup_widget.cpp  | 11 ++++++++++-
 .../ui/widgets/quick_settings/settings_popup_widget.h |  1 +
 cockatrice/src/settings/cache_settings.cpp            |  2 --
 5 files changed, 13 insertions(+), 4 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 daa0aeed3..a5407a15d 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
@@ -58,6 +58,8 @@ PrintingSelector::PrintingSelector(QWidget *parent,
 
     sortAndOptionsContainer = new QWidget(this);
     sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer);
+    sortAndOptionsLayout->setSpacing(3);
+    sortAndOptionsLayout->setContentsMargins(0, 0, 0, 0);
     sortAndOptionsContainer->setLayout(sortAndOptionsLayout);
 
     searchBar = new PrintingSelectorCardSearchWidget(this);
diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
index 3b6cf4b94..919bdbf5f 100644
--- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -20,7 +20,6 @@ PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSel
 {
     setMinimumWidth(300);
     sortToolBar = new QHBoxLayout(this);
-    sortToolBar->setContentsMargins(9, 0, 9, 0);
 
     sortOptionsSelector = new QComboBox(this);
     sortOptionsSelector->addItems(SORT_OPTIONS);
diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp b/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
index a0a5f0806..10b2c327c 100644
--- a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
@@ -2,8 +2,9 @@
 
 #include <QApplication>
 #include <QFocusEvent>
+#include <QPainter>
 
-SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::Popup)
+SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::Popup | Qt::FramelessWindowHint)
 {
     layout = new QVBoxLayout(this);
 }
@@ -26,3 +27,11 @@ void SettingsPopupWidget::closeEvent(QCloseEvent *event)
     emit aboutToClose();
     QWidget::closeEvent(event);
 }
+
+void SettingsPopupWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setPen(Qt::gray);
+    painter.drawRect(rect().adjusted(0, 0, -1, -1));
+    QWidget::paintEvent(event);
+}
\ No newline at end of file
diff --git a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h
index 3fa439c50..291063662 100644
--- a/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h
@@ -19,6 +19,7 @@ signals:
 protected:
     void focusOutEvent(QFocusEvent *event) override;
     void closeEvent(QCloseEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
 
     QVBoxLayout *layout;
 };
diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp
index 8b9834f90..c8f2aa737 100644
--- a/cockatrice/src/settings/cache_settings.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -258,8 +258,6 @@ SettingsCache::SettingsCache()
     bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool();
     printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt();
     printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt();
-    printingSelectorSortOptionsVisible = settings->value("cards/printingselectorsortoptionsvisible", true).toBool();
-    printingSelectorSearchBarVisible = settings->value("cards/printingselectorcardsearchbarvisible", true).toBool();
     printingSelectorNavigationButtonsVisible =
         settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool();
     visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt();