ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Apply pending shell theme after background polling

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-06-22 19:57:05 +02:00
parent cdd833facb
commit 4773202ab0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/background/Background.qml
+3 -1
View File
@@ -70,7 +70,9 @@ Item {
} }
function applyPendingTheme() { function applyPendingTheme() {
if (pendingThemeVersion !== backgroundVersion) return // Background polling can advance backgroundVersion while a theme switch is
// pending; the latest theme payload should still apply.
if (pendingThemeVersion < 0) return
pendingThemeFallbackTimer.stop() pendingThemeFallbackTimer.stop()
Color.loadColors(pendingColorsRaw) Color.loadColors(pendingColorsRaw)
// Color.loadShell also refreshes Style so the type scale flips with the // Color.loadShell also refreshes Style so the type scale flips with the
test/shell.d/background-test.sh
+2 -1
View File
@@ -14,7 +14,8 @@ assert(
assert( assert(
backgroundQml.includes('pendingThemeFallbackTimer.restart()') && backgroundQml.includes('pendingThemeFallbackTimer.restart()') &&
backgroundQml.includes('pendingThemeFallbackTimer.stop()') && backgroundQml.includes('pendingThemeFallbackTimer.stop()') &&
backgroundQml.includes('id: pendingThemeFallbackTimer'), backgroundQml.includes('id: pendingThemeFallbackTimer') &&
!backgroundQml.includes('pendingThemeVersion !== backgroundVersion'),
'background theme transition applies pending colors even if image reveal stalls' 'background theme transition applies pending colors even if image reveal stalls'
) )
JS JS