Integrate complete display layouts

2026-08-18 15:00:18 -04:00
parent 0c3935f818
commit d2898d8806
10 changed files with 220 additions and 31 deletions
@@ -44,6 +44,10 @@ for mapping in \
    'HomePreferences.setAlias(id, alias);' \
    'DesktopPreferences.reload();' \
    'DesktopPreferences.set("displays", value);' \
+    'Displays.currentLayout();' \
+    'Displays.applyProtectedLayout(layout);' \
+    'Displays.canConfirm;' \
+    'Displays.confirm();' \
    'Displays.externalChangeBlocked = blocked;' \
    'SystemSettings.applyPersistedDisplayPolicy();' \
    'Keybinds.applyReload();' \
@@ -85,7 +89,8 @@ jq -e '
        "home.alias:light.desk=Desk",
        "home.alias:light.office=Office",
        "desktop.reload",
-        "display.protect:{\"DP-2\":{\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0}}",
+        "display.apply:[{\"name\":\"DP-2\",\"width\":4500,\"height\":3000,\"refreshRate\":60,\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0,\"x\":-2560,\"y\":0,\"primary\":false},{\"name\":\"HDMI-A-1\",\"width\":2560,\"height\":1440,\"refreshRate\":60,\"mode\":\"2560x1440@60\",\"scale\":1,\"transform\":0,\"x\":0,\"y\":0,\"primary\":true}]",
+        "display.confirm",
        "system.apply",
        "keybinds.reload",
        "wallpaper.apply-policy",
@@ -124,7 +129,8 @@ jq -e '
    .calls == [
        "home.reset",
        "desktop.reload",
-        "display.protect:{\"DP-2\":{\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0}}",
+        "display.apply:[{\"name\":\"DP-2\",\"width\":4500,\"height\":3000,\"refreshRate\":60,\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0,\"x\":-2560,\"y\":0,\"primary\":false},{\"name\":\"HDMI-A-1\",\"width\":2560,\"height\":1440,\"refreshRate\":60,\"mode\":\"2560x1440@60\",\"scale\":1,\"transform\":0,\"x\":0,\"y\":0,\"primary\":true}]",
+        "display.confirm",
        "system.apply",
        "keybinds.reload",
        "wallpaper.apply-policy",
@@ -136,6 +142,25 @@ jq -e '
    and .favorites == []
 ' <<<"$status" >/dev/null || fail "absent Home handoff was wrong: $status"

+# If the restored complete layout is rejected before it can be verified, the
+# original persisted layout is put back and the shell is not reloaded over an
+# unproven display state.
+qs_test ipc call settings-backup-behavior reset >/dev/null
+[[ "$(qs_test ipc call settings-backup-behavior applyDisplayFailure "$payload")" == "false" ]] \
+    || fail 'a rejected restored display layout was reported as successful'
+status="$(qs_test ipc call settings-backup-behavior status)"
+jq -e '.calls == [
+    "home.reset",
+    "home.initialize:light.desk,light.office",
+    "home.alias:light.desk=Desk",
+    "home.alias:light.office=Office",
+    "desktop.reload",
+    "display.apply:[{\"name\":\"DP-2\",\"width\":4500,\"height\":3000,\"refreshRate\":60,\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0,\"x\":-2560,\"y\":0,\"primary\":false},{\"name\":\"HDMI-A-1\",\"width\":2560,\"height\":1440,\"refreshRate\":60,\"mode\":\"2560x1440@60\",\"scale\":1,\"transform\":0,\"x\":0,\"y\":0,\"primary\":true}]",
+    "display.protect:{\"DP-2\":{\"mode\":\"4500x3000@60\",\"scale\":1.5,\"transform\":0,\"x\":0,\"y\":0,\"primary\":true},\"HDMI-A-1\":{\"mode\":\"2560x1440@60\",\"scale\":1,\"transform\":0,\"x\":3000,\"y\":0,\"primary\":false}}",
+    "display.block:false"
+] and (.lastError | contains("display layout"))' <<<"$status" >/dev/null \
+    || fail "rejected display restore did not retain the original layout: $status"
+
 # Restore refuses before launching the helper while a display apply/recovery is
 # active, so no snapshot can race the confirmation boundary.
 qs_test ipc call settings-backup-behavior reset >/dev/null
@@ -39,8 +39,8 @@ rg -Fq 'HomePreferences.resetHomeDefaults();' "$system_settings" \
 if rg -q 'HomePreferences\.(favorites|initialized)\s*=' "$system_settings"; then
    fail 'restoreDefaults mutates Home aliases instead of using resetHomeDefaults'
 fi
-rg -Fq 'root.protectDisplays(protectedDisplays)' "$system_settings" \
-    || fail 'restoreDefaults can apply unconfirmed display geometry during reload'
+rg -Fq 'DesktopPreferences.resetDesktopDefaults();' "$system_settings" \
+    || fail 'restoreDefaults does not clear confirmed display layout fields'
 rg -Fq 'Keybinds.applyReload();' "$system_settings" \
    || fail 'restoreDefaults does not replay shipped keybindings'
 rg -Fq 'root.applyWallpaper(String(DesktopPreferences.get("wallpaperPath") ?? ""));' "$system_settings" \
@@ -120,7 +120,7 @@ before="$(qs_for_harness ipc call settings-system-test stored windowRounding)"
 # ── Reset spans every store, not just the schema one ─────────────────────────
 qs_for_harness ipc call settings-system-test seedHome >/dev/null
 qs_for_harness ipc call settings-system-test commit dockHideDelayMs 900 >/dev/null
-display_fixture='{"DP-2":{"mode":"4500x3000@60","scale":1.5,"transform":0}}'
+display_fixture='{"DP-2":{"mode":"4500x3000@60","scale":1.5,"transform":0,"x":0,"y":0,"primary":true},"HDMI-A-1":{"mode":"2560x1440@60","scale":1,"transform":0,"x":3000,"y":0,"primary":false}}'
 [[ "$(qs_for_harness ipc call settings-system-test commit displays "$display_fixture")" == "true" ]] \
    || fail 'the protected display fixture did not apply'
 sleep 0.4
@@ -138,7 +138,6 @@ sleep 0.6
 reset_state="$(qs_for_harness ipc call settings-system-test resetState)"
 jq -e '.calls == [
    "display.block:true",
-    "display.protect",
    "keybinds.reload",
    "wallpaper.set:",
    "lock.regenerate",
@@ -164,8 +163,8 @@ for default_case in \
    [[ "$(qs_for_harness ipc call settings-system-test stored "$key")" == "$expected" ]] \
        || fail "reset did not restore $key to $expected"
 done
-[[ "$(qs_for_harness ipc call settings-system-test stored displays | jq -cS .)" == "$(jq -cS . <<<"$display_fixture")" ]] \
-    || fail 'reset replaced confirmed display geometry without confirmation'
+[[ "$(qs_for_harness ipc call settings-system-test stored displays | jq -cS .)" == '{}' ]] \
+    || fail 'reset retained confirmed arrangement fields instead of returning startup to shipped placement'

 home_after="$(qs_for_harness ipc call settings-system-test homeState)"
 jq -e '.count == 0 and .initialized == false' <<<"$home_after" >/dev/null \
@@ -102,7 +102,8 @@ for needle in \
    '`inactiveOpacity`' \
    '`lockMinutes`' \
    '`lockOnSleep`' \
-    'scheme-relative role'; do
+    'scheme-relative role' \
+    'mode, scale, rotation, arrangement, and primary role'; do
    rg -Fq "$needle" "$readme" || fail "README is missing $needle"
 done

@@ -65,6 +65,9 @@ password field|Password field|appearance
 slideshow|Wallpaper mode|appearance
 shuffle|Shuffle|appearance
 per-display wallpaper|Per-display wallpaper|appearance
+arrange displays|Arrange displays|displays
+monitor position|Monitor position|displays
+primary display|Primary display|displays
 CASES

 ! rg -Fq 'Startup & Services' "$repo_dir/config/dot/quickshell/services/SettingsSearch.qml" \