jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-07 10:33:24 -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 47bb103a87
9 changed files with 415 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/font_config_test.cpp
View file

@ -282,6 +282,42 @@ TEST(FontConfigTest, CardTextMaxSizeWithoutFamily)
EXPECT_EQ(loaded, cfg);
}
TEST(FontConfigTest, MigratedCardTextMaxResolvesIntoTheEditorsRange)
{
// appearance/maxFontSize came from a control that allowed values above 72
// and the migration seeds it verbatim, so fonts.toml can hold a size the
// font editor cannot show. 72 is what the editor displays and would save,
// so the board has to draw 72 too instead of rendering 100 until the next
// save silently rewrites the theme.
QTemporaryDir tmp;
ASSERT_TRUE(tmp.isValid());
const QString filePath = writeTempFile(tmp, "fonts.toml", "[Fonts]\nCardTextMaxSize = 100\n");
const FontConfig migrated = FontConfig::fromFile(filePath);
ASSERT_EQ(migrated.cardTextMaxSize, 100);
EXPECT_EQ(migrated.resolvedCardTextMaxSize(), 72);
}
TEST(FontConfigTest, CardTextSizesResolveIntoTheEditorsRange)
{
// The same bound applies when the size comes from the CardText family, a
// stored size below the editor's control floor rises to it, and the max is
// never below the resolved shrink-to-fit floor.
FontConfig fromFamily;
fromFamily.fonts[AppFont::CardText] = makeFont("Noto Serif", 100);
EXPECT_EQ(fromFamily.resolvedCardTextMaxSize(), 72);
FontConfig belowFloor;
belowFloor.cardTextMaxSize = 3;
EXPECT_EQ(belowFloor.resolvedCardTextMaxSize(), 6);
FontConfig narrow;
narrow.cardTextMinSize = 20;
narrow.cardTextMaxSize = 12;
EXPECT_EQ(narrow.resolvedCardTextMinSize(), 20);
EXPECT_EQ(narrow.resolvedCardTextMaxSize(), 20);
}
TEST(FontConfigTest, CardTextMaxDefaultIsOmitted)
{
FontConfig cfg;

48
tests/settings/settings_migration_test.cpp
View file

@ -1160,6 +1160,54 @@ TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_MergesWithOtherRoles)
EXPECT_TRUE(content.contains("20"));
}
TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_InsertsIntoFontsSectionNotAfterIt)
{
// A hand-edited fonts.toml may keep [Fonts] first and another section after
// it. Appending the seeded key at EOF would land it in that trailing
// section, where the font parser never reads it.
const QString themesPath = tempDir.path() + "/themes";
ASSERT_TRUE(QDir().mkpath(themesPath + "/MyTheme"));
{
QFile f(themesPath + "/MyTheme/fonts.toml");
ASSERT_TRUE(f.open(QIODevice::WriteOnly | QIODevice::Text));
QTextStream out(&f);
out << "[Fonts]\n"
"# keep this comment\n"
"InterfaceDefault = \"Inter, 10\"\n"
"\n"
"[Other]\n"
"Keep = \"me\"\n";
}
{
QSettings paths(settingsPath + "paths.ini", QSettings::IniFormat);
paths.setValue("paths/themes", themesPath);
paths.sync();
}
{
QSettings appearance(settingsPath + "appearance.ini", QSettings::IniFormat);
appearance.setValue("appearance/maxFontSize", 18);
appearance.sync();
}
ASSERT_TRUE(SettingsMigration::migrateAppearanceMaxFontSizeToTheme(settingsPath));
QFile f(themesPath + "/MyTheme/fonts.toml");
ASSERT_TRUE(f.open(QIODevice::ReadOnly | QIODevice::Text));
const QString content = QString::fromUtf8(f.readAll());
ASSERT_TRUE(content.contains("CardTextMaxSize"));
EXPECT_TRUE(content.contains("18"));
// The new key belongs to [Fonts], not to the section that follows it ...
const int keyPos = content.indexOf("CardTextMaxSize");
const int otherSectionPos = content.indexOf("[Other]");
ASSERT_GE(keyPos, 0);
ASSERT_GE(otherSectionPos, 0);
EXPECT_LT(keyPos, otherSectionPos);
// ... and the file keeps its own comment, ordering and trailing section.
EXPECT_TRUE(content.contains("# keep this comment"));
EXPECT_TRUE(content.contains("InterfaceDefault = \"Inter, 10\""));
EXPECT_TRUE(content.endsWith("[Other]\nKeep = \"me\"\n"));
}
TEST_F(SettingsMigrationTest, AppearanceMaxFontSize_AbsentKeyDoesNothing)
{
ASSERT_FALSE(SettingsMigration::migrateAppearanceMaxFontSizeToTheme(settingsPath));

133
tests/theme_migration/theme_migration_test.cpp
View file

@ -47,13 +47,19 @@ class ThemeMigrationTest : public ::testing::Test
{
protected:
QTemporaryDir tmp;
// Base of the per-user theme tree (<tmp>/themes).
QString themesPath;
// Base of the shipped/install theme tree (<tmp>/system), deliberately
// separate from themesPath so a fallback cannot pass by reading a user file.
QString systemThemesPath;
void SetUp() override
{
ASSERT_TRUE(tmp.isValid());
themesPath = QDir(tmp.path()).absoluteFilePath("themes");
systemThemesPath = QDir(tmp.path()).absoluteFilePath("system");
ASSERT_TRUE(QDir().mkpath(themesPath));
ASSERT_TRUE(QDir().mkpath(systemThemesPath));
}
};
@ -149,6 +155,133 @@ TEST_F(ThemeMigrationTest, IsIdempotent)
EXPECT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(), std::string("css"));
}
TEST_F(ThemeMigrationTest, ThemeConfigFallsBackToTheShippedThemeDir)
{
// A user theme directory only holds what the user (or a migration) wrote.
// Reading theme.cfg from it alone would shadow the shipped theme and leave
// the board without its style and colour scheme.
const QString userDir = QDir(themesPath).absoluteFilePath("Leather");
ASSERT_TRUE(QDir().mkpath(userDir));
writeThemeFile(themesPath, "Leather", "fonts.toml", "[Fonts]\nCardTextMaxSize = 14\n");
writeThemeFile(systemThemesPath, "Leather", "theme.cfg",
"[Appearance]\nColorScheme = Dark\n\n[Style]\nName = Leather\n");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Leather");
const ThemeConfig cfg = ThemeManager::loadDefaultThemeConfig(userDir, systemDir);
EXPECT_EQ(cfg.colorScheme.toStdString(), std::string("Dark"));
EXPECT_EQ(cfg.styleName.toStdString(), std::string("Leather"));
}
TEST_F(ThemeMigrationTest, UserThemeConfigWinsOverTheShippedOne)
{
writeThemeFile(themesPath, "Leather", "theme.cfg", "[Appearance]\nColorScheme = Light\n\n[Style]\nName = Custom\n");
writeThemeFile(systemThemesPath, "Leather", "theme.cfg",
"[Appearance]\nColorScheme = Dark\n\n[Style]\nName = Leather\n");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Leather");
const ThemeConfig cfg =
ThemeManager::loadDefaultThemeConfig(QDir(themesPath).absoluteFilePath("Leather"), systemDir);
EXPECT_EQ(cfg.colorScheme.toStdString(), std::string("Light"));
EXPECT_EQ(cfg.styleName.toStdString(), std::string("Custom"));
}
TEST_F(ThemeMigrationTest, ColorSchemeFollowsTheOsWhenTheResolvedThemeDirIsMissing)
{
// getAvailableThemes() maps System/Fusion to a user directory that only
// appears on save, so a fresh profile has no resolved directory. Fusion
// ships ColorScheme = Dark; inheriting it there would force dark mode on
// every fresh profile regardless of the OS. Only an existing user directory
// is layered on the shipped theme.
const QString userDir = QDir(themesPath).absoluteFilePath("Fusion");
ASSERT_FALSE(QFileInfo::exists(userDir));
writeThemeFile(systemThemesPath, "Fusion", "theme.cfg",
"[Appearance]\nColorScheme = Dark\n\n[Style]\nName = Fusion\n");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Fusion");
const ThemeConfig cfg = ThemeManager::loadColorSchemeConfig(userDir, systemDir);
// Empty means isDarkMode() falls through to the OS color scheme.
EXPECT_TRUE(cfg.colorScheme.isEmpty());
}
TEST_F(ThemeMigrationTest, ColorSchemeInheritsTheShippedSchemeForAnExistingUserDir)
{
// The migration seeds an existing user directory with fonts.toml only. Such
// a directory still belongs to the shipped theme and must keep its scheme
// instead of silently flipping to the OS one.
const QString userDir = QDir(themesPath).absoluteFilePath("Fusion");
ASSERT_TRUE(QDir().mkpath(userDir));
writeThemeFile(themesPath, "Fusion", "fonts.toml", "[Fonts]\nCardTextMaxSize = 14\n");
writeThemeFile(systemThemesPath, "Fusion", "theme.cfg",
"[Appearance]\nColorScheme = Dark\n\n[Style]\nName = Fusion\n");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Fusion");
const ThemeConfig cfg = ThemeManager::loadColorSchemeConfig(userDir, systemDir);
EXPECT_EQ(cfg.colorScheme.toStdString(), std::string("Dark"));
}
TEST_F(ThemeMigrationTest, DefaultThemeConfigStillCarriesTheShippedStyleWithoutAUserDir)
{
// themeChangedSlot()/previewPalette() use the unconditional fallback: a
// stock theme with no user directory must still get its shipped styleName,
// even though its colour scheme follows the OS.
const QString userDir = QDir(themesPath).absoluteFilePath("Fusion");
ASSERT_FALSE(QFileInfo::exists(userDir));
writeThemeFile(systemThemesPath, "Fusion", "theme.cfg",
"[Appearance]\nColorScheme = Dark\n\n[Style]\nName = Fusion\n");
const ThemeConfig cfg =
ThemeManager::loadDefaultThemeConfig(userDir, QDir(systemThemesPath).absoluteFilePath("Fusion"));
EXPECT_EQ(cfg.styleName.toStdString(), std::string("Fusion"));
}
TEST_F(ThemeMigrationTest, StyleSheetFallsBackToTheShippedThemeDir)
{
const QString userDir = QDir(themesPath).absoluteFilePath("Leather");
ASSERT_TRUE(QDir().mkpath(userDir));
writeThemeFile(themesPath, "Leather", "fonts.toml", "[Fonts]\nCardTextMaxSize = 14\n");
writeThemeFile(systemThemesPath, "Leather", "style.css", "shipped-css");
writeThemeFile(systemThemesPath, "Leather", "style-dark.css", "shipped-dark-css");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Leather");
// The scheme-qualified shipped stylesheet wins, else the plain one.
EXPECT_EQ(ThemeManager::themeStyleSheetPath(userDir, systemDir, true).toStdString(),
QDir(systemDir).absoluteFilePath("style-dark.css").toStdString());
EXPECT_EQ(ThemeManager::themeStyleSheetPath(userDir, systemDir, false).toStdString(),
QDir(systemDir).absoluteFilePath("style.css").toStdString());
}
TEST_F(ThemeMigrationTest, StyleSheetPrefersTheUserCopy)
{
const QString userDir = QDir(themesPath).absoluteFilePath("Leather");
writeThemeFile(themesPath, "Leather", "style.css", "user-css");
writeThemeFile(systemThemesPath, "Leather", "style-dark.css", "shipped-dark-css");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Leather");
// A user-authored stylesheet is never mixed with the shipped scheme variant.
EXPECT_EQ(ThemeManager::themeStyleSheetPath(userDir, systemDir, true).toStdString(),
QDir(userDir).absoluteFilePath("style.css").toStdString());
}
TEST_F(ThemeMigrationTest, StyleSheetIsEmptyWhenNeitherDirectoryHasOne)
{
const QString userDir = QDir(themesPath).absoluteFilePath("Leather");
ASSERT_TRUE(QDir().mkpath(userDir));
writeThemeFile(themesPath, "Leather", "fonts.toml", "[Fonts]\nCardTextMaxSize = 14\n");
// Only the opposite scheme's stylesheet is shipped, so no fallback matches.
writeThemeFile(systemThemesPath, "Leather", "style-dark.css", "shipped-dark-css");
const QString systemDir = QDir(systemThemesPath).absoluteFilePath("Leather");
EXPECT_TRUE(ThemeManager::themeStyleSheetPath(userDir, systemDir, false).isEmpty());
}
// Every test brings its own main(): GTest is not guaranteed to be found on the build machines, and
// the fallback then links the bare gtest library without gtest_main.
int main(int argc, char **argv)