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

Rename variables, don't disable DB button anymore.

Browse source 
Took 4 minutes

Took 4 seconds
This commit is contained in:
Lukas Brübach 2025-09-13 14:53:33 +02:00
parent 6ca3988859
commit d9760cf354
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
cockatrice/src/client/ui/widgets/general/home_styled_button.cpp
View file

@ -20,20 +20,22 @@ void HomeStyledButton::updateStylesheet(const QPair<QColor, QColor> &colors)
QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &colors) QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &colors)
{ {
QColor base1 = colors.first; QColor baseGradientStart = colors.first;
QColor base2 = colors.second; QColor baseGradientEnd = colors.second;
QColor hover1 = base1.lighter(120); // 20% lighter QColor hoverGradientStart = baseGradientStart.lighter(120); // 20% lighter
QColor hover2 = base2.lighter(120); QColor hoverGradientEnd = baseGradientEnd.lighter(120);
QColor pressed1 = base1.darker(130); // 30% darker QColor pressedGradientStart = baseGradientStart.darker(130); // 30% darker
QColor pressed2 = base2.darker(130); QColor pressedGradientEnd = baseGradientEnd.darker(130);
// Disabled: more gray, less saturated // Disabled: more gray, less saturated
QColor disabled1 = base1.toHsv(); QColor disabledGradientStart = baseGradientStart.toHsv();
disabled1.setHsv(disabled1.hue(), disabled1.saturation() * 0.2, disabled1.value() * 0.6); disabledGradientStart.setHsv(disabledGradientStart.hue(), disabledGradientStart.saturation() * 0.2,
QColor disabled2 = base2.toHsv(); disabledGradientStart.value() * 0.6);
disabled2.setHsv(disabled2.hue(), disabled2.saturation() * 0.2, disabled2.value() * 0.6); QColor disabledGradientEnd = baseGradientEnd.toHsv();
disabledGradientEnd.setHsv(disabledGradientEnd.hue(), disabledGradientEnd.saturation() * 0.2,
disabledGradientEnd.value() * 0.6);
return QString(R"( return QString(R"(
QPushButton { QPushButton {
@ -60,15 +62,15 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
stop:0 %8, stop:1 %9); stop:0 %8, stop:1 %9);
} }
)") )")
.arg(base1.name()) // border color .arg(baseGradientStart.name())
.arg(base1.name()) // normal gradient start .arg(baseGradientStart.name())
.arg(base2.name()) // normal gradient end .arg(baseGradientEnd.name())
.arg(hover1.name()) // hover start .arg(hoverGradientStart.name())
.arg(hover2.name()) // hover end .arg(hoverGradientEnd.name())
.arg(pressed1.name()) // pressed start .arg(pressedGradientStart.name())
.arg(pressed2.name()) // pressed end .arg(pressedGradientEnd.name())
.arg(disabled1.name()) // disabled start .arg(disabledGradientStart.name())
.arg(disabled2.name()); // disabled end .arg(disabledGradientEnd.name());
} }
void HomeStyledButton::paintEvent(QPaintEvent *event) void HomeStyledButton::paintEvent(QPaintEvent *event)

6
cockatrice/src/client/ui/widgets/general/home_widget.cpp
View file

@ -176,12 +176,6 @@ QGroupBox *HomeWidget::createButtons()
auto visualDatabaseDisplayButton = new HomeStyledButton(tr("Browse Card Database"), gradientColors); auto visualDatabaseDisplayButton = new HomeStyledButton(tr("Browse Card Database"), gradientColors);
connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor, connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor,
&TabSupervisor::addVisualDatabaseDisplayTab); &TabSupervisor::addVisualDatabaseDisplayTab);
if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished,
visualDatabaseDisplayButton,
[visualDatabaseDisplayButton]() { visualDatabaseDisplayButton->setEnabled(true); });
visualDatabaseDisplayButton->setEnabled(false);
}
boxLayout->addWidget(visualDatabaseDisplayButton); boxLayout->addWidget(visualDatabaseDisplayButton);
auto edhrecButton = new HomeStyledButton(tr("Browse EDHRec"), gradientColors); auto edhrecButton = new HomeStyledButton(tr("Browse EDHRec"), gradientColors);
connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab); connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab);