Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 07:52:50 -05:00
Code Packages Releases Activity

greeter: fix custom themes and font family

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
quickshell/Modules/Greetd/GreetdSettings.qml
View File

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

6
quickshell/Widgets/StyledText.qml
View File

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