jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-29 17:32:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert unintentional cherry picks

Browse source 
Took 2 minutes
This commit is contained in:
Lukas Brübach 2026-08-13 13:07:12 +02:00
parent 68e1ca1616
commit 0fa9fdb967
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game_graphics/player/player_target.cpp
View file

@ -33,10 +33,10 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
path.lineTo(50 - border / 2, 30 - border / 2); path.lineTo(50 - border / 2, 30 - border / 2);
path.closeSubpath(); path.closeSubpath();
QPen pen(qApp->palette().highlight().color()); QPen pen(QColor(100, 100, 100));
pen.setWidthF(border); pen.setWidthF(border);
painter->setPen(pen); painter->setPen(pen);
painter->setBrush(hovered ? QColor(18, 24, 38, 200) : QColor(11, 14, 20, 184)); painter->setBrush(hovered ? QColor(50, 50, 50, 160) : QColor(0, 0, 0, 160));
painter->drawPath(path); painter->drawPath(path);

2
cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
View file

@ -289,7 +289,6 @@ void UserInterfaceSettingsPage::enableAllAnimations()
tapAnimationCheckBox.setChecked(true); tapAnimationCheckBox.setChecked(true);
lifeCounterAnimationsCheckBox.setChecked(true); lifeCounterAnimationsCheckBox.setChecked(true);
battlefieldFlashCheckBox.setChecked(true); battlefieldFlashCheckBox.setChecked(true);
visualDeckStorageSelectionAnimationCheckBox.setChecked(true);
} }
void UserInterfaceSettingsPage::disableAllAnimations() void UserInterfaceSettingsPage::disableAllAnimations()
@ -297,7 +296,6 @@ void UserInterfaceSettingsPage::disableAllAnimations()
tapAnimationCheckBox.setChecked(false); tapAnimationCheckBox.setChecked(false);
lifeCounterAnimationsCheckBox.setChecked(false); lifeCounterAnimationsCheckBox.setChecked(false);
battlefieldFlashCheckBox.setChecked(false); battlefieldFlashCheckBox.setChecked(false);
visualDeckStorageSelectionAnimationCheckBox.setChecked(false);
} }
void UserInterfaceSettingsPage::updateCommanderSpellbookUiState() void UserInterfaceSettingsPage::updateCommanderSpellbookUiState()