From 81662b7fec353d8636d7a86ed511da374120350d Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Tue, 14 Jan 2025 05:52:46 -0800 Subject: [PATCH] Reduce spacing in visual deck storage (#5465) * move thing * reduce spacing --- .../visual_deck_storage_search_widget.cpp | 2 +- .../visual_deck_storage/visual_deck_storage_sort_widget.cpp | 1 + .../visual_deck_storage_tag_filter_widget.cpp | 3 +-- .../visual_deck_storage/visual_deck_storage_widget.cpp | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 397c3367b..7828a76f4 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -11,7 +11,7 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(VisualDeckStorageWidget *parent) : parent(parent) { layout = new QHBoxLayout(this); - layout->setContentsMargins(9, 0, 9, 0); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); searchBar = new QLineEdit(this); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp index f794f3016..773e80768 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp @@ -14,6 +14,7 @@ VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget : parent(parent), sortOrder(Alphabetical) { layout = new QHBoxLayout(this); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); // Initialize the ComboBox diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp index 57d963ab2..200ddfa23 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp @@ -16,8 +16,7 @@ VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(VisualDeckSto // Create layout auto *layout = new QHBoxLayout(this); - layout->setContentsMargins(5, 5, 5, 5); - layout->setSpacing(5); + layout->setContentsMargins(5, 0, 5, 0); setFixedHeight(100); 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 f9c1892e1..5fde3639d 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 @@ -19,14 +19,18 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare deckListModel->setObjectName("visualDeckModel"); layout = new QVBoxLayout(); + layout->setSpacing(0); + layout->setContentsMargins(9, 0, 9, 5); setLayout(layout); searchAndSortLayout = new QHBoxLayout(); + searchAndSortLayout->setSpacing(3); + searchAndSortLayout->setContentsMargins(9, 0, 9, 0); + deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this); sortWidget = new VisualDeckStorageSortWidget(this); searchWidget = new VisualDeckStorageSearchWidget(this); tagFilterWidget = new VisualDeckStorageTagFilterWidget(this); - deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this); searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget); searchAndSortLayout->addWidget(sortWidget);