0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve default light and dark themes (#1174)

Browse Source
This commit is contained in:
Trisave 2022-10-08 19:33:24 +02:00 committed by GitHub
parent e0ef09dfe1
commit ebee50eedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
launcher/ui/themes/BrightTheme.cpp
View File

@ -20,19 +20,19 @@ bool BrightTheme::hasColorScheme()
QPalette BrightTheme::colorScheme() QPalette BrightTheme::colorScheme()
{ {
QPalette brightPalette; QPalette brightPalette;
brightPalette.setColor(QPalette::Window, QColor(239,240,241)); brightPalette.setColor(QPalette::Window, QColor(255,255,255));
brightPalette.setColor(QPalette::WindowText, QColor(49,54,59)); brightPalette.setColor(QPalette::WindowText, QColor(17,17,17));
brightPalette.setColor(QPalette::Base, QColor(252,252,252)); brightPalette.setColor(QPalette::Base, QColor(250,250,250));
brightPalette.setColor(QPalette::AlternateBase, QColor(239,240,241)); brightPalette.setColor(QPalette::AlternateBase, QColor(240,240,240));
brightPalette.setColor(QPalette::ToolTipBase, QColor(49,54,59)); brightPalette.setColor(QPalette::ToolTipBase, QColor(17,17,17));
brightPalette.setColor(QPalette::ToolTipText, QColor(239,240,241)); brightPalette.setColor(QPalette::ToolTipText, QColor(255,255,255));
brightPalette.setColor(QPalette::Text, QColor(49,54,59)); brightPalette.setColor(QPalette::Text, Qt::black);
brightPalette.setColor(QPalette::Button, QColor(239,240,241)); brightPalette.setColor(QPalette::Button, QColor(249,249,249));
brightPalette.setColor(QPalette::ButtonText, QColor(49,54,59)); brightPalette.setColor(QPalette::ButtonText, Qt::black);
brightPalette.setColor(QPalette::BrightText, Qt::red); brightPalette.setColor(QPalette::BrightText, Qt::red);
brightPalette.setColor(QPalette::Link, QColor(41, 128, 185)); brightPalette.setColor(QPalette::Link, QColor(37,137,164));
brightPalette.setColor(QPalette::Highlight, QColor(61, 174, 233)); brightPalette.setColor(QPalette::Highlight, QColor(137,207,84));
brightPalette.setColor(QPalette::HighlightedText, QColor(239,240,241)); brightPalette.setColor(QPalette::HighlightedText, Qt::black);
return fadeInactive(brightPalette, fadeAmount(), fadeColor()); return fadeInactive(brightPalette, fadeAmount(), fadeColor());
} }
@ -43,7 +43,7 @@ double BrightTheme::fadeAmount()
QColor BrightTheme::fadeColor() QColor BrightTheme::fadeColor()
{ {
return QColor(239,240,241); return QColor(255,255,255);
} }
bool BrightTheme::hasStyleSheet() bool BrightTheme::hasStyleSheet()

14
launcher/ui/themes/DarkTheme.cpp
View File

@ -20,18 +20,18 @@ bool DarkTheme::hasColorScheme()
QPalette DarkTheme::colorScheme() QPalette DarkTheme::colorScheme()
{ {
QPalette darkPalette; QPalette darkPalette;
darkPalette.setColor(QPalette::Window, QColor(49,54,59)); darkPalette.setColor(QPalette::Window, QColor(49,49,49));
darkPalette.setColor(QPalette::WindowText, Qt::white); darkPalette.setColor(QPalette::WindowText, Qt::white);
darkPalette.setColor(QPalette::Base, QColor(35,38,41)); darkPalette.setColor(QPalette::Base, QColor(34,34,34));
darkPalette.setColor(QPalette::AlternateBase, QColor(49,54,59)); darkPalette.setColor(QPalette::AlternateBase, QColor(42,42,42));
darkPalette.setColor(QPalette::ToolTipBase, Qt::white); darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
darkPalette.setColor(QPalette::ToolTipText, Qt::white); darkPalette.setColor(QPalette::ToolTipText, Qt::white);
darkPalette.setColor(QPalette::Text, Qt::white); darkPalette.setColor(QPalette::Text, Qt::white);
darkPalette.setColor(QPalette::Button, QColor(49,54,59)); darkPalette.setColor(QPalette::Button, QColor(48,48,48));
darkPalette.setColor(QPalette::ButtonText, Qt::white); darkPalette.setColor(QPalette::ButtonText, Qt::white);
darkPalette.setColor(QPalette::BrightText, Qt::red); darkPalette.setColor(QPalette::BrightText, Qt::red);
darkPalette.setColor(QPalette::Link, QColor(42, 130, 218)); darkPalette.setColor(QPalette::Link, QColor(47,163,198));
darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); darkPalette.setColor(QPalette::Highlight, QColor(145,205,92));
darkPalette.setColor(QPalette::HighlightedText, Qt::black); darkPalette.setColor(QPalette::HighlightedText, Qt::black);
darkPalette.setColor(QPalette::PlaceholderText, Qt::darkGray); darkPalette.setColor(QPalette::PlaceholderText, Qt::darkGray);
return fadeInactive(darkPalette, fadeAmount(), fadeColor()); return fadeInactive(darkPalette, fadeAmount(), fadeColor());
@ -44,7 +44,7 @@ double DarkTheme::fadeAmount()
QColor DarkTheme::fadeColor() QColor DarkTheme::fadeColor()
{ {
return QColor(49,54,59); return QColor(49,49,49);
} }
bool DarkTheme::hasStyleSheet() bool DarkTheme::hasStyleSheet()