jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some warnings by containerizing layouts because addChildLayout is silly.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-10 14:23:04 +01:00
parent 09b8904ed8
commit 471b048f83
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp
View file

@ -29,8 +29,9 @@ PrintingSelector::PrintingSelector(QWidget *parent,
: QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView) : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView)
{ {
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
layout = new QVBoxLayout(); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
widgetLoadingBufferTimer = new QTimer(this); widgetLoadingBufferTimer = new QTimer(this);
displayOptionsWidget = new SettingsButtonWidget(this); displayOptionsWidget = new SettingsButtonWidget(this);
@ -43,12 +44,14 @@ PrintingSelector::PrintingSelector(QWidget *parent,
sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
sortToolBar->setVisible(SettingsCache::instance().getPrintingSelectorSortOptionsVisible()); sortToolBar->setVisible(SettingsCache::instance().getPrintingSelectorSortOptionsVisible());
auto sortAndOptionsLayout = new QHBoxLayout(this); sortAndOptionsContainer = new QWidget(this);
sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer);
sortAndOptionsContainer->setLayout(sortAndOptionsLayout);
sortAndOptionsLayout->addWidget(sortToolBar); sortAndOptionsLayout->addWidget(sortToolBar);
sortAndOptionsLayout->addWidget(displayOptionsWidget); sortAndOptionsLayout->addWidget(displayOptionsWidget);
layout->addLayout(sortAndOptionsLayout); layout->addWidget(sortAndOptionsContainer);
searchBar = new PrintingSelectorCardSearchWidget(this); searchBar = new PrintingSelectorCardSearchWidget(this);
searchBar->setVisible(SettingsCache::instance().getPrintingSelectorSearchBarVisible()); searchBar->setVisible(SettingsCache::instance().getPrintingSelectorSearchBarVisible());

2
cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h
View file

@ -44,6 +44,8 @@ private slots:
private: private:
QVBoxLayout *layout; QVBoxLayout *layout;
SettingsButtonWidget *displayOptionsWidget; SettingsButtonWidget *displayOptionsWidget;
QWidget *sortAndOptionsContainer;
QHBoxLayout *sortAndOptionsLayout;
PrintingSelectorViewOptionsWidget *viewOptionsToolbar; PrintingSelectorViewOptionsWidget *viewOptionsToolbar;
PrintingSelectorCardSortingWidget *sortToolBar; PrintingSelectorCardSortingWidget *sortToolBar;
PrintingSelectorCardSearchWidget *searchBar; PrintingSelectorCardSearchWidget *searchBar;

6
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -25,9 +25,11 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
setLayout(layout); setLayout(layout);
// search bar row // search bar row
searchAndSortLayout = new QHBoxLayout(this); searchAndSortContainer = new QWidget(this);
searchAndSortLayout = new QHBoxLayout(searchAndSortContainer);
searchAndSortLayout->setSpacing(3); searchAndSortLayout->setSpacing(3);
searchAndSortLayout->setContentsMargins(9, 0, 9, 0); searchAndSortLayout->setContentsMargins(9, 0, 9, 0);
searchAndSortContainer->setLayout(searchAndSortLayout);
deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this); deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this);
sortWidget = new VisualDeckStorageSortWidget(this); sortWidget = new VisualDeckStorageSortWidget(this);
@ -77,7 +79,7 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
scrollArea->setWidgetResizable(true); scrollArea->setWidgetResizable(true);
// putting everything together // putting everything together
layout->addLayout(searchAndSortLayout); layout->addWidget(searchAndSortContainer);
layout->addWidget(tagFilterWidget); layout->addWidget(tagFilterWidget);
layout->addWidget(scrollArea); layout->addWidget(scrollArea);
layout->addWidget(cardSizeWidget); layout->addWidget(cardSizeWidget);

1
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
View file

@ -56,6 +56,7 @@ signals:
private: private:
QVBoxLayout *layout; QVBoxLayout *layout;
QWidget *searchAndSortContainer;
QHBoxLayout *searchAndSortLayout; QHBoxLayout *searchAndSortLayout;
DeckListModel *deckListModel; DeckListModel *deckListModel;
QLabel *databaseLoadIndicator; QLabel *databaseLoadIndicator;