Commit 54ca3e91 authored by Jin Liu's avatar Jin Liu Committed by Fushan Wen
Browse files

applets/digital-clock: use theme default font when fontFamily not set

When migrating from 5.25 config, the user may have previously set
boldText=true and fontFamily="". In this case, we need to use the
system font, and not the applet's (nonexistent) configured font.

This is required by plasma-desktop!1169

CCBUG: 459372


(cherry picked from commit 9bf9cc4f)
parent 59bf0f5a
Pipeline #236242 passed with stage
in 6 minutes and 44 seconds
......@@ -570,7 +570,7 @@ MouseArea {
height: 1024
font.family: Plasmoid.configuration.autoFontAndSize ? PlasmaCore.Theme.defaultFont.family : Plasmoid.configuration.fontFamily
font.family: (Plasmoid.configuration.autoFontAndSize || Plasmoid.configuration.fontFamily.length === 0) ? PlasmaCore.Theme.defaultFont.family : Plasmoid.configuration.fontFamily
font.weight: Plasmoid.configuration.autoFontAndSize ? PlasmaCore.Theme.defaultFont.weight : Plasmoid.configuration.fontWeight
font.italic: Plasmoid.configuration.autoFontAndSize ? PlasmaCore.Theme.defaultFont.italic : Plasmoid.configuration.italicText
font.pixelSize: Plasmoid.configuration.autoFontAndSize ? 3 * PlasmaCore.Theme.defaultFont.pixelSize : pointToPixel(Plasmoid.configuration.fontSize)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment