mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-06 10:03:26 -08:00
db4e07e55d
The one-glyph cutover recolored every icon from a single palette role, so a disabled deck, a not-ready player and a remove button all lost the red or green that carried their meaning. Add Positive and Negative application colors beside the accents, ship scheme-appropriate defaults for every theme, and resolve them through ThemeManager. Icons now take an IconTint: a palette role for structural glyphs, or a semantic role for states and add/remove actions. A disabled semantic icon falls back to the disabled foreground; on a selected row a semantic tint keeps its color only while it stays legible on the highlight, and a palette tint keeps the existing WindowText -> HighlightedText swap.
122 lines
3.2 KiB
C++
122 lines
3.2 KiB
C++
#ifndef COCKATRICE_THEME_CONFIG_H
|
|
#define COCKATRICE_THEME_CONFIG_H
|
|
|
|
#include <QColor>
|
|
#include <QFont>
|
|
#include <QMap>
|
|
#include <QPalette>
|
|
#include <QSharedPointer>
|
|
#include <QString>
|
|
#include <qtmetamacros.h>
|
|
|
|
// Application-specific color roles, layered on top of the fixed QPalette role
|
|
// set. Stored in the same palette-<scheme>.toml under an [AppColors] section
|
|
// and editable from the palette editor, so theme authors can control colors
|
|
// beyond what Qt's palette can express.
|
|
namespace AppColor
|
|
{
|
|
Q_NAMESPACE
|
|
enum Role
|
|
{
|
|
AccentStrong,
|
|
AccentSoft,
|
|
Positive,
|
|
Negative,
|
|
};
|
|
Q_ENUM_NS(Role)
|
|
} // namespace AppColor
|
|
|
|
// Application-specific font roles, one configurable family + point size per
|
|
// purpose. Stored in a shared fonts.toml under a [Fonts] section (one file per
|
|
// theme, not split by light/dark). Only family and point size are stored;
|
|
// weight/italic are stripped on load and stay caller-side concerns.
|
|
namespace AppFont
|
|
{
|
|
Q_NAMESPACE
|
|
enum Role
|
|
{
|
|
InterfaceDefault,
|
|
ChatLog,
|
|
CardText,
|
|
DeckList,
|
|
};
|
|
Q_ENUM_NS(Role)
|
|
} // namespace AppFont
|
|
|
|
/**
|
|
* @brief Fallback for an application color role when the active theme does not
|
|
* define one.
|
|
*
|
|
* Accent roles return an invalid QColor because ThemeManager derives them from
|
|
* the palette highlight. Semantic roles return an opaque, scheme-appropriate
|
|
* default so a theme written before the role existed still renders it sensibly.
|
|
*/
|
|
QColor defaultAppColor(AppColor::Role role, bool dark);
|
|
|
|
struct ThemeConfig
|
|
{
|
|
QString colorScheme;
|
|
QString styleName;
|
|
|
|
bool isEmpty() const;
|
|
QString toIni() const;
|
|
|
|
static ThemeConfig fromThemeDir(const QString &themeDirPath);
|
|
bool save(const QString &themeDirPath) const;
|
|
};
|
|
|
|
struct PaletteConfig
|
|
{
|
|
QMap<QPalette::ColorGroup, QMap<QPalette::ColorRole, QColor>> colors;
|
|
QMap<AppColor::Role, QColor> appColors;
|
|
|
|
bool operator==(const PaletteConfig &rhs) const
|
|
{
|
|
return colors == rhs.colors && appColors == rhs.appColors;
|
|
}
|
|
bool operator!=(const PaletteConfig &rhs) const
|
|
{
|
|
return !(*this == rhs);
|
|
}
|
|
bool hasPalette() const;
|
|
QString toToml() const;
|
|
|
|
static QString fileName(const QString &colorScheme);
|
|
|
|
static PaletteConfig fromFile(const QString &filePath);
|
|
static PaletteConfig fromScheme(const QString &themeDirPath, const QString &colorScheme);
|
|
static PaletteConfig fromDefault(const QString &themeDirPath, const QString &colorScheme);
|
|
|
|
QPalette apply(QPalette base) const;
|
|
};
|
|
|
|
/** @brief Per-purpose font configuration, stored as family + point size only.
|
|
*
|
|
* Serialized to a shared fonts.toml file with a [Fonts] section, e.g.
|
|
* @code
|
|
* [Fonts]
|
|
* InterfaceDefault = "Inter, 10"
|
|
* @endcode
|
|
*/
|
|
struct FontConfig
|
|
{
|
|
QMap<AppFont::Role, QFont> fonts;
|
|
|
|
bool operator==(const FontConfig &rhs) const
|
|
{
|
|
return fonts == rhs.fonts;
|
|
}
|
|
bool operator!=(const FontConfig &rhs) const
|
|
{
|
|
return !(*this == rhs);
|
|
}
|
|
bool hasFonts() const;
|
|
QString toToml() const;
|
|
|
|
static QString fileName();
|
|
|
|
static FontConfig fromFile(const QString &filePath);
|
|
static FontConfig fromThemeDir(const QString &themeDirPath);
|
|
};
|
|
|
|
#endif // COCKATRICE_THEME_CONFIG_H
|