| Summary: | Settings from Plasma 5.25 not used | ||
|---|---|---|---|
| Product: | [Plasma] plasmashell | Reporter: | Iyán M. V. <me> |
| Component: | Digital Clock widget | Assignee: | Plasma Bugs List <plasma-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | ad.liu.jin, nate, notmart, qydwhotmail |
| Priority: | NOR | Keywords: | regression |
| Version First Reported In: | 5.25.90 | ||
| Target Milestone: | 1.0 | ||
| Platform: | Other | ||
| OS: | Other | ||
| Latest Commit: | https://invent.kde.org/plasma/plasma-desktop/commit/7fcb5948696ff2748ce667a0b8eaa4f426543c62 | Version Fixed/Implemented In: | 5.26 |
| Sentry Crash Report: | |||
|
Description
Iyán M. V.
2022-09-19 07:57:14 UTC
A possibly relevant merge request was started @ https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2152 A possibly relevant merge request was started @ https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2154 Git commit 9bf9cc4fcfcabd55652e6a7d2eac3b778253d210 by Nate Graham, on behalf of Jin Liu. Committed on 23/09/2022 at 02:14. Pushed by ngraham into branch 'master'. 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 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/1169 M +1 -1 applets/digital-clock/package/contents/ui/DigitalClock.qml https://invent.kde.org/plasma/plasma-workspace/commit/9bf9cc4fcfcabd55652e6a7d2eac3b778253d210 Git commit 6204d73eae9beb6837b07f4d0d643d176a412d79 by Fushan Wen, on behalf of Jin Liu. Committed on 24/09/2022 at 01:26. Pushed by fusionfuture into branch 'master'. applets/digital-clock: migrate font settings Plasma 5.26 introduced a new config entry autoFontAndSize which defaults to true. This means if the user customized font before (fontFamily, boldText, italicText), in 5.26 these settings are ignored. So we need to set autoFontAndSize=false if: 1. Any of these 3 old entries above is set. 2. No new entries introduced in 5.26 (autoFontAndSize, fontSize, fontWeight, fontStyleName) are set, so this is a config from 5.25. And fontWeight should be set to 75 (Font.Bold) if boldText==true. A +46 -0 desktoppackage/contents/updates/digitalclock_migrate_font_settings.js https://invent.kde.org/plasma/plasma-desktop/commit/6204d73eae9beb6837b07f4d0d643d176a412d79 Git commit 7fcb5948696ff2748ce667a0b8eaa4f426543c62 by Fushan Wen, on behalf of Jin Liu. Committed on 24/09/2022 at 02:24. Pushed by fusionfuture into branch 'Plasma/5.26'. applets/digital-clock: migrate font settings Plasma 5.26 introduced a new config entry autoFontAndSize which defaults to true. This means if the user customized font before (fontFamily, boldText, italicText), in 5.26 these settings are ignored. So we need to set autoFontAndSize=false if: 1. Any of these 3 old entries above is set. 2. No new entries introduced in 5.26 (autoFontAndSize, fontSize, fontWeight, fontStyleName) are set, so this is a config from 5.25. And fontWeight should be set to 75 (Font.Bold) if boldText==true. (cherry picked from commit 6204d73eae9beb6837b07f4d0d643d176a412d79) A +46 -0 desktoppackage/contents/updates/digitalclock_migrate_font_settings.js https://invent.kde.org/plasma/plasma-desktop/commit/7fcb5948696ff2748ce667a0b8eaa4f426543c62 Git commit 54ca3e91e384d519746840b7342055ab0417994f by Fushan Wen, on behalf of Jin Liu. Committed on 24/09/2022 at 02:25. Pushed by fusionfuture into branch 'Plasma/5.26'. 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 https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/1169 (cherry picked from commit 9bf9cc4fcfcabd55652e6a7d2eac3b778253d210) M +1 -1 applets/digital-clock/package/contents/ui/DigitalClock.qml https://invent.kde.org/plasma/plasma-workspace/commit/54ca3e91e384d519746840b7342055ab0417994f |