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

Improve layout, add a gray border.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-10 16:33:11 +01:00
parent c96847a3e6
commit 1090b825ec
5 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,8 @@ PrintingSelector::PrintingSelector(QWidget *parent,
sortAndOptionsContainer = new QWidget(this); sortAndOptionsContainer = new QWidget(this);
sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer); sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer);
sortAndOptionsLayout->setSpacing(3);
sortAndOptionsLayout->setContentsMargins(0, 0, 0, 0);
sortAndOptionsContainer->setLayout(sortAndOptionsLayout); sortAndOptionsContainer->setLayout(sortAndOptionsLayout);
searchBar = new PrintingSelectorCardSearchWidget(this); searchBar = new PrintingSelectorCardSearchWidget(this);

1
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -20,7 +20,6 @@ PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSel
{ {
setMinimumWidth(300); setMinimumWidth(300);
sortToolBar = new QHBoxLayout(this); sortToolBar = new QHBoxLayout(this);
sortToolBar->setContentsMargins(9, 0, 9, 0);
sortOptionsSelector = new QComboBox(this); sortOptionsSelector = new QComboBox(this);
sortOptionsSelector->addItems(SORT_OPTIONS); sortOptionsSelector->addItems(SORT_OPTIONS);

11
cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
View file

@ -2,8 +2,9 @@
#include <QApplication> #include <QApplication>
#include <QFocusEvent> #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); layout = new QVBoxLayout(this);
} }
@ -26,3 +27,11 @@ void SettingsPopupWidget::closeEvent(QCloseEvent *event)
emit aboutToClose(); emit aboutToClose();
QWidget::closeEvent(event); 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);
}

1
cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h
View file

@ -19,6 +19,7 @@ signals:
protected: protected:
void focusOutEvent(QFocusEvent *event) override; void focusOutEvent(QFocusEvent *event) override;
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;
void paintEvent(QPaintEvent *event) override;
QVBoxLayout *layout; QVBoxLayout *layout;
}; };

2
cockatrice/src/settings/cache_settings.cpp
View file

@ -258,8 +258,6 @@ SettingsCache::SettingsCache()
bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool(); bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool();
printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt(); printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt();
printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt(); printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt();
printingSelectorSortOptionsVisible = settings->value("cards/printingselectorsortoptionsvisible", true).toBool();
printingSelectorSearchBarVisible = settings->value("cards/printingselectorcardsearchbarvisible", true).toBool();
printingSelectorNavigationButtonsVisible = printingSelectorNavigationButtonsVisible =
settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool(); settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool();
visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt(); visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt();