jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 02:53:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Fonts] Resolve CardText sizes against the shipped theme

Browse source 
Seeding themes/<name>/fonts.toml made getAvailableThemes() resolve the user dir, which shadowed the shipped theme.cfg and stylesheet: styleName came back empty and QSS was cleared. Fall back to the shipped theme dir for theme.cfg and QSS when the user dir exists, and resolve CardText sizes through FontConfig's 6..72 range so a migrated 80..100 renders at the size the editor shows. Insert CardTextMaxSize inside [Fonts] when another section follows.
This commit is contained in:
Lukas Brübach 2026-11-07 19:02:51 +01:00
parent e87cd80c9b
commit 06ebd63c6d
10 changed files with 416 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
View file

@ -532,23 +532,46 @@ static bool seedCardTextMaxIntoThemeDir(const QString &themeDirPath, int maxSize
// for the whole board (names, player labels, the completer), which is not
// what the retired maxFontSize setting meant. Let the family keep its
// existing resolution and only constrain the size.
const QString entry = QString("%1 = %2\n").arg(QStringLiteral("CardTextMaxSize"), -20).arg(maxSize);
const QString entry = QString("%1 = %2").arg(QStringLiteral("CardTextMaxSize"), -20).arg(maxSize);
QString out;
if (existing.isEmpty()) {
out = "[Fonts]\n" + entry + "\n";
} else if (existing.contains("[Fonts]", Qt::CaseInsensitive)) {
out = existing;
if (!out.endsWith('\n')) {
out += '\n';
}
out += entry;
} else {
out = existing;
if (!out.endsWith('\n')) {
out += '\n';
}
out += "\n[Fonts]\n" + entry + "\n";
// Insert the key inside an existing [Fonts] section. Appending at EOF
// would land it in whatever section happens to follow, where the font
// parser never reads it. Tracking the last non-blank line of the
// section keeps the file's own comments, ordering and blank lines.
QStringList lines = out.split('\n');
int insertAt = -1;
for (int i = 0; i < lines.size(); ++i) {
const QString trimmed = lines[i].trimmed();
if (insertAt < 0) {
if (trimmed.startsWith('[') && trimmed.endsWith(']') &&
trimmed.mid(1, trimmed.length() - 2).trimmed().compare("Fonts", Qt::CaseInsensitive) == 0) {
insertAt = i + 1;
}
continue;
}
if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
break;
}
if (!trimmed.isEmpty()) {
insertAt = i + 1;
}
}
if (insertAt < 0) {
out += "\n[Fonts]\n" + entry + "\n";
} else {
lines.insert(insertAt, entry);
out = lines.join('\n');
}
}
QFile f(filePath);