Use extern with custom font variables (#7)
This commit is contained in:
parent
6b02149040
commit
b78840238d
2 changed files with 7 additions and 7 deletions
|
|
@ -164,22 +164,22 @@ Application::~Application() {
|
||||||
void Application::run() {
|
void Application::run() {
|
||||||
KotatoSettings::Start();
|
KotatoSettings::Start();
|
||||||
if (!cMainFont().isEmpty()) {
|
if (!cMainFont().isEmpty()) {
|
||||||
style::internal::SetMainFont(cMainFont());
|
style::internal::CustomMainFont = cMainFont();
|
||||||
}
|
}
|
||||||
if (!cSemiboldFont().isEmpty()) {
|
if (!cSemiboldFont().isEmpty()) {
|
||||||
style::internal::SetSemiboldFont(cSemiboldFont());
|
style::internal::CustomSemiboldFont = cSemiboldFont();
|
||||||
}
|
}
|
||||||
if (cSemiboldFontIsBold()) {
|
if (cSemiboldFontIsBold()) {
|
||||||
style::internal::SetSemiboldIsBold(cSemiboldFontIsBold());
|
style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold();
|
||||||
}
|
}
|
||||||
if (!cMonospaceFont().isEmpty()) {
|
if (!cMonospaceFont().isEmpty()) {
|
||||||
style::internal::SetMonospaceFont(cMonospaceFont());
|
style::internal::CustomMonospaceFont = cMonospaceFont();
|
||||||
}
|
}
|
||||||
if (cUseSystemFont()) {
|
if (cUseSystemFont()) {
|
||||||
style::internal::SetUseSystemFont(cUseSystemFont());
|
style::internal::UseSystemFont = cUseSystemFont();
|
||||||
}
|
}
|
||||||
if (cUseOriginalMetrics()) {
|
if (cUseOriginalMetrics()) {
|
||||||
style::internal::SetUseOriginalMetrics(cUseOriginalMetrics());
|
style::internal::UseOriginalMetrics = cUseOriginalMetrics();
|
||||||
}
|
}
|
||||||
style::internal::StartFonts();
|
style::internal::StartFonts();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8ce091c15946b34e7370196224ccbcd5d3d4ba61
|
Subproject commit e6fdff459713ae6b8faafcde2f5c5255343652d4
|
||||||
Loading…
Add table
Reference in a new issue