Repository navigation
Conversation
[Medium impact] The PR appears safe to merge; the previous test mismatch is fixed and no new actionable issues were found. SummaryThe current patch qualifies palette references as
Reviews (2) · Last reviewed commit: "Qualify shell palette references for Qt ..." · Reviewed by Greptile |
Qt 6.12 adds a Color type to QtQuick that shadows the qs.Commons Color singleton, so every unqualified Color.* lookup resolves to undefined and the bar, launcher, menus, notifications, lock screen and polkit dialog render without colors (the launcher shows as a black box). Port of upstream omacom#14553: import qs.Commons as Commons and reference the palette as Commons.Color.*, keeping the singleton's name so plugins written against upstream keep working. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
619cae4 to
9ad87f1
Compare
|
Heads-up for triage: #765 (4.0.5rc1 sync) already includes this fix. I compared the branches. #765 qualifies every code reference to the palette as I'll close this once #765 merges. Until then it stays available as a standalone fix in case the sync is held up. |
Problem
After upgrading to Qt 6.12.0 (
qt6-base 6.12.0-3,qt6-declarative 6.12.0-2) and quickshell 0.3.2, the shell loses all theme colors: the launcher (Super+Space) opens as a black box, and the bar, menus, notifications, lock screen and polkit dialog are affected the same way. The journal fills with:Cause
Qt 6.12 adds a
Colortype toQtQuickthat shadows theqs.CommonsColorsingleton, so every unqualifiedColor.*lookup resolves toundefined.Fix
Port of upstream omacom/omarchy#14553: files that use the palette now
import qs.Commons as Commonsand reference it asCommons.Color.*. The singleton keeps its name, so plugins written against upstream keep working. Upstream's patch doesn't apply cleanly because the fork has diverged, so I applied the same change across the 54 shell files that need it, includingCommons/Border.qmlandCommons/Style.qml.test/shell.d/bar-test.shgets upstream's assertion update.An earlier version of this PR renamed the singleton to
ThemeColor. I replaced that to match upstream.Testing
On aarch64 (Asahi, Qt 6.12.0, quickshell 0.3.2):
undefinederrors. The stock 4.0.3 shell logs hundreds.test/shell.d/bar-test.shpasses.test/shell: the only files that fail are 7 that also fail on unmodifiedorigin/quattro(arm-channel-staging,arm-package-recovery,config,package-build-contract,screenshot-sanity,settings-package-units,unowned-system-paths).🤖 Generated with Claude Code