diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp b/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp index f64810a21..8ca06ef88 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp +++ b/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp @@ -16,11 +16,10 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation // Layout to center the banner label QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(bannerLabel); - layout->setContentsMargins(0, 20, 0, 20); // Space for the gradient setLayout(layout); // Set minimum height for the widget - setMinimumHeight(100); + setMinimumHeight(50); connect(this, &BannerWidget::buddyVisibilityChanged, this, &BannerWidget::toggleBuddyVisibility); } 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 4a692c963..a8f55ef07 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 @@ -44,6 +44,7 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false); + folderWidget->setFixedWidth(scrollArea->viewport()->width()); scrollArea->setWidget(folderWidget); scrollArea->setWidgetResizable(true); @@ -69,6 +70,14 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare } } +void VisualDeckStorageWidget::resizeEvent(QResizeEvent *event) +{ + QWidget::resizeEvent(event); + if (scrollArea->widget() == folderWidget) { + folderWidget->setFixedWidth(scrollArea->viewport()->width()); + } +} + void VisualDeckStorageWidget::retranslateUi() { databaseLoadIndicator->setText(tr("Loading database ...")); @@ -88,6 +97,7 @@ void VisualDeckStorageWidget::deckPreviewDoubleClickedEvent(QMouseEvent *event, void VisualDeckStorageWidget::refreshBannerCards() { folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false); + folderWidget->setFixedWidth(scrollArea->viewport()->width()); scrollArea->setWidget(folderWidget); } 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 790740cd8..563b269d0 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 @@ -23,6 +23,7 @@ class VisualDeckStorageWidget final : public QWidget Q_OBJECT public: explicit VisualDeckStorageWidget(QWidget *parent); + void retranslateUi(); CardSizeWidget *cardSizeWidget; VisualDeckStorageTagFilterWidget *tagFilterWidget; @@ -35,6 +36,7 @@ public slots: void updateColorFilter(); void updateSearchFilter(); void updateSortOrder(); + void resizeEvent(QResizeEvent *event) override; signals: void bannerCardsRefreshed();