mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-08 00:53:57 -07:00
Start from default palette always.
Took 4 minutes
This commit is contained in:
parent
4cc324e1f1
commit
86166ee45a
1 changed files with 3 additions and 3 deletions
|
|
@ -179,7 +179,7 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
|
||||||
|
|
||||||
static inline QPalette createDarkGreenFusionPalette()
|
static inline QPalette createDarkGreenFusionPalette()
|
||||||
{
|
{
|
||||||
QPalette p;
|
QPalette p = QStyleFactory::create("Fusion")->standardPalette();
|
||||||
|
|
||||||
// ---------- Core backgrounds ----------
|
// ---------- Core backgrounds ----------
|
||||||
p.setColor(QPalette::Window, QColor(30, 30, 30)); // #ff1e1e1e
|
p.setColor(QPalette::Window, QColor(30, 30, 30)); // #ff1e1e1e
|
||||||
|
|
@ -248,7 +248,7 @@ static inline QPalette createDarkGreenFusionPalette()
|
||||||
|
|
||||||
static inline QPalette createLightGreenFusionPalette()
|
static inline QPalette createLightGreenFusionPalette()
|
||||||
{
|
{
|
||||||
QPalette p;
|
QPalette p = QStyleFactory::create("Fusion")->standardPalette();
|
||||||
|
|
||||||
// ---------- Core backgrounds ----------
|
// ---------- Core backgrounds ----------
|
||||||
p.setColor(QPalette::Window, QColor(240, 240, 240)); // #fff0f0f0
|
p.setColor(QPalette::Window, QColor(240, 240, 240)); // #fff0f0f0
|
||||||
|
|
@ -350,7 +350,7 @@ void ThemeManager::themeChangedSlot()
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
qApp->setStyle(QStyleFactory::create("Fusion"));
|
||||||
qApp->setPalette(createDarkGreenFusionPalette());
|
qApp->setPalette(createDarkGreenFusionPalette());
|
||||||
} else {
|
} else {
|
||||||
qApp->setStyle(defaultStyleName); // setting the style also sets the palette
|
qApp->setStyle(QStyleFactory::create(defaultStyleName)); // setting the style also sets the palette
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dirPath.isEmpty()) {
|
if (dirPath.isEmpty()) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue