jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-28 17:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[App] Add Fusion Theme (#6577)

Browse source 
Adds a new default theme that causes the QT Fusion theme to be
selected. This theme looks a bit nicer than 'Windows' and supports
both light and dark mode out of the box.
This commit is contained in:
Rob Blanckaert 2026-01-27 17:49:40 -08:00 • committed by GitHub
parent 5309dd17be
commit 7b64970e97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cockatrice/src/interface/theme_manager.cpp
View file

@ -6,10 +6,15 @@
#include <QColor> #include <QColor>
#include <QDebug> #include <QDebug>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QPalette>
#include <QPixmapCache> #include <QPixmapCache>
#include <QStandardPaths> #include <QStandardPaths>
#include <QStyleFactory>
#include <QStyleHints>
#include <Qt>
#define NONE_THEME_NAME "Default" #define NONE_THEME_NAME "Default"
#define FUSION_THEME_NAME "Fusion"
#define STYLE_CSS_NAME "style.css" #define STYLE_CSS_NAME "style.css"
#define HANDZONE_BG_NAME "handzone" #define HANDZONE_BG_NAME "handzone"
#define PLAYERZONE_BG_NAME "playerzone" #define PLAYERZONE_BG_NAME "playerzone"
@ -24,6 +29,9 @@ static const QStringList DEFAULT_RESOURCE_PATHS = {":/resources"};
ThemeManager::ThemeManager(QObject *parent) : QObject(parent) ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
{ {
ensureThemeDirectoryExists(); ensureThemeDirectoryExists();
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, &ThemeManager::themeChangedSlot);
#endif
connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ThemeManager::themeChangedSlot); connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ThemeManager::themeChangedSlot);
themeChangedSlot(); themeChangedSlot();
} }
@ -44,6 +52,7 @@ QStringMap &ThemeManager::getAvailableThemes()
// add default value // add default value
availableThemes.insert(NONE_THEME_NAME, QString()); availableThemes.insert(NONE_THEME_NAME, QString());
availableThemes.insert(FUSION_THEME_NAME, QString());
// load themes from user profile dir // load themes from user profile dir
dir.setPath(SettingsCache::instance().getThemesPath()); dir.setPath(SettingsCache::instance().getThemesPath());
@ -117,6 +126,20 @@ void ThemeManager::themeChangedSlot()
qApp->setStyleSheet(""); qApp->setStyleSheet("");
} }
if (themeName == FUSION_THEME_NAME) {
qApp->setStyle(QStyleFactory::create("Fusion"));
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
QPalette palette;
if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark) {
palette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
}
qApp->setPalette(palette);
#endif
} else {
qApp->setStyle(QStyleFactory::create(QStyleFactory::keys().first()));
}
if (dirPath.isEmpty()) { if (dirPath.isEmpty()) {
// set default values // set default values
QDir::setSearchPaths("theme", DEFAULT_RESOURCE_PATHS); QDir::setSearchPaths("theme", DEFAULT_RESOURCE_PATHS);