1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-05 21:15:38 -05:00

greeter: fix custom themes and font family

fixes #776
This commit is contained in:
bbedward
2025-11-23 13:21:16 -05:00
parent 800588e121
commit d9522818ae
2 changed files with 6 additions and 3 deletions

View File

@@ -81,6 +81,9 @@ Singleton {
settingsLoaded = true
if (typeof Theme !== "undefined") {
if (currentThemeName === "custom" && customThemeFile) {
Theme.loadCustomThemeFromFile(customThemeFile)
}
Theme.applyGreeterTheme(currentThemeName)
}
}

View File

@@ -16,8 +16,8 @@ Text {
}
readonly property string resolvedFontFamily: {
const requestedFont = isMonospace ? SettingsData.monoFontFamily : SettingsData.fontFamily
const defaultFont = isMonospace ? SettingsData.defaultMonoFontFamily : SettingsData.defaultFontFamily
const requestedFont = isMonospace ? Theme.monoFontFamily : Theme.fontFamily
const defaultFont = isMonospace ? "Fira Code" : "Inter Variable"
if (requestedFont === defaultFont) {
return isMonospace ? firaCodeFont.name : interFont.name
@@ -34,7 +34,7 @@ Text {
color: Theme.surfaceText
font.pixelSize: Appearance.fontSize.normal
font.family: resolvedFontFamily
font.weight: SettingsData.fontWeight
font.weight: Theme.fontWeight
wrapMode: Text.WordWrap
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter