From c9195d211dee75e3eb4e12b21fccb02becee1dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 2 Feb 2025 10:45:49 +0100 Subject: [PATCH] Revert resizing. --- .../ui/widgets/general/display/banner_widget.cpp | 2 +- .../ui/widgets/general/display/banner_widget.h | 2 ++ .../visual_deck_storage_widget.cpp | 14 ++------------ .../visual_deck_storage_widget.h | 1 - 4 files changed, 5 insertions(+), 14 deletions(-) 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 8ca06ef88..64a64ba7c 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp +++ b/cockatrice/src/client/ui/widgets/general/display/banner_widget.cpp @@ -14,7 +14,7 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold; color: white;"); // Layout to center the banner label - QVBoxLayout *layout = new QVBoxLayout(this); + layout = new QVBoxLayout(this); layout->addWidget(bannerLabel); setLayout(layout); diff --git a/cockatrice/src/client/ui/widgets/general/display/banner_widget.h b/cockatrice/src/client/ui/widgets/general/display/banner_widget.h index e09784be8..545cb5ed6 100644 --- a/cockatrice/src/client/ui/widgets/general/display/banner_widget.h +++ b/cockatrice/src/client/ui/widgets/general/display/banner_widget.h @@ -2,6 +2,7 @@ #define BANNER_WIDGET_H #include +#include #include class BannerWidget : public QWidget @@ -32,6 +33,7 @@ protected: void paintEvent(QPaintEvent *event) override; private: + QVBoxLayout *layout; QLabel *bannerLabel; Qt::Orientation gradientOrientation; int transparency; // Transparency percentage for the gradient 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 a8f55ef07..80cfa3500 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 @@ -18,12 +18,12 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare deckListModel = new DeckListModel(this); deckListModel->setObjectName("visualDeckModel"); - layout = new QVBoxLayout(); + layout = new QVBoxLayout(this); layout->setSpacing(0); layout->setContentsMargins(9, 0, 9, 5); setLayout(layout); - searchAndSortLayout = new QHBoxLayout(); + searchAndSortLayout = new QHBoxLayout(this); searchAndSortLayout->setSpacing(3); searchAndSortLayout->setContentsMargins(9, 0, 9, 0); @@ -44,7 +44,6 @@ 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); @@ -70,14 +69,6 @@ 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 ...")); @@ -97,7 +88,6 @@ 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 563b269d0..5dad013ad 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 @@ -36,7 +36,6 @@ public slots: void updateColorFilter(); void updateSearchFilter(); void updateSortOrder(); - void resizeEvent(QResizeEvent *event) override; signals: void bannerCardsRefreshed();