Gabriel Brown
9ba224d776
The recent accent-colour setting only reached part of the desktop. looks.lua still hardcoded the focused-window border and glow to blue, so any hyprctl reload -- or every fresh session, for about a second -- reverted a chosen accent; it now reads accentName the same way it already read colorScheme. The lock screen and terminal stayed blue regardless of the chosen accent despite the setting's own description claiming otherwise; panama-lock and panama-theme-apps now resolve and apply the real accent. AccentPicker built its swatch model from Theme.accents directly instead of the schema's own options list, so the two could drift silently; switched it to read the schema. Its hit target only covered the swatch, not the name label added specifically for colour-vision accessibility -- extended to the whole row. Settings search had no route for the "appearance" group, so searching for the accent or colour scheme landed on Home. ColorScheme's hex-to-Hyprland helper assumed 6-digit colours and would silently corrupt a future translucent one; fixed it to read from the end of the string instead of the start. An accent-only change no longer reruns the full colour-scheme pipeline. The gradient it builds for the focused border now goes through SystemSettings' existing serialiser instead of a second, under-escaped copy of the same logic. The settings-ownership contract test enforced the old rule that ColorScheme must never touch the focused border; updated it to verify the real, intended rule instead of contradicting the code. Claude-Session: https://claude.ai/code/session_01E6TJUAh41HaP25MVHWkhRZ
156 lines
6.3 KiB
Bash
Executable File
156 lines
6.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# A setting has one schema-routed owner. A second page may mirror it only when
|
|
# this contract names the exact owner and mirror set. The same ownership rule
|
|
# says who writes each half of the window border: ColorScheme.qml owns the
|
|
# neutral inactive role AND the accent-derived focused role, restating both
|
|
# together on every scheme or accent change.
|
|
|
|
set -euo pipefail
|
|
|
|
repo_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
|
pages_dir="$repo_dir/config/dot/quickshell/modules/settings"
|
|
schema="$repo_dir/config/dot/quickshell/config/PreferenceSchema.qml"
|
|
search="$repo_dir/config/dot/quickshell/services/SettingsSearch.qml"
|
|
scheme="$repo_dir/config/dot/quickshell/services/ColorScheme.qml"
|
|
looks="$repo_dir/config/dot/hypr/looks.lua"
|
|
readme="$pages_dir/README.md"
|
|
|
|
fail() {
|
|
printf 'settings ownership contract: %s\n' "$1" >&2
|
|
exit 1
|
|
}
|
|
|
|
python3 - "$pages_dir" "$schema" "$search" <<'PY' \
|
|
|| fail 'page ownership or intentional mirrors drifted'
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
import sys
|
|
from collections import defaultdict
|
|
from pathlib import Path
|
|
|
|
pages_dir = Path(sys.argv[1])
|
|
schema_text = Path(sys.argv[2]).read_text(encoding="utf-8")
|
|
search_text = Path(sys.argv[3]).read_text(encoding="utf-8")
|
|
|
|
expected = {
|
|
"animationsEnabled": {"owner": "appearance", "mirrors": {"accessibility"}},
|
|
"cursorInactiveTimeout": {"owner": "mouse", "mirrors": {"accessibility"}},
|
|
"cursorSize": {"owner": "accessibility", "mirrors": {"mouse"}},
|
|
"inactiveOpacity": {"owner": "appearance", "mirrors": {"accessibility"}},
|
|
"lockMinutes": {"owner": "power", "mirrors": {"privacy"}},
|
|
"lockOnSleep": {"owner": "power", "mirrors": {"privacy"}},
|
|
}
|
|
|
|
|
|
def strip_comments(text: str) -> str:
|
|
return re.sub(r"//.*", "", text)
|
|
|
|
|
|
def page_name(path: Path) -> str:
|
|
stem = path.stem.removesuffix("Page")
|
|
return re.sub(r"(?<!^)(?=[A-Z])", "-", stem).lower()
|
|
|
|
|
|
rows: dict[str, list[str]] = defaultdict(list)
|
|
row_pattern = re.compile(
|
|
r"(?:ToggleRow|SliderRow|ChoiceRow|TextEntryRow|TimeOfDayRow)\s*\{(?P<body>.*?)\}",
|
|
re.S,
|
|
)
|
|
for page_path in pages_dir.glob("*Page.qml"):
|
|
text = strip_comments(page_path.read_text(encoding="utf-8"))
|
|
for match in row_pattern.finditer(text):
|
|
setting = re.search(r'setting\s*:\s*"([^"]+)"', match.group("body"))
|
|
if setting:
|
|
rows[setting.group(1)].append(page_name(page_path))
|
|
|
|
duplicates = {key: set(pages) for key, pages in rows.items() if len(pages) > 1}
|
|
if set(duplicates) != set(expected):
|
|
raise SystemExit(
|
|
f"duplicate keys are {sorted(duplicates)}, expected {sorted(expected)}"
|
|
)
|
|
|
|
group_pages = dict(re.findall(r'"([^"]+)"\s*:\s*"([^"]+)"', search_text))
|
|
for key, policy in expected.items():
|
|
wanted_pages = {policy["owner"], *policy["mirrors"]}
|
|
if duplicates[key] != wanted_pages:
|
|
raise SystemExit(f"{key} appears on {sorted(duplicates[key])}, expected {sorted(wanted_pages)}")
|
|
|
|
block = re.search(
|
|
r'\{\s*\n\s*key:\s*"' + re.escape(key) + r'"(?P<body>.*?)\n\s*\}',
|
|
schema_text,
|
|
re.S,
|
|
)
|
|
if not block:
|
|
raise SystemExit(f"schema entry missing for {key}")
|
|
group = re.search(r'group:\s*"([^"]+)"', block.group("body"))
|
|
if not group:
|
|
raise SystemExit(f"schema group missing for {key}")
|
|
routed = group_pages.get(group.group(1))
|
|
if routed != policy["owner"]:
|
|
raise SystemExit(
|
|
f"{key} routes to {routed!r}, expected primary owner {policy['owner']!r}"
|
|
)
|
|
PY
|
|
|
|
for needle in \
|
|
'## Setting ownership' \
|
|
'one primary page' \
|
|
'Intentional mirrors' \
|
|
'`animationsEnabled`' \
|
|
'`cursorInactiveTimeout`' \
|
|
'`cursorSize`' \
|
|
'`inactiveOpacity`' \
|
|
'`lockMinutes`' \
|
|
'`lockOnSleep`' \
|
|
'scheme-relative role' \
|
|
'mode, scale, rotation, arrangement, and primary role'; do
|
|
rg -Fq "$needle" "$readme" || fail "README is missing $needle"
|
|
done
|
|
|
|
python3 - "$scheme" "$looks" <<'PY' \
|
|
|| fail 'scheme-relative border ownership drifted'
|
|
import re
|
|
import sys
|
|
|
|
scheme = open(sys.argv[1], encoding="utf-8").read()
|
|
looks = open(sys.argv[2], encoding="utf-8").read()
|
|
|
|
dark = re.search(r'property string inactiveBorderDark:\s*"([^"]+)"', scheme)
|
|
light = re.search(r'property string inactiveBorderLight:\s*"([^"]+)"', scheme)
|
|
effective = re.search(r'property string inactiveBorder:\s*root\.dark\s*\?\s*root\.inactiveBorderDark\s*:\s*root\.inactiveBorderLight', scheme)
|
|
if not dark or not light or not effective:
|
|
raise SystemExit("ColorScheme does not expose the two inactive-border roles")
|
|
if dark.group(1) not in looks or light.group(1) not in looks:
|
|
raise SystemExit("Hyprland startup values disagree with the live scheme roles")
|
|
|
|
without_comments = re.sub(r"//.*", "", scheme)
|
|
|
|
# The focused border is the accent role, and ColorScheme.qml owns it too:
|
|
# each named accent carries a separate pair per scheme, so a scheme change
|
|
# must restate the focused border, not just the neutral one, or a chosen
|
|
# accent goes stale the moment light/dark flips.
|
|
start = re.search(r'property string accentBorderStart:\s*root\.hyprColor\(Theme\.accent\)', scheme)
|
|
end = re.search(r'property string accentBorderEnd:\s*root\.hyprColor\(Theme\.accentSecondary\)', scheme)
|
|
if not start or not end:
|
|
raise SystemExit("ColorScheme does not derive the focused border from the chosen accent")
|
|
|
|
# Written as a Lua TABLE, not a string: the string form of a Hyprland gradient
|
|
# carries only one stop, so writing it that way is accepted and silently
|
|
# keeps whatever the previous accent left behind. Built through the same
|
|
# serialiseValue() SystemSettings.qml uses for every other gradient, rather
|
|
# than a second hand-rolled (and unescaped) copy of that table syntax here.
|
|
if 'SystemSettings.serialiseValue({' not in without_comments:
|
|
raise SystemExit("ColorScheme does not build the focused border through the shared gradient serialiser")
|
|
if 'colors: [root.accentBorderStart, root.accentBorderEnd]' not in without_comments:
|
|
raise SystemExit("ColorScheme does not derive the focused-border gradient from the chosen accent")
|
|
if 'active_border = ${activeBorder}' not in without_comments:
|
|
raise SystemExit("ColorScheme does not write the focused border as the serialised gradient table")
|
|
|
|
if 'inactive_border = "${root.inactiveBorder}"' not in scheme:
|
|
raise SystemExit("ColorScheme does not apply its effective inactive role")
|
|
PY
|
|
|
|
printf 'settings ownership contract: PASS\n'
|