Close the sweep's last blind spot, and stop shortcuts silently colliding

gapsIn and gapsOut were the only two compositor settings the write sweep had
never verified: Hyprland answers for them in CSS shorthand, "5 5 5 5", and the
sweep had no way to compare that. The preference behind each is a single int
that Hyprland expands to four sides, so a uniform reading compares exactly. A
non-uniform one is not something the preference can express, and is skipped
rather than collapsed to a number it never wrote. 63 of 63 verified live now,
none skipped.

Wallpaper thumbnails are cached. The report that five of them sat at "Loading…"
was a screenshot taken 1.1 seconds after the page opened -- decoding one of
these at tile size takes between 1.2 and 2.6 seconds and about ten start at
once, which the code already said. Measuring it did turn up something real
though: without a cache, scrolling back up pays that decode again for every
tile. The tradeoff is a wallpaper replaced in place showing a stale thumbnail
until restart, which is worth it for a directory of files that are added rather
than edited.

A chord already in use is now named rather than taken: "Super+Q is already
Terminal". Two actions on one chord means whichever Hyprland reads last wins,
which is not a thing to find out later by pressing it. Rebinding a shortcut to
the chord it already holds is correctly not a conflict.

Also: Open Appearance lands on the Windows tab now that the page has tabs,
Storage points at reclaimable container space, and a dock row shows its desktop
id only when two pinned applications share a name -- it is developer text, and
repeating it under fifteen recognisable names made the list harder to scan.

Written down because it cost the shell: QML has no default parameter values, and
`function openSettings(page: string, section: string = "")` fails the entire
configuration rather than the one function -- so the bar and dock went with it,
and 43 contracts failed at once pointing at the same line. qmllint --bare passes
that, which is why the usual check before touching the running shell did not
catch it. openSettingsSection exists as a separate function for that reason.

Claude-Session: https://claude.ai/code/session_01BRvzt4H8XXLPVH5MyYdk9L
This commit is contained in:
Gabriel Brown
2026-08-20 09:56:02 -04:00
parent 1b845c0126
commit 79b3d5cb85
9 changed files with 137 additions and 6 deletions
@@ -24,6 +24,14 @@ SettingsPage {
// section down, below a wallpaper grid and the whole lock screen.
property string tab: "theme"
// Arriving from another page that named a section opens on it. Taken once
// rather than bound, so the tabs still work normally afterwards.
Component.onCompleted: {
const section = ShellState.takeSettingsSection();
if (section !== "")
root.tab = section;
}
title: "Appearance"
lede: "Tune the Prism shell and the applications that live inside it. The preview above is your real geometry, to scale."
@@ -63,7 +63,7 @@ SettingsPage {
detail: "Adjusted on the Appearance page, beside a live preview"
action: "Open Appearance"
divider: false
onTriggered: ShellState.openSettings("appearance")
onTriggered: ShellState.openSettingsSection("appearance", "windows")
}
}
@@ -76,7 +76,14 @@ Column {
required property int index
label: root.nameFor(pin.modelData)
detail: pin.modelData
// The desktop id is shown only when the name alone would not say
// which entry this is. It is developer text, and repeating it under
// fifteen recognisable application names is noise that makes the
// list harder to scan, not easier.
detail: root.pinned.filter(other =>
root.nameFor(other) === root.nameFor(pin.modelData)).length > 1
? pin.modelData
: ""
divider: pin.index < root.pinned.length - 1
controlWidth: 132
@@ -21,6 +21,11 @@ SettingsPage {
// when nothing is being captured. Held here rather than per row so that
// starting a new capture cancels any other.
property string capturingChord: ""
// The action already holding a chord somebody just pressed, and the chord
// itself. Held while the capture stays open so the message can name both.
property string conflict: ""
property string conflictChord: ""
readonly property string storedXkbOptions: String(DesktopPreferences.get("keyboardOptions") ?? "")
function xkbOptions(): var {
@@ -170,11 +175,28 @@ SettingsPage {
height: 30
visible: bindRow.capturing
focus: bindRow.capturing
message: root.conflict === ""
? ""
: root.conflictChord + " is already " + root.conflict
// A chord already in use is reported rather than
// taken. Two actions on one chord means whichever
// Hyprland happens to read last wins, which is not
// a thing to discover later by pressing it.
onCaptured: chord => {
const taken = Keybinds.boundTo(chord, bindRow.modelData.luaChord);
if (taken !== "") {
root.conflict = taken;
root.conflictChord = chord;
return;
}
root.conflict = "";
Keybinds.rebind(bindRow.modelData.luaChord, chord);
root.capturingChord = "";
}
onCanceled: root.capturingChord = ""
onCanceled: {
root.conflict = "";
root.capturingChord = "";
}
}
Row {
@@ -278,6 +278,25 @@ SettingsPage {
}
}
// Named here because this is the page somebody opens when space is short,
// and container images are usually the largest thing nobody remembers
// having. Only shown when there is actually something to reclaim.
SettingsCard {
visible: Containers.available && Containers.reclaimable > 0
title: "Containers are holding " + Containers.formatBytes(Containers.reclaimable)
ActionRow {
label: "Images and volumes nothing references"
detail: Containers.unusedImages.length + " image"
+ (Containers.unusedImages.length === 1 ? "" : "s") + " and "
+ Containers.unusedVolumes.length + " volume"
+ (Containers.unusedVolumes.length === 1 ? "" : "s")
action: "Review"
divider: false
onTriggered: ShellState.settingsPage = "containers"
}
}
SettingsCard {
title: "Removable drives"
subtitle: "USB drives and memory cards."
@@ -96,11 +96,19 @@ Item {
source: "file://" + tile.modelData
fillMode: Image.PreserveAspectCrop
asynchronous: true
cache: false
// Decode to roughly the size actually drawn. Without this a
// grid of 12MB photographs decodes at full resolution.
sourceSize.width: 400
sourceSize.height: 240
// Cached, because these are slow: the largest of these files
// takes over two seconds to decode even at this size, and
// without a cache scrolling back up pays that again for
// every tile. What is held is the scaled thumbnail, not the
// original, so the cost of keeping it is small. The tradeoff
// is that a wallpaper replaced in place under the same name
// shows its old thumbnail until the shell restarts -- worth
// it for a directory of files that are added, not edited.
cache: true
// Several of these are 8-12MB originals, so a tile can sit
// empty for a second or two. Fading in on ready makes that
@@ -332,6 +332,21 @@ Singleton {
readonly property var groupOrder: ["Focus", "Move & split", "Size", "Window state",
"Workspaces", "Applications & shell", "Media & hardware keys"]
// The action already bound to a chord, or "" if it is free. Compared on the
// form keybinds.lua writes rather than the prettified display form, because
// that is what a rebind is keyed by -- "SUPER + Q" and "Super+Q" are the
// same binding and must not read as two.
function boundTo(luaChord: string, exceptLuaChord: string): string {
const wanted = String(luaChord).replace(/\s+/g, "").toLowerCase();
const skip = String(exceptLuaChord).replace(/\s+/g, "").toLowerCase();
for (const bind of root.binds) {
const candidate = String(bind.luaChord).replace(/\s+/g, "").toLowerCase();
if (candidate === wanted && candidate !== skip)
return String(bind.description);
}
return "";
}
function grouped(): var {
const buckets = {};
for (const bind of root.binds) {
@@ -91,7 +91,31 @@ Singleton {
root.activeOverlay = "";
}
// A section within the page, for pages that have tabs. Consumed once by the
// page and cleared, rather than bound to -- a binding would pin the tab and
// stop anyone changing it by hand once they arrived.
property string settingsSection: ""
function takeSettingsSection(): string {
const section = root.settingsSection;
root.settingsSection = "";
return section;
}
function openSettings(page: string): void {
root.settingsSection = "";
root.showSettings(page);
}
// Opening straight to a tab within a page. A separate function rather than a
// default argument: QML has no default parameter values, and writing one
// fails the whole configuration -- which takes the shell down with it.
function openSettingsSection(page: string, section: string): void {
root.settingsSection = section;
root.showSettings(page);
}
function showSettings(page: string): void {
const allowed = ["home", "appearance", "displays", "connectivity", "home-phone", "desktop", "sound", "gaming", "notifications", "screen-intelligence", "shortcuts", "mouse", "privacy", "region", "accounts", "accessibility", "power", "datetime", "applications", "updates", "storage", "snapshots", "users", "sharing", "firewall", "printers", "containers", "services", "about"];
root.settingsPage = allowed.indexOf(page) >= 0 ? page : "home";
DesktopPreferences.set("lastPage", root.settingsPage);