Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

egui037: Port DesignCraft to egui 0.37

skylartaylora2db858e7d09
diff --cc .github/workflows/ci.yml
index d0d1fd873,d0d1fd873..65fc735bf
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@@ -22,7 -22,7 +22,7 @@@ jobs
uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
with:
# Same craft-fonts commit as release.yml.
-- craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
++ craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
timeout-minutes: 90
packages: >-
pkg-config libxkbcommon-dev libwayland-dev libx11-dev libxcb1-dev libxcursor-dev
diff --cc .github/workflows/freebsd.yml
index d6b897cec,d6b897cec..70a310d38
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@@ -27,4 -27,4 +27,4 @@@ jobs
# Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
uses: storytold/craft-common-actions/.github/workflows/freebsd.yml@main
with:
-- craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
++ craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
diff --cc .github/workflows/release.yml
index 2af7a9e3e,f65960f27..622ace75c
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@@ -24,7 -68,7 +68,7 @@@ jobs
with:
app-name: designcraft
app-title: DesignCraft
-- craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
++ craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
web-craft-fonts: true
version: ${{ inputs.version }}
secrets:
diff --cc ASSETS.md
index 407a26c92,407a26c92..356309cee
--- a/ASSETS.md
+++ b/ASSETS.md
@@@ -8,6 -8,6 +8,8 @@@ Generated-in-code art is original and h
| Asset | Author | Source | Licence | Notes |
|---|---|---|---|---|
++| `epaint_default_fonts/fonts/egui-icons.ttf` (egui dependency) | John Slegers (emoji-icon-font) | https://github.com/storytold/egui/blob/173cc7375d35dc5fbc5b5d0994fdf787f547c5d1/crates/epaint_default_fonts/fonts/egui-icons.txt; original https://github.com/jslegers/emoji-icon-font | MIT (full text in NOTICE) | Small special-icon subset embedded by default_fonts |
++| `epaint_default_fonts/fonts/emoji-icon-font.ttf` (egui dependency) | John Slegers | https://github.com/storytold/egui/blob/173cc7375d35dc5fbc5b5d0994fdf787f547c5d1/crates/epaint_default_fonts/fonts/emoji-icon-font-mit-license.txt; original https://github.com/jslegers/emoji-icon-font | MIT (full text in NOTICE) | Parent face embedded by monochrome_emoji_fonts |
| `crates/ui-egui/src/i18n/uk.rs` (332 common phrases) | VectorCraft contributors | https://github.com/storytold/vectorcraft/blob/01f329aa99fa0c9517311c7b6cf7233ffc207742/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted for DesignCraft context; remaining Ukrainian phrases are original or credited below |
| `crates/ui-egui/src/i18n/uk.rs` (68 common phrases) | PhotoCraft contributors | https://github.com/storytold/photocraft/blob/ed057bdc6fd89a858c5e0ea4eab158a2a7052dde/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted interface vocabulary |
| `crates/ui-egui/src/i18n/uk.rs` (37 common phrases) | WordCraft contributors | https://github.com/storytold/wordcraft/blob/7fb7b013591e2593fbd038f90bbc535be318e5a3/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted interface vocabulary |
diff --cc Cargo.lock
index e75e8d5a5,beb1f6f8f..19899a2f7
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -4,66 -4,66 +4,60 @@@ version =
[[package]]
name = "accesskit"
--version = "0.24.1"
++version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
++checksum = "ad442f58ee04714aaa0ba0a2768c1ea1935b29507bb22ddece8cbbc76db02932"
dependencies = [
"uuid",
]
[[package]]
name = "accesskit_atspi_common"
--version = "0.18.1"
++version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
++checksum = "52c182f9c282ac9c5638d876d551d15e5f7d397ec263349a0c6a2b61595dd5e4"
dependencies = [
"accesskit",
-- "accesskit_consumer 0.36.0",
++ "accesskit_consumer",
"atspi-common",
-- "phf",
++ "phf 0.14.0",
"serde",
"zvariant",
]
[[package]]
name = "accesskit_consumer"
--version = "0.35.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
--dependencies = [
-- "accesskit",
-- "hashbrown 0.16.1",
--]
--
--[[package]]
--name = "accesskit_consumer"
--version = "0.36.0"
++version = "0.39.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
++checksum = "8a45e2bb300bea6d5f33a82c3e051c3ddc6f41c209750f68a0acbe991a284344"
dependencies = [
"accesskit",
-- "hashbrown 0.16.1",
++ "hashbrown 0.17.1",
]
[[package]]
--name = "accesskit_consumer"
--version = "0.38.0"
++name = "accesskit_ios"
++version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
++checksum = "28e539d64b27fd4c14de8f78ada8f7c944c092f52f7e49fb63316507a57f6937"
dependencies = [
"accesskit",
-- "hashbrown 0.16.1",
++ "accesskit_consumer",
++ "hashbrown 0.17.1",
++ "objc2 0.5.2",
++ "objc2-foundation 0.2.2",
++ "objc2-ui-kit 0.2.2",
]
[[package]]
name = "accesskit_macos"
--version = "0.26.3"
++version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
++checksum = "5701624bf6a11efb6d4c8e922bf44126ed96250e5faa9a7a0468c979635839a4"
dependencies = [
"accesskit",
-- "accesskit_consumer 0.38.0",
-- "hashbrown 0.16.1",
++ "accesskit_consumer",
++ "hashbrown 0.17.1",
"objc2 0.5.2",
"objc2-app-kit 0.2.2",
"objc2-foundation 0.2.2",
@@@ -71,9 -71,9 +65,9 @@@
[[package]]
name = "accesskit_unix"
--version = "0.21.1"
++version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
++checksum = "202f24df034a7476d07b7f74284de84f6d62aabd858dbe7ee9cad3b7ad6f8f9d"
dependencies = [
"accesskit",
"accesskit_atspi_common",
@@@ -89,13 -89,13 +83,13 @@@
[[package]]
name = "accesskit_windows"
--version = "0.32.1"
++version = "0.35.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
++checksum = "ce63f35d6bdcf59f26b76b3379063f738e6412cef46999cc772d46aa3de35adb"
dependencies = [
"accesskit",
-- "accesskit_consumer 0.35.0",
-- "hashbrown 0.16.1",
++ "accesskit_consumer",
++ "hashbrown 0.17.1",
"static_assertions",
"windows",
"windows-core",
@@@ -103,11 -103,11 +97,12 @@@
[[package]]
name = "accesskit_winit"
--version = "0.32.2"
++version = "0.34.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
++checksum = "ee96dd150375c05912d8a473f98c2fb155fb3234fac88292d396548a2460fa77"
dependencies = [
"accesskit",
++ "accesskit_ios",
"accesskit_macos",
"accesskit_unix",
"accesskit_windows",
@@@ -236,6 -236,6 +231,7 @@@ dependencies =
"parking_lot",
"percent-encoding",
"windows-sys 0.60.2",
++ "wl-clipboard-rs",
"x11rb",
]
@@@ -446,12 -446,12 +442,48 @@@ version = "1.5.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
++[[package]]
++name = "aws-lc-rs"
++version = "1.18.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13"
++dependencies = [
++ "aws-lc-sys",
++ "untrusted 0.7.1",
++ "zeroize",
++]
++
++[[package]]
++name = "aws-lc-sys"
++version = "0.46.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc"
++dependencies = [
++ "cc",
++ "cmake",
++ "dunce",
++ "fs_extra",
++ "pkg-config",
++]
++
[[package]]
name = "base64"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
++[[package]]
++name = "base64"
++version = "0.23.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
++
++[[package]]
++name = "base64ct"
++version = "1.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
++
[[package]]
name = "bit-set"
version = "0.8.0"
@@@ -494,6 -494,6 +526,15 @@@ version = "2.13.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
++[[package]]
++name = "block-buffer"
++version = "0.10.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
++dependencies = [
++ "generic-array",
++]
++
[[package]]
name = "block2"
version = "0.5.1"
@@@ -683,13 -683,13 +724,29 @@@ dependencies =
"libc",
]
++[[package]]
++name = "chacha20"
++version = "0.10.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
++dependencies = [
++ "cfg-if",
++ "cpufeatures 0.3.1",
++ "rand_core 0.10.1",
++]
++
[[package]]
name = "chrono"
version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
dependencies = [
++ "iana-time-zone",
++ "js-sys",
"num-traits",
++ "serde",
++ "wasm-bindgen",
++ "windows-link",
]
[[package]]
@@@ -701,6 -701,6 +758,39 @@@ dependencies =
"error-code",
]
++[[package]]
++name = "cmake"
++version = "0.1.58"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "cmpv2"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "961b955a666e25ee5a1091d219128d6e6401e3dab84efb1a2bf6b4035d797b39"
++dependencies = [
++ "crmf",
++ "der",
++ "spki",
++ "x509-cert",
++]
++
++[[package]]
++name = "cms"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b77c319abfd5219629c45c34c89ba945ed3c5e49fcde9d16b6c3885f118a730"
++dependencies = [
++ "const-oid",
++ "der",
++ "spki",
++ "x509-cert",
++]
++
[[package]]
name = "codespan-reporting"
version = "0.13.1"
@@@ -756,6 -756,6 +846,12 @@@ dependencies =
"crossbeam-utils",
]
++[[package]]
++name = "const-oid"
++version = "0.9.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
++
[[package]]
name = "core-foundation"
version = "0.9.4"
@@@ -766,6 -766,6 +862,16 @@@ dependencies =
"libc",
]
++[[package]]
++name = "core-foundation"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
@@@ -779,7 -779,7 +885,7 @@@ source = "registry+https://github.com/r
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
-- "core-foundation",
++ "core-foundation 0.9.4",
"core-graphics-types",
"foreign-types",
"libc",
@@@ -792,7 -792,7 +898,7 @@@ source = "registry+https://github.com/r
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
-- "core-foundation",
++ "core-foundation 0.9.4",
"libc",
]
@@@ -802,12 -802,12 +908,18 @@@ version = "20.1.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
dependencies = [
-- "core-foundation",
++ "core-foundation 0.9.4",
"core-graphics",
"foreign-types",
"libc",
]
++[[package]]
++name = "core_detect"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
++
[[package]]
name = "core_maths"
version = "0.1.1"
@@@ -817,6 -817,6 +929,24 @@@ dependencies =
"libm",
]
++[[package]]
++name = "cpufeatures"
++version = "0.2.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "cpufeatures"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
++dependencies = [
++ "libc",
++]
++
[[package]]
name = "craft-atomic"
version = "0.1.0"
@@@ -854,20 -854,20 +984,33 @@@ dependencies =
[[package]]
name = "craft-print"
version = "0.1.0"
--source = "git+https://github.com/storytold/craft-libs?rev=d991bf6792f8ade99c51358bf3c1d902c8cd96b5#d991bf6792f8ade99c51358bf3c1d902c8cd96b5"
++source = "git+https://github.com/storytold/craft-libs?rev=25da1314d443171b4adeaad2cd9454b273f35c6f#25da1314d443171b4adeaad2cd9454b273f35c6f"
dependencies = [
++ "craft-winprint-gdi",
++ "miniz_oxide 0.8.9",
++ "roxmltree 0.20.0",
"tempfile",
++ "winprint",
++ "winsafe",
]
[[package]]
name = "craft-ui"
version = "0.1.0"
--source = "git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51eeb3de70e735c8ce87a59a7dedd47675"
++source = "git+https://github.com/storytold/craft-libs?rev=25da1314d443171b4adeaad2cd9454b273f35c6f#25da1314d443171b4adeaad2cd9454b273f35c6f"
dependencies = [
"egui",
"serde",
]
++[[package]]
++name = "craft-winprint-gdi"
++version = "0.1.0"
++source = "git+https://github.com/storytold/winprint.rs?rev=417ac3c4d14d3da5485a99c7d5ce8f05664ec312#417ac3c4d14d3da5485a99c7d5ce8f05664ec312"
++dependencies = [
++ "windows-sys 0.61.2",
++]
++
[[package]]
name = "crc32fast"
version = "1.5.2"
@@@ -877,6 -877,6 +1020,18 @@@ dependencies =
"cfg-if",
]
++[[package]]
++name = "crmf"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36fe21b96d5b87f5de4b5b7202ec41c00110ac817ce6728fe75fb2fe5962ed92"
++dependencies = [
++ "cms",
++ "der",
++ "spki",
++ "x509-cert",
++]
++
[[package]]
name = "crossbeam-channel"
version = "0.5.17"
@@@ -917,6 -917,6 +1072,16 @@@ version = "0.2.4
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
++[[package]]
++name = "crypto-common"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
++dependencies = [
++ "generic-array",
++ "typenum",
++]
++
[[package]]
name = "cursor-icon"
version = "1.2.0"
@@@ -929,6 -929,6 +1094,30 @@@ version = "0.3.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
++[[package]]
++name = "der"
++version = "0.7.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
++dependencies = [
++ "const-oid",
++ "der_derive",
++ "flagset",
++ "pem-rfc7468",
++ "zeroize",
++]
++
++[[package]]
++name = "der_derive"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
[[package]]
name = "derive_arbitrary"
version = "1.4.2"
@@@ -1132,8 -1132,8 +1321,10 @@@ dependencies =
"craft-cms",
"designcraft-color",
"designcraft-fonts",
++ "flate2",
"image",
"log",
++ "quick-xml",
"resvg",
"tiff",
"zune-core",
@@@ -1256,8 -1256,8 +1447,7 @@@ dependencies =
"tempfile",
"toml",
"unicode-bidi",
-- "unicode-bidi-mirroring",
-- "unicode-segmentation",
++ "web-time",
"zip",
]
@@@ -1293,6 -1293,6 +1483,16 @@@ dependencies =
"rayon",
]
++[[package]]
++name = "digest"
++version = "0.10.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
++dependencies = [
++ "block-buffer",
++ "crypto-common",
++]
++
[[package]]
name = "dispatch"
version = "0.2.0"
@@@ -1353,10 -1353,10 +1553,15 @@@ source = "registry+https://github.com/r
checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
[[package]]
--name = "ecolor"
--version = "0.36.2"
++name = "dunce"
++version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34"
++checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
++
++[[package]]
++name = "ecolor"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"bytemuck",
"emath",
@@@ -1364,9 -1364,9 +1569,8 @@@
[[package]]
name = "eframe"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "55ad41fac6e3149abb4866e93df37dbd33baa95db525c3368c944584e95a5dc2"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"ahash",
"bytemuck",
@@@ -1388,6 -1388,6 +1592,7 @@@
"pollster 1.0.1",
"profiling",
"raw-window-handle",
++ "send_wrapper",
"static_assertions",
"wasm-bindgen",
"web-sys",
@@@ -1399,9 -1399,9 +1604,8 @@@
[[package]]
name = "egui"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"accesskit",
"ahash",
@@@ -1419,9 -1419,9 +1623,8 @@@
[[package]]
name = "egui-wgpu"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5cef1f6d1bba40b09a4d0d62cb822b81030922cfbf65c5373398c3a3caafc5bd"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"ahash",
"bytemuck",
@@@ -1439,31 -1439,31 +1642,34 @@@
[[package]]
name = "egui-winit"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "98466000559d66ba4db786a30448b01483946add4188e7f10f522a27b4fb89cc"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"accesskit_winit",
"arboard",
++ "block2 0.6.2",
"bytemuck",
"egui",
++ "image",
"log",
"objc2 0.6.4",
++ "objc2-app-kit 0.3.2",
"objc2-foundation 0.3.2",
"objc2-ui-kit 0.3.2",
++ "parking_lot",
"profiling",
"raw-window-handle",
"smithay-clipboard",
"web-time",
"webbrowser",
++ "windows-sys 0.61.2",
"winit",
]
[[package]]
name = "egui_glow"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "606ed4167daf341e5753d703285c4c1d562324b2c07aa8f405cd7d066fe58f3b"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"bytemuck",
"egui",
@@@ -1475,9 -1475,9 +1681,8 @@@
[[package]]
name = "egui_kittest"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5eb3f3effb2726fee23449293e67acbf6cc6ce35525b1722bd5743bb348114d5"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"dify",
"eframe",
@@@ -1502,13 -1502,13 +1707,26 @@@ checksum = "252afb9ae5eaa683babdc6a068b
[[package]]
name = "emath"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"bytemuck",
]
++[[package]]
++name = "encoding_rs"
++version = "0.8.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679"
++dependencies = [
++ "cfg-if",
++ "core_detect",
++ "multiversion_no_op",
++ "rustversion",
++ "scopeguard",
++ "simdutf8",
++]
++
[[package]]
name = "endi"
version = "1.1.1"
@@@ -1538,9 -1538,9 +1756,8 @@@ dependencies =
[[package]]
name = "epaint"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
dependencies = [
"ahash",
"bytemuck",
@@@ -1556,16 -1556,16 +1773,17 @@@
"self_cell",
"skrifa 0.44.0",
"smallvec",
++ "unicode-bidi",
"unicode-general-category",
++ "unicode-properties",
"unicode-segmentation",
-- "vello_cpu 0.1.0",
++ "vello_cpu 0.2.0",
]
[[package]]
name = "epaint_default_fonts"
--version = "0.36.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
[[package]]
name = "equivalent"
@@@ -1656,12 -1656,12 +1874,34 @@@ version = "0.4.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
++[[package]]
++name = "filetime"
++version = "0.2.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
++dependencies = [
++ "cfg-if",
++ "libc",
++]
++
[[package]]
name = "find-msvc-tools"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
++[[package]]
++name = "fixedbitset"
++version = "0.5.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
++
++[[package]]
++name = "flagset"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
++
[[package]]
name = "flate2"
version = "1.1.10"
@@@ -1694,6 -1694,6 +1934,28 @@@ dependencies =
"num-traits",
]
++[[package]]
++name = "fmt-derive"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1cb4a4b45c26455885f8b462db12978e51f60cc914337bccb9a36faf93410169"
++dependencies = [
++ "fmt-derive-proc",
++]
++
++[[package]]
++name = "fmt-derive-proc"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7704da0760734344ce8753f15b21e97c6be85dc5a8f2c3a963fbd042b3380d23"
++dependencies = [
++ "proc-macro-crate",
++ "proc-macro-error",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
[[package]]
name = "fmv-macos-events"
version = "0.1.0"
@@@ -1711,6 -1711,6 +1973,12 @@@ version = "1.0.7
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++[[package]]
++name = "foldhash"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
++
[[package]]
name = "foldhash"
version = "0.2.0"
@@@ -1794,6 -1794,6 +2062,22 @@@ dependencies =
"percent-encoding",
]
++[[package]]
++name = "fs_extra"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
++
++[[package]]
++name = "futures-channel"
++version = "0.3.34"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
++dependencies = [
++ "futures-core",
++ "futures-sink",
++]
++
[[package]]
name = "futures-core"
version = "0.3.34"
@@@ -1830,6 -1830,6 +2114,12 @@@ dependencies =
"syn 3.0.6",
]
++[[package]]
++name = "futures-sink"
++version = "0.3.34"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
++
[[package]]
name = "futures-task"
version = "0.3.34"
@@@ -1843,12 -1843,12 +2133,25 @@@ source = "registry+https://github.com/r
checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
dependencies = [
"futures-core",
++ "futures-io",
"futures-macro",
++ "futures-sink",
"futures-task",
++ "memchr",
"pin-project-lite",
"slab",
]
++[[package]]
++name = "generic-array"
++version = "0.14.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
++dependencies = [
++ "typenum",
++ "version_check",
++]
++
[[package]]
name = "gethostname"
version = "1.1.0"
@@@ -1868,6 -1868,6 +2171,19 @@@ dependencies =
"unicode-width",
]
++[[package]]
++name = "getrandom"
++version = "0.2.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
++dependencies = [
++ "cfg-if",
++ "js-sys",
++ "libc",
++ "wasi",
++ "wasm-bindgen",
++]
++
[[package]]
name = "getrandom"
version = "0.3.4"
@@@ -1887,8 -1887,8 +2203,11 @@@ source = "registry+https://github.com/r
checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
++ "js-sys",
"libc",
"r-efi 6.0.0",
++ "rand_core 0.10.1",
++ "wasm-bindgen",
]
[[package]]
@@@ -1919,7 -1919,7 +2238,7 @@@ source = "registry+https://github.com/r
checksum = "d99fc21d493812643aae86d53b7bbd02f376434a90317e8a790bc209fdd6605e"
dependencies = [
"bytemuck",
-- "foldhash",
++ "foldhash 0.2.0",
"hashbrown 0.17.1",
"log",
"peniko",
@@@ -1931,32 -1931,32 +2250,16 @@@
[[package]]
name = "glifo"
--version = "0.2.0"
++version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a"
++checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
dependencies = [
"bytemuck",
-- "foldhash",
++ "foldhash 0.2.0",
"hashbrown 0.17.1",
"log",
"peniko",
-- "skrifa 0.44.0",
-- "smallvec",
-- "vello_common 0.1.0",
--]
--
--[[package]]
--name = "glifo"
--version = "0.3.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
--dependencies = [
-- "bytemuck",
-- "foldhash",
-- "hashbrown 0.17.1",
-- "log",
-- "peniko",
-- "png",
++ "png",
"skrifa 0.44.0",
"smallvec",
"vello_common 0.2.0",
@@@ -2063,6 -2063,6 +2366,25 @@@ dependencies =
"euclid",
]
++[[package]]
++name = "h2"
++version = "0.4.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d29020232d6aa3fb1daca64c1127cf662cf97f254ae16c18c05b8ab635fc118"
++dependencies = [
++ "atomic-waker",
++ "bytes",
++ "fnv",
++ "futures-core",
++ "futures-sink",
++ "http",
++ "indexmap",
++ "slab",
++ "tokio",
++ "tokio-util",
++ "tracing",
++]
++
[[package]]
name = "half"
version = "2.7.1"
@@@ -2100,6 -2100,6 +2422,15 @@@ dependencies =
"smallvec",
]
++[[package]]
++name = "hashbrown"
++version = "0.15.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
++dependencies = [
++ "foldhash 0.1.5",
++]
++
[[package]]
name = "hashbrown"
version = "0.16.1"
@@@ -2108,7 -2108,7 +2439,7 @@@ checksum = "841d1cc9bed7f9236f321df9770
dependencies = [
"allocator-api2",
"equivalent",
-- "foldhash",
++ "foldhash 0.2.0",
]
[[package]]
@@@ -2117,7 -2117,7 +2448,7 @@@ version = "0.17.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
dependencies = [
-- "foldhash",
++ "foldhash 0.2.0",
]
[[package]]
@@@ -2160,7 -2159,7 +2490,7 @@@ dependencies =
"hayro-syntax",
"kurbo",
"moxcms",
-- "phf",
++ "phf 0.13.1",
"rustc-hash 2.1.3",
"siphasher",
"skrifa 0.47.0",
@@@ -2225,6 -2224,6 +2555,12 @@@ version = "0.4.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
++[[package]]
++name = "heck"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
++
[[package]]
name = "hermit-abi"
version = "0.5.3"
@@@ -2237,12 -2236,12 +2573,137 @@@ version = "0.4.3
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
++[[package]]
++name = "http"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0"
++dependencies = [
++ "bytes",
++ "itoa",
++]
++
++[[package]]
++name = "http-body"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
++dependencies = [
++ "bytes",
++ "http",
++]
++
++[[package]]
++name = "http-body-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "http",
++ "http-body",
++ "pin-project-lite",
++]
++
++[[package]]
++name = "httparse"
++version = "1.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
++
++[[package]]
++name = "hyper"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c"
++dependencies = [
++ "atomic-waker",
++ "bytes",
++ "futures-channel",
++ "futures-core",
++ "h2",
++ "http",
++ "http-body",
++ "httparse",
++ "itoa",
++ "pin-project-lite",
++ "smallvec",
++ "tokio",
++ "want",
++]
++
++[[package]]
++name = "hyper-rustls"
++version = "0.27.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53"
++dependencies = [
++ "http",
++ "hyper",
++ "hyper-util",
++ "rustls",
++ "tokio",
++ "tokio-rustls",
++ "tower-service",
++]
++
++[[package]]
++name = "hyper-util"
++version = "0.1.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff"
++dependencies = [
++ "base64 0.23.1",
++ "bytes",
++ "futures-channel",
++ "futures-util",
++ "http",
++ "http-body",
++ "httparse",
++ "hyper",
++ "ipnet",
++ "libc",
++ "percent-encoding",
++ "pin-project-lite",
++ "socket2",
++ "system-configuration",
++ "tokio",
++ "tower-service",
++ "tracing",
++ "windows-registry",
++]
++
[[package]]
name = "hypher"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45f2b4f6b5da34d400d4c112eadcc14512cc5d04307a8eee182586d9bebd7ce6"
++[[package]]
++name = "iana-time-zone"
++version = "0.1.65"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
++dependencies = [
++ "android_system_properties",
++ "core-foundation-sys",
++ "iana-time-zone-haiku",
++ "js-sys",
++ "log",
++ "wasm-bindgen",
++ "windows-core",
++]
++
++[[package]]
++name = "iana-time-zone-haiku"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
++dependencies = [
++ "cc",
++]
++
[[package]]
name = "icu_collections"
version = "2.3.0"
@@@ -2397,6 -2396,6 +2858,12 @@@ dependencies =
"hashbrown 0.17.1",
]
++[[package]]
++name = "ipnet"
++version = "2.12.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
++
[[package]]
name = "is-docker"
version = "0.2.0"
@@@ -2548,20 -2547,20 +3015,20 @@@ checksum = "e2db585e1d738fc771bf08a1514
[[package]]
name = "kittest"
--version = "0.4.0"
++version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5"
++checksum = "0bb81a721ba76aa095b7f45deb180504f786904e56ca4b8e141f66eb89a78b75"
dependencies = [
"accesskit",
-- "accesskit_consumer 0.35.0",
++ "accesskit_consumer",
]
[[package]]
name = "krilla"
version = "0.8.2"
- source = "git+https://github.com/storytold/craft-libs?rev=89dcbb3060377a26c99a6d80caa16084366704c4#89dcbb3060377a26c99a6d80caa16084366704c4"
+ source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
dependencies = [
-- "base64",
++ "base64 0.22.1",
"bumpalo",
"flate2",
"float-cmp",
@@@ -2698,6 -2697,6 +3165,12 @@@ version = "0.4.34
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
++[[package]]
++name = "lru-slab"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
++
[[package]]
name = "memchr"
version = "2.8.3"
@@@ -2722,6 -2721,6 +3195,12 @@@ dependencies =
"autocfg",
]
++[[package]]
++name = "mime"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
++
[[package]]
name = "minicov"
version = "0.3.8"
@@@ -2752,6 -2751,6 +3231,17 @@@ dependencies =
"simd-adler32",
]
++[[package]]
++name = "mio"
++version = "1.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee"
++dependencies = [
++ "libc",
++ "wasi",
++ "windows-sys 0.61.2",
++]
++
[[package]]
name = "moxcms"
version = "0.8.1"
@@@ -2781,6 -2780,6 +3271,12 @@@ dependencies =
"windows-sys 0.61.2",
]
++[[package]]
++name = "multiversion_no_op"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
++
[[package]]
name = "naga"
version = "30.0.1"
@@@ -2855,6 -2854,6 +3351,15 @@@ version = "0.2.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
++[[package]]
++name = "nom"
++version = "8.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
++dependencies = [
++ "memchr",
++]
++
[[package]]
name = "nu-ansi-term"
version = "0.50.3"
@@@ -3229,6 -3228,6 +3734,12 @@@ dependencies =
"libc",
]
++[[package]]
++name = "openssl-probe"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
++
[[package]]
name = "orbclient"
version = "0.3.55"
@@@ -3267,6 -3266,6 +3778,16 @@@ dependencies =
"pin-project-lite",
]
++[[package]]
++name = "os_pipe"
++version = "1.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
++dependencies = [
++ "libc",
++ "windows-sys 0.61.2",
++]
++
[[package]]
name = "ouroboros"
version = "0.18.5"
@@@ -3284,7 -3283,7 +3805,7 @@@ version = "0.18.5
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
dependencies = [
-- "heck",
++ "heck 0.4.1",
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
@@@ -3332,6 -3331,6 +3853,25 @@@ dependencies =
"ryu",
]
++[[package]]
++name = "pem"
++version = "3.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
++dependencies = [
++ "base64 0.22.1",
++ "serde_core",
++]
++
++[[package]]
++name = "pem-rfc7468"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
++dependencies = [
++ "base64ct",
++]
++
[[package]]
name = "peniko"
version = "0.6.1"
@@@ -3351,14 -3350,14 +3891,35 @@@ version = "2.3.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
++[[package]]
++name = "petgraph"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
++dependencies = [
++ "fixedbitset",
++ "hashbrown 0.15.5",
++ "indexmap",
++]
++
[[package]]
name = "phf"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
dependencies = [
-- "phf_macros",
-- "phf_shared",
++ "phf_macros 0.13.1",
++ "phf_shared 0.13.1",
++]
++
++[[package]]
++name = "phf"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
++dependencies = [
++ "phf_macros 0.14.0",
++ "phf_shared 0.14.0",
"serde",
]
@@@ -3369,7 -3368,7 +3930,17 @@@ source = "registry+https://github.com/r
checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
dependencies = [
"fastrand",
-- "phf_shared",
++ "phf_shared 0.13.1",
++]
++
++[[package]]
++name = "phf_generator"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
++dependencies = [
++ "fastrand",
++ "phf_shared 0.14.0",
]
[[package]]
@@@ -3378,8 -3377,8 +3949,21 @@@ version = "0.13.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
dependencies = [
-- "phf_generator",
-- "phf_shared",
++ "phf_generator 0.13.1",
++ "phf_shared 0.13.1",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
++[[package]]
++name = "phf_macros"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
++dependencies = [
++ "phf_generator 0.14.0",
++ "phf_shared 0.14.0",
"proc-macro2",
"quote",
"syn 2.0.119",
@@@ -3394,6 -3393,6 +3978,15 @@@ dependencies =
"siphasher",
]
++[[package]]
++name = "phf_shared"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
++dependencies = [
++ "siphasher",
++]
++
[[package]]
name = "pic-scale"
version = "0.7.12"
@@@ -3555,6 -3554,6 +4148,30 @@@ dependencies =
"toml_edit",
]
++[[package]]
++name = "proc-macro-error"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
++dependencies = [
++ "proc-macro-error-attr",
++ "proc-macro2",
++ "quote",
++ "syn 1.0.109",
++ "version_check",
++]
++
++[[package]]
++name = "proc-macro-error-attr"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "version_check",
++]
++
[[package]]
name = "proc-macro2"
version = "1.0.107"
@@@ -3593,7 -3592,7 +4210,7 @@@ dependencies =
"bit-vec 0.8.0",
"bitflags 2.13.2",
"num-traits",
-- "rand",
++ "rand 0.9.5",
"rand_chacha",
"rand_xorshift",
"regex-syntax",
@@@ -3635,6 -3634,6 +4252,63 @@@ dependencies =
"memchr",
]
++[[package]]
++name = "quinn"
++version = "0.11.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11"
++dependencies = [
++ "bytes",
++ "cfg_aliases",
++ "pin-project-lite",
++ "quinn-proto",
++ "quinn-udp",
++ "rustc-hash 2.1.3",
++ "rustls",
++ "socket2",
++ "thiserror 2.0.21",
++ "tokio",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-proto"
++version = "0.11.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe"
++dependencies = [
++ "aws-lc-rs",
++ "bytes",
++ "getrandom 0.4.3",
++ "lru-slab",
++ "rand 0.10.3",
++ "rand_pcg",
++ "ring",
++ "rustc-hash 2.1.3",
++ "rustls",
++ "rustls-pki-types",
++ "slab",
++ "thiserror 2.0.21",
++ "tinyvec",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-udp"
++version = "0.5.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016"
++dependencies = [
++ "cfg_aliases",
++ "libc",
++ "once_cell",
++ "socket2",
++ "tracing",
++ "windows-sys 0.61.2",
++]
++
[[package]]
name = "quote"
version = "1.0.47"
@@@ -3663,7 -3662,7 +4337,18 @@@ source = "registry+https://github.com/r
checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
dependencies = [
"rand_chacha",
-- "rand_core",
++ "rand_core 0.9.5",
++]
++
++[[package]]
++name = "rand"
++version = "0.10.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
++dependencies = [
++ "chacha20",
++ "getrandom 0.4.3",
++ "rand_core 0.10.1",
]
[[package]]
@@@ -3673,9 -3672,9 +4358,15 @@@ source = "registry+https://github.com/r
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
-- "rand_core",
++ "rand_core 0.9.5",
]
++[[package]]
++name = "rand_core"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
++
[[package]]
name = "rand_core"
version = "0.9.5"
@@@ -3685,13 -3684,13 +4376,28 @@@ dependencies =
"getrandom 0.3.4",
]
++[[package]]
++name = "rand_core"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
++
++[[package]]
++name = "rand_pcg"
++version = "0.10.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
++dependencies = [
++ "rand_core 0.10.1",
++]
++
[[package]]
name = "rand_xorshift"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
dependencies = [
-- "rand_core",
++ "rand_core 0.9.5",
]
[[package]]
@@@ -3843,6 -3842,6 +4549,49 @@@ version = "1.1.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
++[[package]]
++name = "reqwest"
++version = "0.13.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
++dependencies = [
++ "base64 0.23.1",
++ "bytes",
++ "encoding_rs",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "h2",
++ "http",
++ "http-body",
++ "http-body-util",
++ "hyper",
++ "hyper-rustls",
++ "hyper-util",
++ "js-sys",
++ "log",
++ "mime",
++ "percent-encoding",
++ "pin-project-lite",
++ "quinn",
++ "rustls",
++ "rustls-pki-types",
++ "rustls-platform-verifier",
++ "serde",
++ "serde_json",
++ "serde_urlencoded",
++ "sync_wrapper",
++ "tokio",
++ "tokio-rustls",
++ "tower",
++ "tower-http",
++ "tower-service",
++ "url",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++]
++
[[package]]
name = "resvg"
version = "0.47.0"
@@@ -3896,6 -3895,6 +4645,20 @@@ dependencies =
"bytemuck",
]
++[[package]]
++name = "ring"
++version = "0.17.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
++dependencies = [
++ "cc",
++ "cfg-if",
++ "getrandom 0.2.17",
++ "libc",
++ "untrusted 0.9.0",
++ "windows-sys 0.52.0",
++]
++
[[package]]
name = "roots"
version = "0.0.8"
@@@ -3964,6 -3963,6 +4727,81 @@@ dependencies =
"windows-sys 0.61.2",
]
++[[package]]
++name = "rustls"
++version = "0.23.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
++dependencies = [
++ "aws-lc-rs",
++ "once_cell",
++ "rustls-pki-types",
++ "rustls-webpki",
++ "subtle",
++ "zeroize",
++]
++
++[[package]]
++name = "rustls-native-certs"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
++dependencies = [
++ "openssl-probe",
++ "rustls-pki-types",
++ "schannel",
++ "security-framework",
++]
++
++[[package]]
++name = "rustls-pki-types"
++version = "1.15.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96"
++dependencies = [
++ "web-time",
++ "zeroize",
++]
++
++[[package]]
++name = "rustls-platform-verifier"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"
++dependencies = [
++ "core-foundation 0.10.1",
++ "core-foundation-sys",
++ "jni",
++ "log",
++ "once_cell",
++ "rustls",
++ "rustls-native-certs",
++ "rustls-platform-verifier-android",
++ "rustls-webpki",
++ "security-framework",
++ "security-framework-sys",
++ "webpki-root-certs",
++ "windows-sys 0.61.2",
++]
++
++[[package]]
++name = "rustls-platform-verifier-android"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
++
++[[package]]
++name = "rustls-webpki"
++version = "0.103.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
++dependencies = [
++ "aws-lc-rs",
++ "ring",
++ "rustls-pki-types",
++ "untrusted 0.9.0",
++]
++
[[package]]
name = "rustversion"
version = "1.0.23"
@@@ -4006,6 -4005,6 +4844,12 @@@ version = "1.0.23
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
++[[package]]
++name = "ryu-js"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "04d056b875a9d2e6cb9a61d127afee9ac5999b9f87bcb32079d1318e505be714"
++
[[package]]
name = "same-file"
version = "1.0.6"
@@@ -4015,6 -4014,6 +4859,15 @@@ dependencies =
"winapi-util",
]
++[[package]]
++name = "schannel"
++version = "0.1.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
++dependencies = [
++ "windows-sys 0.61.2",
++]
++
[[package]]
name = "scoped-tls"
version = "1.0.1"
@@@ -4027,6 -4026,6 +4880,29 @@@ version = "1.2.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
++[[package]]
++name = "security-framework"
++version = "3.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
++dependencies = [
++ "bitflags 2.13.2",
++ "core-foundation 0.10.1",
++ "core-foundation-sys",
++ "libc",
++ "security-framework-sys",
++]
++
++[[package]]
++name = "security-framework-sys"
++version = "2.17.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
[[package]]
name = "self_cell"
version = "1.3.0"
@@@ -4039,6 -4038,6 +4915,12 @@@ version = "1.0.28
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
++[[package]]
++name = "send_wrapper"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
++
[[package]]
name = "serde"
version = "1.0.229"
@@@ -4082,6 -4081,6 +4964,17 @@@ dependencies =
"zmij",
]
++[[package]]
++name = "serde_json_canonicalizer"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe52319a927259afbfa5180c5157cd8167edfd3e8c254f9558c7fef44c5649f2"
++dependencies = [
++ "ryu-js",
++ "serde",
++ "serde_json",
++]
++
[[package]]
name = "serde_repr"
version = "0.1.21"
@@@ -4102,6 -4101,6 +4995,40 @@@ dependencies =
"serde_core",
]
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
++dependencies = [
++ "form_urlencoded",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "sha1"
++version = "0.10.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
++dependencies = [
++ "cfg-if",
++ "cpufeatures 0.2.17",
++ "digest",
++]
++
++[[package]]
++name = "sha2"
++version = "0.10.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
++dependencies = [
++ "cfg-if",
++ "cpufeatures 0.2.17",
++ "digest",
++]
++
[[package]]
name = "shlex"
version = "2.0.1"
@@@ -4118,6 -4117,6 +5045,175 @@@ dependencies =
"libc",
]
++[[package]]
++name = "signature"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
++dependencies = [
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "sigstore-bundle"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e7dc53c8a941858d01479622dbb7650aaa2ee0ca1fb58fb6cdddbfc3064abbb"
++dependencies = [
++ "base64 0.22.1",
++ "hex",
++ "serde",
++ "serde_json",
++ "sigstore-crypto",
++ "sigstore-merkle",
++ "sigstore-rekor",
++ "sigstore-tsa",
++ "sigstore-types",
++ "thiserror 2.0.21",
++]
++
++[[package]]
++name = "sigstore-crypto"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "da90c3d9af638898a5fdc347479b18f950bb0dde11ecf2244f94cd28135da53b"
++dependencies = [
++ "aws-lc-rs",
++ "base64 0.22.1",
++ "const-oid",
++ "der",
++ "digest",
++ "pem",
++ "rand_core 0.10.1",
++ "sha2",
++ "signature",
++ "sigstore-types",
++ "spki",
++ "thiserror 2.0.21",
++ "tracing",
++ "x509-cert",
++]
++
++[[package]]
++name = "sigstore-merkle"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c0d53558825c77716855c13794306fff766854c1bf92948e77d7890da3f2455"
++dependencies = [
++ "base64 0.22.1",
++ "hex",
++ "sigstore-crypto",
++ "sigstore-types",
++ "thiserror 2.0.21",
++]
++
++[[package]]
++name = "sigstore-rekor"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "641fdaaa40d0cd6e249cf1671c2240beff1a3ece578062cf43e750779e8db2b3"
++dependencies = [
++ "base64 0.22.1",
++ "hex",
++ "reqwest",
++ "serde",
++ "serde_json",
++ "sigstore-crypto",
++ "sigstore-merkle",
++ "sigstore-types",
++ "thiserror 2.0.21",
++ "url",
++]
++
++[[package]]
++name = "sigstore-trust-root"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a6b0d2550f05c096400066e858db13d91f9de3b750a7541fb1291c1dc80ca290"
++dependencies = [
++ "base64 0.22.1",
++ "chrono",
++ "hex",
++ "rustls-pki-types",
++ "serde",
++ "serde_json",
++ "sigstore-crypto",
++ "sigstore-types",
++ "thiserror 2.0.21",
++ "x509-cert",
++]
++
++[[package]]
++name = "sigstore-tsa"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0bc86c8abc1ece6832236e7e34e9baebb5d4d40490c0332b814a0d8624ca7255"
++dependencies = [
++ "aws-lc-rs",
++ "base64 0.22.1",
++ "chrono",
++ "cmpv2",
++ "cms",
++ "const-oid",
++ "der",
++ "hex",
++ "rand 0.10.3",
++ "reqwest",
++ "rustls-pki-types",
++ "rustls-webpki",
++ "sigstore-crypto",
++ "sigstore-types",
++ "thiserror 2.0.21",
++ "tracing",
++ "x509-cert",
++ "x509-tsp",
++]
++
++[[package]]
++name = "sigstore-types"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f8d870c9bcfdf83396ac2bd2d6a23c5d09ec02cc9fda50fa1cbb3dd71a9bee53"
++dependencies = [
++ "base64 0.22.1",
++ "chrono",
++ "hex",
++ "pem",
++ "serde",
++ "serde_json",
++ "thiserror 2.0.21",
++]
++
++[[package]]
++name = "sigstore-verify"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d30aff69036e4579b416956e9ba68cec45b793116f78f10842d04c7f8b924bab"
++dependencies = [
++ "base64 0.22.1",
++ "chrono",
++ "cms",
++ "const-oid",
++ "hex",
++ "pem",
++ "rustls-pki-types",
++ "rustls-webpki",
++ "serde",
++ "serde_json",
++ "serde_json_canonicalizer",
++ "sigstore-bundle",
++ "sigstore-crypto",
++ "sigstore-merkle",
++ "sigstore-rekor",
++ "sigstore-trust-root",
++ "sigstore-tsa",
++ "sigstore-types",
++ "thiserror 2.0.21",
++ "tls_codec",
++ "tracing",
++ "x509-cert",
++]
++
[[package]]
name = "simd-adler32"
version = "0.3.10"
@@@ -4278,7 -4277,7 +5374,17 @@@ version = "0.2.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
dependencies = [
-- "serde",
++ "serde",
++]
++
++[[package]]
++name = "socket2"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
++dependencies = [
++ "libc",
++ "windows-sys 0.61.2",
]
[[package]]
@@@ -4290,6 -4289,6 +5396,16 @@@ dependencies =
"bitflags 2.13.2",
]
++[[package]]
++name = "spki"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
++dependencies = [
++ "base64ct",
++ "der",
++]
++
[[package]]
name = "stable_deref_trait"
version = "1.2.1"
@@@ -4322,6 -4321,6 +5438,27 @@@ dependencies =
"unicode-properties",
]
++[[package]]
++name = "strum"
++version = "0.28.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
++dependencies = [
++ "strum_macros",
++]
++
++[[package]]
++name = "strum_macros"
++version = "0.28.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
++dependencies = [
++ "heck 0.5.0",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
[[package]]
name = "subsetter"
version = "0.2.6"
@@@ -4334,6 -4333,6 +5471,12 @@@ dependencies =
"write-fonts",
]
++[[package]]
++name = "subtle"
++version = "2.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
++
[[package]]
name = "svgtypes"
version = "0.16.1"
@@@ -4344,6 -4343,6 +5487,16 @@@ dependencies =
"siphasher",
]
++[[package]]
++name = "syn"
++version = "1.0.109"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
++dependencies = [
++ "proc-macro2",
++ "unicode-ident",
++]
++
[[package]]
name = "syn"
version = "2.0.119"
@@@ -4366,6 -4365,6 +5519,15 @@@ dependencies =
"unicode-ident",
]
++[[package]]
++name = "sync_wrapper"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
++dependencies = [
++ "futures-core",
++]
++
[[package]]
name = "synstructure"
version = "0.14.0"
@@@ -4377,6 -4376,6 +5539,38 @@@ dependencies =
"syn 3.0.6",
]
++[[package]]
++name = "system-configuration"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
++dependencies = [
++ "bitflags 2.13.2",
++ "core-foundation 0.9.4",
++ "system-configuration-sys",
++]
++
++[[package]]
++name = "system-configuration-sys"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
++[[package]]
++name = "tar"
++version = "0.4.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
++dependencies = [
++ "filetime",
++ "libc",
++ "xattr",
++]
++
[[package]]
name = "tempfile"
version = "3.27.0"
@@@ -4504,13 -4503,13 +5698,63 @@@ version = "1.13.3
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
++[[package]]
++name = "tls_codec"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0de2e01245e2bb89d6f05801c564fa27624dbd7b1846859876c7dad82e90bf6b"
++dependencies = [
++ "tls_codec_derive",
++ "zeroize",
++]
++
++[[package]]
++name = "tls_codec_derive"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
[[package]]
name = "tokio"
version = "1.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
dependencies = [
++ "bytes",
++ "libc",
++ "mio",
++ "pin-project-lite",
++ "socket2",
++ "windows-sys 0.61.2",
++]
++
++[[package]]
++name = "tokio-rustls"
++version = "0.26.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
++dependencies = [
++ "rustls",
++ "tokio",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.7.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "futures-sink",
++ "libc",
"pin-project-lite",
++ "tokio",
]
[[package]]
@@@ -4564,6 -4563,6 +5808,51 @@@ version = "1.1.2+spec-1.1.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
++[[package]]
++name = "tower"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
++dependencies = [
++ "futures-core",
++ "futures-util",
++ "pin-project-lite",
++ "sync_wrapper",
++ "tokio",
++ "tower-layer",
++ "tower-service",
++]
++
++[[package]]
++name = "tower-http"
++version = "0.6.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
++dependencies = [
++ "bitflags 2.13.2",
++ "bytes",
++ "futures-util",
++ "http",
++ "http-body",
++ "pin-project-lite",
++ "tower",
++ "tower-layer",
++ "tower-service",
++ "url",
++]
++
++[[package]]
++name = "tower-layer"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
++
++[[package]]
++name = "tower-service"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
++
[[package]]
name = "tracing"
version = "0.1.44"
@@@ -4596,6 -4595,6 +5885,23 @@@ dependencies =
"once_cell",
]
++[[package]]
++name = "tree_magic_mini"
++version = "3.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
++dependencies = [
++ "memchr",
++ "nom",
++ "petgraph",
++]
++
++[[package]]
++name = "try-lock"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
++
[[package]]
name = "ttf-parser"
version = "0.25.1"
@@@ -4614,6 -4613,6 +5920,12 @@@ dependencies =
"rustc-hash 2.1.3",
]
++[[package]]
++name = "typenum"
++version = "1.20.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
++
[[package]]
name = "uds_windows"
version = "1.2.1"
@@@ -4700,6 -4699,6 +6012,18 @@@ version = "0.2.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
++[[package]]
++name = "untrusted"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
++
++[[package]]
++name = "untrusted"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
++
[[package]]
name = "url"
version = "2.5.8"
@@@ -4718,7 -4717,7 +6042,7 @@@ version = "0.47.0
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de"
dependencies = [
-- "base64",
++ "base64 0.22.1",
"data-url",
"flate2",
"fontdb",
@@@ -4791,21 -4790,21 +6115,6 @@@ dependencies =
"thiserror 2.0.21",
]
--[[package]]
--name = "vello_common"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2"
--dependencies = [
-- "bytemuck",
-- "fearless_simd",
-- "guillotiere",
-- "log",
-- "peniko",
-- "smallvec",
-- "thiserror 2.0.21",
--]
--
[[package]]
name = "vello_common"
version = "0.2.0"
@@@ -4835,18 -4834,18 +6144,6 @@@ dependencies =
"vello_common 0.0.8",
]
--[[package]]
--name = "vello_cpu"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea"
--dependencies = [
-- "bytemuck",
-- "glifo 0.2.0",
-- "hashbrown 0.17.1",
-- "vello_common 0.1.0",
--]
--
[[package]]
name = "vello_cpu"
version = "0.2.0"
@@@ -4889,6 -4888,6 +6186,21 @@@ dependencies =
"winapi-util",
]
++[[package]]
++name = "want"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b"
++dependencies = [
++ "try-lock",
++]
++
++[[package]]
++name = "wasi"
++version = "0.11.1+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
++
[[package]]
name = "wasip2"
version = "1.0.4+wasi-0.2.12"
@@@ -5164,6 -5163,6 +6476,15 @@@ dependencies =
"web-sys",
]
++[[package]]
++name = "webpki-root-certs"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b96554aa2acc8ccdb7e1c9a58a7a68dd5d13bccc69cd124cb09406db612a1c9b"
++dependencies = [
++ "rustls-pki-types",
++]
++
[[package]]
name = "weezl"
version = "0.1.12"
@@@ -5445,6 -5444,6 +6766,17 @@@ dependencies =
"windows-link",
]
++[[package]]
++name = "windows-registry"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
++dependencies = [
++ "windows-link",
++ "windows-result",
++ "windows-strings",
++]
++
[[package]]
name = "windows-result"
version = "0.4.1"
@@@ -5640,7 -5639,7 +6972,7 @@@ checksum = "d6bbff5f0aada427a1e5a6da5f1
[[package]]
name = "winit"
version = "0.30.13"
--source = "git+https://github.com/storytold/winit.git?rev=3d51077fd1a966f84df9ef287839dc84fd5b4ca7#3d51077fd1a966f84df9ef287839dc84fd5b4ca7"
++source = "git+https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc#a517b3846ee8457d84ee4975110bfda6797c44dc"
dependencies = [
"ahash",
"android-activity",
@@@ -5651,7 -5650,7 +6983,7 @@@
"calloop 0.13.0",
"cfg_aliases",
"concurrent-queue",
-- "core-foundation",
++ "core-foundation 0.9.4",
"core-graphics",
"cursor-icon",
"dpi",
@@@ -5696,6 -5695,6 +7028,27 @@@ dependencies =
"memchr",
]
++[[package]]
++name = "winprint"
++version = "0.2.1"
++source = "git+https://github.com/storytold/winprint.rs?rev=5f80b9baf6b58937c401656634e42d33f00ddf49#5f80b9baf6b58937c401656634e42d33f00ddf49"
++dependencies = [
++ "flate2",
++ "fmt-derive",
++ "reqwest",
++ "scopeguard",
++ "sigstore-trust-root",
++ "sigstore-types",
++ "sigstore-verify",
++ "strum",
++ "tar",
++ "thiserror 2.0.21",
++ "windows",
++ "windows-core",
++ "windows-implement",
++ "xml",
++]
++
[[package]]
name = "winresource"
version = "0.1.31"
@@@ -5718,6 -5717,6 +7071,24 @@@ version = "0.57.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
++[[package]]
++name = "wl-clipboard-rs"
++version = "0.9.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4d7888ccd4896447b2d14d3a9350a85df2aeb6f181e2e7a31349d104ac46cac1"
++dependencies = [
++ "libc",
++ "log",
++ "os_pipe",
++ "rustix 1.1.5",
++ "thiserror 2.0.21",
++ "tree_magic_mini",
++ "wayland-backend",
++ "wayland-client",
++ "wayland-protocols",
++ "wayland-protocols-wlr",
++]
++
[[package]]
name = "write-fonts"
version = "0.48.1"
@@@ -5769,6 -5768,6 +7140,41 @@@ version = "0.13.2
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
++[[package]]
++name = "x509-cert"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94"
++dependencies = [
++ "const-oid",
++ "der",
++ "sha1",
++ "signature",
++ "spki",
++ "tls_codec",
++]
++
++[[package]]
++name = "x509-tsp"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f5ceece934a21607055b7ac5c25adb56a2ff559804b10705dc674d1d838c15e1"
++dependencies = [
++ "cmpv2",
++ "cms",
++ "der",
++]
++
++[[package]]
++name = "xattr"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
++dependencies = [
++ "libc",
++ "rustix 1.1.5",
++]
++
[[package]]
name = "xcursor"
version = "0.3.11"
@@@ -5794,6 -5793,6 +7200,12 @@@ version = "0.2.1
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
++[[package]]
++name = "xml"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52"
++
[[package]]
name = "xml-rs"
version = "0.8.29"
@@@ -5995,6 -5994,6 +7407,26 @@@ dependencies =
"synstructure",
]
++[[package]]
++name = "zeroize"
++version = "1.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879"
++dependencies = [
++ "zeroize_derive",
++]
++
++[[package]]
++name = "zeroize_derive"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.119",
++]
++
[[package]]
name = "zerotrie"
version = "0.2.5"
@@@ -6121,3 -6120,3 +7553,23 @@@ dependencies =
"syn 3.0.6",
"winnow",
]
++
++[[patch.unused]]
++name = "egui_demo_lib"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
++
++[[patch.unused]]
++name = "egui_extras"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
++
++[[patch.unused]]
++name = "egui_inspection"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
++
++[[patch.unused]]
++name = "egui_system_font_provider"
++version = "0.37.0"
++source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
diff --cc Cargo.toml
index 8a83e0463,0245708f0..4819a9b9e
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -79,18 -79,18 +79,20 @@@ craft-docpath = { version = "0.1.0", gi
# Atomic file replacement for saves and exports (craft-libs).
craft-atomic = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e" }
# File › Print through the system print spooler (craft-libs).
--craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "d991bf6792f8ade99c51358bf3c1d902c8cd96b5" }
++craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "25da1314d443171b4adeaad2cd9454b273f35c6f" }
# ICC colour management: working spaces, transforms, black point compensation (craft-libs).
craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e" }
# ui
# Shared frontend components; keep this dependency above the engine boundary.
--craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }
--egui = "0.36"
--egui_extras = { version = "0.36", default-features = false, features = ["svg"] }
--eframe = { version = "0.36", default-features = false }
--egui_kittest = "0.36"
++craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "25da1314d443171b4adeaad2cd9454b273f35c6f", features = ["serde"] }
++egui = "0.37"
++egui_extras = { version = "0.37", default-features = false, features = ["svg"] }
++eframe = { version = "0.37", default-features = false }
++egui_kittest = "0.37"
++# Monotonic clock on native and web (`Instant`); screenshot settlement must not use wall time.
++web-time = "1"
rfd = "0.17"
arboard = { version = "3.6", default-features = false }
@@@ -122,9 -122,10 +124,24 @@@ debug =
# Opt-in cancelable macOS termination on the pinned winit 0.30 line.
[patch.crates-io]
- krilla = { git = "https://github.com/storytold/craft-libs", rev = "89dcbb3060377a26c99a6d80caa16084366704c4", version = "=0.8.2" }
- winit = { git = "https://github.com/storytold/winit.git", rev = "3d51077fd1a966f84df9ef287839dc84fd5b4ca7" }
- hayro = { git = "https://github.com/storytold/craft-libs", rev = "89dcbb3060377a26c99a6d80caa16084366704c4", version = "=0.7.1" }
- hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "89dcbb3060377a26c99a6d80caa16084366704c4", version = "=0.7.0" }
- hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "89dcbb3060377a26c99a6d80caa16084366704c4", version = "=0.7.2" }
- hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "89dcbb3060377a26c99a6d80caa16084366704c4", version = "=0.3.0" }
+ krilla = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.8.2" }
-winit = { git = "https://github.com/storytold/winit.git", rev = "3d51077fd1a966f84df9ef287839dc84fd5b4ca7" }
++winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
+ hayro = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.1" }
+ hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.0" }
+ hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.2" }
+ hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.3.0" }
+ hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0" }
++ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
++egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
diff --cc NOTICE
index f1e997156,71abff776..fc46bcdf3
--- a/NOTICE
+++ b/NOTICE
@@@ -113,3 -114,3 +114,21 @@@ Assets already bundled through Hayro's
non-visual character-mapping data; see licenses/pdf-backend/hayro-cmap/LICENSE.txt.
Adobe and contributor names do not endorse or promote this product.
Per-file hashes and sources are recorded in ASSETS.md.
++
++Bundled egui font icons
++
++The pinned egui dependency includes egui-icons.ttf, a small subset of John Slegers'
++emoji-icon-font, through default_fonts. The parent emoji-icon-font.ttf face is
++included through monochrome_emoji_fonts. Their upstream project is
++https://github.com/jslegers/emoji-icon-font; both use the same exact copyright
++and permission notice below.
++
++MIT License
++
++Copyright (c) 2014 John Slegers
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --cc apps/designcraft-cli/tests/it/cli.rs
index 173a605f4,467b231f6..02536382a
--- a/apps/designcraft-cli/tests/it/cli.rs
+++ b/apps/designcraft-cli/tests/it/cli.rs
@@@ -401,6 -401,76 +401,97 @@@ fn mcp_automation_roots_confine_the_ser
let _ = std::fs::remove_dir_all(base);
}
+ /// #1552: each root flag may be given more than once. A path inside any root of its kind passes;
+ /// the roots' common parent, a sibling whose name starts like a root's, `..` out of a root, the
+ /// other kind's roots and a link out of a root stay refused.
+ #[test]
+ fn mcp_automation_roots_take_several_folders() {
+ let base = std::env::temp_dir().join(format!("dc-cli-roots-several-{}", std::process::id()));
+ let _ = std::fs::remove_dir_all(&base);
+ for d in ["in", "shared", "out", "scratch", "outside", "in2", "scratch2"] {
+ std::fs::create_dir_all(base.join(d)).unwrap();
+ }
+ // Resolved, as the server shows the roots (`/var` is `/private/var` on macOS).
+ let base = std::fs::canonicalize(base).unwrap();
+ for f in ["in/a.designcraft", "shared/b.designcraft", "outside/secret.designcraft", "parent.designcraft", "in2/c.designcraft"] {
+ make_document(&base.join(f));
+ }
++ // Windows' canonical `\\?\` form is not a prefix under which `..` is a path component:
++ // traversal requests use the ordinary spelling, while the other requests keep the resolved one.
++ let plain = |path: &std::path::Path| -> String {
++ let text = path.to_string_lossy();
++ if !cfg!(windows) {
++ return text.into_owned();
++ }
++ if let Some(rest) = text.strip_prefix(r"\\?\UNC\") {
++ return format!(r"\\{rest}");
++ }
++ match text.strip_prefix(r"\\?\") {
++ Some(rest) => rest.to_owned(),
++ None => text.into_owned(),
++ }
++ };
+ let p = |f: &str| base.join(f).to_str().unwrap().to_string();
+ let sep = std::path::MAIN_SEPARATOR;
- let up = |root: &str, rest: &str| format!("{}{sep}..{sep}{rest}", p(root));
++ let up = |root: &str, rest: &str| format!("{}{sep}..{sep}{rest}", plain(&base.join(root)));
+ let calls = [
+ ("open_document", serde_json::json!({"path": p("in/a.designcraft")})),
+ ("open_document", serde_json::json!({"path": p("shared/b.designcraft")})),
+ // The roots' common parent is not a root.
+ ("open_document", serde_json::json!({"path": p("parent.designcraft")})),
+ ("open_document", serde_json::json!({"path": up("shared", &format!("outside{sep}secret.designcraft"))})),
+ // `in2` only starts like `in`.
+ ("open_document", serde_json::json!({"path": p("in2/c.designcraft")})),
+ // `..` from one read root into another stays inside.
+ ("open_document", serde_json::json!({"path": up("shared", &format!("in{sep}a.designcraft"))})),
+ ("save_document", serde_json::json!({"path": p("out/x.designcraft")})),
+ ("save_document", serde_json::json!({"path": p("scratch/y.designcraft")})),
+ ("save_document", serde_json::json!({"path": p("z.designcraft")})),
+ ("save_document", serde_json::json!({"path": p("scratch2/z.designcraft")})),
+ // Read and write stay separate: a read root is not a write root, nor the other way round.
+ ("save_document", serde_json::json!({"path": p("shared/w.designcraft")})),
+ ("open_document", serde_json::json!({"path": p("out/x.designcraft")})),
+ ("export_png", serde_json::json!({"path": up("scratch", &format!("outside{sep}p.png"))})),
+ ];
+ let read2 = format!("--automation-read-root={}", p("shared"));
+ let args = ["--automation-read-root", &p("in"), &read2, "--automation-write-root", &p("out"), "--automation-write-root", &p("scratch")];
+ let (success, stderr, replies) = mcp_session(&args, &calls);
+ assert!(success, "{stderr}");
- let confined = format!("files confined: read {}, {}; write {}, {}", p("in"), p("shared"), p("out"), p("scratch"));
- assert!(stderr.contains(&confined), "{stderr}");
++ let confined = format!(
++ "files confined: read {}, {}; write {}, {}",
++ plain(&base.join("in")),
++ plain(&base.join("shared")),
++ plain(&base.join("out")),
++ plain(&base.join("scratch"))
++ );
++ assert!(stderr.contains(&confined), "expected {confined:?} in {stderr:?}");
+ let errors: Vec<bool> = replies.iter().map(|r| r["result"]["isError"] == true).collect();
+ assert_eq!(errors, [false, false, true, true, true, false, false, false, true, true, true, true, true], "{replies:?}");
+ for (i, kind) in [(2, "read"), (3, "read"), (4, "read"), (8, "write"), (9, "write"), (10, "write"), (11, "read"), (12, "write")] {
+ assert!(text(&replies[i]).contains(&format!("outside the {kind} roots ")), "{i}: {}", text(&replies[i]));
+ }
+ assert!(base.join("out/x.designcraft").is_file() && base.join("scratch/y.designcraft").is_file());
+ for f in ["z.designcraft", "scratch2/z.designcraft", "shared/w.designcraft", "outside/p.png"] {
+ assert!(!base.join(f).exists(), "{f} was written outside the write roots");
+ }
+
+ // A link in one root that leads out of all of them is outside, for reading and for writing.
+ #[cfg(unix)]
+ {
+ std::os::unix::fs::symlink(base.join("outside/secret.designcraft"), base.join("shared/leak.designcraft")).unwrap();
+ std::os::unix::fs::symlink(base.join("outside"), base.join("scratch/away")).unwrap();
+ let calls = [
+ ("open_document", serde_json::json!({"path": p("shared/leak.designcraft")})),
+ ("save_document", serde_json::json!({"path": p("scratch/away/x.designcraft")})),
+ ];
+ let (_, _, replies) = mcp_session(&args, &calls);
+ assert!(text(&replies[0]).contains("outside the read roots"), "{}", text(&replies[0]));
+ assert!(text(&replies[1]).contains("outside the write roots"), "{}", text(&replies[1]));
+ assert!(!base.join("outside/x.designcraft").exists());
+ }
+ let _ = std::fs::remove_dir_all(base);
+ }
+
#[test]
fn mcp_automation_root_flags_are_checked_up_front() {
let base = std::env::temp_dir().join(format!("dc-cli-roots-args-{}", std::process::id()));
diff --cc apps/designcraft-web/src/web.rs
index 27d236a2f,27d236a2f..a8914f09d
--- a/apps/designcraft-web/src/web.rs
+++ b/apps/designcraft-web/src/web.rs
@@@ -350,9 -350,9 +350,14 @@@ struct WebShell
impl eframe::App for WebShell {
fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
let graphics = self.graphics.clone();
-- let _ = graphics.run_if_healthy(|| {
-- let dropped = ctx.input_mut(|i| std::mem::take(&mut i.raw.dropped_files));
-- for f in dropped {
++ let _ = graphics.run_if_healthy(|| self.app.logic(ctx));
++ }
++
++ fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
++ let _ = self.graphics.run_if_healthy(|| {
++ // Dropped files belong to this host iteration's raw input, not to stale logic input:
++ // read them here once, before the batch is saved as pending for a hidden pass.
++ for f in std::mem::take(&mut raw.dropped_files) {
let request = self.app.import_request("drop");
let inbox = self.inbox.clone();
let ctx = ctx.clone();
@@@ -367,14 -367,14 +372,8 @@@
}
});
}
-- self.app.logic(ctx);
-- });
-- }
--
-- fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
-- let _ = self.graphics.run_if_healthy(|| {
designcraft_ui_egui::drop_key_name_text(raw, ctx.text_edit_focused() || self.app.canvas_ime());
-- self.app.raw_input_hook(raw);
++ self.app.raw_input_hook(ctx, raw);
});
}
diff --cc apps/designcraft/Cargo.toml
index 7dc83bc55,7dc83bc55..387bb5fdf
--- a/apps/designcraft/Cargo.toml
+++ b/apps/designcraft/Cargo.toml
@@@ -13,7 -13,7 +13,7 @@@ workspace = tru
[dependencies]
designcraft-engine = { workspace = true }
designcraft-ui-egui = { workspace = true }
--eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links"] }
++eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links", "clipboard"] }
egui = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
diff --cc apps/designcraft/src/main.rs
index e694fe84f,195a2dc6e..da84db264
--- a/apps/designcraft/src/main.rs
+++ b/apps/designcraft/src/main.rs
@@@ -51,39 -51,39 +51,45 @@@ struct App
impl eframe::App for App {
fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
self.startup.enter();
-- if let Some(note) = self.startup.take_notice() {
-- self.app.status(note);
-- }
-- // The third call: two frames went through `ui`, so the first was presented and the driver
-- // survived it (a fault at the first present is what the fallback in `gpu` is for).
-- if self.frames == 2 {
-- self.startup.presented();
-- }
-- self.frames = self.frames.saturating_add(1);
-- if u64::from(self.frames) >= gpu::STARTUP_FRAMES
-- && let Some(device) = self.log_errors_after_startup.take()
-- {
-- gpu_limits::log_uncaptured_errors(&device);
-- }
-- #[cfg(target_os = "macos")]
-- {
-- if self.menu.is_none() && std::env::var_os("DESIGNCRAFT_NO_NATIVE_MENU").is_none() {
-- self.menu = Some(native_menu::NativeMenu::install(&mut self.app, ctx));
-- }
-- if let Some(m) = &mut self.menu {
-- m.poll(&mut self.app, ctx);
-- }
-- // Noted for a start again after a graphics failure, which reopens them (`gpu::restart`).
-- self.startup.opening(apple_events::poll(&self.apple_events, &mut self.app, ctx));
-- }
++ // Queue/deadline work only. A hidden `run_logic` tick also reports pass index zero, so
++ // startup counters and native-menu polling must not live here.
self.app.logic(ctx);
self.startup.leave();
}
-- fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
-- self.app.raw_input_hook(raw);
++ fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
++ self.app.raw_input_hook(ctx, raw);
}
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
self.startup.enter();
++ // `App::ui` is the only signal that a real layout pass ran. A discarded multipass first
++ // pass reports index 0 once, so these once-per-frame counters/menu polls still run once.
++ if ui.ctx().current_pass_index() == 0 {
++ if let Some(note) = self.startup.take_notice() {
++ self.app.status(note);
++ }
++ // The third UI callback: two frames went through `ui`, so the first was presented and
++ // the driver survived it (a fault at the first present is what `gpu` falls back for).
++ if self.frames == 2 {
++ self.startup.presented();
++ }
++ self.frames = self.frames.saturating_add(1);
++ if u64::from(self.frames) >= gpu::STARTUP_FRAMES
++ && let Some(device) = self.log_errors_after_startup.take()
++ {
++ gpu_limits::log_uncaptured_errors(&device);
++ }
++ #[cfg(target_os = "macos")]
++ {
++ if self.menu.is_none() && std::env::var_os("DESIGNCRAFT_NO_NATIVE_MENU").is_none() {
++ self.menu = Some(native_menu::NativeMenu::install(&mut self.app, ui.ctx()));
++ }
++ if let Some(m) = &mut self.menu {
++ m.poll(&mut self.app, ui.ctx());
++ }
++ // Noted for a start again after a graphics failure, which reopens them (`gpu::restart`).
++ self.startup.opening(apple_events::poll(&self.apple_events, &mut self.app, ui.ctx()));
++ }
++ }
self.app.ui(ui);
self.startup.leave();
#[cfg(target_os = "macos")]
@@@ -407,6 -407,6 +413,9 @@@ fn main() -> std::process::ExitCode
.with_fullsize_content_view(true)
.with_titlebar_shown(false)
.with_title_shown(false),
++ // DesignCraft's own FontDb supplies script-specific system fallbacks; egui's system-font
++ // provider would put its discovery ahead of that order and change line metrics.
++ system_font_fallback: false,
..Default::default()
};
options.viewport = options.viewport.with_app_id(APP_ID);
diff --cc apps/designcraft/src/native_menu.rs
index 1ac9437d1,1ac9437d1..8996debe5
--- a/apps/designcraft/src/native_menu.rs
+++ b/apps/designcraft/src/native_menu.rs
@@@ -65,10 -65,10 +65,11 @@@ impl NativeMenu
// muda keeps the first handler for the life of the process, so this channel serves every
// menu bar built later (`build_bar`).
let (tx, events) = channel();
-- let repaint = ctx.clone();
++ let notify = app.native_action_notifier(ctx.clone());
MenuEvent::set_event_handler(Some(move |e: MenuEvent| {
-- let _ = tx.send(e);
-- repaint.request_repaint();
++ if tx.send(e).is_ok() {
++ notify();
++ }
}));
Self::build_bar(app, events)
}
@@@ -170,11 -170,11 +171,14 @@@
}
pub fn poll(&mut self, app: &mut DesignApp, ctx: &egui::Context) {
-- while let Ok(ev) = self.events.try_recv() {
-- if let Some((cmd, params, _)) = self.items.get(ev.id.as_ref()) {
-- menus::activate_native(app, ctx, &cmd.clone(), &params.clone());
++ app.poll_native_actions(ctx, || {
++ loop {
++ let ev = self.events.try_recv().ok()?;
++ if let Some((cmd, params, _)) = self.items.get(ev.id.as_ref()) {
++ return Some((cmd.clone(), params.clone()));
++ }
}
-- }
++ });
// Interface Language and Show CJK Features (set in Preferences or by `app.language`, or put
// back by Cancel): the system menu bar follows at once, like the panels (the new menu
// replaces the old one as the application's menu before that one is dropped).
diff --cc crates/engine/src/cmd/datamerge/tests.rs
index 98849eae1,98849eae1..5cee93730
--- a/crates/engine/src/cmd/datamerge/tests.rs
+++ b/crates/engine/src/cmd/datamerge/tests.rs
@@@ -2,7 -2,7 +2,7 @@@
use std::path::{Path, PathBuf};
--use designcraft_doc::{Content, DataField, DataFieldKind, DataSource, Delimiter, HyperlinkDest, SourceStatus};
++use designcraft_doc::{Content, DataField, DataFieldKind, DataSource, Delimiter, HyperlinkDest, Selection, SourceStatus, StoryId, TextSel};
use serde_json::{Value, json};
use super::parse::{self, parse_csv};
@@@ -790,6 -790,6 +790,30 @@@ fn tiling_rows_first_bottom_inset_and_r
assert_eq!(s.documents().len(), before);
}
++/// An IME delete-surrounding while a record is previewed edits the template, not the filled
++/// record, and its undo step restores the template.
++#[test]
++fn an_ime_delete_ends_a_preview_and_edits_the_template() {
++ let mut s = Session::new();
++ new_doc(&mut s, 1);
++ let f = text_frame(&mut s, [36.0, 36.0, 240.0, 80.0], "", None);
++ let sid = StoryId(f["story"].as_u64().unwrap());
++ select_csv(&mut s, "Name\nAda\nGrace\n");
++ exec(&mut s, "data.placeholder.add", json!({"field": "Name"}));
++ assert_eq!(texts(&s), vec!["<<Name>>".to_string()]);
++ exec(&mut s, "data.preview", json!({"record": 2}));
++ assert_eq!(texts(&s), vec!["Grace".to_string()], "the preview shows the record");
++ // The caret was placed in the preview, at the end of the filled text.
++ s.doc_mut().unwrap().selection = Selection::text(TextSel { story: sid, anchor: 5, focus: 5, frame: None, cell: None });
++ let m = s.ime_delete_surrounding(1, 0, false).unwrap().expect("the delete changed the template");
++ assert!(m.inserted.is_empty());
++ assert!(s.doc().unwrap().preview_stash.is_none(), "the preview ended before the edit");
++ assert_eq!(texts(&s), vec!["<<Nae>>".to_string()], "the template lost the character, not the filled record");
++ s.execute("edit.undo", &json!({})).unwrap();
++ assert_eq!(texts(&s), vec!["<<Name>>".to_string()], "Undo restores the template, never the preview record");
++ assert!(s.doc().unwrap().preview_stash.is_none());
++}
++
#[test]
fn update_remove_preview_inline_rows_and_old_files() {
let dir = scratch("update");
diff --cc crates/engine/src/cmd/interchange.rs
index bf0e011a0,bf0e011a0..098779f49
--- a/crates/engine/src/cmd/interchange.rs
+++ b/crates/engine/src/cmd/interchange.rs
@@@ -512,7 -512,7 +512,10 @@@ mod tests
let (idml, _) = linked_idml(link, false).unwrap();
let (doc, seen) = crate::io::touched(|| import(&idml, Some(&package)).unwrap());
// Beside the package, and the link itself where it is on this computer.
-- assert!(seen.iter().all(|p| p.starts_with(&dir) || p == std::path::Path::new(link)), "{link}: {seen:?}");
++ // A rooted local path such as /dev/zero acquires the package's drive on Windows.
++ let local = std::path::Path::new(link);
++ let external = (local.has_root() && !link.starts_with(r"\\")).then(|| std::path::absolute(dir.join(local)).unwrap());
++ assert!(seen.iter().all(|p| p.starts_with(&dir) || Some(p) == external.as_ref()), "{link}: {seen:?}");
let asset = doc.assets.values().next().unwrap();
assert!(asset.data.is_empty(), "{link}");
assert_eq!(super::super::links::status(asset, None), "missing", "{link}");
diff --cc crates/engine/src/cmd/links.rs
index 6623b6cb8,70ad8dac1..ba3fef4f6
--- a/crates/engine/src/cmd/links.rs
+++ b/crates/engine/src/cmd/links.rs
@@@ -808,7 -858,7 +858,7 @@@ mod tests
assert_eq!(a.pixels, Some((60, 20)));
assert_eq!(a.mime, "application/postscript");
assert_eq!(a.data.as_slice(), eps(30).as_bytes());
-- let moved = dir.join("new/replacement.eps");
++ let moved = dir.join("new").join("replacement.eps");
std::fs::rename(&replacement, &moved).unwrap();
assert_eq!(s.execute("links.relinkFolder", &json!({"dir": dir.join("new").to_string_lossy()})).unwrap()["relinked"], 1);
assert_eq!(s.doc().unwrap().doc.assets[&aid].link.as_deref(), moved.to_str());
diff --cc crates/engine/src/cmd/mod.rs
index 1d6294ea6,1d6294ea6..afc09c8e9
--- a/crates/engine/src/cmd/mod.rs
+++ b/crates/engine/src/cmd/mod.rs
@@@ -6,7 -6,7 +6,7 @@@ mod articles
pub mod book;
mod buttons;
pub(crate) mod captions;
--mod changes;
++pub(crate) mod changes;
mod color_theme;
mod colorsettings;
mod conditions;
diff --cc crates/engine/src/cmd/paste_svg.rs
index 54513be53,54513be53..92e37b6f1
--- a/crates/engine/src/cmd/paste_svg.rs
+++ b/crates/engine/src/cmd/paste_svg.rs
@@@ -27,7 -27,7 +27,7 @@@ pub fn is_svg_markup(text: &str) -> boo
designcraft_images::is_svg(text.as_bytes())
}
--/// Nesting deeper than this is flattened into its parent (hostile input can't exhaust the stack).
++/// Cap conversion nesting too; the shared image parser bounds XML before usvg runs.
const MAX_DEPTH: usize = 64;
/// A converted SVG node, in points.
@@@ -426,13 -426,13 +426,16 @@@ mod tests
#[test]
fn deeply_nested_groups_do_not_exhaust_the_stack() {
let mut s = session();
++ let before = serde_json::to_value(&s.doc().unwrap().doc).unwrap();
++ let undo = s.doc().unwrap().history.undo.len();
let depth = 2000;
let svg = format!(
r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/>{}</svg>"#,
"<g opacity=\"0.99\">".repeat(depth),
"</g>".repeat(depth)
);
-- // usvg itself may refuse a document this deep; either way, no crash.
-- let _ = s.execute("edit.pasteSvg", &json!({"svg": svg}));
++ assert!(s.execute("edit.pasteSvg", &json!({"svg": svg})).is_err());
++ assert_eq!(serde_json::to_value(&s.doc().unwrap().doc).unwrap(), before);
++ assert_eq!(s.doc().unwrap().history.undo.len(), undo);
}
}
diff --cc crates/engine/src/cmd/preflight.rs
index 19d64c1fc,2d9698ba1..1846f3e78
--- a/crates/engine/src/cmd/preflight.rs
+++ b/crates/engine/src/cmd/preflight.rs
@@@ -348,17 -348,21 +348,19 @@@ mod placed_vector_tests
/// file is still missing.
#[test]
fn a_missing_link_shown_by_its_preview_is_still_reported() {
++ let dir = tempfile::tempdir().unwrap();
++ let missing_path = dir.path().join("missing dir").join("photo.jpg");
let mut s = Session::new();
s.execute("file.new", &json!({})).unwrap();
let png = designcraft_render::Rendered { width: 40, height: 20, pixels: vec![200; 40 * 20 * 4] }.to_png();
s.execute("file.place", &json!({"base64": base64_encode(&png), "name": "photo.jpg", "x": 72, "y": 72, "width": 20})).unwrap();
let doc = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
let asset = doc.assets.values_mut().next().unwrap();
- std::sync::Arc::make_mut(asset).link = Some("/definitely/missing dir/photo.jpg".into());
- // The temporary folder is an absolute path with the default settings on Windows, macOS and Linux. On Windows,
- // `/x` names no drive, so `document_path` refuses it when the document has no path.
- let link = std::env::temp_dir().join(format!("dc-preflight-missing-{} dir", std::process::id())).join("photo.jpg");
- let link = link.to_string_lossy().into_owned();
- std::sync::Arc::make_mut(asset).link = Some(link.clone());
++ std::sync::Arc::make_mut(asset).link = Some(missing_path.to_str().unwrap().into());
let r = s.execute("preflight.run", &json!({})).unwrap();
let missing: Vec<&str> =
r["issues"].as_array().unwrap().iter().filter(|i| i["kind"] == "missingLink").map(|i| i["message"].as_str().unwrap()).collect();
- assert_eq!(missing, ["Missing link: /definitely/missing dir/photo.jpg"]);
- assert_eq!(missing, [format!("Missing link: {link}")]);
++ assert_eq!(missing, [format!("Missing link: {}", missing_path.display())]);
}
}
diff --cc crates/engine/src/cmd/print.rs
index 0bb280780,0bb280780..8283dcf0a
--- a/crates/engine/src/cmd/print.rs
+++ b/crates/engine/src/cmd/print.rs
@@@ -84,7 -84,7 +84,10 @@@ mod tests
assert!(command.contains(&"print-scaling=auto-fit"));
assert!(!command.iter().any(|a| a.starts_with("sides=")));
} else {
-- assert_eq!(command[0], "powershell");
++ assert_eq!(
++ command,
++ ["xps-print", "printer=Office", "copies=2", "collate=true", "duplex=(queue default)", "scaling=shrink-to-fit", "color=color"]
++ );
}
assert!(r["bytes"].as_u64().unwrap() > 500);
assert!(s.execute("file.print", &json!({"pages": "9", "dryRun": true})).is_err());
diff --cc crates/engine/src/cmd/text.rs
index dbfbcfe15,43038f76a..406557ffb
--- a/crates/engine/src/cmd/text.rs
+++ b/crates/engine/src/cmd/text.rs
@@@ -72,6 -72,6 +72,15 @@@ pub fn specs() -> Vec<CommandSpec>
ok()
}),
cmd!("text.insert", "Type", [], None, "{text, raw?: bool (no typographer's quotes)} — replaces the selected text", has_text, insert),
++ cmd!(
++ "text.deleteSurrounding",
++ "Delete Surrounding Text",
++ [],
++ None,
++ "{before?: int, after?: int, bytes?: bool, commit?: string} — removes the text around the selection (an input method's delete-surrounding), keeps the selection and its direction, and with `commit` types that text over it: one undo step",
++ has_text,
++ delete_surrounding
++ ),
cmd!("text.delete", "Delete Text", [], None, "{forward?: bool, word?: bool}", has_text, delete),
cmd!(noundo "text.move", "Move Caret", [], None, "{dir: left|right|up|down|lineStart|lineEnd|storyStart|storyEnd, extend?, word?}", has_text, move_caret),
cmd!(noundo "text.exitToFrame", "Select Frame", [], None, "{}", has_doc, |s, _| {
@@@ -758,6 -767,6 +776,71 @@@ fn insert(s: &mut Session, p: &Value) -
result
}
++/// The input method's delete-surrounding: remove `before`/`after` characters (or bytes) around
++/// the selection, keeping the selection itself and its direction, then optionally type `commit`
++/// over it. One undo step for the whole batch, through the normal command pipeline (preview
++/// restoration, panic guard, undo, auto-size and the journal), unlike a private edit.
++fn delete_surrounding(s: &mut Session, p: &Value) -> Result<Value> {
++ let count = |key: &str| -> Result<usize> {
++ match p.get(key).and_then(Value::as_u64) {
++ Some(v) => usize::try_from(v).map_err(|_| bad("text.deleteSurrounding", format!("{key} is out of range"))),
++ None => Ok(0),
++ }
++ };
++ let before = count("before")?;
++ let after = count("after")?;
++ let bytes = p.get("bytes").and_then(Value::as_bool).unwrap_or(false);
++ let commit = designcraft_tools::ime_commit_text(p.get("commit").and_then(Value::as_str).unwrap_or(""));
++ // What the request removes, from the committed text as it is now: the ranges exclude the
++ // selection and any pre-edit (a pre-edit is only a preview, never in the story).
++ let (before_range, after_range, tracking, length_before) = {
++ let st = s.doc()?;
++ let t = st.selection.text.ok_or_else(|| bad("text.deleteSurrounding", "no text insertion point"))?;
++ let story = st.doc.text_story(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
++ let (before_range, after_range) = crate::ime_delete_ranges(&story.text, t.anchor, t.focus, before, after, bytes)
++ .ok_or_else(|| bad("text.deleteSurrounding", "the IME text selection is not on character boundaries"))?;
++ (before_range, after_range, st.doc.settings.track_changes && t.cell.is_none(), story.text.len())
++ };
++ s.edit(|d, sel| {
++ let t = sel.text.ok_or_else(|| bad("text.deleteSurrounding", "no text insertion point"))?;
++ let story = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
++ if !after_range.is_empty() {
++ if tracking {
++ crate::cmd::changes::mark_deleted(story, after_range.clone());
++ } else {
++ story.delete(after_range.clone());
++ }
++ }
++ let mut shift = 0usize;
++ if !before_range.is_empty() {
++ if tracking {
++ // Tracked changes keep the text and mark it deleted: the selection does not move.
++ let new_end = crate::cmd::changes::mark_deleted(story, before_range.clone());
++ shift = before_range.end.saturating_sub(new_end);
++ } else {
++ shift = before_range.len();
++ story.delete(before_range.clone());
++ }
++ }
++ sel.text = Some(TextSel { anchor: t.anchor.saturating_sub(shift), focus: t.focus.saturating_sub(shift), ..t });
++ Ok(())
++ })?;
++ if !commit.is_empty() {
++ insert(s, &json!({"text": commit}))?;
++ }
++ let st = s.doc()?;
++ let (anchor, focus) = st.selection.text.map_or((0, 0), |t| (t.anchor, t.focus));
++ let length_after = st.selection.text.and_then(|t| st.doc.text_story(t.story, t.cell)).map_or(0, |story| story.text.len());
++ Ok(json!({
++ "deletedBefore": [before_range.start, before_range.end],
++ "deletedAfter": [after_range.start, after_range.end],
++ "lengthBefore": length_before,
++ "lengthAfter": length_after,
++ "anchor": anchor,
++ "focus": focus,
++ }))
++}
++
fn smart_quotes(s: &Session, text: &str) -> String {
if !text.contains(['"', '\'']) {
return text.to_string();
diff --cc crates/engine/src/file_access.rs
index 4f9a17c6f,31d61e382..7fb1bc5c2
--- a/crates/engine/src/file_access.rs
+++ b/crates/engine/src/file_access.rs
@@@ -284,7 -300,7 +300,19 @@@ mod tests
}
fn s(p: PathBuf) -> String {
-- p.to_string_lossy().into_owned()
++ let text = p.to_string_lossy();
++ if !cfg!(windows) {
++ return text.into_owned();
++ }
++ // A canonical path on Windows has a `\\?\` prefix, under which `..` is not a name:
++ // send ordinary paths, as the roots show them.
++ if let Some(rest) = text.strip_prefix(r"\\?\UNC\") {
++ return format!(r"\\{rest}");
++ }
++ match text.strip_prefix(r"\\?\") {
++ Some(rest) => rest.to_owned(),
++ None => text.into_owned(),
++ }
}
#[test]
diff --cc crates/engine/src/lib.rs
index d16dc9dd1,545c3fac3..c7e4f9275
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@@ -33,7 -33,7 +33,7 @@@ pub use cmd::{CommandInfo, CommandSpec
pub use designcraft_compose as compose;
pub use designcraft_doc as doc;
pub use designcraft_tools as tools;
--pub use tooling::{SnapView, UiRequest, ViewInfo};
++pub use tooling::{ImeMutation, ImeTextContext, SnapView, UiRequest, ViewInfo, ime_delete_ranges};
#[derive(Debug, thiserror::Error)]
pub enum EngineError {
@@@ -101,6 -101,6 +101,9 @@@ pub struct DocState
/// Editing parent spreads (Pages panel double-click on a parent).
pub editing_parents: bool,
pub uid: u64,
++ /// Changes whenever this document state is recreated, even if [`Self::uid`] is preserved
++ /// (File › Revert keeps the uid for recovery but replaces the document).
++ pub identity_epoch: u64,
/// Recovery entries this state actually opened or published, for repeated-open and cleanup.
/// Bounded, deduplicated checkpoint addresses; never inferred from uid alone.
pub(crate) recovery_entries: Vec<(std::path::PathBuf, u64)>,
@@@ -145,6 -145,6 +148,7 @@@ impl DocState
let active_layer = doc.default_layer();
let doc = Arc::new(doc);
let revision = next_revision();
++ let identity_epoch = NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
DocState {
saved_doc: doc.clone(),
doc,
@@@ -156,7 -156,7 +160,8 @@@
active_layer,
interaction: None,
editing_parents: false,
-- uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
++ uid: identity_epoch,
++ identity_epoch,
recovery_entries: Vec::new(),
preview_stash: None,
preview_record: None,
diff --cc crates/engine/src/math.rs
index 224420953,16ef7e234..d4aaf2600
--- a/crates/engine/src/math.rs
+++ b/crates/engine/src/math.rs
@@@ -59,7 -59,7 +59,7 @@@ impl MBox
}
}
--#[derive(Clone, Debug, PartialEq)]
++#[cfg_attr(test, derive(Debug, PartialEq))]
enum Node {
/// A character run: identifiers italic, numbers and symbols upright.
Sym(String, Class),
@@@ -79,6 -79,6 +79,51 @@@
Fenced(String, Box<Node>, String),
}
++// Empty a node before field drop glue can follow its children recursively. This also covers
++// replaced scripts and partially built parser continuations during unwinding.
++impl Node {
++ fn detach_children(&mut self, pending: &mut Vec<Node>) {
++ fn detach(child: &mut Node, pending: &mut Vec<Node>) {
++ pending.push(std::mem::replace(child, Node::Group(Vec::new())));
++ }
++ match self {
++ Self::Group(nodes) => pending.append(nodes),
++ Self::Frac(a, b) => {
++ detach(a, pending);
++ detach(b, pending);
++ }
++ Self::Sqrt(index, body) => {
++ if let Some(index) = index {
++ detach(index, pending);
++ }
++ detach(body, pending);
++ }
++ Self::Scripts { base, sup, sub } => {
++ detach(base, pending);
++ if let Some(sup) = sup {
++ detach(sup, pending);
++ }
++ if let Some(sub) = sub {
++ detach(sub, pending);
++ }
++ }
++ Self::Fenced(_, body, _) => detach(body, pending),
++ Self::Sym(_, _) | Self::Text(_) | Self::Space(_) | Self::Big(_) => {}
++ }
++ }
++}
++
++impl Drop for Node {
++ fn drop(&mut self) {
++ let mut pending = Vec::new();
++ self.detach_children(&mut pending);
++ while let Some(mut node) = pending.pop() {
++ node.detach_children(&mut pending);
++ // Its own Drop and boxed field glue now see only empty leaves, never this subtree.
++ }
++ }
++}
++
#[derive(Clone, Copy, Debug, PartialEq)]
enum Class {
Ident,
@@@ -160,15 -160,15 +205,13 @@@ fn big_op(name: &str) -> Option<&'stati
})
}
--/// Deepest expression nesting parsed. Recursive descent must not overflow the stack on hostile
--/// input (`\frac\frac…`, `{{{{…`, `\left(\left(…`); past the cap groups stop descending.
++/// Deepest logical expression nesting parsed. Heap continuations keep this full budget safe on
++/// the default native thread stack; past the cap groups retain their existing empty result.
const MAX_NESTING: usize = 256;
struct Parser<'a> {
s: &'a [char],
i: usize,
-- /// Enclosing group depth, at most [`MAX_NESTING`].
-- depth: usize,
}
impl Parser<'_> {
@@@ -225,21 -225,21 +268,6 @@@
}
out
}
-- fn arg(&mut self) -> Node {
-- if self.depth >= MAX_NESTING {
-- return Node::Group(Vec::new());
-- }
-- self.depth += 1;
-- self.skip_ws();
-- let n = if self.peek() == Some('{') {
-- self.i += 1;
-- Node::Group(self.list(Some('}')))
-- } else {
-- self.atom().unwrap_or(Node::Group(vec![]))
-- };
-- self.depth -= 1;
-- n
-- }
fn delimiter(&mut self) -> String {
self.skip_ws();
match self.peek() {
@@@ -265,166 -265,166 +293,243 @@@
None => String::new(),
}
}
-- fn atom(&mut self) -> Option<Node> {
-- self.skip_ws();
-- let c = self.peek()?;
-- self.i += 1;
-- Some(match c {
-- '{' => Node::Group(self.list(Some('}'))),
-- '\\' => {
-- let name = self.command();
-- match name.as_str() {
-- "frac" | "dfrac" | "tfrac" => {
-- let a = self.arg();
-- let b = self.arg();
-- Node::Frac(Box::new(a), Box::new(b))
++}
++
++/// Continuations carry parser state on the heap instead of in native call frames.
++enum ParseWork<'a> {
++ List { end: Option<char>, depth: usize },
++ Sequence { kind: SequenceKind, depth: usize, out: Vec<Node> },
++ Append { kind: SequenceKind, depth: usize, out: Vec<Node>, group: bool },
++ Arg { depth: usize },
++ Atom { depth: usize },
++ Script { kind: SequenceKind, depth: usize, out: Vec<Node>, up: bool },
++ FractionNumerator { depth: usize },
++ FractionDenominator { numerator: Node },
++ SqrtIndex { outer: Parser<'a>, depth: usize },
++ SqrtArgument { index: Option<Box<Node>> },
++ Fence { open: String },
++ UntilRight { depth: usize },
++ One { depth: usize },
++ OneAtom { depth: usize },
++}
++
++#[derive(Clone, Copy)]
++enum SequenceKind {
++ List(Option<char>),
++ Fence,
++ One,
++}
++
++/// Repeated scripts replace only their own slot, preserving the base and the opposite slot.
++fn attach_script(mut base: Node, argument: Node, up: bool) -> Node {
++ if let Node::Scripts { sup, sub, .. } = &mut base {
++ let slot = if up { sup } else { sub };
++ *slot = Some(Box::new(argument));
++ base
++ } else if up {
++ Node::Scripts { base: Box::new(base), sup: Some(Box::new(argument)), sub: None }
++ } else {
++ Node::Scripts { base: Box::new(base), sup: None, sub: Some(Box::new(argument)) }
++ }
++}
++
++impl<'a> Parser<'a> {
++ fn parse(&mut self, depth: usize) -> Node {
++ let mut work = vec![ParseWork::List { end: None, depth }];
++ let mut value = Node::Group(Vec::new());
++ while let Some(next) = work.pop() {
++ match next {
++ ParseWork::List { end, depth } => {
++ if depth >= MAX_NESTING {
++ value = Node::Group(Vec::new());
++ } else {
++ work.push(ParseWork::Sequence { kind: SequenceKind::List(end), depth: depth + 1, out: Vec::new() });
}
-- "sqrt" => {
-- self.skip_ws();
-- let idx = (self.peek() == Some('[')).then(|| {
-- self.i += 1;
-- let mut s = String::new();
-- while let Some(c) = self.peek() {
-- self.i += 1;
-- if c == ']' {
-- break;
-- }
-- s.push(c);
-- }
-- Box::new(parse_at(&s, self.depth + 1))
-- });
-- let a = self.arg();
-- Node::Sqrt(idx, Box::new(a))
++ }
++ ParseWork::Sequence { kind, depth, mut out } => {
++ self.skip_ws();
++ let Some(c) = self.peek() else {
++ value = Node::Group(out);
++ continue;
++ };
++ if let SequenceKind::List(Some(end)) = kind
++ && c == end
++ {
++ self.i += 1;
++ value = Node::Group(out);
++ continue;
}
-- "text" | "mathrm" | "textrm" | "operatorname" => Node::Text(self.raw_group()),
-- "sin" | "cos" | "tan" | "log" | "ln" | "exp" | "lim" | "max" | "min" => Node::Text(name),
-- "," => Node::Space(3.0 / 18.0),
-- ":" | ">" => Node::Space(4.0 / 18.0),
-- ";" => Node::Space(5.0 / 18.0),
-- "quad" => Node::Space(1.0),
-- "qquad" => Node::Space(2.0),
-- "!" => Node::Space(-3.0 / 18.0),
-- " " => Node::Space(0.25),
-- "left" => {
-- let open = self.delimiter();
-- let body = self.list_until_right();
-- let close = self.delimiter();
-- Node::Fenced(open, Box::new(Node::Group(body)), close)
++ if matches!(kind, SequenceKind::Fence)
++ && self.s.get(self.i..).is_some_and(|s| s.starts_with(&['\\', 'r', 'i', 'g', 'h', 't']))
++ && !self.s.get(self.i + 6).is_some_and(char::is_ascii_alphabetic)
++ {
++ self.i += 6;
++ value = Node::Group(out);
++ continue;
++ }
++ if (c == '^' || c == '_') && !matches!(kind, SequenceKind::Fence) {
++ self.i += 1;
++ work.push(ParseWork::Script { kind, depth, out, up: c == '^' });
++ work.push(ParseWork::Arg { depth });
++ } else if matches!(kind, SequenceKind::One) {
++ value = Node::Group(out);
++ } else {
++ let group = matches!(kind, SequenceKind::Fence);
++ work.push(ParseWork::Append { kind, depth, out: std::mem::take(&mut out), group });
++ work.push(if group { ParseWork::One { depth: depth + 1 } } else { ParseWork::Atom { depth } });
}
-- "{" => Node::Sym("{".into(), Class::Punct),
-- "}" => Node::Sym("}".into(), Class::Punct),
-- "%" | "$" | "#" | "&" | "_" => Node::Sym(name, Class::Plain),
-- n => match (big_op(n), symbol(n)) {
-- (Some(op), _) => Node::Big(op.into()),
-- (None, Some((s, cl))) => Node::Sym(s.into(), cl),
-- _ => Node::Text(format!("\\{n}")),
-- },
}
-- }
-- c if c.is_ascii_digit() || c == '.' => {
-- let mut s = c.to_string();
-- while let Some(d) = self.peek().filter(|d| d.is_ascii_digit() || *d == '.') {
-- s.push(d);
-- self.i += 1;
++ ParseWork::Append { kind, depth, mut out, group } => {
++ if group {
++ if let Node::Group(nodes) = &mut value {
++ out.append(nodes);
++ }
++ } else {
++ out.push(std::mem::replace(&mut value, Node::Group(Vec::new())));
++ }
++ work.push(ParseWork::Sequence { kind, depth, out });
}
-- Node::Sym(s, Class::Number)
-- }
-- c if c.is_alphabetic() => Node::Sym(c.to_string(), Class::Ident),
-- '+' => Node::Sym("+".into(), Class::Bin),
-- '-' => Node::Sym("−".into(), Class::Bin),
-- '*' => Node::Sym("∗".into(), Class::Bin),
- '=' | '<' | '>' => Node::Sym(c.to_string(), Class::Rel),
- '<'..='>' => Node::Sym(c.to_string(), Class::Rel),
-- ',' | ';' => Node::Sym(c.to_string(), Class::Punct),
-- '\'' => Node::Sym("′".into(), Class::Plain),
-- c => Node::Sym(c.to_string(), Class::Plain),
-- })
-- }
-- fn list(&mut self, end: Option<char>) -> Vec<Node> {
-- if self.depth >= MAX_NESTING {
-- return Vec::new();
-- }
-- self.depth += 1;
-- let mut out: Vec<Node> = Vec::new();
-- loop {
-- self.skip_ws();
-- match self.peek() {
-- None => break,
-- Some(c) if Some(c) == end => {
-- self.i += 1;
-- break;
++ ParseWork::Arg { depth } => {
++ if depth >= MAX_NESTING {
++ value = Node::Group(Vec::new());
++ continue;
++ }
++ self.skip_ws();
++ if self.peek() == Some('{') {
++ self.i += 1;
++ work.push(ParseWork::List { end: Some('}'), depth: depth + 1 });
++ } else {
++ work.push(ParseWork::Atom { depth: depth + 1 });
++ }
++ }
++ ParseWork::Script { kind, depth, mut out, up } => {
++ let argument = std::mem::replace(&mut value, Node::Group(Vec::new()));
++ let base = out.pop().unwrap_or(Node::Group(Vec::new()));
++ out.push(attach_script(base, argument, up));
++ work.push(ParseWork::Sequence { kind, depth, out });
++ }
++ ParseWork::FractionNumerator { depth } => {
++ let numerator = std::mem::replace(&mut value, Node::Group(Vec::new()));
++ work.push(ParseWork::FractionDenominator { numerator });
++ work.push(ParseWork::Arg { depth });
++ }
++ ParseWork::FractionDenominator { numerator } => {
++ value = Node::Frac(Box::new(numerator), Box::new(std::mem::replace(&mut value, Node::Group(Vec::new()))));
++ }
++ ParseWork::SqrtIndex { outer, depth } => {
++ *self = outer;
++ let index = Some(Box::new(std::mem::replace(&mut value, Node::Group(Vec::new()))));
++ work.push(ParseWork::SqrtArgument { index });
++ work.push(ParseWork::Arg { depth });
++ }
++ ParseWork::SqrtArgument { index } => {
++ value = Node::Sqrt(index, Box::new(std::mem::replace(&mut value, Node::Group(Vec::new()))));
}
-- Some('^') | Some('_') => {
-- let up = self.peek() == Some('^');
++ ParseWork::Fence { open } => {
++ let close = self.delimiter();
++ value = Node::Fenced(open, Box::new(std::mem::replace(&mut value, Node::Group(Vec::new()))), close);
++ }
++ ParseWork::UntilRight { depth } => {
++ if depth >= MAX_NESTING {
++ value = Node::Group(Vec::new());
++ } else {
++ work.push(ParseWork::Sequence { kind: SequenceKind::Fence, depth, out: Vec::new() });
++ }
++ }
++ ParseWork::One { depth } => {
++ work.push(ParseWork::OneAtom { depth });
++ work.push(ParseWork::Atom { depth });
++ }
++ ParseWork::OneAtom { depth } => {
++ let out = vec![std::mem::replace(&mut value, Node::Group(Vec::new()))];
++ work.push(ParseWork::Sequence { kind: SequenceKind::One, depth, out });
++ }
++ ParseWork::Atom { depth } => {
++ self.skip_ws();
++ let Some(c) = self.peek() else {
++ value = Node::Group(Vec::new());
++ continue;
++ };
self.i += 1;
-- let a = self.arg();
-- let base = out.pop().unwrap_or(Node::Group(vec![]));
-- let node = match base {
-- Node::Scripts { base, sup, sub } => {
-- if up {
-- Node::Scripts { base, sup: Some(Box::new(a)), sub }
-- } else {
-- Node::Scripts { base, sup, sub: Some(Box::new(a)) }
++ match c {
++ '{' => work.push(ParseWork::List { end: Some('}'), depth }),
++ '\\' => {
++ let name = self.command();
++ match name.as_str() {
++ "frac" | "dfrac" | "tfrac" => {
++ work.push(ParseWork::FractionNumerator { depth });
++ work.push(ParseWork::Arg { depth });
++ }
++ "sqrt" => {
++ self.skip_ws();
++ if self.peek() == Some('[') {
++ self.i += 1;
++ let start = self.i;
++ let mut end = start;
++ // Keep the existing first-']' index grammar, including EOF.
++ while let Some(c) = self.peek() {
++ self.i += 1;
++ if c == ']' {
++ break;
++ }
++ end = self.i;
++ }
++ let inner = self.s.get(start..end).unwrap_or_default();
++ let outer = std::mem::replace(self, Parser { s: inner, i: 0 });
++ work.push(ParseWork::SqrtIndex { outer, depth });
++ work.push(ParseWork::List { end: None, depth: depth + 1 });
++ } else {
++ work.push(ParseWork::SqrtArgument { index: None });
++ work.push(ParseWork::Arg { depth });
++ }
++ }
++ "left" => {
++ let open = self.delimiter();
++ work.push(ParseWork::Fence { open });
++ work.push(ParseWork::UntilRight { depth });
++ }
++ "text" | "mathrm" | "textrm" | "operatorname" => value = Node::Text(self.raw_group()),
++ "sin" | "cos" | "tan" | "log" | "ln" | "exp" | "lim" | "max" | "min" => value = Node::Text(name),
++ "," => value = Node::Space(3.0 / 18.0),
++ ":" | ">" => value = Node::Space(4.0 / 18.0),
++ ";" => value = Node::Space(5.0 / 18.0),
++ "quad" => value = Node::Space(1.0),
++ "qquad" => value = Node::Space(2.0),
++ "!" => value = Node::Space(-3.0 / 18.0),
++ " " => value = Node::Space(0.25),
++ "{" => value = Node::Sym("{".into(), Class::Punct),
++ "}" => value = Node::Sym("}".into(), Class::Punct),
++ "%" | "$" | "#" | "&" | "_" => value = Node::Sym(name, Class::Plain),
++ n => {
++ value = match (big_op(n), symbol(n)) {
++ (Some(op), _) => Node::Big(op.into()),
++ (None, Some((s, cl))) => Node::Sym(s.into(), cl),
++ _ => Node::Text(format!("\\{n}")),
++ }
++ }
}
}
-- b => Node::Scripts { base: Box::new(b), sup: up.then(|| Box::new(a.clone())), sub: (!up).then(|| Box::new(a)) },
-- };
-- out.push(node);
-- }
-- Some(_) => {
-- if let Some(a) = self.atom() {
-- out.push(a);
++ c if c.is_ascii_digit() || c == '.' => {
++ let mut s = c.to_string();
++ while let Some(d) = self.peek().filter(|d| d.is_ascii_digit() || *d == '.') {
++ s.push(d);
++ self.i += 1;
++ }
++ value = Node::Sym(s, Class::Number);
++ }
++ c if c.is_alphabetic() => value = Node::Sym(c.to_string(), Class::Ident),
++ '+' => value = Node::Sym("+".into(), Class::Bin),
++ '-' => value = Node::Sym("−".into(), Class::Bin),
++ '*' => value = Node::Sym("∗".into(), Class::Bin),
++ '<'..='>' => value = Node::Sym(c.to_string(), Class::Rel),
++ ',' | ';' => value = Node::Sym(c.to_string(), Class::Punct),
++ '\'' => value = Node::Sym("′".into(), Class::Plain),
++ c => value = Node::Sym(c.to_string(), Class::Plain),
}
}
}
}
-- self.depth -= 1;
-- out
-- }
-- fn list_until_right(&mut self) -> Vec<Node> {
-- if self.depth >= MAX_NESTING {
-- return Vec::new();
-- }
-- let mut out = Vec::new();
-- loop {
-- self.skip_ws();
-- if self.peek().is_none() {
-- break;
-- }
- if self.s[self.i..].starts_with(&['\\', 'r', 'i', 'g', 'h', 't']) && !self.s.get(self.i + 6).is_some_and(|c| c.is_ascii_alphabetic()) {
- if self.s[self.i..].starts_with(&['\\', 'r', 'i', 'g', 'h', 't']) && !self.s.get(self.i + 6).is_some_and(char::is_ascii_alphabetic) {
-- self.i += 6;
-- break;
-- }
-- let mut p = Parser { s: self.s, i: self.i, depth: self.depth + 1 };
-- let one = p.list_one();
-- self.i = p.i;
-- out.extend(one);
-- }
-- out
-- }
-- /// One atom plus any scripts on it.
-- fn list_one(&mut self) -> Vec<Node> {
-- let mut out = Vec::new();
-- if let Some(a) = self.atom() {
-- out.push(a);
-- }
-- loop {
-- self.skip_ws();
-- match self.peek() {
-- Some('^') | Some('_') => {
-- let up = self.peek() == Some('^');
-- self.i += 1;
-- let a = self.arg();
-- let base = out.pop().unwrap_or(Node::Group(vec![]));
-- out.push(match base {
-- Node::Scripts { base, sub, .. } if up => Node::Scripts { base, sup: Some(Box::new(a)), sub },
-- Node::Scripts { base, sup, .. } => Node::Scripts { base, sup, sub: Some(Box::new(a)) },
-- b => Node::Scripts { base: Box::new(b), sup: up.then(|| Box::new(a.clone())), sub: (!up).then(|| Box::new(a)) },
-- });
-- }
-- _ => break,
-- }
-- }
-- out
++ value
}
}
@@@ -434,8 -434,8 +539,7 @@@ fn parse(src: &str) -> Node
fn parse_at(src: &str, depth: usize) -> Node {
let chars: Vec<char> = src.chars().collect();
-- let mut p = Parser { s: &chars, i: 0, depth };
-- Node::Group(p.list(None))
++ Parser { s: &chars, i: 0 }.parse(depth)
}
/// Typesetting fonts and metrics.
@@@ -484,174 -484,174 +588,251 @@@ fn hbox(parts: Vec<(MBox, f64)>) -> MBo
out
}
++struct GroupLayout<'a> {
++ items: std::iter::Enumerate<std::slice::Iter<'a, Node>>,
++ parts: Vec<(MBox, f64)>,
++ prev: Option<Class>,
++ size: f64,
++}
++
++struct ScriptLayout {
++ out: MBox,
++ bw: f64,
++ basc: f64,
++ bdesc: f64,
++ big: bool,
++ size: f64,
++}
++
++impl ScriptLayout {
++ fn new(base: MBox, big: bool, size: f64) -> Self {
++ Self { bw: base.w, basc: base.asc, bdesc: base.desc, out: base, big, size }
++ }
++ fn add(&mut self, script: MBox, up: bool) {
++ let Self { out, bw, basc, bdesc, big, size } = self;
++ let y = if *big {
++ if up { -*basc - *size * 0.1 - script.desc } else { *bdesc + *size * 0.1 + script.asc }
++ } else if up {
++ -(*size * 0.42).max(*basc - script.asc * 0.6)
++ } else {
++ (*size * 0.2).max(*bdesc * 0.8)
++ };
++ out.w = out.w.max(if *big { script.w } else { *bw + script.w + *size * 0.05 });
++ let (sa, sd) = (script.asc, script.desc);
++ let x = if *big { (*bw - script.w) / 2.0 } else { *bw + *size * 0.05 };
++ out.els.extend(script.shifted(x, y));
++ if up {
++ out.asc = out.asc.max(-y + sa);
++ } else {
++ out.desc = out.desc.max(y + sd);
++ }
++ }
++ fn finish(mut self) -> MBox {
++ if self.big {
++ let dx = (self.out.w - self.bw) / 2.0;
++ let els = std::mem::take(&mut self.out.els);
++ self.out.els = MBox { els, ..Default::default() }.shifted(dx, 0.0);
++ }
++ self.out
++ }
++}
++
++enum LayoutWork<'a> {
++ Visit(&'a Node, f64),
++ GroupNext(GroupLayout<'a>),
++ GroupAppend(GroupLayout<'a>, f64),
++ FractionNumerator(&'a Node, f64),
++ FractionDenominator(MBox, f64),
++ SqrtBody(Option<&'a Node>, f64),
++ SqrtIndex(MBox, f64),
++ ScriptBase { sup: Option<&'a Node>, sub: Option<&'a Node>, big: bool, size: f64 },
++ ScriptSup { state: ScriptLayout, sub: Option<&'a Node> },
++ ScriptSub(ScriptLayout),
++ Fence(&'a str, &'a str, f64),
++}
++
++/// Postorder evaluation moves each child's box into its parent before visiting the next child.
++/// No ancestor retains a second flattened copy, and native stack use is independent of nesting.
fn layout(f: &Fonts, n: &Node, size: f64) -> MBox {
-- let axis = size * 0.25;
-- match n {
-- Node::Sym(s, cl) => text_box(f, s, size, *cl == Class::Ident),
-- Node::Text(s) => text_box(f, s, size, false),
-- Node::Space(em) => MBox { w: em * size, ..Default::default() },
-- Node::Group(list) => {
-- let mut parts = Vec::new();
-- let mut prev: Option<Class> = None;
-- for (k, item) in list.iter().enumerate() {
-- let cl = match item {
-- Node::Sym(_, c) => Some(*c),
-- Node::Scripts { base, .. } => match &**base {
++ let mut work = vec![LayoutWork::Visit(n, size)];
++ let mut value = MBox::default();
++ while let Some(next) = work.pop() {
++ match next {
++ LayoutWork::Visit(node, size) => match node {
++ Node::Sym(s, cl) => value = text_box(f, s, size, *cl == Class::Ident),
++ Node::Text(s) => value = text_box(f, s, size, false),
++ Node::Space(em) => value = MBox { w: em * size, ..Default::default() },
++ Node::Group(list) => {
++ work.push(LayoutWork::GroupNext(GroupLayout { items: list.iter().enumerate(), parts: Vec::new(), prev: None, size }))
++ }
++ Node::Frac(a, b) => {
++ work.push(LayoutWork::FractionNumerator(b, size));
++ work.push(LayoutWork::Visit(a, size * 0.85));
++ }
++ Node::Sqrt(index, body) => {
++ work.push(LayoutWork::SqrtBody(index.as_deref(), size));
++ work.push(LayoutWork::Visit(body, size));
++ }
++ Node::Scripts { base, sup, sub } => {
++ work.push(LayoutWork::ScriptBase { sup: sup.as_deref(), sub: sub.as_deref(), big: matches!(&**base, Node::Big(_)), size });
++ work.push(LayoutWork::Visit(base, size));
++ }
++ Node::Big(op) => {
++ let mut b = text_box(f, op, size * 1.5, false);
++ b.asc = size * 1.05;
++ b.desc = size * 0.35;
++ for e in &mut b.els {
++ if let Elem::Text { y, .. } = e {
++ *y = size * 0.32;
++ }
++ }
++ value = b;
++ }
++ Node::Fenced(open, body, close) => {
++ work.push(LayoutWork::Fence(open, close, size));
++ work.push(LayoutWork::Visit(body, size));
++ }
++ },
++ LayoutWork::GroupNext(mut group) => {
++ if let Some((k, item)) = group.items.next() {
++ let cl = match item {
Node::Sym(_, c) => Some(*c),
++ Node::Scripts { base, .. } => match &**base {
++ Node::Sym(_, c) => Some(*c),
++ _ => None,
++ },
_ => None,
-- },
-- _ => None,
-- };
-- // A leading + or − (or after another operator) is a sign, not a binary operator.
-- let cl = if cl == Some(Class::Bin) && (k == 0 || matches!(prev, Some(Class::Bin | Class::Rel | Class::Punct))) {
-- Some(Class::Plain)
++ };
++ let cl = if cl == Some(Class::Bin) && (k == 0 || matches!(group.prev, Some(Class::Bin | Class::Rel | Class::Punct))) {
++ Some(Class::Plain)
++ } else {
++ cl
++ };
++ let gap = |c: Option<Class>| match c {
++ Some(Class::Bin) => group.size * 4.0 / 18.0,
++ Some(Class::Rel) => group.size * 5.0 / 18.0,
++ _ => 0.0,
++ };
++ let mut before = gap(cl).max(gap(group.prev));
++ if k == 0 {
++ before = 0.0;
++ }
++ if group.prev == Some(Class::Punct) {
++ before = before.max(group.size * 3.0 / 18.0);
++ }
++ group.prev = cl;
++ let size = group.size;
++ work.push(LayoutWork::GroupAppend(group, before));
++ work.push(LayoutWork::Visit(item, size));
} else {
-- cl
-- };
-- let gap = |c: Option<Class>| match c {
-- Some(Class::Bin) => size * 4.0 / 18.0,
-- Some(Class::Rel) => size * 5.0 / 18.0,
-- _ => 0.0,
-- };
-- let mut before = gap(cl).max(gap(prev));
-- if k == 0 {
-- before = 0.0;
++ value = hbox(group.parts);
}
-- if prev == Some(Class::Punct) {
-- before = before.max(size * 3.0 / 18.0);
++ }
++ LayoutWork::GroupAppend(mut group, before) => {
++ group.parts.push((std::mem::take(&mut value), before));
++ work.push(LayoutWork::GroupNext(group));
++ }
++ LayoutWork::FractionNumerator(denominator, size) => {
++ work.push(LayoutWork::FractionDenominator(std::mem::take(&mut value), size));
++ work.push(LayoutWork::Visit(denominator, size * 0.85));
++ }
++ LayoutWork::FractionDenominator(na, size) => {
++ let nb = std::mem::take(&mut value);
++ let axis = size * 0.25;
++ let w = na.w.max(nb.w) + size * 0.2;
++ let t = (size * 0.06).max(0.4);
++ let gap = size * 0.15;
++ let num_base = -(axis + t / 2.0 + gap + na.desc);
++ let den_base = -axis + t / 2.0 + gap + nb.asc;
++ let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
++ out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
++ let (wa, wb) = (na.w, nb.w);
++ out.els.extend(na.shifted((w - wa) / 2.0, num_base));
++ out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
++ value = out;
++ }
++ LayoutWork::SqrtBody(index, size) => {
++ let inner = std::mem::take(&mut value);
++ let axis = size * 0.25;
++ let t = (size * 0.05).max(0.4);
++ let gap = size * 0.12;
++ let top = inner.asc + gap + t;
++ let bottom = inner.desc;
++ let hook = size * 0.55;
++ let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
++ out.els.push(Elem::Line {
++ pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
++ w: t,
++ });
++ out.els.extend(inner.shifted(hook, 0.0));
++ if let Some(index) = index {
++ work.push(LayoutWork::SqrtIndex(out, size));
++ work.push(LayoutWork::Visit(index, size * 0.55));
++ } else {
++ value = out;
}
-- parts.push((layout(f, item, size), before));
-- prev = cl;
}
-- hbox(parts)
-- }
-- Node::Frac(a, b) => {
-- let s2 = size * 0.85;
-- let (na, nb) = (layout(f, a, s2), layout(f, b, s2));
-- let w = na.w.max(nb.w) + size * 0.2;
-- let t = (size * 0.06).max(0.4);
-- let gap = size * 0.15;
-- let num_base = -(axis + t / 2.0 + gap + na.desc);
-- let den_base = -axis + t / 2.0 + gap + nb.asc;
-- let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
-- out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
-- let (wa, wb) = (na.w, nb.w);
-- out.els.extend(na.shifted((w - wa) / 2.0, num_base));
-- out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
-- out
-- }
-- Node::Sqrt(idx, a) => {
-- let inner = layout(f, a, size);
-- let t = (size * 0.05).max(0.4);
-- let gap = size * 0.12;
-- let top = inner.asc + gap + t;
-- let bottom = inner.desc;
-- let hook = size * 0.55;
-- let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
-- // The radical: a short rise, the long stroke down, then up to the bar.
-- out.els.push(Elem::Line {
-- pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
-- w: t,
-- });
-- let iw = inner.w;
-- let _ = iw;
-- out.els.extend(inner.shifted(hook, 0.0));
-- if let Some(i) = idx {
-- let ib = layout(f, i, size * 0.55);
-- let (ia, iw2) = (ib.asc, ib.w);
-- out.els.extend(ib.shifted((hook * 0.3 - iw2).max(0.0) - 0.0, -axis - size * 0.1));
++ LayoutWork::SqrtIndex(mut out, size) => {
++ let ib = std::mem::take(&mut value);
++ let (ia, iw) = (ib.asc, ib.w);
++ let axis = size * 0.25;
++ let hook = size * 0.55;
++ out.els.extend(ib.shifted((hook * 0.3 - iw).max(0.0) - 0.0, -axis - size * 0.1));
out.asc = out.asc.max(axis + size * 0.1 + ia);
++ value = out;
}
-- out
-- }
-- Node::Big(op) => {
-- let mut b = text_box(f, op, size * 1.5, false);
-- b.asc = size * 1.05;
-- b.desc = size * 0.35;
-- for e in &mut b.els {
-- if let Elem::Text { y, .. } = e {
-- // Centre the glyph on the math axis.
-- *y = size * 0.32;
++ LayoutWork::ScriptBase { sup, sub, big, size } => {
++ let state = ScriptLayout::new(std::mem::take(&mut value), big, size);
++ if let Some(sup) = sup {
++ work.push(LayoutWork::ScriptSup { state, sub });
++ work.push(LayoutWork::Visit(sup, size * 0.7));
++ } else if let Some(sub) = sub {
++ work.push(LayoutWork::ScriptSub(state));
++ work.push(LayoutWork::Visit(sub, size * 0.7));
++ } else {
++ value = state.finish();
}
}
-- b
-- }
-- Node::Scripts { base, sup, sub } => {
-- let big = matches!(&**base, Node::Big(_));
-- let b = layout(f, base, size);
-- let s2 = size * 0.7;
-- let (bw, basc, bdesc) = (b.w, b.asc, b.desc);
-- let mut out = MBox { w: bw, asc: basc, desc: bdesc, els: b.els };
-- if big {
-- // Limits above and below.
-- let mut w = bw;
-- if let Some(sp) = sup {
-- let sb = layout(f, sp, s2);
-- let y = -basc - size * 0.1 - sb.desc;
-- w = w.max(sb.w);
-- let (sw, sa) = (sb.w, sb.asc);
-- out.els.extend(sb.shifted((bw - sw) / 2.0, y));
-- out.asc = out.asc.max(-y + sa);
-- }
-- if let Some(sbn) = sub {
-- let sb = layout(f, sbn, s2);
-- let y = bdesc + size * 0.1 + sb.asc;
-- w = w.max(sb.w);
-- let (sw, sd) = (sb.w, sb.desc);
-- out.els.extend(sb.shifted((bw - sw) / 2.0, y));
-- out.desc = out.desc.max(y + sd);
++ LayoutWork::ScriptSup { mut state, sub } => {
++ state.add(std::mem::take(&mut value), true);
++ if let Some(sub) = sub {
++ let size = state.size;
++ work.push(LayoutWork::ScriptSub(state));
++ work.push(LayoutWork::Visit(sub, size * 0.7));
++ } else {
++ value = state.finish();
}
-- // Centre the operator over the widest limit.
-- let dx = (w - bw) / 2.0;
-- let els = std::mem::take(&mut out.els);
-- out = MBox { w, asc: out.asc, desc: out.desc, els: MBox { els, ..Default::default() }.shifted(dx, 0.0) };
-- return out;
-- }
-- let mut w = bw;
-- if let Some(sp) = sup {
-- let sb = layout(f, sp, s2);
-- let y = -(size * 0.42).max(basc - sb.asc * 0.6);
-- w = w.max(bw + sb.w + size * 0.05);
-- let sa = sb.asc;
-- out.els.extend(sb.shifted(bw + size * 0.05, y));
-- out.asc = out.asc.max(-y + sa);
}
-- if let Some(sbn) = sub {
-- let sb = layout(f, sbn, s2);
-- let y = (size * 0.2).max(bdesc * 0.8);
-- w = w.max(bw + sb.w + size * 0.05);
-- let sd = sb.desc;
-- out.els.extend(sb.shifted(bw + size * 0.05, y));
-- out.desc = out.desc.max(y + sd);
++ LayoutWork::ScriptSub(mut state) => {
++ state.add(std::mem::take(&mut value), false);
++ value = state.finish();
}
-- out.w = w;
-- out
-- }
-- Node::Fenced(open, body, close) => {
-- let inner = layout(f, body, size);
-- let h = (inner.asc + inner.desc).max(size);
-- let k = h / size;
-- let ds = size * k.max(1.0);
-- let mk = |s: &str| -> MBox {
-- if s.is_empty() {
-- return MBox::default();
-- }
-- let mut b = text_box(f, s, ds, false);
-- // Scaled delimiters centred on the content.
-- let mid = (inner.desc - inner.asc) / 2.0;
-- for e in &mut b.els {
-- if let Elem::Text { y, .. } = e {
-- *y = mid + ds * 0.25;
++ LayoutWork::Fence(open, close, size) => {
++ let inner = std::mem::take(&mut value);
++ let h = (inner.asc + inner.desc).max(size);
++ let k = h / size;
++ let ds = size * k.max(1.0);
++ let mk = |s: &str| -> MBox {
++ if s.is_empty() {
++ return MBox::default();
}
-- }
-- b.asc = inner.asc.max(size * 0.72);
-- b.desc = inner.desc.max(size * 0.22);
-- b
-- };
-- let (l, r) = (mk(open), mk(close));
-- hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)])
++ let mut b = text_box(f, s, ds, false);
++ let mid = (inner.desc - inner.asc) / 2.0;
++ for e in &mut b.els {
++ if let Elem::Text { y, .. } = e {
++ *y = mid + ds * 0.25;
++ }
++ }
++ b.asc = inner.asc.max(size * 0.72);
++ b.desc = inner.desc.max(size * 0.22);
++ b
++ };
++ let (l, r) = (mk(open), mk(close));
++ value = hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)]);
++ }
}
}
++ value
}
/// Typeset `latex` at `size` points: SVG bytes and the size in points.
@@@ -706,18 -706,18 +887,189 @@@ pub fn to_svg(latex: &str, size: f64) -
mod tests {
use super::*;
++ // Frozen pre-repair arithmetic; called only for shallow fixtures, never deep input.
++ fn recursive_layout_reference(f: &Fonts, n: &Node, size: f64) -> MBox {
++ let axis = size * 0.25;
++ match n {
++ Node::Sym(s, cl) => text_box(f, s, size, *cl == Class::Ident),
++ Node::Text(s) => text_box(f, s, size, false),
++ Node::Space(em) => MBox { w: em * size, ..Default::default() },
++ Node::Group(list) => {
++ let mut parts = Vec::new();
++ let mut prev: Option<Class> = None;
++ for (k, item) in list.iter().enumerate() {
++ let cl = match item {
++ Node::Sym(_, c) => Some(*c),
++ Node::Scripts { base, .. } => match &**base {
++ Node::Sym(_, c) => Some(*c),
++ _ => None,
++ },
++ _ => None,
++ };
++ // A leading + or − (or after another operator) is a sign, not a binary operator.
++ let cl = if cl == Some(Class::Bin) && (k == 0 || matches!(prev, Some(Class::Bin | Class::Rel | Class::Punct))) {
++ Some(Class::Plain)
++ } else {
++ cl
++ };
++ let gap = |c: Option<Class>| match c {
++ Some(Class::Bin) => size * 4.0 / 18.0,
++ Some(Class::Rel) => size * 5.0 / 18.0,
++ _ => 0.0,
++ };
++ let mut before = gap(cl).max(gap(prev));
++ if k == 0 {
++ before = 0.0;
++ }
++ if prev == Some(Class::Punct) {
++ before = before.max(size * 3.0 / 18.0);
++ }
++ parts.push((recursive_layout_reference(f, item, size), before));
++ prev = cl;
++ }
++ hbox(parts)
++ }
++ Node::Frac(a, b) => {
++ let s2 = size * 0.85;
++ let (na, nb) = (recursive_layout_reference(f, a, s2), recursive_layout_reference(f, b, s2));
++ let w = na.w.max(nb.w) + size * 0.2;
++ let t = (size * 0.06).max(0.4);
++ let gap = size * 0.15;
++ let num_base = -(axis + t / 2.0 + gap + na.desc);
++ let den_base = -axis + t / 2.0 + gap + nb.asc;
++ let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
++ out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
++ let (wa, wb) = (na.w, nb.w);
++ out.els.extend(na.shifted((w - wa) / 2.0, num_base));
++ out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
++ out
++ }
++ Node::Sqrt(idx, a) => {
++ let inner = recursive_layout_reference(f, a, size);
++ let t = (size * 0.05).max(0.4);
++ let gap = size * 0.12;
++ let top = inner.asc + gap + t;
++ let bottom = inner.desc;
++ let hook = size * 0.55;
++ let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
++ // The radical: a short rise, the long stroke down, then up to the bar.
++ out.els.push(Elem::Line {
++ pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
++ w: t,
++ });
++ let iw = inner.w;
++ let _ = iw;
++ out.els.extend(inner.shifted(hook, 0.0));
++ if let Some(i) = idx {
++ let ib = recursive_layout_reference(f, i, size * 0.55);
++ let (ia, iw2) = (ib.asc, ib.w);
++ out.els.extend(ib.shifted((hook * 0.3 - iw2).max(0.0) - 0.0, -axis - size * 0.1));
++ out.asc = out.asc.max(axis + size * 0.1 + ia);
++ }
++ out
++ }
++ Node::Big(op) => {
++ let mut b = text_box(f, op, size * 1.5, false);
++ b.asc = size * 1.05;
++ b.desc = size * 0.35;
++ for e in &mut b.els {
++ if let Elem::Text { y, .. } = e {
++ // Centre the glyph on the math axis.
++ *y = size * 0.32;
++ }
++ }
++ b
++ }
++ Node::Scripts { base, sup, sub } => {
++ let big = matches!(&**base, Node::Big(_));
++ let b = recursive_layout_reference(f, base, size);
++ let s2 = size * 0.7;
++ let (bw, basc, bdesc) = (b.w, b.asc, b.desc);
++ let mut out = MBox { w: bw, asc: basc, desc: bdesc, els: b.els };
++ if big {
++ // Limits above and below.
++ let mut w = bw;
++ if let Some(sp) = sup {
++ let sb = recursive_layout_reference(f, sp, s2);
++ let y = -basc - size * 0.1 - sb.desc;
++ w = w.max(sb.w);
++ let (sw, sa) = (sb.w, sb.asc);
++ out.els.extend(sb.shifted((bw - sw) / 2.0, y));
++ out.asc = out.asc.max(-y + sa);
++ }
++ if let Some(sbn) = sub {
++ let sb = recursive_layout_reference(f, sbn, s2);
++ let y = bdesc + size * 0.1 + sb.asc;
++ w = w.max(sb.w);
++ let (sw, sd) = (sb.w, sb.desc);
++ out.els.extend(sb.shifted((bw - sw) / 2.0, y));
++ out.desc = out.desc.max(y + sd);
++ }
++ // Centre the operator over the widest limit.
++ let dx = (w - bw) / 2.0;
++ let els = std::mem::take(&mut out.els);
++ out = MBox { w, asc: out.asc, desc: out.desc, els: MBox { els, ..Default::default() }.shifted(dx, 0.0) };
++ return out;
++ }
++ let mut w = bw;
++ if let Some(sp) = sup {
++ let sb = recursive_layout_reference(f, sp, s2);
++ let y = -(size * 0.42).max(basc - sb.asc * 0.6);
++ w = w.max(bw + sb.w + size * 0.05);
++ let sa = sb.asc;
++ out.els.extend(sb.shifted(bw + size * 0.05, y));
++ out.asc = out.asc.max(-y + sa);
++ }
++ if let Some(sbn) = sub {
++ let sb = recursive_layout_reference(f, sbn, s2);
++ let y = (size * 0.2).max(bdesc * 0.8);
++ w = w.max(bw + sb.w + size * 0.05);
++ let sd = sb.desc;
++ out.els.extend(sb.shifted(bw + size * 0.05, y));
++ out.desc = out.desc.max(y + sd);
++ }
++ out.w = w;
++ out
++ }
++ Node::Fenced(open, body, close) => {
++ let inner = recursive_layout_reference(f, body, size);
++ let h = (inner.asc + inner.desc).max(size);
++ let k = h / size;
++ let ds = size * k.max(1.0);
++ let mk = |s: &str| -> MBox {
++ if s.is_empty() {
++ return MBox::default();
++ }
++ let mut b = text_box(f, s, ds, false);
++ // Scaled delimiters centred on the content.
++ let mid = (inner.desc - inner.asc) / 2.0;
++ for e in &mut b.els {
++ if let Elem::Text { y, .. } = e {
++ *y = mid + ds * 0.25;
++ }
++ }
++ b.asc = inner.asc.max(size * 0.72);
++ b.desc = inner.desc.max(size * 0.22);
++ b
++ };
++ let (l, r) = (mk(open), mk(close));
++ hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)])
++ }
++ }
++ }
++
#[test]
fn parses_the_common_constructs() {
let n = parse(r"\frac{a^2+b}{\sqrt[3]{x}}");
-- let Node::Group(v) = n else { panic!() };
++ let Node::Group(v) = &n else { panic!() };
assert!(matches!(&v[0], Node::Frac(_, _)));
let n = parse(r"\sum_{i=1}^{n} i^2 \le \alpha");
-- let Node::Group(v) = n else { panic!() };
++ let Node::Group(v) = &n else { panic!() };
assert!(matches!(&v[0], Node::Scripts { base, sup: Some(_), sub: Some(_) } if matches!(**base, Node::Big(_))));
assert!(v.iter().any(|x| *x == Node::Sym("≤".into(), Class::Rel)));
assert!(v.iter().any(|x| *x == Node::Sym("α".into(), Class::Ident)));
let n = parse(r"\left( \frac{1}{2} \right) + \text{if } x");
-- let Node::Group(v) = n else { panic!() };
++ let Node::Group(v) = &n else { panic!() };
assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "(" && c == ")"));
assert!(v.contains(&Node::Text("if ".into())));
}
@@@ -726,19 -726,19 +1078,19 @@@
#[test]
fn right_prefixed_commands_do_not_close_a_fence() {
let n = parse(r"\left( x \rightarrow y \right)");
-- let Node::Group(v) = n else { panic!() };
++ let Node::Group(v) = &n else { panic!() };
assert_eq!(v.len(), 1, "{v:?}");
let Node::Fenced(o, body, c) = &v[0] else { panic!("{v:?}") };
assert!(o == "(" && c == ")", "{v:?}");
let Node::Group(b) = &**body else { panic!("{v:?}") };
assert_eq!(*b, vec![Node::Sym("x".into(), Class::Ident), Node::Sym("→".into(), Class::Rel), Node::Sym("y".into(), Class::Ident)]);
// An unknown `\right…` command stays inside the fence too.
-- let Node::Group(v) = parse(r"\left[ \rightfoo \right]") else { panic!() };
++ let Node::Group(v) = &parse(r"\left[ \rightfoo \right]") else { panic!() };
assert_eq!(v.len(), 1, "{v:?}");
assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "[" && c == "]"), "{v:?}");
// Real closers still close it.
for (src, close) in [(r"\left( x \right)", ")"), (r"\left( x \right.", ""), (r"\left( x \right)y", ")")] {
-- let Node::Group(v) = parse(src) else { panic!() };
++ let Node::Group(v) = &parse(src) else { panic!() };
assert!(matches!(&v[0], Node::Fenced(_, _, c) if c == close), "{src}: {v:?}");
}
}
@@@ -767,9 -767,9 +1119,223 @@@
format!("{}x{}", "{".repeat(100_000), "}".repeat(100_000)),
format!("{}x", r"\frac".repeat(100_000)),
format!("{}x", r"\left(".repeat(100_000)),
++ format!("{}z{}", r"\sqrt{".repeat(1_024), "}".repeat(1_024)),
++ format!("{}z{}", "x^{".repeat(1_024), "}".repeat(1_024)),
] {
-- let (svg, _) = to_svg(&latex, 12.0);
++ let (svg, (w, h)) = to_svg(&latex, 12.0);
assert!(!svg.is_empty());
++ assert!(w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0, "{w} {h}");
++ }
++ }
++ /// Count actual tree shape without recursively comparing or formatting a deep AST.
++ fn shape(root: &Node) -> ([usize; 6], usize) {
++ let mut counts = [0; 6]; // groups, fractions, roots, fences, scripts, sentinel z
++ let mut deepest = 0;
++ let mut work = vec![(root, 1)];
++ while let Some((node, depth)) = work.pop() {
++ deepest = deepest.max(depth);
++ match node {
++ Node::Group(nodes) => {
++ counts[0] += 1;
++ work.extend(nodes.iter().map(|node| (node, depth + 1)));
++ }
++ Node::Frac(a, b) => {
++ counts[1] += 1;
++ work.extend([(a.as_ref(), depth + 1), (b.as_ref(), depth + 1)]);
++ }
++ Node::Sqrt(index, body) => {
++ counts[2] += 1;
++ work.push((body, depth + 1));
++ if let Some(index) = index {
++ work.push((index, depth + 1));
++ }
++ }
++ Node::Fenced(_, body, _) => {
++ counts[3] += 1;
++ work.push((body, depth + 1));
++ }
++ Node::Scripts { base, sup, sub } => {
++ counts[4] += 1;
++ work.push((base, depth + 1));
++ if let Some(sup) = sup {
++ work.push((sup, depth + 1));
++ }
++ if let Some(sub) = sub {
++ work.push((sub, depth + 1));
++ }
++ }
++ Node::Sym(s, _) if s == "z" => counts[5] += 1,
++ _ => {}
++ }
++ }
++ (counts, deepest)
++ }
++
++ #[test]
++ fn the_full_256_budget_keeps_deep_valid_formulas_intact() {
++ assert_eq!(MAX_NESTING, 256, "preserve the existing expression capability");
++ let groups = MAX_NESTING - 1;
++ let arguments = (MAX_NESTING - 1) / 2;
++ let index_groups = MAX_NESTING - 3;
++ let cases = [
++ (format!("{}z{}", "{".repeat(groups), "}".repeat(groups)), [groups + 1, 0, 0, 0, 0, 1], groups + 2),
++ (format!("{}z{}", r"\left(".repeat(groups), r"\right)".repeat(groups)), [groups + 1, 0, 0, groups, 0, 1], groups * 2 + 2),
++ (format!("{}z{}", r"\frac{".repeat(arguments), "}{y}".repeat(arguments)), [arguments * 2 + 1, arguments, 0, 0, 0, 1], arguments * 2 + 2),
++ (format!("{}z{}", r"\sqrt{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, arguments, 0, 0, 1], arguments * 2 + 2),
++ (format!("{}z{}", "x^{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, 0, 0, arguments, 1], arguments * 2 + 2),
++ (format!("{}z{}", "x_{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, 0, 0, arguments, 1], arguments * 2 + 2),
++ (format!(r"\sqrt[{}z{}]{{y}}", "{".repeat(index_groups), "}".repeat(index_groups)), [index_groups + 3, 0, 1, 0, 0, 1], index_groups + 4),
++ ];
++ for (latex, counts, depth) in cases {
++ assert_eq!(shape(&parse(&latex)), (counts, depth), "all constructs must remain nested, not flatten into siblings");
++ let (svg, (w, h)) = to_svg(&latex, 12.0);
++ assert!(w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0, "{w} {h}");
++ assert!(String::from_utf8(svg).unwrap().contains(">z<"), "the innermost content must render");
++ }
++ }
++
++ #[test]
++ fn cap_and_index_returns_preserve_their_exact_cursor_semantics() {
++ let chars: Vec<_> = "x".chars().collect();
++ let mut p = Parser { s: &chars, i: 0 };
++ assert_eq!(p.parse(MAX_NESTING - 1), Node::Group(vec![Node::Sym("x".into(), Class::Ident)]));
++ assert_eq!(p.i, 1);
++ let mut p = Parser { s: &chars, i: 0 };
++ assert_eq!(p.parse(MAX_NESTING), Node::Group(vec![]));
++ assert_eq!(p.i, 0, "a capped List does not consume its input");
++ // Both the index subparse and radicand still have their entire old depth allowance.
++ let source = r"\sqrt[x]{y}z";
++ assert_eq!(
++ parse_at(source, MAX_NESTING - 4),
++ Node::Group(vec![
++ Node::Sqrt(
++ Some(Box::new(Node::Group(vec![Node::Sym("x".into(), Class::Ident)]))),
++ Box::new(Node::Group(vec![Node::Sym("y".into(), Class::Ident)]))
++ ),
++ Node::Sym("z".into(), Class::Ident),
++ ])
++ );
++ // At this starting depth the index and braced body are capped. The outer cursor is
++ // restored after ']', then the old non-consuming body cap leaves y/}/z as siblings.
++ let chars: Vec<_> = source.chars().collect();
++ let mut p = Parser { s: &chars, i: 0 };
++ assert_eq!(
++ p.parse(MAX_NESTING - 2),
++ Node::Group(vec![
++ Node::Sqrt(Some(Box::new(Node::Group(vec![]))), Box::new(Node::Group(vec![]))),
++ Node::Sym("y".into(), Class::Ident),
++ Node::Sym("}".into(), Class::Plain),
++ Node::Sym("z".into(), Class::Ident),
++ ])
++ );
++ assert_eq!(p.i, chars.len());
++ // Do not change the permissive first-']' index grammar into balanced bracket parsing.
++ assert_eq!(
++ parse(r"\sqrt[x[y]z]q"),
++ Node::Group(vec![
++ Node::Sqrt(
++ Some(Box::new(Node::Group(vec![
++ Node::Sym("x".into(), Class::Ident),
++ Node::Sym("[".into(), Class::Plain),
++ Node::Sym("y".into(), Class::Ident)
++ ]))),
++ Box::new(Node::Sym("z".into(), Class::Ident))
++ ),
++ Node::Sym("]".into(), Class::Plain),
++ Node::Sym("q".into(), Class::Ident),
++ ])
++ );
++ }
++
++ #[test]
++ fn heap_continuations_preserve_small_grammar_and_script_precedence() {
++ let sym = |s: &str| Node::Sym(s.into(), Class::Ident);
++ assert_eq!(
++ parse("x^{a}_{b}^{c}_{d}"),
++ Node::Group(vec![Node::Scripts {
++ base: Box::new(sym("x")),
++ sup: Some(Box::new(Node::Group(vec![sym("c")]))),
++ sub: Some(Box::new(Node::Group(vec![sym("d")]))),
++ }])
++ );
++ assert_eq!(
++ parse(r"\left( ^x \right)"),
++ Node::Group(vec![Node::Fenced("(".into(), Box::new(Node::Group(vec![Node::Sym("^".into(), Class::Plain), sym("x")])), ")".into())])
++ );
++ assert_eq!(parse(r"\frac{x"), Node::Group(vec![Node::Frac(Box::new(Node::Group(vec![sym("x")])), Box::new(Node::Group(vec![])))]));
++ assert_eq!(
++ parse(r"\text{a{b}}\{\}\_\unknown"),
++ Node::Group(vec![
++ Node::Text("a{b}".into()),
++ Node::Sym("{".into(), Class::Punct),
++ Node::Sym("}".into(), Class::Punct),
++ Node::Sym("_".into(), Class::Plain),
++ Node::Text(r"\unknown".into())
++ ])
++ );
++ }
++
++ #[test]
++ fn heap_layout_preserves_the_existing_element_order_and_geometry() {
++ let db = FontDb::global();
++ let f = Fonts { upright: db.face(FAMILY, "Regular"), italic: db.face(FAMILY, "Italic"), fallback: db.face(FALLBACK, "Regular") };
++ for latex in [
++ "E = mc^2",
++ "x^{a}_{b}^{c}_{d}",
++ r"\frac{a^2+b}{\sqrt[3]{x}}",
++ r"\sum_{i=0}^{n} i^2",
++ r"\int_a^b x",
++ r"\left( x \rightarrow y \right) + \text{if } x",
++ r"\left. x \right]",
++ r"-x,+y;\quad z",
++ r"\sqrt[x[y]z]q",
++ r"\frac{x",
++ r"\left( ^x \right)",
++ ] {
++ let tree = parse(latex);
++ let actual = layout(&f, &tree, 12.0);
++ let expected = recursive_layout_reference(&f, &tree, 12.0);
++ assert_eq!((actual.w, actual.asc, actual.desc, actual.els), (expected.w, expected.asc, expected.desc, expected.els), "{latex}");
++ }
++ }
++
++ fn mixed_chain(depth: usize) -> Node {
++ let mut node = Node::Sym("z".into(), Class::Ident);
++ for i in 0..depth {
++ node = match i % 5 {
++ 0 => Node::Group(vec![node]),
++ 1 => Node::Frac(Box::new(node), Box::new(Node::Text("d".into()))),
++ 2 => Node::Sqrt(Some(Box::new(Node::Text("3".into()))), Box::new(node)),
++ 3 => Node::Scripts { base: Box::new(node), sup: Some(Box::new(Node::Text("p".into()))), sub: Some(Box::new(Node::Text("q".into()))) },
++ _ => Node::Fenced("(".into(), Box::new(node), ")".into()),
++ };
++ }
++ node
++ }
++
++ #[test]
++ fn deep_nodes_drop_when_replaced_or_owned_by_unwinding_continuations() {
++ // Far beyond the parser budget: this directly proves the private destructor's traversal.
++ drop(mixed_chain(50_000));
++ for up in [false, true] {
++ let old = Box::new(mixed_chain(50_000));
++ let other = Box::new(Node::Text("other".into()));
++ let (sup, sub) = if up { (Some(old), Some(other)) } else { (Some(other), Some(old)) };
++ let root = attach_script(Node::Scripts { base: Box::new(Node::Big("∑".into())), sup, sub }, Node::Text("new".into()), up);
++ let Node::Scripts { base, sup, sub } = &root else { panic!("script wrapper") };
++ assert!(matches!(&**base, Node::Big(s) if s == "∑"));
++ let (replaced, retained) = if up { (sup, sub) } else { (sub, sup) };
++ assert!(matches!(replaced.as_deref(), Some(Node::Text(s)) if s == "new"));
++ assert!(matches!(retained.as_deref(), Some(Node::Text(s)) if s == "other"));
}
++ let result = std::panic::catch_unwind(|| {
++ // Actual continuation variants own completed children while awaiting later input.
++ let _partial = [
++ ParseWork::FractionDenominator { numerator: mixed_chain(25_000) },
++ ParseWork::SqrtArgument { index: Some(Box::new(mixed_chain(25_000))) },
++ ];
++ panic!("exercise partial-parser-state unwinding");
++ });
++ assert!(result.is_err(), "the intentional panic must actually unwind the owned frames");
}
}
diff --cc crates/engine/src/tests_ime.rs
index 266470914,266470914..73100c428
--- a/crates/engine/src/tests_ime.rs
+++ b/crates/engine/src/tests_ime.rs
@@@ -30,6 -30,6 +30,47 @@@ fn steps(s: &Session) -> usize
s.doc().unwrap().history.undo.len()
}
++#[test]
++fn ime_byte_deletion_rounds_inward_from_the_requested_count() {
++ // a: 0..1, é: 1..3, 😀: 3..7, b: 7..8.
++ let text = "aé😀b";
++ assert_eq!(ime_delete_ranges(text, 7, 7, 4, 0, true), Some((3..7, 7..7)), "the whole emoji");
++ assert_eq!(ime_delete_ranges(text, 7, 7, 6, 0, true), Some((1..7, 7..7)), "é and the emoji");
++ assert_eq!(ime_delete_ranges(text, 7, 7, 3, 0, true), Some((7..7, 7..7)), "a count starting inside the emoji leaves it");
++ assert_eq!(ime_delete_ranges(text, 7, 7, 100, 0, true), Some((0..7, 7..7)), "more bytes than the text takes it all");
++ // The scan starts at the requested count, not at the start of the story.
++ let long = format!("{}é", "x".repeat(20_000));
++ let end = long.len();
++ assert_eq!(ime_delete_ranges(&long, end, end, 3, 0, true), Some((end - 3..end, end..end)), "x and é");
++ assert_eq!(ime_delete_ranges(&long, end, end, 2, 0, true), Some((end - 2..end, end..end)), "the whole é");
++ assert_eq!(ime_delete_ranges(&long, end, end, 1, 0, true), Some((end..end, end..end)), "one byte inside é leaves it");
++}
++
++#[test]
++fn ime_delete_reports_the_ranges_it_applied() {
++ let mut s = session();
++ let sid = typing_into(&mut s, "aé😀b");
++ s.execute("text.select", &json!({"story": sid, "anchor": 1, "focus": 3})).unwrap();
++ let m = s.ime_delete_surrounding(2, 4, true).unwrap().expect("the delete changed the text");
++ assert_eq!(m.deleted_before, 0..1, "the byte before the selection");
++ assert_eq!(m.deleted_after, 3..7, "the emoji after it");
++ assert_eq!((m.anchor_before, m.focus_before), (1, 3));
++ assert_eq!((m.anchor_after, m.focus_after), (0, 2), "the selection stays selected, shifted left");
++ assert_eq!((m.text_len_before, m.text_len_after), (8, 3));
++ assert!(m.inserted.is_empty());
++ assert_eq!(text(&mut s, sid), "éb");
++ // A request that removes nothing is reported as no mutation at all.
++ s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
++ assert!(s.ime_delete_surrounding(0, 0, false).unwrap().is_none());
++ // A commit reports the text it typed and replaces the selection.
++ s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
++ let m = s.ime_commit("日", ViewInfo::default()).unwrap().expect("the commit changed the text");
++ assert_eq!(m.inserted, "日");
++ assert!(m.deleted_before.is_empty() && m.deleted_after.is_empty());
++ assert_eq!((m.anchor_after, m.focus_after), (3, 3));
++ assert_eq!(text(&mut s, sid), "日b");
++}
++
#[test]
fn ime_composition_shows_in_place_and_commits_as_one_step() {
// Romaji → kana → conversion → commit, as the macOS Japanese IME sends it.
diff --cc crates/engine/src/tooling.rs
index 65d069bac,65d069bac..1ff7fbe5f
--- a/crates/engine/src/tooling.rs
+++ b/crates/engine/src/tooling.rs
@@@ -1,12 -1,12 +1,14 @@@
//! Tool hosting: the active tool receives pointer/key events and its actions are executed here.
++use std::ops::Range;
use std::sync::Arc;
++use designcraft_doc::{CellAddr, StoryId};
use designcraft_geom::Unit;
pub use designcraft_tools::SnapView;
use designcraft_tools::{Action, CanvasLayout, Cursor, Mods, Overlay, PointerEvent, PointerKind, ToolContext, ToolKey};
use serde::Serialize;
--use serde_json::Value;
++use serde_json::{Value, json};
use crate::{EngineError, HistoryEntry, Interaction, Result, Session, record_undo};
@@@ -346,3 -346,3 +348,294 @@@ impl Session
}
}
}
++
++/// The committed text around the Type tool's IME caret.
++///
++/// While an IME composition is active the marked text is only an interaction preview, so this
++/// borrows the interaction's committed snapshot and selection instead of the previewed document.
++/// `anchor` and `focus` are UTF-8 byte offsets into `text`; `focus` is the primary caret end.
++#[derive(Clone, Copy, Debug)]
++pub struct ImeTextContext<'a> {
++ /// Stable document identity (a new document gets a new value).
++ pub document_uid: u64,
++ /// Document-state identity: changes when the state is recreated even if `document_uid` is
++ /// preserved (File › Revert).
++ pub document_epoch: u64,
++ /// Story being edited, or the story that owns the edited table cell.
++ pub story: StoryId,
++ /// Edited table cell, when the caret is in one.
++ pub cell: Option<CellAddr>,
++ /// Committed logical story text, without the current IME pre-edit.
++ pub text: &'a str,
++ /// Selection anchor (the end that stays put under Shift-arrow selection).
++ pub anchor: usize,
++ /// Primary selection end (the caret).
++ pub focus: usize,
++}
++
++/// What an accepted IME mutation applied to the committed story text.
++///
++/// The engine reports this from the whole story, not from the bounded outgoing IME window, so a
++/// successful mutation can be described exactly even when the deleted text lies outside that
++/// window. `deleted_before` and `deleted_after` are byte ranges of the text before the mutation;
++/// `inserted` is the text the mutation typed at the selection. Invalid or unreportable mutations
++/// return `None` rather than a guessed description.
++#[derive(Clone, Debug, PartialEq, Eq)]
++pub struct ImeMutation {
++ /// Stable document identity of the mutation.
++ pub document_uid: u64,
++ /// Document-state identity (see [`ImeTextContext::document_epoch`]).
++ pub document_epoch: u64,
++ /// Story (or the story owning the edited cell) that changed.
++ pub story: StoryId,
++ /// Edited table cell, when the caret was in one.
++ pub cell: Option<CellAddr>,
++ /// Committed selection before and after the mutation (UTF-8 byte offsets).
++ pub anchor_before: usize,
++ pub focus_before: usize,
++ pub anchor_after: usize,
++ pub focus_after: usize,
++ /// Committed story text length before and after the mutation.
++ pub text_len_before: usize,
++ pub text_len_after: usize,
++ /// Text removed before and after the selection (empty when nothing was removed).
++ pub deleted_before: Range<usize>,
++ pub deleted_after: Range<usize>,
++ /// Text typed at the selection, after the commit normalization.
++ pub inserted: String,
++}
++
++/// The identity, committed selection and text length at the IME caret.
++#[derive(Clone, Copy, Debug)]
++struct ImeState {
++ document_uid: u64,
++ document_epoch: u64,
++ story: StoryId,
++ cell: Option<CellAddr>,
++ anchor: usize,
++ focus: usize,
++ text_len: usize,
++}
++
++/// The ranges a successful `text.deleteSurrounding` reports it removed.
++fn ime_ranges_from_command(r: &Value) -> Option<(Range<usize>, Range<usize>)> {
++ let range = |key: &str| {
++ let arr = r.get(key)?.as_array()?;
++ let start = usize::try_from(arr.first()?.as_u64()?).ok()?;
++ let end = usize::try_from(arr.get(1)?.as_u64()?).ok()?;
++ (start <= end).then_some(start..end)
++ };
++ Some((range("deletedBefore")?, range("deletedAfter")?))
++}
++
++/// The byte ranges an IME delete-surrounding request removes around a selection.
++///
++/// The returned pair is `(before_selection, after_selection)`. Counts exclude the selection
++/// itself and the current pre-edit. Character counts are Unicode scalar values. Byte counts
++/// round inward: a count that ends inside a character leaves that whole character. Invalid or
++/// non-boundary selection offsets return `None` rather than guessed ranges.
++pub fn ime_delete_ranges(text: &str, anchor: usize, focus: usize, before: usize, after: usize, bytes: bool) -> Option<(Range<usize>, Range<usize>)> {
++ if anchor > text.len() || focus > text.len() || !text.is_char_boundary(anchor) || !text.is_char_boundary(focus) {
++ return None;
++ }
++ let min = anchor.min(focus);
++ let max = anchor.max(focus);
++ if bytes {
++ // Start at the requested byte offset and step at most three bytes to the next character
++ // boundary: the scan is bounded by the count, not by the caret's offset in the story.
++ let from = min.saturating_sub(before).min(min);
++ let mut before_start = from;
++ while before_start < min && !text.is_char_boundary(before_start) {
++ before_start += 1;
++ }
++ let target = max.saturating_add(after).min(text.len());
++ let mut after_end = max;
++ for (i, c) in text[max..].char_indices() {
++ let end = max + i + c.len_utf8();
++ if end <= target {
++ after_end = end;
++ } else {
++ break;
++ }
++ }
++ Some((before_start..min, max..after_end))
++ } else {
++ let before_start = if before == 0 {
++ min
++ } else {
++ let mut seen = 0usize;
++ let mut start = 0usize;
++ for (i, _) in text[..min].char_indices().rev() {
++ seen += 1;
++ start = i;
++ if seen == before {
++ break;
++ }
++ }
++ if seen < before { 0 } else { start }
++ };
++ let mut after_end = max;
++ if after > 0 {
++ let mut seen = 0usize;
++ for (i, c) in text[max..].char_indices() {
++ seen += 1;
++ after_end = max + i + c.len_utf8();
++ if seen == after {
++ break;
++ }
++ }
++ }
++ Some((before_start..min, max..after_end))
++ }
++}
++
++impl Session {
++ /// The committed text and selection at the Type tool's IME caret.
++ ///
++ /// Returns `None` without an insertion point, without a committed story, or while a
++ /// composition has no interaction snapshot to describe its committed text. The query never
++ /// copies the story.
++ pub fn ime_text_context(&self) -> Option<ImeTextContext<'_>> {
++ let st = self.active()?;
++ let (doc, ts) = if self.tool.composing() {
++ let it = st.interaction.as_ref()?;
++ (it.doc.as_ref(), it.selection.text?)
++ } else {
++ (st.doc.as_ref(), st.selection.text?)
++ };
++ let story = doc.text_story(ts.story, ts.cell)?;
++ if ts.anchor > story.text.len()
++ || ts.focus > story.text.len()
++ || !story.text.is_char_boundary(ts.anchor)
++ || !story.text.is_char_boundary(ts.focus)
++ {
++ // A stale or corrupt insertion point: report unavailable rather than inventing offsets.
++ return None;
++ }
++ Some(ImeTextContext {
++ document_uid: st.uid,
++ document_epoch: st.identity_epoch,
++ story: ts.story,
++ cell: ts.cell,
++ text: &story.text,
++ anchor: ts.anchor,
++ focus: ts.focus,
++ })
++ }
++
++ /// Delete the text an IME asked to remove around the selection, as one undo step.
++ ///
++ /// The mutation goes through the `text.deleteSurrounding` command, so it restores a Data Merge
++ /// preview, records undo, auto-sizes, journals and is panic-guarded like any other edit.
++ /// The selection itself and any current pre-edit are excluded. Character counts are scalar
++ /// values; byte counts round inward to whole characters. A selection keeps its direction and
++ /// is remapped past the deleted text.
++ pub fn ime_delete_surrounding(&mut self, before: usize, after: usize, bytes: bool) -> Result<Option<ImeMutation>> {
++ if !self.ime_deletion_changes_text(before, after, bytes)? {
++ return Ok(None);
++ }
++ let Some(pre) = self.ime_state() else { return Ok(None) };
++ self.end_preedit_without_typing()?;
++ let r = self.execute("text.deleteSurrounding", &json!({"before": before, "after": after, "bytes": bytes}))?;
++ Ok(self.ime_mutation_from_command(pre, &r, String::new()))
++ }
++
++ /// The IME committed `text`: one `text.insert`, reported as the mutation it applied.
++ pub fn ime_commit(&mut self, text: &str, view: ViewInfo) -> Result<Option<ImeMutation>> {
++ let Some(pre) = self.ime_state() else { return self.tool_ime_commit(text, view).map(|()| None) };
++ self.tool_ime_commit(text, view)?;
++ let inserted = designcraft_tools::ime_commit_text(text);
++ // A commit replaces the selection: the removed ranges are empty at its two ends.
++ let (start, end) = (pre.anchor.min(pre.focus), pre.anchor.max(pre.focus));
++ Ok(self.ime_mutation_from_states(pre, start..start, end..end, inserted))
++ }
++
++ /// Delete surrounding text and insert the IME commit in one undo step.
++ ///
++ /// This is the normal delete-surrounding-then-commit batch: both mutations are one
++ /// `text.deleteSurrounding` command, so one Undo restores the state before the batch.
++ pub fn ime_commit_after_delete(&mut self, text: &str, view: ViewInfo, before: usize, after: usize, bytes: bool) -> Result<Option<ImeMutation>> {
++ if !self.ime_deletion_changes_text(before, after, bytes)? {
++ return self.ime_commit(text, view);
++ }
++ let Some(pre) = self.ime_state() else { return Ok(None) };
++ self.end_preedit_without_typing()?;
++ let inserted = designcraft_tools::ime_commit_text(text);
++ let r = self.execute("text.deleteSurrounding", &json!({"before": before, "after": after, "bytes": bytes, "commit": inserted.clone()}))?;
++ Ok(self.ime_mutation_from_command(pre, &r, inserted))
++ }
++
++ /// The identity, committed selection and text length of the IME caret's story.
++ fn ime_state(&self) -> Option<ImeState> {
++ let context = self.ime_text_context()?;
++ Some(ImeState {
++ document_uid: context.document_uid,
++ document_epoch: context.document_epoch,
++ story: context.story,
++ cell: context.cell,
++ anchor: context.anchor,
++ focus: context.focus,
++ text_len: context.text.len(),
++ })
++ }
++
++ /// Report the mutation the delete command applied, from its ranges and the states around it.
++ fn ime_mutation_from_command(&self, before: ImeState, r: &Value, inserted: String) -> Option<ImeMutation> {
++ let (deleted_before, deleted_after) = ime_ranges_from_command(r)?;
++ self.ime_mutation_from_states(before, deleted_before, deleted_after, inserted)
++ }
++
++ fn ime_mutation_from_states(
++ &self,
++ before: ImeState,
++ deleted_before: Range<usize>,
++ deleted_after: Range<usize>,
++ inserted: String,
++ ) -> Option<ImeMutation> {
++ let after = self.ime_state()?;
++ // The mutation must have stayed in the story it began in.
++ if after.document_uid != before.document_uid
++ || after.document_epoch != before.document_epoch
++ || after.story != before.story
++ || after.cell != before.cell
++ {
++ return None;
++ }
++ Some(ImeMutation {
++ document_uid: before.document_uid,
++ document_epoch: before.document_epoch,
++ story: before.story,
++ cell: before.cell,
++ anchor_before: before.anchor,
++ focus_before: before.focus,
++ anchor_after: after.anchor,
++ focus_after: after.focus,
++ text_len_before: before.text_len,
++ text_len_after: after.text_len,
++ deleted_before,
++ deleted_after,
++ inserted,
++ })
++ }
++
++ fn end_preedit_without_typing(&mut self) -> Result<()> {
++ if !self.tool.composing() {
++ return Ok(());
++ }
++ match self.with_ctx(ViewInfo::default(), |s, cx| s.tool.ime_preedit(cx, "", None)) {
++ Some(actions) => self.run_actions(actions),
++ None => {
++ self.tool = designcraft_tools::create(self.tool.id());
++ Ok(())
++ }
++ }
++ }
++
++ fn ime_deletion_changes_text(&self, before: usize, after: usize, bytes: bool) -> Result<bool> {
++ let Some(context) = self.ime_text_context() else { return Ok(false) };
++ let Some((before_range, after_range)) = ime_delete_ranges(context.text, context.anchor, context.focus, before, after, bytes) else {
++ return Err(EngineError::Other("the IME text selection is not on character boundaries".into()));
++ };
++ Ok(!before_range.is_empty() || !after_range.is_empty())
++ }
++}
diff --cc crates/fonts/src/fontdb.rs
index 352e0952b,1c1e55bd1..1aa4ec068
--- a/crates/fonts/src/fontdb.rs
+++ b/crates/fonts/src/fontdb.rs
@@@ -1067,12 -1067,12 +1067,20 @@@ fn style_italic(style: &str) -> bool
}
impl FontDb {
-- /// A database holding the bundled fonts, then the craft-fonts Japanese faces (Mincho first,
-- /// so they are the fallback for Japanese text after the requested and bundled fonts; empty
-- /// without `CRAFT_FONTS_DIR`), whose system font scan reads `font_dirs`.
++ /// A database holding the bundled fonts, then the craft-fonts Japanese faces (Mincho first),
++ /// followed by Noto Sans Hebrew Regular and Noto Sans Devanagari Regular for document text.
++ /// The optional craft-fonts faces are absent without `CRAFT_FONTS_DIR`; system font scans
++ /// read `font_dirs`. Japanese fallback and UI ordering remain independent of these additions.
pub fn with_font_dirs(font_dirs: Vec<std::path::PathBuf>) -> Self {
let mut faces = Vec::new();
-- let craft = crate::japanese_document_fonts().into_iter().map(|f| f.bytes);
++ let craft = crate::japanese_document_fonts()
++ .into_iter()
++ .chain(
++ ["Noto Sans Hebrew", "Noto Sans Devanagari"]
++ .into_iter()
++ .filter_map(|family| crate::CRAFT_FONTS.iter().find(|f| f.family == family && f.style == "Regular")),
++ )
++ .map(|f| f.bytes);
for data in BUNDLED.iter().copied().chain(craft) {
for (i, family, style, coords) in enumerate_faces(data) {
if let Some(f) = make_face(FontBytes::Static(data), FontSource::Bundled, i, family, style, coords) {
@@@ -2200,6 -2200,6 +2208,71 @@@ mod tests_fallback
#[path = "tests_docfonts.rs"]
mod tests_docfonts;
++#[cfg(all(test, not(target_arch = "wasm32")))]
++mod native_gui_document_fonts_tests {
++ use super::*;
++
++ #[test]
++ fn native_gui_canonical_document_faces_load_without_system_or_added_fonts() {
++ if crate::CRAFT_FONTS.is_empty() {
++ assert!(std::env::var_os("CRAFT_FONTS_REQUIRED").is_none(), "required canonical fonts were not embedded");
++ return; // Optional-input builds retain their supported Latin-only database.
++ }
++ let db = FontDb::with_font_dirs(Vec::new());
++ db.set_system_fallback(false);
++ let scope = db.scoped(0);
++ let japanese = crate::japanese_document_fonts();
++ let previous: Vec<_> = BUNDLED
++ .iter()
++ .copied()
++ .chain(japanese.iter().map(|f| f.bytes))
++ .flat_map(enumerate_faces)
++ .map(|(_, family, style, _)| (family, style))
++ .collect();
++ let loaded: Vec<_> = db.read_faces().iter().map(|f| (f.family.clone(), f.style.clone())).collect();
++ assert!(loaded.len() >= previous.len(), "existing bundled/Japanese faces disappeared");
++ assert_eq!(&loaded[..previous.len()], previous.as_slice(), "preserve all Latin and Japanese face ordering");
++ for family in ["Source Sans 3", "Source Serif 4", "Inter", "JetBrains Mono"] {
++ let face = db.face(family, "Regular");
++ assert_eq!((face.family.as_str(), face.style.as_str(), &face.source), (family, "Regular", &FontSource::Bundled));
++ }
++ assert!(!japanese.is_empty(), "the required central manifest includes the existing Japanese faces");
++ assert!(japanese[0].family.contains("Mincho"));
++ assert_eq!(crate::japanese_ui_fonts(false)[0].family, "BIZ UDPGothic");
++ assert_eq!(crate::japanese_ui_fonts(true)[0].style, "Bold");
++ let latin = db.face(crate::DEFAULT_FAMILY, "Regular");
++ for language in [Some("ja"), None] {
++ assert!(db.fallback_for('語', latin.id(), language).unwrap().family.contains("Mincho"), "Japanese fallback changed: {language:?}");
++ }
++ let mut admitted = Vec::new();
++ for (family, text) in [("Noto Sans Hebrew", "שלום עולם"), ("Noto Sans Devanagari", "नमस्ते दुनिया")] {
++ let embedded: Vec<_> = crate::CRAFT_FONTS.iter().filter(|f| f.family == family && f.style == "Regular").collect();
++ assert_eq!(embedded.len(), 1, "exactly one canonical {family} Regular input");
++ assert!(scope.has_family(family), "production database did not register {family}");
++ assert!(scope.has_style(family, "Regular"), "{family} Regular");
++ assert!(!scope.has_style(family, "Unavailable Native GUI Style"));
++ assert!(db.families().iter().any(|f| f == family), "family catalog omits {family}");
++ assert!(scope.family_infos().iter().any(|f| f.family == family), "menu catalog omits {family}");
++ let face = scope.face(family, "Regular");
++ assert_eq!((face.family.as_str(), face.style.as_str(), &face.source), (family, "Regular", &FontSource::Bundled));
++ assert_eq!(face.data(), embedded[0].bytes, "neither OS discovery nor an injected face may satisfy this contract");
++ for c in text.chars().filter(|c| !c.is_whitespace()) {
++ assert_ne!(face.glyph_for(c), 0, "{family} lacks U+{:04X} ({c})", u32::from(c));
++ let fallback = db.fallback_for(c, latin.id(), None).unwrap();
++ assert_eq!((fallback.family.as_str(), fallback.style.as_str(), &fallback.source), (family, "Regular", &FontSource::Bundled));
++ assert_eq!(fallback.data(), embedded[0].bytes, "document fallback must use the canonical {family} face for {c}");
++ assert_ne!(fallback.glyph_for(c), 0);
++ }
++ let replacement = scope.face(family, "Unavailable Native GUI Style");
++ assert_eq!((replacement.family.as_str(), replacement.style.as_str()), (family, "Regular"), "nearest-style policy stays truthful");
++ admitted.push((family.to_string(), "Regular".to_string()));
++ }
++ assert_eq!(&loaded[previous.len()..], admitted.as_slice(), "only the two deliberate Regular tuples follow the existing document faces");
++ assert!(!scope.has_family("Unavailable Native GUI Family"));
++ assert_eq!(scope.face("Unavailable Native GUI Family", "Regular").family, FALLBACK_FAMILY);
++ }
++}
++
#[cfg(test)]
#[path = "tests_vertical.rs"]
mod tests_vertical;
diff --cc crates/images/Cargo.toml
index ae8dd0293,ae8dd0293..48dc5955d
--- a/crates/images/Cargo.toml
+++ b/crates/images/Cargo.toml
@@@ -14,6 -14,6 +14,8 @@@ designcraft-fonts = { workspace = true
image = { workspace = true }
tiff = { workspace = true }
resvg = { workspace = true }
++quick-xml = { workspace = true }
++flate2 = "1"
log = { workspace = true }
craft-cms = { workspace = true }
zune-core = { version = "0.5", default-features = false }
diff --cc crates/images/src/lib.rs
index 1723145ea,3a8facf08..8154f4bfe
--- a/crates/images/src/lib.rs
+++ b/crates/images/src/lib.rs
@@@ -77,8 -77,8 +77,23 @@@ fn svg_options() -> &'static usvg::Opti
let font_resolver = usvg::FontResolver { select_font: select_font(), select_fallback: select_fallback() };
// Images inside an SVG come only from `data:` URLs: an `href` naming a file is not read
// (it is left out, as usvg leaves out an image it can't load).
-- let image_href_resolver =
-- usvg::ImageHrefResolver { resolve_data: usvg::ImageHrefResolver::default_data_resolver(), resolve_string: Box::new(|_, _| None) };
++ let default_data = usvg::ImageHrefResolver::default_data_resolver();
++ let image_href_resolver = usvg::ImageHrefResolver {
++ resolve_data: Box::new(move |mime, data, options| {
++ let raster = matches!(
++ image::guess_format(&data),
++ Ok(image::ImageFormat::Png | image::ImageFormat::Jpeg | image::ImageFormat::Gif | image::ImageFormat::WebP)
++ );
++ if mime == "image/svg+xml" || (mime == "text/plain" && !raster) {
++ let xml = svg_data(&data)?;
++ svg_preflight(&xml)?;
++ default_data(mime, Arc::new(xml.into_owned()), options)
++ } else {
++ default_data(mime, data, options)
++ }
++ }),
++ resolve_string: Box::new(|_, _| None),
++ };
usvg::Options { fontdb: Arc::new(db), font_family: "Source Sans 3".into(), font_resolver, image_href_resolver, ..Default::default() }
})
}
@@@ -207,9 -207,9 +222,69 @@@ fn add_face(db: &mut Arc<usvg::fontdb::
ids.into_iter().find(|id| db.face(*id).is_some_and(|f| f.index == index))
}
--/// The parsed SVG.
++/// Limits apply before usvg's recursive XML/SVG parsing, including SVGZ output.
++/// Ordinary SVG doctypes are accepted; internal DTD subsets are not, since entity
++/// expansion could introduce markup that the streaming depth check never sees.
++const MAX_SVG_BYTES: usize = 16 * 1024 * 1024;
++const MAX_SVG_EVENTS: usize = 100_000;
++const MAX_SVG_DEPTH: usize = 64;
++
++fn svg_data(bytes: &[u8]) -> Option<std::borrow::Cow<'_, [u8]>> {
++ use std::io::Read;
++
++ if bytes.len() > MAX_SVG_BYTES {
++ return None;
++ }
++ if bytes.starts_with(&[0x1f, 0x8b]) {
++ let mut xml = Vec::new();
++ flate2::read::GzDecoder::new(bytes).take(MAX_SVG_BYTES as u64 + 1).read_to_end(&mut xml).ok()?;
++ (xml.len() <= MAX_SVG_BYTES).then_some(std::borrow::Cow::Owned(xml))
++ } else {
++ Some(std::borrow::Cow::Borrowed(bytes))
++ }
++}
++
++fn svg_preflight(bytes: &[u8]) -> Option<()> {
++ use quick_xml::events::Event;
++
++ let text = std::str::from_utf8(bytes).ok()?;
++ let mut reader = quick_xml::Reader::from_str(text);
++ let mut depth = 0usize;
++ for _ in 0..MAX_SVG_EVENTS {
++ match reader.read_event().ok()? {
++ Event::Start(_) => {
++ depth += 1;
++ if depth > MAX_SVG_DEPTH {
++ return None;
++ }
++ }
++ Event::Empty(_) if depth >= MAX_SVG_DEPTH => return None,
++ Event::End(_) => depth = depth.checked_sub(1)?,
++ Event::DocType(doctype) => {
++ // A '[' inside a quoted external identifier is not an internal subset.
++ let mut quote = None;
++ for &byte in doctype.as_ref() {
++ match (quote, byte) {
++ (Some(q), b) if b == q => quote = None,
++ (None, b'\'' | b'"') => quote = Some(byte),
++ (None, b'[') => return None,
++ _ => {}
++ }
++ }
++ }
++ Event::Eof => return (depth == 0).then_some(()),
++ _ => {}
++ }
++ }
++ None
++}
++
++/// Parse an SVG with at most 16 MiB encoded/decoded data, 100,000 XML events and
++/// 64 nested elements. Reject internal DTD subsets before recursive conversion.
pub fn svg_tree(bytes: &[u8]) -> Option<usvg::Tree> {
-- usvg::Tree::from_data(bytes, svg_options()).ok()
++ let xml = svg_data(bytes)?;
++ svg_preflight(&xml)?;
++ usvg::Tree::from_data(&xml, svg_options()).ok()
}
/// Natural size of a placed graphic in points: rasters at 72 ppi (one pixel per point), PSDs
@@@ -503,6 -503,6 +578,98 @@@ mod tests
<text x="110" y="60" font-size="20">Hi</text>
</svg>"##;
++ fn nested_svg(groups: usize) -> String {
++ format!(
++ r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/>{}</svg>"#,
++ "<g opacity=\"0.99\">".repeat(groups),
++ "</g>".repeat(groups)
++ )
++ }
++
++ fn gzip(bytes: &[u8]) -> Vec<u8> {
++ use std::io::Write;
++
++ let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::fast());
++ encoder.write_all(bytes).unwrap();
++ encoder.finish().unwrap()
++ }
++
++ #[test]
++ fn svg_depth_is_checked_before_recursive_parsing() {
++ // Count the SVG root and leaf too; the boundary document still draws its path.
++ let accepted = nested_svg(MAX_SVG_DEPTH - 2);
++ let tree = svg_tree(accepted.as_bytes()).unwrap();
++ assert!(!tree.root().children().is_empty());
++ drop(tree);
++ for depth in [MAX_SVG_DEPTH - 1, 2000] {
++ let rejected = nested_svg(depth);
++ assert!(svg_tree(rejected.as_bytes()).is_none());
++ assert!(natural_size(rejected.as_bytes()).is_none());
++ assert!(render_svg(rejected.as_bytes(), 10).is_none());
++ }
++ }
++
++ #[test]
++ fn svg_depth_ignores_markup_in_comments_cdata_and_attributes() {
++ let markup = "<g>".repeat(2000);
++ let svg = format!(
++ r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><!--{markup}--><desc><![CDATA[{markup}]]></desc><rect data-label="&lt;g>" width="10" height="10"/></svg>"#
++ );
++ assert!(svg_tree(svg.as_bytes()).is_some());
++ }
++
++ #[test]
++ fn svg_external_doctype_is_preserved_but_entity_markup_is_refused() {
++ let external =
++ format!(r#"<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">{}"#, nested_svg(2));
++ assert!(svg_tree(external.as_bytes()).is_some());
++ let internal = r#"<!DOCTYPE svg [<!ENTITY shape "<rect width='10' height='10'/>">]><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">&shape;</svg>"#;
++ assert!(svg_tree(internal.as_bytes()).is_none());
++ }
++
++ #[test]
++ fn svg_byte_and_event_limits_are_enforced() {
++ let mut bytes = nested_svg(0).into_bytes();
++ bytes.resize(MAX_SVG_BYTES, b' ');
++ assert!(svg_tree(&bytes).is_some());
++ bytes.push(b' ');
++ assert!(svg_tree(&bytes).is_none());
++
++ let document = |comments| {
++ format!(
++ r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/></svg>"#,
++ "<!-- -->".repeat(comments)
++ )
++ };
++ assert!(svg_tree(document(MAX_SVG_EVENTS - 4).as_bytes()).is_some());
++ assert!(svg_tree(document(MAX_SVG_EVENTS - 3).as_bytes()).is_none());
++ }
++
++ #[test]
++ fn svgz_has_the_same_depth_and_decoded_size_limits() {
++ assert!(svg_tree(&gzip(nested_svg(2).as_bytes())).is_some());
++ assert!(svg_tree(&gzip(nested_svg(2000).as_bytes())).is_none());
++ let mut bytes = nested_svg(0).into_bytes();
++ bytes.resize(MAX_SVG_BYTES + 1, b' ');
++ let compressed = gzip(&bytes);
++ assert!(compressed.len() < MAX_SVG_BYTES);
++ assert!(svg_tree(&compressed).is_none());
++ assert!(svg_tree(b"\x1f\x8bnot gzip").is_none());
++ }
++
++ #[test]
++ fn nested_svg_data_images_cannot_bypass_the_depth_limit() {
++ let nested = nested_svg(2000);
++ let encoded = nested.bytes().map(|b| format!("%{b:02X}")).collect::<String>();
++ for mime in ["image/svg+xml", "text/plain"] {
++ let svg = format!(
++ r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><image width="10" height="10" href="data:{mime},{encoded}"/></svg>"#
++ );
++ // As with other unreadable data images, the parent survives without the image.
++ assert!(svg_tree(svg.as_bytes()).unwrap().root().children().is_empty());
++ }
++ }
++
#[test]
fn svg_sniff_size_and_render() {
let b = SVG.as_bytes();
diff --cc crates/tools/src/lib.rs
index f0fd68019,f0fd68019..8ec32fe8c
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@@ -34,6 -34,6 +34,8 @@@ use serde_json::Value
pub use catalog::{SPLIT_IN_TWO_COLUMNS, TOOL_GROUPS, ToolInfo, tool_for_shortcut, tool_info};
pub use layout::{CanvasLayout, SpreadSlot};
pub use nav::ZoomTool;
++/// The exact text an IME commit types (see [`Tool::ime_commit`]).
++pub use text::ime_commit_text;
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
pub struct Mods {
diff --cc crates/tools/src/text.rs
index 56658f41e,f0503e912..daa68949c
--- a/crates/tools/src/text.rs
+++ b/crates/tools/src/text.rs
@@@ -5,7 -5,7 +5,8 @@@
//!
//! IME: the marked text of a composition is a preview of `text.insert` at the caret (so it lays
//! out in place like typed text), underlined, until the IME commits it (one `text.insert`, one
--//! undo step) or clears it (the preview goes, leaving no undo step).
++//! undo step) or clears it (the preview goes, leaving no undo step). A delete-surrounding batch
++//! is one `text.deleteSurrounding` instead; the engine runs it through the command pipeline.
use std::ops::Range;
@@@ -136,6 -136,6 +137,13 @@@ impl TypeTool
}
}
++/// The text an IME commit types: `\r` becomes a paragraph break, and other control characters
++/// are dropped (Tab and the line break stay). The engine and the UI share this so a commit's
++/// exact accepted text is known without inspecting the document.
++pub fn ime_commit_text(text: &str) -> String {
++ text.chars().map(|c| if c == '\r' { '\n' } else { c }).filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect()
++}
++
/// Byte range in `s` of the characters `r` (IME ranges count characters; carets count bytes).
/// `None` when `r` runs past the end of `s` or backwards.
fn char_range_to_bytes(s: &str, r: Range<usize>) -> Option<Range<usize>> {
@@@ -437,7 -442,7 +450,7 @@@ impl Tool for TypeTool
}
fn ime_commit(&mut self, cx: &ToolContext, text: &str) -> Vec<Action> {
-- let text: String = text.chars().map(|c| if c == '\r' { '\n' } else { c }).filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect();
++ let text = ime_commit_text(text);
// The marked text goes; the result is typed in its place like any typing: one command,
// one undo step.
let mut out = if self.preedit.take().is_some() { vec![Action::Cancel] } else { vec![] };
diff --cc crates/ui-egui/Cargo.toml
index c9d85253f,c9d85253f..d39ad777b
--- a/crates/ui-egui/Cargo.toml
+++ b/crates/ui-egui/Cargo.toml
@@@ -19,15 -19,15 +19,20 @@@ designcraft-compose = { workspace = tru
designcraft-render = { workspace = true }
designcraft-tools = { workspace = true }
designcraft-engine = { workspace = true }
++# The UI draws monochrome icon glyphs from egui's bundled emoji faces (☰, ⚠, 📋); 0.37 moved
++# them behind this feature. They stay bundled copies of OSI/CC0 faces from `epaint_default_fonts`.
++egui = { workspace = true, features = ["monochrome_emoji_fonts"] }
++web-time = { workspace = true }
++# Unicode bidi classes are used only to bypass the label cache for ordinary LTR text.
unicode-bidi = { workspace = true }
--unicode-bidi-mirroring = { workspace = true }
--unicode-segmentation = { workspace = true }
--egui = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
log = { workspace = true }
[dev-dependencies]
++# egui 0.37 no longer enables `default_fonts` for library consumers; egui_kittest disables
++# egui's defaults, and package-scoped UI tests do not build the app binary.
++egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
tempfile = { workspace = true }
designcraft-idml = { workspace = true }
zip = { workspace = true }
diff --cc crates/ui-egui/examples/ui_shot.rs
index 45acf8c38,45acf8c38..73de469cc
--- a/crates/ui-egui/examples/ui_shot.rs
+++ b/crates/ui-egui/examples/ui_shot.rs
@@@ -93,7 -93,7 +93,8 @@@ fn main()
/// windowed app's raw-input hook does.
fn step(harness: &mut egui_kittest::Harness<'_, DesignApp>) {
let mut raw = std::mem::take(harness.input_mut());
-- harness.state_mut().raw_input_hook(&mut raw);
++ let ctx = harness.ctx.clone();
++ harness.state_mut().raw_input_hook(&ctx, &mut raw);
*harness.input_mut() = raw;
harness.step();
}
diff --cc crates/ui-egui/src/about.rs
index 75442b93c,75442b93c..30e48274b
--- a/crates/ui-egui/src/about.rs
+++ b/crates/ui-egui/src/about.rs
@@@ -36,7 -36,7 +36,7 @@@ pub fn paint_mark(ui: &egui::Ui, rect:
let ctx = ui.ctx();
let ppp = ctx.pixels_per_point();
let px = ((rect.width().min(rect.height()) * ppp).round() as u32).clamp(8, 1024);
-- let key = egui::Id::new(("artcraft_mark", px, color.to_array()));
++ let key = egui::Id::unique(("artcraft_mark", px, color.to_array()));
let tex: Option<egui::TextureHandle> = ctx.data(|d| d.get_temp(key));
let tex = tex.unwrap_or_else(|| {
let mut rc = vello_cpu::RenderContext::new_with(px as u16, px as u16, vello_cpu::RenderSettings { num_threads: 0, ..Default::default() });
@@@ -114,7 -114,7 +114,7 @@@ pub fn show(app: &mut DesignApp, ctx: &
}
let t = Tokens::get(ctx);
let mut open: Option<&'static str> = None;
-- let area = egui::Id::new("about");
++ let area = egui::Id::unique("about");
let instance = area.with("placement");
let resp = crate::modal_drag::modal(ctx, area, instance).show(ctx, |ui| {
ui.set_width(if app.ui.about_tab == 0 { 460.0 } else { 640.0 });
diff --cc crates/ui-egui/src/canvas.rs
index 2118c4929,75acc32a9..8d3e4af8b
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@@ -4,8 -4,8 +4,11 @@@
use designcraft_compose as compose;
use designcraft_doc::{Content, Document, GuideSel, Item, SpreadRef};
use designcraft_engine::doc::Selection;
++use designcraft_engine::{ImeMutation, ImeTextContext};
use designcraft_geom::{Affine, Point, Rect as DRect, Vec2 as DVec2};
use designcraft_tools::{CanvasLayout, Cursor, Mods, Overlay, PointerEvent, PointerKind, SpreadSlot, ToolKey};
++use egui::ime_context::{CommittedText, ImeMutationStamp, ImeObservation, ImeTarget};
++use egui::output::IMESurroundingText;
use egui::{Color32, Pos2, Rect, Sense, Stroke, StrokeKind, pos2, vec2};
use serde_json::{Value, json};
@@@ -296,25 -380,25 +383,39 @@@ pub fn set_zoom(app: &mut DesignApp, z
zoom_at(app, rect.center(), z / cur);
}
++/// How long egui (0.37 `WheelState`) keeps a scroll action's latched modifiers after the last
++/// wheel event: 150 ms, or a second while fingers rest on a trackpad. The Alt latch below ends
++/// with the action, exactly as egui ends Ctrl/Cmd, so the rest of an ended motion scrolls for
++/// both keys and a later plain scroll is never taken for a zoom.
++const SCROLL_ACTION_TIMEOUT: f64 = 0.150;
++const RESTING_FINGER_TIMEOUT: f64 = 1.0;
++
/// Whether the wheel motion now arriving was made with Alt down. As egui does for Ctrl/Cmd, a
/// motion keeps its key to its end: the wheel is smoothed over a few frames, and a trackpad swipe
/// coasts on after the key is let go.
fn wheel_alt(ui: &egui::Ui) -> bool {
-- let id = egui::Id::new("canvas_wheel_alt");
-- // Alt, and whether a trackpad swipe is under way.
-- let (mut alt, mut swipe): (bool, bool) = ui.data(|d| d.get_temp(id)).unwrap_or_default();
++ let id = egui::Id::unique("canvas_wheel_alt");
++ // Alt, whether a trackpad swipe is under way, and the time of the last wheel event.
++ let (mut alt, mut swipe, mut last): (bool, bool, f64) = ui.data(|d| d.get_temp(id)).unwrap_or((false, false, f64::NEG_INFINITY));
ui.input(|i| {
for e in &i.events {
-- if let egui::Event::MouseWheel { phase, modifiers, .. } = e {
-- (alt, swipe) = match phase {
-- egui::TouchPhase::Start => (modifiers.alt, true),
-- egui::TouchPhase::Move => (modifiers.alt || (swipe && alt), swipe),
-- egui::TouchPhase::End | egui::TouchPhase::Cancel => (false, false),
-- };
++ let egui::Event::MouseWheel { phase, modifiers, source, .. } = e else { continue };
++ // egui ends the action (and drops its latched modifiers) when a new event arrives
++ // after this pause; the Alt latch ends there too.
++ let timeout = if swipe && *source == egui::MouseWheelSource::Trackpad { RESTING_FINGER_TIMEOUT } else { SCROLL_ACTION_TIMEOUT };
++ if timeout < i.time - last {
++ alt = false;
++ swipe = false;
}
++ last = i.time;
++ (alt, swipe) = match phase {
++ egui::TouchPhase::Start => (modifiers.alt, true),
++ egui::TouchPhase::Move => (modifiers.alt || (swipe && alt), swipe),
++ egui::TouchPhase::End | egui::TouchPhase::Cancel => (false, false),
++ };
}
});
-- ui.data_mut(|d| d.insert_temp(id, (alt, swipe)));
++ ui.data_mut(|d| d.insert_temp(id, (alt, swipe, last)));
alt
}
@@@ -376,7 -460,7 +477,7 @@@ fn navigation_space(app: &mut DesignApp
}
fn spring_zoom_mode(app: &DesignApp, ctx: &egui::Context, space: bool) -> bool {
-- let down = ctx.data(|d| d.get_temp::<bool>(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
++ let down = ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
space && ctx.input(|i| i.modifiers.command) && !down && !app.session.tool_busy()
}
@@@ -388,7 -472,7 +489,7 @@@ struct SpringZoom
/// Lend the Zoom tool the gesture; the selected tool and document selection stay intact.
fn spring_zoom_input(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response, xf: &Xf, active: bool) -> bool {
-- let id = egui::Id::new(("canvas_spring_zoom", app.pane));
++ let id = egui::Id::unique(("canvas_spring_zoom", app.pane));
let mut zoom: SpringZoom = ui.data(|d| d.get_temp(id)).unwrap_or_default();
if !ui.input(|i| i.focused) {
ui.data_mut(|d| d.remove::<SpringZoom>(id));
@@@ -531,8 -615,8 +632,8 @@@ pub fn show(app: &mut DesignApp, ui: &m
painter.rect_stroke(xf.rect(slot.bounds), 0.0, Stroke::new(hair, Color32::from_rgb(0x4a, 0x4a, 0x4a)), StrokeKind::Outside);
}
if !preview {
-- let drag = ui.data(|d| d.get_temp::<GuideDrag>(egui::Id::new(GUIDE_DRAG)));
-- let press = ui.data(|d| d.get_temp::<GuidePress>(egui::Id::new(GUIDE_PRESS)));
++ let drag = ui.data(|d| d.get_temp::<GuideDrag>(egui::Id::unique(GUIDE_DRAG)));
++ let press = ui.data(|d| d.get_temp::<GuidePress>(egui::Id::unique(GUIDE_PRESS)));
let moving = drag.as_ref().zip(press).and_then(|(g, press)| moving_guides(app, &xf, rect, g, press));
draw_guides(app, &painter, &xf, &doc, &layout, &t, moving.as_ref());
if let Some(g) = drag
@@@ -593,7 -677,7 +694,7 @@@
}
}
draw_tool_overlays(app, &painter, &xf);
-- ime_output(app, ui.ctx(), &xf);
++ ime_canvas_pass(app, ui.ctx(), &xf);
if rulers {
draw_rulers(app, ui, full, rect, &xf, &doc, &layout, &t);
ruler_units_menus(app, &resp, full, rect, &doc);
@@@ -611,8 -695,8 +712,8 @@@
let space = navigation_space(app, ui.ctx());
let zoom = spring_zoom_mode(app, ui.ctx(), space);
let middle = ui.input(|i| i.pointer.middle_down());
-- let alt_hand: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_alt_hand", app.pane)))).unwrap_or(false);
-- let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
++ let alt_hand: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_alt_hand", app.pane)))).unwrap_or(false);
++ let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
let alt_text = wants_text && !tool_drag && ui.input(|i| i.modifiers.alt);
let c = if middle || alt_hand {
Cursor::HandGrab
@@@ -624,7 -708,7 +725,7 @@@
app.session.cursor(xf.to_canvas(p), ui.input(|i| mods(i, false)), app.view_info())
};
// A column guide that a press would drag, or one being dragged: a resize cursor across it.
-- let dragging = ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::new((COLUMN_DRAG, app.pane)))).map(|g| g.spread);
++ let dragging = ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::unique((COLUMN_DRAG, app.pane)))).map(|g| g.spread);
let column = dragging.or_else(|| {
let menu_open = context_menu_open(ui.ctx());
(!space && !zoom && !middle && !alt_hand && !tool_drag && !menu_open && xf.rot == 0)
@@@ -640,6 -724,6 +741,11 @@@
ui.ctx().set_cursor_icon(icon);
draw_cursor_badge(&painter, p, c, &t);
}
++ // A second viewport has no panels, dialogs or Quick Apply after its canvas: observe here,
++ // once, as the end of its pass. The root viewport observes at the end of `DesignApp::ui`.
++ if ui.ctx().viewport_id() != egui::ViewportId::ROOT {
++ ime_observe(app, ui.ctx());
++ }
}
/// The loaded text cursor's badge beside the system cursor: lines of text, a closed chain
@@@ -1578,7 -1663,7 +1685,7 @@@ fn draw_text_selection
/// A text field had keyboard focus when this frame began, per window: egui keeps one focus per
/// viewport, so a field focused in the main window must not mute the second window's canvas.
fn field_focused_id(ctx: &egui::Context) -> egui::Id {
-- egui::Id::new("canvas_field_focused").with(ctx.viewport_id())
++ egui::Id::unique("canvas_field_focused").with(ctx.viewport_id())
}
/// Called before the panels draw. A panel field gives up focus on Enter or Tab while it draws,
@@@ -1600,7 -1685,7 +1707,7 @@@ pub fn begin_frame(ctx: &egui::Context
/// (held when this frame's events began, held after them).
#[cfg(not(target_arch = "wasm32"))]
fn modifiers_id() -> egui::Id {
-- egui::Id::new("canvas-frame-modifiers")
++ egui::Id::unique("canvas-frame-modifiers")
}
/// Caret / text highlight inside a table cell (the cell's lines are offset by the cell origin).
@@@ -1692,10 -1777,10 +1799,10 @@@ fn draw_inverse_highlight
);
let (w, h) = (((bbox.width() * ppp).round() as u32).clamp(1, 8192), ((bbox.height() * ppp).round() as u32).clamp(1, 8192));
let Some(st) = app.session.active() else { return };
-- let key = egui::Id::new(("inverse_sel", st.uid, st.revision, std::sync::Arc::as_ptr(&st.doc) as usize, story.0))
++ let key = egui::Id::unique(("inverse_sel", st.uid, st.revision, std::sync::Arc::as_ptr(&st.doc) as usize, story.0))
.with((runs.iter().map(|r| r.2.len() + r.3.len() * 7919).sum::<usize>(), w, h))
.with((bbox.min.x.to_bits(), bbox.min.y.to_bits(), xf.zoom.to_bits(), st.selection.text.map(|t| (t.anchor, t.focus))));
-- let cache_id = egui::Id::new("inverse_sel_tex");
++ let cache_id = egui::Id::unique("inverse_sel_tex");
let cached: Option<(egui::Id, egui::TextureHandle)> = ctx.data(|d| d.get_temp(cache_id));
let tex = match cached {
Some((k, t)) if k == key => t,
@@@ -1917,7 -2002,7 +2024,7 @@@ fn draw_content_ghost(painter: &egui::P
/// A screen-resolution proxy of a placed graphic for the ghost, cached per asset.
fn ghost_texture(ctx: &egui::Context, doc: &Document, g: &designcraft_doc::Graphic) -> Option<egui::TextureHandle> {
let asset = doc.assets.get(&g.asset)?;
-- let key = egui::Id::new(("content_ghost", std::sync::Arc::as_ptr(&asset.data) as usize, asset.data.len(), asset.page));
++ let key = egui::Id::unique(("content_ghost", std::sync::Arc::as_ptr(&asset.data) as usize, asset.data.len(), asset.page));
if let Some(t) = ctx.data(|d| d.get_temp::<egui::TextureHandle>(key)) {
return Some(t);
}
@@@ -1994,7 -2079,7 +2101,7 @@@ fn draw_rulers(app: &DesignApp, ui: &eg
// While the zero point is dragged out of the corner, the rulers measure from where it would
// land (kept on the pasteboard, as the engine keeps it) and crosshair lines show the spot.
// Cmd-dragged, the lines are the two guides it makes; locked, a plain drag does nothing.
-- let dragged = ui.data(|d| d.get_temp::<Pos2>(egui::Id::new((ZERO_POINT_DRAG, app.pane)))).filter(|p| !corner.contains(*p));
++ let dragged = ui.data(|d| d.get_temp::<Pos2>(egui::Id::unique((ZERO_POINT_DRAG, app.pane)))).filter(|p| !corner.contains(*p));
let guides = ui.input(|i| i.modifiers.command);
let moving = dragged.filter(|_| !guides && !doc.settings.zero_point_locked).and_then(|p| zero_point_at(app, xf, p));
let cross = if guides { dragged } else { moving.map(|(_, c)| xf.to_screen(c)) };
@@@ -2198,7 -2283,7 +2305,7 @@@ struct MenuRequest
/// The popup id of the canvas context menu in split-view pane `pane`.
fn context_menu_id(pane: u8) -> egui::Id {
-- egui::Id::new(("canvas_context_menu", pane))
++ egui::Id::unique(("canvas_context_menu", pane))
}
/// Was a canvas context menu open (in either pane of this window) when this frame began?
@@@ -2206,7 -2291,7 +2313,7 @@@
/// click or key still belongs to the menu. Popups are per window (viewport), and so is input.
pub fn context_menu_open(ctx: &egui::Context) -> bool {
let pass = ctx.cumulative_pass_nr();
-- let key = egui::Id::new("canvas_context_menu_open").with(ctx.viewport_id());
++ let key = egui::Id::unique("canvas_context_menu_open").with(ctx.viewport_id());
if let Some((p, open)) = ctx.data(|d| d.get_temp::<(u64, bool)>(key))
&& p == pass
{
@@@ -2342,7 -2427,7 +2449,7 @@@ fn scrollbars(app: &mut DesignApp, ui:
let mut hot = [false; 2];
for (n, vertical) in [true, false].into_iter().enumerate() {
let (track, thumb, k) = scrollbar_rects(outer, screen, cb, vertical);
-- let id = egui::Id::new(("canvas_scrollbar", app.pane, vertical));
++ let id = egui::Id::unique(("canvas_scrollbar", app.pane, vertical));
let resp = ui.interact(track, id, Sense::click_and_drag());
let grab_id = id.with("grab");
if resp.drag_started() {
@@@ -2426,10 -2511,10 +2533,10 @@@ fn handle_input(app: &mut DesignApp, ui
// see the primary button.
// A column guide drag keeps the pointer until the button is up, whatever Space or a menu does
// meanwhile.
-- if ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::new((COLUMN_DRAG, app.pane)))).is_some() && column_guide_drag(app, ui, resp, rect, &xf) {
++ if ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::unique((COLUMN_DRAG, app.pane)))).is_some() && column_guide_drag(app, ui, resp, rect, &xf) {
return;
}
-- let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
++ let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
let hand = space && !ui.input(|i| i.modifiers.command);
if !tool_drag && ((hand && resp.dragged()) || resp.dragged_by(egui::PointerButton::Middle)) {
let d = xf.unrotate_delta(resp.drag_delta());
@@@ -2440,7 -2525,7 +2547,7 @@@
}
// Editing text (Space types a space): Alt held at the press gives the Hand tool until the
// button is released, and the caret stays. Alt pressed later in a text drag copies the text.
-- let alt_hand_id = egui::Id::new(("canvas_alt_hand", app.pane));
++ let alt_hand_id = egui::Id::unique(("canvas_alt_hand", app.pane));
let mut alt_hand: bool = ui.data(|d| d.get_temp(alt_hand_id)).unwrap_or(false);
let (press, alt, primary_down) = ui.input(|i| (i.pointer.primary_pressed(), i.modifiers.alt, i.pointer.primary_down()));
if press && alt && wants_text && !tool_drag && !menu_open && resp.hovered() {
@@@ -2471,11 -2556,11 +2578,25 @@@
let vi = app.view_info();
let pos = |p: Pos2| xf.to_canvas(p);
let mut events: Vec<PointerEvent> = Vec::new();
-- let down_id = egui::Id::new(("canvas_pointer_down", app.pane));
++ let down_id = egui::Id::unique(("canvas_pointer_down", app.pane));
let mut down: bool = ui.data(|d| d.get_temp(down_id)).unwrap_or(false);
-- let clicks_id = egui::Id::new(("canvas_clicks", app.pane));
++ let clicks_id = egui::Id::unique(("canvas_clicks", app.pane));
let (pressed, released, origin, latest, now) =
ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos(), i.time));
++ // A complete click can arrive in one pass: release clears egui's held origin.
++ // Recover the actual primary press position, preserving the origin for held gestures.
++ let origin = origin.or_else(|| {
++ ui.input(|i| {
++ i.events
++ .iter()
++ .rev()
++ .find_map(|event| match event {
++ egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, .. } => Some(*pos),
++ _ => None,
++ })
++ .filter(|pos| pos.is_finite())
++ })
++ });
let in_view = |o: Pos2| if xf.rot == 0 { rect.contains(o) } else { resp.rect.contains(o) };
if pressed
&& !space
@@@ -2498,7 -2583,7 +2619,7 @@@
events.push(PointerEvent { kind: PointerKind::Drag, pos: pos(p), mods: m, clicks: 1 });
}
// Power Zoom: holding the Hand tool still for half a second turns the press into one.
-- let hold_id = egui::Id::new(("canvas_hold", app.pane));
++ let hold_id = egui::Id::unique(("canvas_hold", app.pane));
if down && !released && app.session.tool_id() == "hand" && !m.alt {
let (now, origin_pos) = ui.input(|i| (i.time, i.pointer.press_origin()));
let (start, fired): (f64, bool) = ui.data(|d| d.get_temp(hold_id)).unwrap_or((now, false));
@@@ -2581,7 -2666,7 +2702,7 @@@
};
let composing = composing_at_start || app.session.tool_composing();
match e {
-- egui::Event::Ime(ime) if wants_text => ime_event(app, ime, vi),
++ egui::Event::Ime(ime) if wants_text => ime_event(app, ui.ctx(), ime, vi),
// Keys the IME passes through come as text only while nothing is marked.
egui::Event::Text(t) if wants_text && !composing => {
let _ = app.run("text.insert", json!({"text": t}));
@@@ -2648,6 -2733,6 +2769,7 @@@
_ => {}
}
}
++ finish_pending_ime_delete(app, ui.ctx());
let _ = DVec2::ZERO;
}
@@@ -2663,28 -2748,28 +2785,77 @@@ fn keyboard_pane(app: &DesignApp) -> bo
app.pane == app.focus_pane
}
++/// Has the composition these events belong to already ended outside the IME in this batch?
++///
++/// A pointer press and a document switch end the composition and type its marked text where the
++/// caret then is, but the system IME still sends the Commit (or a delete) for the copy it holds.
++/// Applying those at the new caret would type the text twice, put it in another story or document,
++/// or delete text there, so they are dropped and the IME is told to drop its copy.
++fn ime_composition_ended(app: &DesignApp) -> bool {
++ app.ime_marked.is_some() && !app.session.tool_composing()
++}
++
++/// Did the composition move to another owner (another story, cell or document state) since it
++/// began? A late commit then belongs to the old one, not the caret that is there now.
++fn ime_composition_moved(app: &DesignApp) -> bool {
++ let Some(recorded) = app.ime_target else { return false };
++ app.session.ime_text_context().is_some_and(|context| ime_target(&context) != recorded)
++}
++
++/// Drop events for a composition that already ended or moved, keeping what was typed.
++fn drop_stale_ime_events(app: &mut DesignApp) {
++ app.ime_marked = None;
++ app.ime_target = None;
++ app.pending_ime_delete = None;
++ app.ime_discard = true;
++ // The host must interrupt the system IME's copy in this pass too, as for a click away.
++ app.ime_interrupt = true;
++}
++
/// One input method event for the text caret: marked text previews in the story, a commit types.
--fn ime_event(app: &mut DesignApp, e: egui::ImeEvent, vi: designcraft_engine::ViewInfo) {
++fn ime_event(app: &mut DesignApp, ctx: &egui::Context, e: egui::ImeEvent, vi: designcraft_engine::ViewInfo) {
let r = match e {
egui::ImeEvent::Preedit { text, active_range_chars } => {
-- app.ime_marked = Some(text.clone()).filter(|t| !t.is_empty());
++ if text.is_empty() {
++ app.ime_marked = None;
++ app.ime_target = None;
++ } else {
++ // The composition's owner at its first marked text: a commit may only land there.
++ if app.ime_marked.is_none() {
++ app.ime_target = app.session.ime_text_context().map(|c| ime_target(&c));
++ }
++ app.ime_marked = Some(text.clone());
++ }
app.session.tool_preedit(&text, active_range_chars, vi).map_err(|e| e.to_string())
}
++ // A composition that already ended or moved in this batch owns nothing any more.
++ egui::ImeEvent::Commit(_) | egui::ImeEvent::DeleteSurrounding { .. } | egui::ImeEvent::DeleteSurroundingBytes { .. }
++ if app.ime_interrupt || ime_composition_ended(app) || ime_composition_moved(app) =>
++ {
++ // Dropping a stale delete clears the marked target. Keep the pass's interrupt latch
++ // authoritative so the commit following that delete cannot become a fresh insertion.
++ drop_stale_ime_events(app);
++ Ok(())
++ }
// A bare line break confirms the composition (Enter with some IMEs): the marked text, not
// a new paragraph.
egui::ImeEvent::Commit(t) if t == "\n" || t == "\r" => {
++ finish_pending_ime_delete(app, ctx);
keep_marked_text(app);
Ok(())
}
-- egui::ImeEvent::Commit(t) => {
-- app.ime_marked = None;
-- app.session.tool_ime_commit(&t, vi).map_err(|e| e.to_string())
-- }
++ egui::ImeEvent::Commit(t) => ime_commit(app, ctx, &t, vi),
// The web text agent's corrections and mobile Backspace: characters around the caret go.
-- egui::ImeEvent::DeleteSurrounding { before_chars, after_chars } if !app.session.tool_composing() => {
-- delete_surrounding(app, before_chars, after_chars)
++ // These are held for the Commit in the same batch so both mutations are one undo step.
++ egui::ImeEvent::DeleteSurrounding { before_chars, after_chars } => {
++ app.pending_ime_delete = Some((before_chars, after_chars, false));
++ Ok(())
}
-- // `Enabled` and `Disabled` carry nothing: the IME is on while `ime_output` sets `ime`.
++ egui::ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes } => {
++ app.pending_ime_delete = Some((before_bytes, after_bytes, true));
++ Ok(())
++ }
++ // `Enabled` and `Disabled` carry nothing: the IME is on while the observation sets `ime`.
_ => Ok(()),
};
if let Err(e) = r {
@@@ -2693,15 -2778,15 +2864,245 @@@
app.after_engine();
}
--/// Delete `before` characters before the caret and `after` after it (sizes come from the browser:
--/// a correction never deletes more than a word's worth).
--fn delete_surrounding(app: &mut DesignApp, before: usize, after: usize) -> Result<(), String> {
-- for (n, forward) in [(before, false), (after, true)] {
-- for _ in 0..n.min(64) {
-- app.run("text.delete", json!({"forward": forward}))?;
++/// The bounded committed snapshot and stable target just before an IME mutation.
++struct ImeBefore {
++ target: ImeTarget,
++ stamp: ImeMutationStamp,
++ snapshot: IMESurroundingText,
++ document_uid: u64,
++ document_epoch: u64,
++ story: designcraft_doc::StoryId,
++ cell: Option<designcraft_doc::CellAddr>,
++ anchor: usize,
++ focus: usize,
++}
++
++fn ime_target(context: &ImeTextContext<'_>) -> ImeTarget {
++ let owner = egui::Id::unique(("designcraft-ime", context.document_uid, context.story.0, context.cell.map(|c| (c.table, c.row, c.col))));
++ ImeTarget::new(owner, context.document_epoch)
++}
++
++fn capture_ime_before(app: &DesignApp) -> Option<ImeBefore> {
++ let context = app.session.ime_text_context()?;
++ let snapshot = IMESurroundingText::from_text(context.text, context.focus, context.anchor, None);
++ let stamp = ImeMutationStamp::from_surrounding_text(snapshot.clone());
++ Some(ImeBefore {
++ target: ime_target(&context),
++ stamp,
++ snapshot,
++ document_uid: context.document_uid,
++ document_epoch: context.document_epoch,
++ story: context.story,
++ cell: context.cell,
++ anchor: context.anchor,
++ focus: context.focus,
++ })
++}
++
++fn ime_commit(app: &mut DesignApp, ctx: &egui::Context, text: &str, vi: designcraft_engine::ViewInfo) -> Result<(), String> {
++ let pending = app.pending_ime_delete.take();
++ let before = capture_ime_before(app);
++ let r = if let Some((before_bytes, after_bytes, bytes)) = pending {
++ app.session.ime_commit_after_delete(text, vi, before_bytes, after_bytes, bytes)
++ } else {
++ app.session.ime_commit(text, vi)
++ };
++ app.ime_marked = None;
++ app.ime_target = None;
++ let r = r.map_err(|e| e.to_string());
++ if let Ok(mutation) = &r {
++ note_ime_change(app, ctx, before, mutation.as_ref(), pending);
++ }
++ r.map(|_| ())
++}
++
++fn finish_pending_ime_delete(app: &mut DesignApp, ctx: &egui::Context) {
++ let Some((before_bytes, after_bytes, bytes)) = app.pending_ime_delete.take() else { return };
++ if ime_composition_ended(app) || ime_composition_moved(app) {
++ // The composition ended earlier in this batch: its delete belongs to the copy the system
++ // IME still holds, not to the caret that is there now.
++ drop_stale_ime_events(app);
++ return;
++ }
++ let before = capture_ime_before(app);
++ match app.session.ime_delete_surrounding(before_bytes, after_bytes, bytes) {
++ Ok(mutation) => {
++ // The delete drops the composition (its marked text is not typed): the IME's copy goes.
++ if !app.session.tool_composing() && app.ime_marked.take().is_some() {
++ app.ime_discard = true;
++ }
++ if !app.session.tool_composing() {
++ app.ime_target = None;
++ }
++ note_ime_change(app, ctx, before, mutation.as_ref(), Some((before_bytes, after_bytes, bytes)));
}
++ Err(e) => app.status(e.to_string()),
+ }
- Ok(())
++ app.after_engine();
++}
++
++/// Record the origin of a successful IME mutation.
++///
++/// A receipt is earned only when the engine reported the exact mutation it applied and the bounded
++/// committed snapshot agrees with it. Smart quotes, autocorrect, tracked changes and any other
++/// application transformation therefore report `Other`, as do failed, stale and no-op mutations.
++fn note_ime_change(
++ app: &mut DesignApp,
++ ctx: &egui::Context,
++ before: Option<ImeBefore>,
++ mutation: Option<&ImeMutation>,
++ delete: Option<(usize, usize, bool)>,
++) {
++ let Some(before) = before else { return };
++ let Some(after) = app.session.ime_text_context() else {
++ let viewport = ctx.viewport_id();
++ app.ime_tracker.note_application_change(viewport, ctx.cumulative_frame_nr_for(viewport), before.target);
++ return;
++ };
++ if ime_target(&after) != before.target {
++ return;
++ }
++ let after_snapshot = IMESurroundingText::from_text(after.text, after.focus, after.anchor, None);
++ if &after_snapshot == before.stamp.surrounding_text() {
++ return;
++ }
++ let after_stamp = ImeMutationStamp::from_surrounding_text(after_snapshot.clone());
++ let viewport = ctx.viewport_id();
++ let frame_nr = ctx.cumulative_frame_nr_for(viewport);
++ if mutation.is_some_and(|m| ime_change_is_exact(&before, &after_snapshot, m, delete)) {
++ app.ime_tracker.note_input_method_apply(viewport, frame_nr, before.target, before.stamp, after_stamp);
++ } else {
++ app.ime_tracker.note_application_change(viewport, frame_nr, before.target);
++ }
++}
++
++/// Does the bounded post-mutation snapshot agree with the mutation the engine applied?
++///
++/// The expected result is built from the reported ranges and typed text — absolute byte offsets in
++/// the whole story, not the truncated outgoing window — so a delete that reaches past the window
++/// still matches. Every visible byte of the after window must agree with it, but a mutation the
++/// after window does not overlap at all (a delete longer than the window) rests on the engine's
++/// report alone, which is exact because the engine computed it from the whole story. A rewrite,
++/// tracked changes or a replaced story is not a receipt.
++fn ime_change_is_exact(before: &ImeBefore, after: &IMESurroundingText, m: &ImeMutation, delete: Option<(usize, usize, bool)>) -> bool {
++ // The same target, selection and text the receipt was captured around.
++ if m.document_uid != before.document_uid
++ || m.document_epoch != before.document_epoch
++ || m.story != before.story
++ || m.cell != before.cell
++ || m.anchor_before != before.anchor
++ || m.focus_before != before.focus
++ {
++ return false;
++ }
++ let (Some(before_payload), Some(after_payload)) = (before.snapshot.available(), after.available()) else { return false };
++ let before_text = before_payload.text.as_str();
++ let after_text = after_payload.text.as_str();
++ let selection = m.anchor_before.min(m.focus_before)..m.anchor_before.max(m.focus_before);
++ // The reported deletion adjoins the selection, is inside the text, and exists only for a
++ // delete-surrounding event. Its exact extent is the engine's: it computes the ranges from the
++ // whole story with the requested counts.
++ if m.deleted_before.end != selection.start
++ || m.deleted_after.start != selection.end
++ || m.deleted_before.start > selection.start
++ || m.deleted_after.end > m.text_len_before
++ {
++ return false;
++ }
++ if delete.is_none() && (!m.deleted_before.is_empty() || !m.deleted_after.is_empty()) {
++ return false;
++ }
++ // The story changed by exactly the removed bytes, the replaced selection and the typed text:
++ // tracked changes and an inserted paragraph return (a table anchor) break this identity.
++ let replaced = if m.inserted.is_empty() { 0 } else { selection.len() };
++ let expected_len = m
++ .text_len_before
++ .saturating_sub(m.deleted_before.len())
++ .saturating_sub(m.deleted_after.len())
++ .saturating_sub(replaced)
++ .saturating_add(m.inserted.len());
++ if m.text_len_after != expected_len {
++ return false;
+ }
- Ok(())
++ // A commit collapses the caret after the typed text; a delete keeps the selection, shifted.
++ let (want_anchor, want_focus) = if m.inserted.is_empty() {
++ (m.anchor_before.saturating_sub(m.deleted_before.len()), m.focus_before.saturating_sub(m.deleted_before.len()))
++ } else {
++ let at = m.deleted_before.start + m.inserted.len();
++ (at, at)
++ };
++ if m.anchor_after != want_anchor || m.focus_after != want_focus {
++ return false;
++ }
++ // The text around the caret, rebuilt from the reported mutation. A snapshot's window starts
++ // before its selection's start by the selection's own offset in that window.
++ let before_win = selection.start.saturating_sub(before_payload.cursor.min(before_payload.anchor));
++ let after_selection = m.anchor_after.min(m.focus_after)..m.anchor_after.max(m.focus_after);
++ let after_win = after_selection.start.saturating_sub(after_payload.cursor.min(after_payload.anchor));
++ if after_win.saturating_add(after_payload.cursor) != m.focus_after || after_win.saturating_add(after_payload.anchor) != m.anchor_after {
++ return false;
++ }
++ let before_end = before_win.saturating_add(before_text.len());
++ let after_end = after_win.saturating_add(after_text.len());
++ if before_end > m.text_len_before || after_end > m.text_len_after {
++ return false;
++ }
++ let kept = if m.inserted.is_empty() { selection.len() } else { 0 };
++ let inserted_post = m.deleted_before.start + kept;
++ let tail_post = inserted_post + m.inserted.len();
++ let compared = (|| -> Option<usize> {
++ let mut n = 0usize;
++ n += ime_compare_kept(before_text, before_win..before_end, 0..m.deleted_before.start, 0, after_text, after_win..after_end)?;
++ if kept > 0 {
++ n += ime_compare_kept(before_text, before_win..before_end, selection.clone(), m.deleted_before.start, after_text, after_win..after_end)?;
++ }
++ n += ime_compare_window(after_text, after_win..after_end, &(inserted_post..tail_post), &m.inserted)?;
++ n += ime_compare_kept(
++ before_text,
++ before_win..before_end,
++ m.deleted_after.end..m.text_len_before,
++ tail_post,
++ after_text,
++ after_win..after_end,
++ )?;
++ Some(n)
++ })();
++ compared.is_some()
++}
++
++/// Compare one unchanged piece of the story: the pre-mutation bytes `pre` (absolute) appear at
++/// post-mutation offset `post_start`. Returns the number of bytes compared, or `None` on a
++/// mismatch. Bytes outside the bounded before window cannot be checked and are skipped.
++fn ime_compare_kept(
++ before_text: &str,
++ before_win: std::ops::Range<usize>,
++ pre: std::ops::Range<usize>,
++ post_start: usize,
++ after_text: &str,
++ after_win: std::ops::Range<usize>,
++) -> Option<usize> {
++ let from = pre.start.max(before_win.start);
++ let to = pre.end.min(before_win.end);
++ if from >= to {
++ return Some(0);
++ }
++ let expected = before_text.get(from - before_win.start..to - before_win.start)?;
++ let post = post_start + (from - pre.start)..post_start + (to - pre.start);
++ ime_compare_window(after_text, after_win, &post, expected)
++}
++
++/// Compare `expected`, which begins at absolute post-mutation offset `post.start`, with what the
++/// after window shows of it. Returns the number of bytes compared; `None` when they differ.
++fn ime_compare_window(after_text: &str, after_win: std::ops::Range<usize>, post: &std::ops::Range<usize>, expected: &str) -> Option<usize> {
++ let from = post.start.max(after_win.start);
++ let to = post.end.min(after_win.end);
++ if from >= to {
++ return Some(0);
++ }
++ let actual = after_text.get(from - after_win.start..to - after_win.start)?;
++ let skip = from - post.start;
++ let want = expected.get(skip..skip + (to - from))?;
++ (actual == want).then_some(to - from)
}
/// End a composition outside the IME (a click away, the canvas losing the keyboard): the marked
@@@ -2710,6 -2795,6 +3111,7 @@@ pub(crate) fn keep_marked_text(app: &mu
if app.ime_marked.take().is_some() {
app.ime_discard = true;
}
++ app.ime_target = None;
if app.session.tool_composing() {
if let Err(e) = app.session.end_composition() {
app.status(e.to_string());
@@@ -2718,31 -2803,31 +3120,83 @@@
}
}
++/// What the canvas found for this viewport pass, observed once at the end of the pass.
++pub(crate) struct CanvasIme {
++ /// The viewport it was found in: the second window's canvas runs inside the root's pass and
++ /// must not consume the root's observation.
++ viewport: egui::ViewportId,
++ /// The caret's screen rectangle, when the canvas owns the text caret this pass.
++ caret: Option<Rect>,
++}
++
/// While the text caret is in the canvas, let the system IME compose (egui-winit allows it only in
/// frames that set `ime`; the web build focuses its hidden text input then) and keep the candidate
/// window at the caret, through zoom, scrolling, view rotation and vertical text.
--fn ime_output(app: &mut DesignApp, ctx: &egui::Context, xf: &Xf) {
++///
++/// The caret is only recorded here: the observation waits for the end of the viewport's pass, so
++/// a command or a field that takes the keyboard in a later section of the UI is included.
++fn ime_canvas_pass(app: &mut DesignApp, ctx: &egui::Context, xf: &Xf) {
if !keyboard_pane(app) {
++ // Both panes see the same viewport and events. The focused pane owns this viewport's one
++ // observation; observing for the other would reset the context every split-window frame.
return;
}
// A text field, dialog or Quick Apply has the keyboard: egui's own text editing serves the IME.
let ours = app.session.wants_text() && !ctx.text_edit_focused() && !modal_open(app);
let caret = if ours { app.session.tool_ime_caret(app.view_info()) } else { None };
-- let Some((a, b)) = caret else {
++ let caret = caret.map(|(a, b)| Rect::from_two_pos(xf.to_screen(a), xf.to_screen(b)).expand(1.0));
++ app.canvas_ime = caret.is_some();
++ app.ime_canvas = Some(CanvasIme { viewport: ctx.viewport_id(), caret });
++}
++
++/// Observe the IME once for this viewport pass, after every command and focus change it applied.
++pub(crate) fn ime_observe(app: &mut DesignApp, ctx: &egui::Context) {
++ let viewport = ctx.viewport_id();
++ if app.ime_canvas.as_ref().is_none_or(|canvas| canvas.viewport != viewport) {
++ return;
++ }
++ let Some(canvas) = app.ime_canvas.take() else { return };
++ // A text field, dialog or Quick Apply that took the keyboard later in the pass owns the IME.
++ let ours = canvas.caret.is_some() && !ctx.text_edit_focused() && !modal_open(app);
++ let Some(r) = canvas.caret.filter(|_| ours) else {
// The IME goes away with its marked text: keep that text as typed, like a click away.
keep_marked_text(app);
++ app.ime_tracker.observe(viewport, None);
return;
};
-- let r = Rect::from_two_pos(xf.to_screen(a), xf.to_screen(b)).expand(1.0);
// The composition ended outside the IME (a click, a command): the IME drops what it has marked.
-- let interrupt = app.ime_marked.is_some() && !app.session.tool_composing();
++ let interrupt = app.ime_interrupt || (app.ime_marked.is_some() && !app.session.tool_composing());
++ app.ime_interrupt = false;
if interrupt {
app.ime_marked = None;
++ app.ime_target = None;
app.ime_discard = true;
}
app.canvas_ime = true;
++ // One observation per viewport pass, after this pass's events and commands. The committed
++ // text excludes any active pre-edit, and the tracker copies only the bounded IME window.
++ let update = match app.session.ime_text_context() {
++ Some(context) => {
++ let observation = ImeObservation::new(ctx.cumulative_frame_nr_for(viewport), ctx.cumulative_pass_nr_for(viewport), ime_target(&context))
++ .purpose(egui::IMEPurpose::Normal)
++ .committed(Some(CommittedText::new(context.text, context.focus, context.anchor)));
++ app.ime_tracker.observe(viewport, Some(observation))
++ }
++ None => app.ime_tracker.observe(viewport, None),
++ };
++ let Some(update) = update else { return };
ctx.output_mut(|o| {
-- o.ime = Some(egui::output::IMEOutput { purpose: egui::IMEPurpose::Normal, rect: r, cursor_rect: r, should_interrupt_composition: interrupt });
++ o.ime = Some(egui::output::IMEOutput {
++ owner: update.owner,
++ context_generation: update.context_generation,
++ purpose: update.purpose,
++ rect: r,
++ cursor_rect: r,
++ should_interrupt_composition: interrupt,
++ reset_request: None,
++ change_cause: update.change_cause,
++ surrounding_text: update.surrounding_text,
++ });
});
}
@@@ -2818,7 -2903,7 +3272,7 @@@ fn draw_flattener_preview(painter: &egu
/// story version).
fn draw_dynamic_spelling(app: &DesignApp, ctx: &egui::Context, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
for story in doc.stories.values() {
-- let key = egui::Id::new(("dyn_spell", std::sync::Arc::as_ptr(story) as usize, doc.user_words.len()));
++ let key = egui::Id::unique(("dyn_spell", std::sync::Arc::as_ptr(story) as usize, doc.user_words.len()));
let bad: std::sync::Arc<Vec<std::ops::Range<usize>>> = match ctx.data(|d| d.get_temp(key)) {
Some(v) => v,
None => {
@@@ -2878,7 -2963,7 +3332,7 @@@ const ZERO_POINT_DRAG: &str = "canvas_z
/// Cmd-dragged (Ctrl elsewhere), it makes a horizontal and a vertical guide instead.
/// Holds the pointer position while dragging; returns true while it owns the pointer.
fn zero_point_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-- let id = egui::Id::new((ZERO_POINT_DRAG, app.pane));
++ let id = egui::Id::unique((ZERO_POINT_DRAG, app.pane));
let corner = Rect::from_min_max(resp.rect.min, rect.min);
let (pressed, released, down, origin, latest, dbl, command) = ui.input(|i| {
(
@@@ -3179,7 -3264,7 +3633,7 @@@ fn guide_at(app: &DesignApp, xf: &Xf, p
/// the guide is selected and the object is not. Returns true from the press to the release, so
/// the tools never see that press.
fn guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-- let id = egui::Id::new(GUIDE_DRAG);
++ let id = egui::Id::unique(GUIDE_DRAG);
let (pressed, released, origin, latest) =
ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos()));
let mut drag: Option<GuideDrag> = ui.data(|d| d.get_temp(id));
@@@ -3208,7 -3293,7 +3662,7 @@@
if !shift && !selected {
let _ = app.run("guide.select", json!({"spread": r, "page": pi, "index": gi}));
}
-- ui.data_mut(|d| d.insert_temp(egui::Id::new(GUIDE_PRESS), GuidePress { origin: o, shift }));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique(GUIDE_PRESS), GuidePress { origin: o, shift }));
drag = Some(GuideDrag { orientation, from: Some((r, pi, gi)), at: Some(o), mods: egui::Modifiers::NONE });
}
}
@@@ -3227,8 -3312,8 +3681,8 @@@
}
ui.data_mut(|d| d.remove::<GuideDrag>(id));
let press: Option<GuidePress> = ui.data_mut(|d| {
-- let press = d.get_temp(egui::Id::new(GUIDE_PRESS));
-- d.remove::<GuidePress>(egui::Id::new(GUIDE_PRESS));
++ let press = d.get_temp(egui::Id::unique(GUIDE_PRESS));
++ d.remove::<GuidePress>(egui::Id::unique(GUIDE_PRESS));
press
});
let Some(p) = g.at else { return true };
@@@ -3490,7 -3575,7 +3944,7 @@@ fn snap_gutter(app: &DesignApp, g: &Col
/// move its gutter, both guides together; Escape puts it back. One undo step per drag. Returns
/// true while it owns the pointer.
fn column_guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-- let id = egui::Id::new((COLUMN_DRAG, app.pane));
++ let id = egui::Id::unique((COLUMN_DRAG, app.pane));
let (pressed, released, origin, latest, shift, escape) = ui.input(|i| {
(
i.pointer.primary_pressed(),
@@@ -3721,7 -3806,7 +4175,14 @@@ mod tests
}
fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
-- let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).build_ui_state(
++ harness_with_step(app, 1.0 / 4.0)
++ }
++
++ /// A window whose frames last `step_dt` seconds. Wheel motion is tested at a realistic frame
++ /// rate: egui ends a scroll action after 150 ms without wheel events, so quarter-second
++ /// frames would split every motion into separate actions.
++ fn harness_with_step(app: DesignApp, step_dt: f32) -> Harness<'static, DesignApp> {
++ let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(step_dt).build_ui_state(
|ui, app: &mut DesignApp| {
let ctx = ui.ctx().clone();
app.logic(&ctx);
@@@ -3937,12 -4022,12 +4398,19 @@@
harness(app)
}
++ /// [`new_document`] at 60 frames a second, the cadence a wheel motion really arrives at.
++ fn new_document_60fps() -> Harness<'static, DesignApp> {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ app.run("file.new", json!({})).unwrap();
++ harness_with_step(app, 1.0 / 60.0)
++ }
++
fn held(modifiers: egui::Modifiers) -> egui::Event {
egui::Event::ModifiersChanged(modifiers)
}
fn wheel(phase: egui::TouchPhase, up: f32, modifiers: egui::Modifiers) -> egui::Event {
-- egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, up), phase, modifiers }
++ egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, up), phase, modifiers, source: egui::MouseWheelSource::Unknown }
}
// Plays `events` with the pointer at `at`, a frame each, and lets the motion settle.
@@@ -4000,7 -4085,7 +4468,7 @@@
|key| vec![vec![held(key | Modifiers::SHIFT), wheel(Move, 100.0, key | Modifiers::SHIFT)]],
];
for (i, motion) in motions.iter().enumerate() {
-- let (mut with_alt, mut with_command) = (new_document(), new_document());
++ let (mut with_alt, mut with_command) = (new_document_60fps(), new_document_60fps());
let at = with_alt.state().canvas_rect.unwrap().center() + vec2(150.0, 90.0);
let start = *with_alt.state().view().unwrap();
for (alt, command) in motion(Modifiers::ALT).iter().zip(motion(Modifiers::COMMAND)) {
@@@ -4030,8 -4115,8 +4498,8 @@@
egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() },
|ui| {
app.logic(ui.ctx());
-- // Fonts installed by logic become available at the start of the next frame,
-- // just as in the full application UI.
++ // Fonts are installed by the first real UI pass, just as in the full application.
++ app.ui_setup(ui.ctx());
if app.fonts_ready {
show(app, ui);
}
@@@ -4829,7 -4914,7 +5297,7 @@@
primary(&mut h, ruler, true);
h.event(egui::Event::PointerMoved(dest));
h.run_steps(2);
-- let g = h.ctx.data(|d| d.get_temp::<GuideDrag>(egui::Id::new(GUIDE_DRAG))).expect("dragging");
++ let g = h.ctx.data(|d| d.get_temp::<GuideDrag>(egui::Id::unique(GUIDE_DRAG))).expect("dragging");
assert_eq!(g.orientation, designcraft_doc::Orientation::Horizontal);
assert!(guide_readout(h.state(), &xf, &g).is_some_and(|t| t.starts_with("Y: ")));
primary(&mut h, dest, false);
@@@ -5500,6 -5585,6 +5968,428 @@@
egui::Event::Ime(egui::ImeEvent::Preedit { text: t.into(), active_range_chars: Some(c..c) })
}
++ fn ime_payload(ime: &egui::output::IMEOutput) -> Option<(&str, usize, usize)> {
++ ime.surrounding_text.available().map(|p| (p.text.as_str(), p.cursor, p.anchor))
++ }
++
++ fn text_selection(app: &mut DesignApp, sid: &Value, anchor: usize, focus: usize) {
++ app.session.execute("text.select", &json!({"story": sid, "anchor": anchor, "focus": focus})).unwrap();
++ }
++
++ struct NativeClickFixture {
++ app: DesignApp,
++ ctx: egui::Context,
++ target: Value,
++ old: Value,
++ at: Pos2,
++ focus: usize,
++ }
++
++ fn native_gui_click_fixture() -> NativeClickFixture {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let old = typing_app(&mut app, &ctx, "Old story");
++ let frame = app.run("frame.create", json!({"rect": [36, 280, 300, 400], "content": "text", "text": "Target story"})).unwrap();
++ let target = frame["story"].clone();
++ // Measure an interior first-word caret through the engine, rather than guessing a
++ // font-dependent screen pixel or clicking the frame's resize border.
++ let (point, focus) = (50..180)
++ .find_map(|x| {
++ app.run("text.placeCaret", json!({"frame": frame["id"], "point": [x, 290]})).unwrap();
++ let sel = app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(sel.story.0, target.as_u64().unwrap());
++ (1..5).contains(&sel.focus).then_some((Point::new(f64::from(x), 290.0), sel.focus))
++ })
++ .expect("an interior point in the target's first word");
++ text_selection(&mut app, &old, "Old story".len(), "Old story".len());
++ for _ in 0..4 {
++ ime_frame(&mut app, &ctx, vec![]);
++ }
++ let at = on_screen(&app, point);
++ assert!(app.canvas_rect.unwrap().contains(at));
++ ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at)]);
++ assert_eq!(app.session.doc().unwrap().selection.text.unwrap().story.0, old.as_u64().unwrap());
++ NativeClickFixture { app, ctx, target, old, at, focus }
++ }
++
++ fn native_gui_button(pos: Pos2, pressed: bool) -> egui::Event {
++ egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }
++ }
++
++ /// The 37-byte Devanagari line the native run had in the previous story.
++ const NATIVE_GUI_OLD_DEVANAGARI: &str = "नमस्ते दुनिया";
++
++ /// The click fixture with the non-empty selection in the previous story that the native
++ /// Windows run had (37-byte Devanagari, 0..37). A non-empty selection shows the contextual
++ /// task bar; keep it present but clear of the target click.
++ fn native_gui_selected_old_click_fixture() -> NativeClickFixture {
++ let mut f = native_gui_click_fixture();
++ text_selection(&mut f.app, &f.old, 0, "Old story".len());
++ f.app.run("text.insert", json!({"text": NATIVE_GUI_OLD_DEVANAGARI})).unwrap();
++ text_selection(&mut f.app, &f.old, 0, NATIVE_GUI_OLD_DEVANAGARI.len());
++ for _ in 0..4 {
++ ime_frame(&mut f.app, &f.ctx, vec![]);
++ }
++ let sel = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((sel.story.0, sel.anchor, sel.focus), (f.old.as_u64().unwrap(), 0, NATIVE_GUI_OLD_DEVANAGARI.len()));
++ assert_eq!(NATIVE_GUI_OLD_DEVANAGARI.len(), 37, "the native fixture's Devanagari line was 37 UTF-8 bytes");
++ assert!(!sel.is_caret(), "the previous story's selection is non-empty");
++ assert!(!context_menu_open(&f.ctx), "no context menu owns this frame's keys");
++ assert!(f.app.ui.dialog.is_none() && f.app.ui.palette.is_none(), "no modal owns the keyboard");
++ assert!(!f.ctx.text_edit_focused(), "no text field owns the keyboard");
++ assert_eq!(f.app.pane, f.app.focus_pane, "the canvas pane takes the keyboard");
++ let task_bar = egui::Id::unique(("task_bar", f.ctx.viewport_id(), f.app.pane));
++ let bar = f.ctx.memory(|m| m.area_rect(task_bar)).expect("the old selection shows the floating task bar");
++ assert!(!bar.contains(f.at), "the floating task bar does not cover the target click at {bar:?}");
++ f
++ }
++
++ fn native_gui_input(f: &mut NativeClickFixture, events: Vec<egui::Event>, discard: bool) -> Vec<(bool, bool, bool)> {
++ let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))), events, ..Default::default() };
++ let mut edges = Vec::new();
++ let mut out = f.ctx.run_ui(raw, |ui| {
++ edges.push(ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin().is_some())));
++ f.app.logic(ui.ctx());
++ f.app.ui(ui);
++ if discard && edges.len() == 1 {
++ ui.ctx().request_discard("native same-batch click exactly-once regression");
++ }
++ });
++ if discard {
++ assert_eq!(out.platform_output.num_completed_passes, 2, "the requested discarded pass actually ran");
++ }
++ out.textures_delta.clear();
++ edges
++ }
++
++ fn native_gui_released(f: &NativeClickFixture) {
++ assert!(!f.ctx.input(|i| i.pointer.primary_down()), "the native primary button is up");
++ let down = f.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", f.app.pane)))).unwrap_or(false);
++ assert!(!down, "the canvas retained a released pointer");
++ assert!(!f.app.session.tool_busy(), "a released click must not leave a tool gesture");
++ }
++
++ fn native_gui_second_click_target(f: &mut NativeClickFixture) -> (Value, Pos2, usize) {
++ let frame = f.app.run("frame.create", json!({"rect": [330, 280, 575, 400], "content": "text", "text": "Second story"})).unwrap();
++ let story = frame["story"].clone();
++ let (point, focus) = (345..465)
++ .find_map(|x| {
++ f.app.run("text.placeCaret", json!({"frame": frame["id"], "point": [x, 290]})).unwrap();
++ let sel = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(sel.story.0, story.as_u64().unwrap());
++ (1..5).contains(&sel.focus).then_some((Point::new(f64::from(x), 290.0), sel.focus))
++ })
++ .expect("an independently measured interior caret in the second story");
++ text_selection(&mut f.app, &f.old, "Old story".len(), "Old story".len());
++ for _ in 0..4 {
++ ime_frame(&mut f.app, &f.ctx, vec![]);
++ }
++ let at = on_screen(&f.app, point);
++ assert!(f.app.canvas_rect.unwrap().contains(f.at));
++ assert!(f.app.canvas_rect.unwrap().contains(at));
++ let max_click_dist = f.ctx.options(|o| o.input_options.max_click_dist);
++ assert!((at - f.at).length() > max_click_dist, "the two target presses must not form a double click");
++ (story, at, focus)
++ }
++
++ #[test]
++ fn native_gui_two_completed_clicks_use_last_primary_press_once() {
++ for reverse in [false, true] {
++ for discard in [false, true] {
++ let mut f = native_gui_click_fixture();
++ let (second, second_at, second_focus) = native_gui_second_click_target(&mut f);
++ let (first_at, last_at, final_story, final_focus) =
++ if reverse { (second_at, f.at, f.target.clone(), f.focus) } else { (f.at, second_at, second.clone(), second_focus) };
++ let initial = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((initial.story.0, initial.anchor, initial.focus), (f.old.as_u64().unwrap(), "Old story".len(), "Old story".len()));
++ let undo = f.app.session.doc().unwrap().history.undo.len();
++ let journal = f.app.session.journal.len();
++ let edges = native_gui_input(
++ &mut f,
++ vec![
++ egui::Event::PointerMoved(first_at),
++ native_gui_button(first_at, true),
++ native_gui_button(first_at, false),
++ egui::Event::PointerMoved(last_at),
++ native_gui_button(last_at, true),
++ native_gui_button(last_at, false),
++ ],
++ discard,
++ );
++ assert_eq!(edges[0], (true, true, false), "both completed clicks leave no held origin");
++ assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "discard must not replay either press");
++ let sel = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(
++ (sel.story.0, sel.anchor, sel.focus),
++ (final_story.as_u64().unwrap(), final_focus, final_focus),
++ "reverse={reverse}, discard={discard}"
++ );
++ let commands = &f.app.session.journal[journal..];
++ assert_eq!(
++ commands.iter().filter(|(id, _)| id == "text.placeCaret").count(),
++ 1,
++ "one aggregate canvas selection, reverse={reverse}, discard={discard}"
++ );
++ assert_eq!(
++ commands.iter().filter(|(id, _)| id == "text.release").count(),
++ 1,
++ "one corresponding release, reverse={reverse}, discard={discard}"
++ );
++ let clicks =
++ f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one recovered canvas press");
++ assert_eq!(clicks.n, 1, "separated clicks and discarded passes must not select a word");
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo, "pointer selection adds no document history");
++ native_gui_released(&f);
++ native_gui_input(&mut f, vec![egui::Event::Text("!".into())], false);
++ let mut target_text = "Target story".to_owned();
++ let mut second_text = "Second story".to_owned();
++ if reverse {
++ target_text.insert(final_focus, '!');
++ } else {
++ second_text.insert(final_focus, '!');
++ }
++ assert_eq!(story_text(&mut f.app, &f.target), target_text);
++ assert_eq!(story_text(&mut f.app, &second), second_text);
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "typing at the final caret is one edit");
++ native_gui_released(&f);
++ }
++ }
++ }
++
++ #[test]
++ fn native_gui_nonfinite_final_press_cannot_reuse_an_earlier_click() {
++ for discard in [false, true] {
++ let mut f = native_gui_click_fixture();
++ let at = f.at;
++ let initial = f.app.session.doc().unwrap().selection.text;
++ let undo = f.app.session.doc().unwrap().history.undo.len();
++ let journal = f.app.session.journal.len();
++ let edges = native_gui_input(
++ &mut f,
++ vec![
++ egui::Event::PointerMoved(at),
++ native_gui_button(at, true),
++ native_gui_button(at, false),
++ native_gui_button(pos2(f32::NAN, at.y), true),
++ egui::Event::PointerMoved(at),
++ native_gui_button(at, false),
++ ],
++ discard,
++ );
++ assert_eq!(edges[0], (true, true, false));
++ assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "discard must not replay malformed input");
++ assert_eq!(
++ f.app.session.doc().unwrap().selection.text,
++ initial,
++ "discard={discard}: reject the last press instead of reviving an earlier valid one"
++ );
++ assert!(f.app.session.journal[journal..].iter().all(|(id, _)| id != "text.placeCaret" && id != "text.release"));
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo);
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ native_gui_released(&f);
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(at + vec2(90.0, 0.0))], false);
++ assert_eq!(f.app.session.doc().unwrap().selection.text, initial, "motion after the invalid released press cannot drag");
++ native_gui_released(&f);
++ }
++ }
++
++ #[test]
++ fn native_gui_same_batch_click_switches_story_once_before_typing() {
++ for discard in [false, true] {
++ let mut f = native_gui_click_fixture();
++ let undo = f.app.session.doc().unwrap().history.undo.len();
++ let at = f.at;
++ let edges =
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(at), native_gui_button(at, true), native_gui_button(at, false)], discard);
++ assert_eq!(edges[0], (true, true, false), "the real input consumed both edges and cleared the origin");
++ assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "a discarded pass must not replay the press");
++ let selection = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((selection.story.0, selection.anchor, selection.focus), (f.target.as_u64().unwrap(), f.focus, f.focus), "discard={discard}");
++ let clicks = f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one actual canvas click");
++ assert_eq!(clicks.n, 1, "discard={discard}: replay must not turn a caret into word selection");
++ native_gui_released(&f);
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo, "a click is not a document edit");
++ let end = |pressed| egui::Event::Key { key: egui::Key::End, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
++ native_gui_input(&mut f, vec![end(true), end(false)], false);
++ let caret = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((caret.story.0, caret.focus), (f.target.as_u64().unwrap(), "Target story".len()));
++ native_gui_input(&mut f, vec![egui::Event::Text("!".into())], false);
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story!");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "one typed edit, including discarded-pass control");
++ f.app.run("edit.undo", json!({})).unwrap();
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ f.app.run("edit.redo", json!({})).unwrap();
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story!");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ native_gui_released(&f);
++ }
++ }
++
++ /// The native Windows failure: with a non-empty selection in another story, a click that
++ /// switches stories followed by End in the same job left the new story's caret at the click
++ /// point. End in a later job worked. Drive the actual app UI and actual pointer/key events in
++ /// one batch, in split batches, and with End while the press is still held; discard a pass to
++ /// cover replay. The End press must reach the type tool once and win over the click, wherever
++ /// the pointer release falls, and typing must go there once.
++ #[test]
++ fn native_gui_click_then_end_in_one_batch_keeps_the_target_caret_at_the_story_end() {
++ let names = ["same batch, click events first", "click batch then End batch", "End while the press is held"];
++ for (layout, name) in names.into_iter().enumerate() {
++ for discard in [false, true] {
++ let mut f = native_gui_selected_old_click_fixture();
++ let (at, target, old) = (f.at, f.target.clone(), f.old.clone());
++ let undo = f.app.session.doc().unwrap().history.undo.len();
++ let journal = f.app.session.journal.len();
++ let moved = || egui::Event::PointerMoved(at);
++ let down = || native_gui_button(at, true);
++ let up = || native_gui_button(at, false);
++ let end =
++ |pressed| egui::Event::Key { key: egui::Key::End, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
++ let batches: Vec<Vec<egui::Event>> = match layout {
++ 0 => vec![vec![moved(), down(), up(), end(true), end(false)]],
++ 1 => vec![vec![moved(), down(), up()], vec![end(true), end(false)]],
++ _ => vec![vec![moved(), down()], vec![end(true)], vec![up(), end(false)]],
++ };
++ for events in batches {
++ native_gui_input(&mut f, events, discard);
++ }
++ let selection = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(
++ (selection.story.0, selection.anchor, selection.focus),
++ (target.as_u64().unwrap(), "Target story".len(), "Target story".len()),
++ "{name}, discard={discard}: End must win after the click, wherever the release falls"
++ );
++ let commands = &f.app.session.journal[journal..];
++ assert_eq!(
++ commands.iter().filter(|(id, _)| id == "text.move").count(),
++ 1,
++ "{name}, discard={discard}: the End press reached the type tool once"
++ );
++ let clicks = f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one actual canvas click");
++ assert_eq!(clicks.n, 1, "{name}, discard={discard}: a discarded pass must not replay the press as a word selection");
++ native_gui_released(&f);
++ native_gui_input(&mut f, vec![egui::Event::Text("!".into())], discard);
++ assert_eq!(story_text(&mut f.app, &target), "Target story!", "{name}, discard={discard}: typing lands at the End caret once");
++ assert_eq!(story_text(&mut f.app, &old), NATIVE_GUI_OLD_DEVANAGARI);
++ assert_eq!(
++ f.app.session.journal[journal..].iter().filter(|(id, _)| id == "text.insert").count(),
++ 1,
++ "{name}, discard={discard}: the text event is not replayed"
++ );
++ assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "{name}, discard={discard}: one edit");
++ }
++ }
++ }
++
++ #[test]
++ fn native_gui_split_click_and_drag_release_keep_pointer_ownership() {
++ for drag in [false, true] {
++ let mut f = native_gui_click_fixture();
++ let at = f.at;
++ native_gui_input(&mut f, vec![native_gui_button(at, true)], false);
++ let sel = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((sel.story.0, sel.focus), (f.target.as_u64().unwrap(), f.focus));
++ assert!(f.ctx.input(|i| i.pointer.primary_down()));
++ assert!(f.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", f.app.pane)))).unwrap());
++ if drag {
++ let moved = at + vec2(60.0, 0.0);
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(moved)], false);
++ let sel = f.app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(sel.story.0, f.target.as_u64().unwrap());
++ assert!(!sel.is_caret(), "a real held drag selects text");
++ }
++ let release = if drag { pos2(-20.0, at.y) } else { at };
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(release), native_gui_button(release, false)], false);
++ native_gui_released(&f);
++ let selection = f.app.session.doc().unwrap().selection.text;
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(at + vec2(90.0, 0.0))], false);
++ assert_eq!(f.app.session.doc().unwrap().selection.text, selection, "motion after release cannot continue the old drag");
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ }
++ }
++
++ #[test]
++ fn native_gui_outside_press_and_open_menu_do_not_click_through() {
++ for menu in [false, true] {
++ let mut f = native_gui_click_fixture();
++ let at = f.at;
++ let selection = f.app.session.doc().unwrap().selection.text;
++ if menu {
++ let blank = f.app.canvas_rect.unwrap().max - vec2(30.0, 30.0);
++ for pressed in [true, false] {
++ let event =
++ egui::Event::PointerButton { pos: blank, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() };
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(blank), event], false);
++ }
++ assert!(context_menu_open(&f.ctx), "the actual secondary click opened the canvas menu");
++ assert_eq!(f.app.session.doc().unwrap().selection.text, selection);
++ native_gui_input(&mut f, vec![egui::Event::PointerMoved(at), native_gui_button(at, true), native_gui_button(at, false)], false);
++ } else {
++ let outside = pos2(-20.0, -20.0);
++ assert!(!f.app.canvas_rect.unwrap().contains(outside));
++ native_gui_input(
++ &mut f,
++ vec![
++ egui::Event::PointerMoved(outside),
++ native_gui_button(outside, true),
++ egui::Event::PointerMoved(at),
++ native_gui_button(at, false),
++ ],
++ false,
++ );
++ }
++ assert_eq!(f.app.session.doc().unwrap().selection.text, selection, "menu={menu}: an unowned press cannot move the old caret");
++ assert_eq!(story_text(&mut f.app, &f.target), "Target story");
++ assert_eq!(story_text(&mut f.app, &f.old), "Old story");
++ native_gui_released(&f);
++ }
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn native_gui_font_inventory_keeps_exact_regular_and_missing_style_diagnostics() {
++ if designcraft_fonts::CRAFT_FONTS.is_empty() {
++ assert!(std::env::var_os("CRAFT_FONTS_REQUIRED").is_none(), "required canonical fonts were not embedded");
++ return; // The supported optional-input build has no central document fonts.
++ }
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ app.run("file.new", json!({})).unwrap();
++ for (family, text) in [("Noto Sans Hebrew", "שלום"), ("Noto Sans Devanagari", "नमस्ते")] {
++ assert!(designcraft_fonts::CRAFT_FONTS.iter().any(|f| f.family == family && f.style == "Regular"), "canonical {family} Regular absent");
++ for style in ["Regular", "Unavailable Native GUI Style"] {
++ let frame = app.run("frame.create", json!({"rect": [36, 36, 300, 120], "content": "text", "text": text})).unwrap();
++ app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": text.len()})).unwrap();
++ app.run("type.char", json!({"fontFamily": family, "fontStyle": style})).unwrap();
++ }
++ }
++ let frame = app.run("frame.create", json!({"rect": [36, 36, 300, 120], "content": "text", "text": "Missing"})).unwrap();
++ app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": 7})).unwrap();
++ app.run("type.char", json!({"fontFamily": "Unavailable Native GUI Family", "fontStyle": "Regular"})).unwrap();
++ let inventory = app.run("font.list", json!({})).unwrap();
++ let rows = inventory.as_array().unwrap();
++ assert_eq!(rows.len(), 5, "{inventory}");
++ for family in ["Noto Sans Hebrew", "Noto Sans Devanagari"] {
++ for style in ["Regular", "Unavailable Native GUI Style"] {
++ let row = rows.iter().find(|r| r["family"] == family && r["style"] == style).unwrap();
++ assert_eq!(row["missing"], false, "{row}");
++ assert_eq!(row["styleMissing"], style != "Regular", "{row}");
++ assert_eq!(row["matchStatus"], if style == "Regular" { "exact" } else { "styleSubstitute" }, "{row}");
++ assert_eq!(row["resolvedFamily"], family, "{row}");
++ assert_eq!(row["resolvedStyle"], "Regular", "{row}");
++ assert_eq!(row["source"], "bundled", "an installed or injected face cannot satisfy this production contract: {row}");
++ }
++ }
++ let missing = rows.iter().find(|r| r["family"] == "Unavailable Native GUI Family").unwrap();
++ assert_eq!(missing["missing"], true, "{missing}");
++ assert_eq!(missing["matchStatus"], "missing", "{missing}");
++ assert!(missing["source"].is_null(), "{missing}");
++ }
++
#[test]
#[allow(deprecated)] // `ImeEvent::Enabled` / `Disabled`: egui no longer sends them, other integrations may.
fn ime_events_compose_in_the_story_with_the_candidate_window_at_the_caret() {
@@@ -5582,6 -5667,6 +6472,312 @@@
assert_eq!(story_text(&mut app, &sid), "abde日");
}
++ #[test]
++ fn ime_reports_the_committed_story_and_excludes_the_pre_edit() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, "a😀b");
++ let len = "a😀b".len();
++ text_selection(&mut app, &sid, 0, len);
++ let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("a😀b", len, 0)), "reversed selection keeps its direction");
++ let owner = (ime.owner, ime.context_generation);
++ // Marked text previews in the document but is not committed surrounding text.
++ let ime = ime_frame(&mut app, &ctx, vec![preedit("に", 1)]).expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("a😀b", len, 0)));
++ assert_eq!(ime.owner, owner.0);
++ let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]).expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("日", 3, 3)));
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
++ assert_eq!(story_text(&mut app, &sid), "日");
++ assert_eq!(ime.owner, owner.0);
++ assert_eq!(ime.context_generation, owner.1, "a commit is not a new context");
++ let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("日", 3, 3)), "a later pass reports the same committed text");
++ assert_eq!((ime.owner, ime.context_generation), owner, "an unchanged pass keeps the context");
++ }
++
++ #[test]
++ fn ime_empty_story_is_available_and_wide_text_is_bounded() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ typing_app(&mut app, &ctx, "");
++ let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("", 0, 0)), "an empty document is available, not unavailable");
++ assert!(!app.session.tool_composing());
++
++ let long = "a".repeat(5000);
++ let sid = typing_app(&mut app, &ctx, &long);
++ let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ let (text, _, _) = ime_payload(&ime).expect("a long document still has surrounding text");
++ assert!(text.len() <= egui::output::MAX_IME_SURROUNDING_TEXT_BYTES, "{}", text.len());
++ text_selection(&mut app, &sid, 0, 5000);
++ let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert!(ime.surrounding_text.available().is_none(), "a selection beyond the bound is explicitly unavailable");
++ }
++
++ #[test]
++ fn ime_owner_follows_the_story_and_the_document() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ typing_app(&mut app, &ctx, "ab");
++ let first = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ app.session.execute("text.move", &json!({"dir": "left"})).unwrap();
++ let moved = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_eq!((moved.owner, moved.context_generation), (first.owner, first.context_generation), "a caret move keeps the context");
++
++ let other = app.run("frame.create", json!({"rect": [400, 36, 200, 100], "content": "text", "text": "xy"})).unwrap();
++ let other_sid = other["story"].clone();
++ text_selection(&mut app, &other_sid, 2, 2);
++ let second = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_ne!(second.owner, first.owner, "another story is another owner");
++ assert_ne!(second.context_generation, first.context_generation);
++
++ app.run("file.new", json!({})).unwrap();
++ let doc = app.run("frame.create", json!({"rect": [36, 36, 200, 100], "content": "text", "text": "z"})).unwrap();
++ text_selection(&mut app, &doc["story"], 1, 1);
++ let replaced = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
++ assert_ne!(replaced.owner, second.owner, "a new document is another owner");
++ assert_eq!(ime_payload(&replaced), Some(("z", 1, 1)));
++ }
++
++ #[test]
++ fn ime_cause_distinguishes_commits_from_application_edits() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ typing_app(&mut app, &ctx, "a");
++ let committed = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]).expect("a text caret");
++ assert_eq!(committed.change_cause, egui::output::ImeChangeCause::InputMethod);
++ let typed = ime_frame(&mut app, &ctx, vec![egui::Event::Text("!".into())]).expect("a text caret");
++ assert_eq!(typed.change_cause, egui::output::ImeChangeCause::Other, "ordinary typing is an application edit");
++ assert_eq!(ime_payload(&typed), Some(("a日!", 5, 5)));
++
++ // An application edit before the commit in one pass breaks the receipt chain.
++ let mut before = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ typing_app(&mut before, &ctx, "a");
++ let mixed = ime_frame(&mut before, &ctx, vec![egui::Event::Text("x".into()), egui::Event::Ime(egui::ImeEvent::Commit("日".into()))])
++ .expect("a text caret");
++ assert_eq!(mixed.change_cause, egui::output::ImeChangeCause::Other);
++ assert_eq!(ime_payload(&mixed), Some(("ax日", 5, 5)));
++
++ // An application edit after the commit in one pass also dominates.
++ let mut after = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ typing_app(&mut after, &ctx, "a");
++ let mixed = ime_frame(&mut after, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into())), egui::Event::Text("!".into())])
++ .expect("a text caret");
++ assert_eq!(mixed.change_cause, egui::output::ImeChangeCause::Other);
++ assert_eq!(ime_payload(&mixed), Some(("a日!", 5, 5)));
++ }
++
++ #[test]
++ fn ime_cause_and_context_survive_a_discarded_pass() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ typing_app(&mut app, &ctx, "a");
++ let raw = egui::RawInput {
++ screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))),
++ events: vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))],
++ ..Default::default()
++ };
++ let mut passes = 0;
++ let mut out = ctx.run_ui(raw, |ui| {
++ passes += 1;
++ if passes == 1 {
++ ui.ctx().request_discard("IME multipass regression");
++ }
++ app.logic(ui.ctx());
++ app.ui(ui);
++ });
++ out.textures_delta.clear();
++ assert_eq!(out.platform_output.num_completed_passes, 2, "the frame really was multipass");
++ let ime = out.platform_output.ime.expect("a text caret");
++ assert_eq!(ime_payload(&ime), Some(("a日", 4, 4)), "the second pass rebuilds the current text");
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod, "the discarded pass keeps the accepted commit's cause");
++ }
++
++ #[test]
++ fn ime_autocorrect_is_not_an_input_method_cause() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ app.session.prefs.autocorrect = true;
++ let sid = typing_app(&mut app, &ctx, "teh");
++ let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit(" ".into()))]).expect("a text caret");
++ assert_eq!(story_text(&mut app, &sid), "the ");
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::Other);
++ }
++
++ #[test]
++ fn ime_delete_surrounding_excludes_the_selection_and_rounds_bytes_inward() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, "aé😀b");
++ // Select é, which keeps its bytes and direction; 'a' before and 😀 after go.
++ text_selection(&mut app, &sid, 1, 3);
++ ime_frame(&mut app, &ctx, vec![]);
++ let steps = app.session.doc().unwrap().history.undo.len();
++ let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 4 })])
++ .expect("a text caret");
++ assert_eq!(story_text(&mut app, &sid), "éb");
++ let sel = app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!((sel.anchor, sel.focus), (0, 2), "the selected text stays selected and directed");
++ assert_eq!(ime_payload(&ime), Some(("éb", 2, 0)));
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
++ assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "one deletion is one undo step");
++ app.run("edit.undo", json!({})).unwrap();
++ assert_eq!(story_text(&mut app, &sid), "aé😀b");
++ ime_frame(&mut app, &ctx, vec![]);
++ // The same deletion with a reversed selection keeps anchor > focus.
++ text_selection(&mut app, &sid, 3, 1);
++ ime_frame(&mut app, &ctx, vec![]);
++ let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 4 })])
++ .expect("a text caret");
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
++ let sel = app.session.doc().unwrap().selection.text.unwrap();
++ assert_eq!(story_text(&mut app, &sid), "éb");
++ assert_eq!((sel.anchor, sel.focus), (2, 0), "reversed selection stays reversed");
++
++ // One byte of a two-byte character leaves the whole character.
++ let partial = typing_app(&mut app, &ctx, "aé");
++ text_selection(&mut app, &partial, 1, 1);
++ ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 0, after_bytes: 1 })]);
++ assert_eq!(story_text(&mut app, &partial), "aé");
++ // A preceding count that lands inside the four-byte emoji leaves it whole too.
++ let partial = typing_app(&mut app, &ctx, "a😀");
++ ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 0 })]);
++ assert_eq!(story_text(&mut app, &partial), "a😀");
++ }
++
++ #[test]
++ fn ime_delete_surrounding_has_no_sixty_four_character_cap() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, &"x".repeat(100));
++ ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 200, after_chars: 0 })]);
++ assert_eq!(story_text(&mut app, &sid), "");
++ }
++
++ #[test]
++ fn ime_delete_and_commit_are_one_undo_step() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, "ab");
++ text_selection(&mut app, &sid, 1, 2);
++ ime_frame(&mut app, &ctx, vec![]);
++ let steps = app.session.doc().unwrap().history.undo.len();
++ let ime = ime_frame(
++ &mut app,
++ &ctx,
++ vec![
++ egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 0 }),
++ egui::Event::Ime(egui::ImeEvent::Commit("X".into())),
++ ],
++ )
++ .expect("a text caret");
++ assert_eq!(story_text(&mut app, &sid), "X");
++ assert_eq!(ime_payload(&ime), Some(("X", 1, 1)));
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
++ assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "the IME batch is one undo step");
++ app.run("edit.undo", json!({})).unwrap();
++ assert_eq!(story_text(&mut app, &sid), "ab");
++ }
++
++ /// The input method's Commit for a composition a click ended earlier in the same event batch
++ /// must not type the marked text again at the clicked caret.
++ #[test]
++ fn a_commit_after_a_click_in_the_same_batch_is_not_typed_twice() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, "ab");
++ ime_frame(&mut app, &ctx, vec![preedit("い", 1)]);
++ assert_eq!(story_text(&mut app, &sid), "abい");
++ let p = on_screen(&app, Point::new(150.0, 120.0));
++ let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
++ ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(p), press(true), egui::Event::Ime(egui::ImeEvent::Commit("い".into()))])
++ .expect("still at a text caret");
++ let typed = story_text(&mut app, &sid);
++ assert_eq!(typed.matches('い').count(), 1, "the click typed the marked text once: {typed:?}");
++ assert!(typed.starts_with("ab"), "{typed:?}");
++ assert!(!app.session.tool_composing());
++ assert!(app.take_ime_discard(), "the system IME is told to drop its copy");
++ ime_frame(&mut app, &ctx, vec![press(false)]);
++ }
++
++ /// A delete-surrounding and its commit from the same ended composition must not edit the
++ /// clicked caret's text either.
++ #[test]
++ fn a_delete_and_commit_after_a_click_in_the_same_batch_are_dropped() {
++ for delete in [
++ egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 0 },
++ egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 },
++ ] {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, "ab");
++ ime_frame(&mut app, &ctx, vec![preedit("い", 1)]);
++ let p = on_screen(&app, Point::new(150.0, 120.0));
++ let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
++ ime_frame(
++ &mut app,
++ &ctx,
++ vec![egui::Event::PointerMoved(p), press(true), egui::Event::Ime(delete), egui::Event::Ime(egui::ImeEvent::Commit("い".into()))],
++ )
++ .expect("still at a text caret");
++ let typed = story_text(&mut app, &sid);
++ assert_eq!(typed.matches('い').count(), 1, "the late commit is dropped: {typed:?}");
++ assert!(typed.contains("ab"), "the click's text was not deleted: {typed:?}");
++ assert!(app.take_ime_discard());
++ ime_frame(&mut app, &ctx, vec![press(false)]);
++ }
++ }
++
++ /// A byte-count delete that reaches past the bounded IME window is still exactly the requested
++ /// input method mutation: the engine reports the ranges from the whole story.
++ #[test]
++ fn a_delete_beyond_the_surrounding_window_is_still_an_input_method_cause() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ let ctx = egui::Context::default();
++ let sid = typing_app(&mut app, &ctx, &"x".repeat(5000));
++ let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 4500, after_bytes: 0 })])
++ .expect("a text caret");
++ assert_eq!(story_text(&mut app, &sid).len(), 500);
++ assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
++ assert_eq!(ime_payload(&ime).map(|(text, cursor, anchor)| (text.len(), cursor, anchor)), Some((500, 500, 500)));
++ }
++
++ /// The pass's IME observation comes after the later UI sections: a click into the Story
++ /// Editor's field takes the keyboard from the canvas in the same pass, so the composition
++ /// ends there and the canvas reports no IME.
++ #[test]
++ fn a_later_field_taking_the_keyboard_ends_the_composition_in_that_pass() {
++ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
++ app.run("file.new", json!({})).unwrap();
++ let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "ab"})).unwrap();
++ let sid = f["story"].clone();
++ app.select_tool("type");
++ app.run("text.select", json!({"story": sid, "anchor": 2, "focus": 2})).unwrap();
++ app.run("app.storyEditor", json!({"story": sid})).unwrap();
++ let mut h = crate::test_window::open(app, egui::vec2(1440.0, 900.0));
++ h.event(preedit("い", 1));
++ h.run_steps(2);
++ assert!(h.state().app.session.tool_composing());
++ let canvas_owner = h.output().platform_output.ime.as_ref().expect("the canvas owns the composition").owner;
++ let field = h.get_all_by_role(egui::accesskit::Role::MultilineTextInput).next().expect("the Story Editor's text field");
++ field.click();
++ h.run_steps(2);
++ assert!(!h.state().app.session.tool_composing(), "the composition ended where the field took the keyboard");
++ assert!(h.state_mut().app.take_ime_discard());
++ assert!(h.get_all_by_role(egui::accesskit::Role::MultilineTextInput).next().unwrap().is_focused(), "the field has the keyboard");
++ let ime = h.output().platform_output.ime.as_ref().expect("the focused Story Editor publishes its IME context");
++ assert_ne!(ime.owner, canvas_owner, "the field owns the IME, not the canvas");
++ let typed = story_text(&mut h.state_mut().app, &sid);
++ assert!(typed.contains('い'), "the marked text stays as typed: {typed:?}");
++ h.event(egui::Event::Ime(egui::ImeEvent::Commit("X".into())));
++ h.run_steps(2);
++ let edited = story_text(&mut h.state_mut().app, &sid);
++ assert_eq!(edited.matches('X').count(), 1, "the field's next commit is applied once: {edited:?}");
++ assert_eq!(edited.matches('い').count(), 1, "the old canvas composition is not replayed: {edited:?}");
++ }
++
#[test]
fn clicking_away_mid_composition_keeps_the_text_and_interrupts_the_ime() {
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
@@@ -5781,7 -5866,7 +6977,7 @@@ mod scrollbar_tests
let h = window();
let rect = h.state().app.canvas_rect.unwrap();
for vertical in [true, false] {
-- let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, vertical))).expect("scrollbar").rect;
++ let r = h.ctx.read_response(egui::Id::unique(("canvas_scrollbar", 0u8, vertical))).expect("scrollbar").rect;
let (track, thumb, k) = bar(&h, vertical);
assert_eq!(r, track);
assert!(k > 0.0, "the zoomed-in view scrolls");
@@@ -5833,7 -5918,7 +7029,7 @@@
let (_, v1, _) = bar(&h, true);
let (_, h1, _) = bar(&h, false);
assert!(v1.min.y > v0.min.y && h1.min.x > h0.min.x, "{v0:?} → {v1:?}, {h0:?} → {h1:?}");
-- let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, true))).expect("scrollbar");
++ let r = h.ctx.read_response(egui::Id::unique(("canvas_scrollbar", 0u8, true))).expect("scrollbar");
assert_eq!(r.rect, bar(&h, true).0);
}
diff --cc crates/ui-egui/src/chrome.rs
index b0fed5799,5183222eb..34d6cfb5e
--- a/crates/ui-egui/src/chrome.rs
+++ b/crates/ui-egui/src/chrome.rs
@@@ -31,7 -31,7 +31,7 @@@ const MAC_LIGHTS_LEFT: f32 = 10.0
pub const MAC_CONTENT_LEFT: f32 = MAC_LIGHTS_LEFT + 2.0 * MAC_LIGHT_PITCH + MAC_LIGHT + (MAC_APP_BAR - MAC_LIGHT) / 2.0;
fn search_id() -> egui::Id {
-- egui::Id::new("app_bar_search")
++ egui::Id::unique("app_bar_search")
}
/// Whether the application bar's search field had the keyboard last frame. Escape takes egui's
@@@ -94,7 -94,7 +94,7 @@@ fn search_field(app: &mut DesignApp, ui
.text_color(t.text)
.hint_text(hint)
.desired_width(field.width())
-- .vertical_align(egui::Align::Center)
++ .align(egui::Align2::LEFT_CENTER)
// Return runs the highlighted match instead of leaving the field.
.return_key(None),
)
@@@ -219,12 -219,12 +219,12 @@@ pub fn app_bar(app: &mut DesignApp, ui
egui::pos2(full.min.x - left as f32, full.min.y),
egui::pos2(full.max.x - caption_w, full.min.y + bar + APP_BAR_BAND),
);
-- let response = ui.interact(drag, egui::Id::new("window_title_drag"), Sense::click_and_drag());
++ let response = ui.interact(drag, egui::Id::unique("window_title_drag"), Sense::click_and_drag());
// Only from an empty part of the bar: the lower band, or the gap between the menus
// and the tools (as they were last frame). A menu title pressed and dragged doesn't
// move the window, as with native title bars.
-- let (gap0, gap1) =
-- ui.data(|d| (d.get_temp::<f32>(egui::Id::new("app_bar_menus_end")), d.get_temp::<f32>(egui::Id::new("app_bar_tools_start"))));
++ let (gap0, gap1) = ui
++ .data(|d| (d.get_temp::<f32>(egui::Id::unique("app_bar_menus_end")), d.get_temp::<f32>(egui::Id::unique("app_bar_tools_start"))));
let empty = |p: egui::Pos2| p.y >= full.min.y + bar || matches!((gap0, gap1), (Some(a), Some(b)) if p.x >= a && p.x <= b);
let from_empty = ui.input(|i| i.pointer.press_origin().or(i.pointer.interact_pos())).is_some_and(empty);
if response.double_clicked() && from_empty {
@@@ -245,7 -245,7 +245,7 @@@
ui.scope_builder(egui::UiBuilder::new().max_rect(scrolled), |ui| {
// The right-hand controls' width, measured last frame: in a window too narrow for them
// and the menus they follow the menus, and the bar scrolls sideways.
-- let tools_w_id = ui.id().with("tools_width");
++ let tools_w_id = ui.scope_id().with("tools_width");
let tools_w: f32 = ui.data(|d| d.get_temp(tools_w_id)).unwrap_or(0.0);
crate::widgets::overflow_scrolling(ui);
// (Drag-scrolling is touch-only by default, so a mouse drag on the bar moves the window.)
@@@ -264,7 -264,7 +264,7 @@@
}
menus_end = ui.min_rect().max.x;
// Where the menus end on screen (moves as a narrow bar scrolls).
-- ui.data_mut(|d| d.insert_temp(egui::Id::new("app_bar_menus_end"), menus_end));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique("app_bar_menus_end"), menus_end));
let size = vec2(tools_slot_width(ui.available_width(), tools_w), ui.available_height());
let tools = ui.allocate_ui_with_layout(size, egui::Layout::right_to_left(egui::Align::Center), |ui| {
ui.add_space(4.0);
@@@ -331,7 -331,7 +331,7 @@@
let _ = app.run("help.discord", json!({}));
}
tools_start = ui.min_rect().min.x;
-- ui.data_mut(|d| d.insert_temp(egui::Id::new("app_bar_tools_start"), tools_start));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique("app_bar_tools_start"), tools_start));
ui.min_rect().width()
});
if (tools.inner - tools_w).abs() > 0.5 {
@@@ -373,8 -373,8 +373,8 @@@ fn caption_buttons(app: &mut DesignApp
[("window.close", "Close"), ("window.maximize", if maximized { "Restore" } else { "Maximize" }), ("window.minimize", "Minimize")]
{
let (rect, _) = ui.allocate_exact_size(vec2(CAPTION_BUTTON_W, APP_BAR), Sense::hover());
-- let response = ui.interact(rect, egui::Id::new(command), Sense::click());
-- response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), label));
++ let response = ui.interact(rect, egui::Id::unique(command), Sense::click());
++ response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), label));
let hovered = response.hovered();
if hovered {
ui.painter().rect_filled(rect, 0.0, if command == "window.close" { t.caption_close } else { t.hover });
@@@ -430,7 -430,7 +430,7 @@@ pub(crate) fn resize_borders(app: &mut
("west", rect(r.left(), r.top() + corner, r.left() + edge, r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
("east", rect(r.right() - edge, r.top() + corner, r.right(), r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
] {
-- let response = ui.interact(region, egui::Id::new(("window_resize", name)), Sense::drag()).on_hover_cursor(cursor);
++ let response = ui.interact(region, egui::Id::unique(("window_resize", name)), Sense::drag()).on_hover_cursor(cursor);
if response.drag_started_by(egui::PointerButton::Primary) {
let _ = app.run("window.resize", json!({"edge": name}));
app.flush_window_commands(ui.ctx());
@@@ -564,20 -569,101 +569,105 @@@ fn control_page(app: &mut DesignApp, ui
});
}
+ /// The Control panel's font sizes (and leadings), as InDesign lists them.
+ const SIZES: &[f64] = &[6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 18.0, 24.0, 30.0, 36.0, 48.0, 60.0, 72.0];
+ /// The Control panel's tracking values (1/1000 em).
+ const TRACKING: &[f64] = &[-100.0, -75.0, -50.0, -25.0, -10.0, -5.0, 0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 200.0];
+
+ /// Whether the text Control panel shows Paragraph Formatting Controls (¶) rather than Character
+ /// Formatting Controls (A).
+ const PARA_MODE: &str = "ctl_text_para_mode";
+
+ /// An icon and a field after it, as the Control panel lays its fields out.
+ pub(crate) fn icon_field(ui: &mut egui::Ui, icon: &str, tip: &str, field: NumField) -> Option<f64> {
+ let t = Tokens::get(ui.ctx());
+ let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
+ icons::paint(ui.painter(), r, icon, t.icon);
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
+ let label = resp.id;
+ resp.on_hover_text(tip);
+ field.spinner().labelled_by(label).show(ui)
+ }
+
+ /// A column of two rows (the Control panel's two-row groups).
+ fn rows(ui: &mut egui::Ui, mut row: impl FnMut(&mut egui::Ui, usize)) {
+ ui.vertical(|ui| {
+ ui.spacing_mut().item_spacing.y = 3.0;
+ ui.horizontal(|ui| row(ui, 0));
+ ui.horizontal(|ui| row(ui, 1));
+ });
+ }
+
+ /// A small toggle button showing `text` (the case and position buttons).
+ fn text_toggle(ui: &mut egui::Ui, text: &str, strike: bool, on: bool, tip: &str) -> bool {
+ let t = Tokens::get(ui.ctx());
+ let (r, resp) = ui.allocate_exact_size(vec2(24.0, 20.0), Sense::click());
+ if on {
+ ui.painter().rect_filled(r, 2.0, t.tool_active);
+ } else if resp.hovered() {
+ ui.painter().rect_filled(r, 2.0, t.hover);
+ }
+ let col = if on { t.text_strong } else { t.icon };
- ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
++ if text == "small-caps" {
++ crate::icons::paint(ui.painter(), r, "small-caps", col);
++ } else {
++ ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
++ }
+ if strike {
+ ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
+ }
- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, tip));
+ resp.on_hover_text(tip).clicked()
+ }
+
+ /// The text Control panel, as InDesign's: A shows the Character Formatting Controls (font, size
+ /// and leading, the case and position buttons, kerning and tracking, the scales, baseline shift
+ /// and skew, the character style and language); ¶ the Paragraph Formatting Controls (alignment,
+ /// the indents, space before and after, the drop cap, the paragraph style, Hyphenate and Align to
+ /// Baseline Grid).
fn control_text(app: &mut DesignApp, ui: &mut egui::Ui) {
let t = Tokens::get(ui.ctx());
+ let lang = app.ui.language.clone();
+ let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
let attrs = panels::text_attrs(app);
let chars = attrs.as_ref().map(|a| a["chars"].clone()).unwrap_or_default();
let para = attrs.as_ref().map(|a| a["para"].clone()).unwrap_or_default();
- let mode_id = egui::Id::new(PARA_MODE);
++ let mode_id = egui::Id::unique(PARA_MODE);
+ let para_mode = ui.data(|d| d.get_temp::<bool>(mode_id)).unwrap_or(false);
ui.vertical(|ui| {
- ui.horizontal(|ui| {
- ui.label(egui::RichText::new("A").font(semibold(15.0)).color(t.text_strong));
- });
- ui.horizontal(|ui| {
- ui.label(egui::RichText::new("¶").font(semibold(15.0)).color(t.text_dim));
- });
+ ui.spacing_mut().item_spacing.y = 3.0;
+ for (para, text, tip) in [(false, "A", "Character Formatting Controls"), (true, "¶", "Paragraph Formatting Controls")] {
+ let on = para_mode == para;
+ let (r, resp) = ui.allocate_exact_size(vec2(24.0, 22.0), Sense::click());
+ if on {
+ ui.painter().rect_filled(r, 2.0, t.tool_active);
+ } else if resp.hovered() {
+ ui.painter().rect_filled(r, 2.0, t.hover);
+ }
+ ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, semibold(15.0), if on { t.text_strong } else { t.text_dim });
+ let tip = tr(tip);
- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, &tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, &tip));
+ if resp.on_hover_text(&tip).clicked() {
+ ui.data_mut(|d| d.insert_temp(mode_id, para));
+ }
+ }
});
vsep(ui);
+ if para_mode {
+ control_paragraph(app, ui, &attrs, &para, &tr);
+ } else {
+ control_character(app, ui, &attrs, &chars, &para, &tr);
+ }
+ }
+
+ fn control_character(
+ app: &mut DesignApp,
+ ui: &mut egui::Ui,
+ attrs: &Option<serde_json::Value>,
+ chars: &serde_json::Value,
+ para: &serde_json::Value,
+ tr: &dyn Fn(&str) -> String,
+ ) {
ui.vertical(|ui| {
let fam = chars["fontFamily"].as_str().unwrap_or("").to_string();
let sty = chars["fontStyle"].as_str().unwrap_or("").to_string();
@@@ -585,29 -671,133 +675,133 @@@
panels::font_style_picker(app, ui, &fam, &sty, 170.0);
});
vsep(ui);
- egui::Grid::new("ctl_char").num_columns(4).spacing(vec2(4.0, 3.0)).show(ui, |ui| {
- caption(ui, "𝐓");
- if let Some(v) = number(ui, "csize", chars["size"].as_f64(), " pt", 54.0, 2) {
- let _ = app.run("type.char", json!({"attrs": {"size": v}}));
+ // Size and leading: a spinner on the left and a list of common values on the right;
+ // automatic leading in parentheses.
+ rows(ui, |ui, row| {
+ if row == 0 {
+ if let Some(v) = icon_field(
+ ui,
+ "font-size",
+ &tr("Font Size"),
+ NumField::number("csize", chars["size"].as_f64(), " pt", 2).width(84.0).presets(SIZES).range(0.1, 1296.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"size": v}}));
+ }
+ } else {
+ let auto = chars["leading"]["kind"].as_str() != Some("points");
+ let lead = if auto {
+ chars["size"].as_f64().map(|s| s * para["autoLeading"].as_f64().unwrap_or(1.2))
+ } else {
+ chars["leading"]["value"].as_f64()
+ };
+ let lead = lead.map(|v| (v * 100.0).round() / 100.0);
+ let key = if auto { "cleadauto" } else { "clead" };
+ if let Some(v) = icon_field(
+ ui,
+ "leading",
+ &tr("Leading"),
+ NumField::number(key, lead, " pt", 2).width(84.0).presets(SIZES).range(0.0, 5000.0).parens(auto),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
+ }
}
- caption(ui, crate::i18n::tr(&app.ui.language, "VA"));
- if let Some(v) = number(ui, "ctrack", chars["tracking"].as_f64(), "", 48.0, 0) {
- let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
+ });
+ vsep(ui);
+ // All Caps, Superscript, Underline / Small Caps, Subscript, Strikethrough.
+ let caps = chars["capitalization"].as_str().unwrap_or("normal").to_string();
+ let pos = chars["position"].as_str().unwrap_or("normal").to_string();
+ let (ul, st) = (chars["underline"].as_bool().unwrap_or(false), chars["strikethrough"].as_bool().unwrap_or(false));
+ let mut set = None;
+ rows(ui, |ui, row| {
+ if row == 0 {
+ if text_toggle(ui, "TT", false, caps == "allCaps", &tr("All Caps")) {
+ set = Some(json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }}));
+ }
+ if text_toggle(ui, "T¹", false, pos == "superscript", &tr("Superscript")) {
+ set = Some(json!({"position": if pos == "superscript" { "normal" } else { "superscript" }}));
+ }
+ if text_toggle(ui, "T̲", false, ul, &tr("Underline")) {
+ set = Some(json!({"underline": !ul}));
+ }
+ } else {
- if text_toggle(ui, "Tᴛ", false, caps == "smallCaps", &tr("Small Caps")) {
++ if text_toggle(ui, "small-caps", false, caps == "smallCaps", &tr("Small Caps")) {
+ set = Some(json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }}));
+ }
+ if text_toggle(ui, "T₁", false, pos == "subscript", &tr("Subscript")) {
+ set = Some(json!({"position": if pos == "subscript" { "normal" } else { "subscript" }}));
+ }
+ if text_toggle(ui, "T", true, st, &tr("Strikethrough")) {
+ set = Some(json!({"strikethrough": !st}));
+ }
}
- ui.end_row();
- caption(ui, "Ā");
- let lead = match chars["leading"]["kind"].as_str() {
- Some("points") => chars["leading"]["value"].as_f64(),
- _ => chars["size"].as_f64().map(|s| s * para["autoLeading"].as_f64().unwrap_or(1.2)),
- };
- if let Some(v) = number(ui, "clead", lead, " pt", 54.0, 2) {
- let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
+ });
+ if let Some(a) = set {
+ let _ = app.run("type.char", json!({"attrs": a}));
+ }
+ vsep(ui);
+ rows(ui, |ui, row| {
+ if row == 0 {
+ let t = Tokens::get(ui.ctx());
+ let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
+ icons::paint(ui.painter(), r, "kerning", t.icon);
+ resp.on_hover_text(tr("Kerning"));
+ crate::panels::properties::kerning_control(app, ui, "ckern", &chars["kerning"], 92.0);
+ } else {
+ if let Some(v) = icon_field(
+ ui,
+ "tracking",
+ &tr("Tracking"),
+ NumField::number("ctrack", chars["tracking"].as_f64(), "", 0).width(92.0).presets(TRACKING).step(5.0).range(-1000.0, 10000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
+ }
}
- caption(ui, crate::i18n::tr(&app.ui.language, "IT"));
- if let Some(v) = number(ui, "chs", chars["hScale"].as_f64().map(|v| v * 100.0), "%", 48.0, 0) {
- let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
+ });
+ vsep(ui);
+ const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
+ let pct = |v: &serde_json::Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
+ rows(ui, |ui, row| {
+ if row == 0 {
+ if let Some(v) = icon_field(
+ ui,
+ "vscale",
+ &tr("Vertical Scale"),
+ NumField::number("cvs", pct(&chars["vScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
+ }
+ } else {
+ if let Some(v) = icon_field(
+ ui,
+ "hscale",
+ &tr("Horizontal Scale"),
+ NumField::number("chs", pct(&chars["hScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
+ }
+ }
+ });
+ vsep(ui);
+ rows(ui, |ui, row| {
+ if row == 0 {
+ if let Some(v) = icon_field(
+ ui,
+ "baseline-shift",
+ &tr("Baseline Shift"),
+ NumField::number("cbs", chars["baselineShift"].as_f64(), " pt", 2).width(76.0).range(-5000.0, 5000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
+ }
+ } else {
+ if let Some(v) = icon_field(
+ ui,
+ "skew",
+ &tr("Skew (False Italic)"),
+ NumField::number("csk", chars["skew"].as_f64(), "°", 1).width(76.0).range(-85.0, 85.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
+ }
}
- ui.end_row();
});
vsep(ui);
ui.vertical(|ui| {
@@@ -663,6 -994,35 +998,35 @@@ fn control_paragraph
});
}
+ /// A swatch field of the Control panel (Shading and Border colours): the swatch's chip and name,
+ /// and the document's swatches in its menu. Returns the swatch picked.
+ pub(crate) fn swatch_field(ui: &mut egui::Ui, doc: &designcraft_doc::Document, cur: &str, width: f32, label: &str) -> Option<String> {
+ let t = Tokens::get(ui.ctx());
+ let (r, resp) = ui.allocate_exact_size(vec2(width, crate::widgets::FIELD_H), Sense::click());
+ let resp = resp.on_hover_text(label);
+ resp.widget_info(|| {
- let mut info = egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, label);
++ let mut info = egui::WidgetInfo::labeled(egui::Role::ComboBox, true, label);
+ info.current_text_value = Some(cur.to_string());
+ info
+ });
+ let p = ui.painter();
+ p.rect_filled(r, 0.0, if resp.hovered() { t.hover } else { t.input });
+ p.rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+ let seg = egui::Rect::from_min_max(egui::pos2(r.max.x - crate::widgets::SEG_W, r.min.y), r.max);
+ p.line_segment([seg.left_top(), seg.left_bottom()], Stroke::new(1.0, t.field_border));
+ icons::paint(p, egui::Rect::from_center_size(seg.center(), vec2(12.0, 12.0)), "chevron-down", t.icon);
+ let (c, g) = crate::widgets::swatch_colors(doc, cur, 1.0);
+ let chip = egui::Rect::from_min_size(egui::pos2(r.min.x + 4.0, r.center().y - 6.0), vec2(12.0, 12.0));
+ crate::widgets::paint_chip(p, chip, c, g);
+ let clip = egui::Rect::from_min_max(r.min, egui::pos2(seg.min.x - 2.0, r.max.y));
+ p.with_clip_rect(clip).text(egui::pos2(chip.max.x + 5.0, r.center().y), egui::Align2::LEFT_CENTER, cur, egui::FontId::proportional(11.5), t.text);
+ let mut picked = None;
+ egui::Popup::menu(&resp).show(|ui| {
+ picked = crate::panels::swatch_list(ui, doc, cur);
+ });
+ picked
+ }
+
/// The widest a document tab grows: a longer name is shortened so its close button and the
/// tabs after it stay in view.
const DOC_TAB_MAX_W: f32 = 260.0;
@@@ -695,8 -1055,8 +1059,8 @@@ pub fn doc_tabs(app: &mut DesignApp, ui
let elided = galley.elided;
let w = (galley.size().x + zoom_label.size().x + DOC_TAB_PAD).max(if is_active { 210.0 } else { 150.0 }).min(max_w);
let r = egui::Rect::from_min_size(egui::pos2(x, bar.min.y), vec2(w, 28.0));
-- let resp = ui.interact(r, ui.id().with(("doctab", i)), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, title));
++ let resp = ui.interact(r, ui.scope_id().with(("doctab", i)), Sense::click());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, title));
let resp = if elided {
resp.on_hover_ui(|ui| {
let _ = crate::rtl::label(ui, title);
@@@ -706,8 -1066,8 +1070,8 @@@
};
ui.painter().rect_filled(r, 0.0, if is_active { t.panel } else { t.tab_strip });
let cr = egui::Rect::from_center_size(egui::pos2(r.min.x + 18.0, r.center().y), vec2(14.0, 14.0));
-- let cresp = ui.interact(cr, ui.id().with(("docclose", i)), Sense::click());
-- cresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, format!("{close_label} {title}")));
++ let cresp = ui.interact(cr, ui.scope_id().with(("docclose", i)), Sense::click());
++ cresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("{close_label} {title}")));
ui.painter().text(
cr.center(),
egui::Align2::CENTER_CENTER,
@@@ -1029,7 -1389,7 +1393,7 @@@ pub(crate) fn recent_file_stat(ctx: &eg
}
fn recent_file_stat_at(ctx: &egui::Context, path: &str, now: f64) -> RecentStat {
-- let key = egui::Id::new(("recent_stat", path));
++ let key = egui::Id::unique(("recent_stat", path));
if let Some(st) = ctx.data(|d| d.get_temp::<RecentStat>(key))
&& (0.0..RECENT_STAT_MS).contains(&(now - st.checked))
{
@@@ -1044,7 -1404,7 +1408,7 @@@
/// The texture of a recent file's saved first-page picture, decoded once per file version.
fn recent_preview_texture(ctx: &egui::Context, path: &str, modified: Option<std::time::SystemTime>) -> Option<egui::TextureHandle> {
type Cached = (Option<std::time::SystemTime>, Option<egui::TextureHandle>);
-- let key = egui::Id::new(("recent_preview", path));
++ let key = egui::Id::unique(("recent_preview", path));
if let Some((m, tex)) = ctx.data(|d| d.get_temp::<Cached>(key))
&& m == modified
{
@@@ -1157,7 -1539,7 +1543,7 @@@ mod tests
/// The rect of an object Control panel group.
fn group(h: &egui_kittest::Harness<'static, test_window::Window>, id: &str) -> egui::Rect {
-- h.ctx.read_response(egui::Id::new(("object_control", id))).unwrap().rect
++ h.ctx.read_response(egui::Id::unique(("object_control", id))).unwrap().rect
}
/// The rect of the node with this label, preferring the one in the Control bar's row: the
@@@ -1303,12 -1685,12 +1689,21 @@@
fn long_document_names_keep_tabs_short_and_close_buttons_visible() {
let latin = "Quarterly report with a very long file name ".repeat(6);
let hebrew = "דוח רבעוני עם שם קובץ ארוך מאוד ".repeat(6);
++ // Use the bundled or pinned test face; optional-input builds without either skip
++ // the Hebrew tab explicitly instead of rendering tofu under the strict glyph policy.
++ let hebrew_ok = test_window::install_test_hebrew_face();
++ if !hebrew_ok {
++ eprintln!("skipped the Hebrew tab: set DESIGNCRAFT_TEST_HEBREW_FONT to the pinned NotoSansHebrew.ttf");
++ }
let mut app = app();
-- for title in [latin.as_str(), hebrew.as_str(), "Short"] {
-- app.run("file.new", serde_json::json!({ "title": title })).unwrap();
++ app.run("file.new", serde_json::json!({ "title": latin })).unwrap();
++ if hebrew_ok {
++ app.run("file.new", serde_json::json!({ "title": hebrew })).unwrap();
}
++ app.run("file.new", serde_json::json!({ "title": "Short" })).unwrap();
let h = test_window::open(app, vec2(1200.0, 600.0));
-- for title in [latin.as_str(), hebrew.as_str()] {
++ let titles = if hebrew_ok { vec![latin.as_str(), hebrew.as_str()] } else { vec![latin.as_str()] };
++ for title in titles {
let tab = rect(&h, title);
assert!(tab.width() <= super::DOC_TAB_MAX_W, "{title:?} tab is {} wide", tab.width());
let close = rect(&h, &format!("Close {title}"));
@@@ -1596,7 -2205,7 +2218,7 @@@
}
fn caption_center(&self, id: &str) -> egui::Pos2 {
-- self.ctx.read_response(egui::Id::new(id)).unwrap().rect.center()
++ self.ctx.read_response(egui::Id::unique(id)).unwrap().rect.center()
}
}
@@@ -1620,7 -2229,7 +2242,7 @@@
#[test]
fn title_area_drags_and_double_clicks_but_menus_do_not_drag() {
let mut h = WindowHarness::new();
-- let title = h.ctx.read_response(egui::Id::new("window_title_drag")).unwrap().rect;
++ let title = h.ctx.read_response(egui::Id::unique("window_title_drag")).unwrap().rect;
assert!(title.width() > 0.0, "there is a drag region between menus and tools");
let p = title.center();
let mut commands = h.press(p);
@@@ -1670,8 -2279,8 +2292,8 @@@
h.size = vec2(640.0, 560.0);
h.frame(vec![]);
h.frame(vec![]);
-- let rect = |h: &WindowHarness, id: &str| h.ctx.read_response(egui::Id::new(id)).unwrap().rect;
-- let menus_end = |h: &WindowHarness| h.ctx.data(|d| d.get_temp::<f32>(egui::Id::new("app_bar_menus_end"))).unwrap();
++ let rect = |h: &WindowHarness, id: &str| h.ctx.read_response(egui::Id::unique(id)).unwrap().rect;
++ let menus_end = |h: &WindowHarness| h.ctx.data(|d| d.get_temp::<f32>(egui::Id::unique("app_bar_menus_end"))).unwrap();
let (close, menus0) = (rect(&h, "window.close"), menus_end(&h));
assert!(close.left() >= 0.0 && close.right() <= h.size.x, "{close:?}");
let p = egui::pos2(200.0, 18.0);
@@@ -1682,6 -2291,6 +2304,7 @@@
delta: vec2(0.0, -3000.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
},
]);
for _ in 0..10 {
@@@ -1700,8 -2309,8 +2323,8 @@@
h.size = vec2(900.0, 560.0);
h.frame(vec![]);
h.frame(vec![]);
-- let drag = h.ctx.read_response(egui::Id::new("window_title_drag")).unwrap().rect;
-- let close = h.ctx.read_response(egui::Id::new("window.close")).unwrap().rect;
++ let drag = h.ctx.read_response(egui::Id::unique("window_title_drag")).unwrap().rect;
++ let close = h.ctx.read_response(egui::Id::unique("window.close")).unwrap().rect;
assert!(drag.right() <= close.left() + 0.5, "{drag:?} {close:?}");
let p = egui::pos2(450.0, APP_BAR + APP_BAR_BAND / 2.0);
assert!(drag.contains(p), "{drag:?}");
@@@ -1717,7 -2326,7 +2340,7 @@@
h.frame(vec![]);
h.frame(vec![]);
for id in ["window.minimize", "window.maximize", "window.close"] {
-- let rect = h.ctx.read_response(egui::Id::new(id)).unwrap().rect;
++ let rect = h.ctx.read_response(egui::Id::unique(id)).unwrap().rect;
assert!(rect.left() >= 0.0 && rect.right() <= h.size.x, "{id}: {rect:?}");
let p = rect.center();
assert!(!h.click(p).is_empty(), "{id} remains clickable");
diff --cc crates/ui-egui/src/control.rs
index 1cb7395c0,1cb7395c0..f935873f8
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@@ -600,7 -600,7 +600,7 @@@ mod automation_contract_tests
assert_eq!(app.control_synthetic, queued);
// The ordinary input hook consumes one pointer event per frame, freeing
// enough room for a complete click without dropping earlier input.
-- app.raw_input_hook(&mut egui::RawInput::default());
++ app.raw_input_hook(&ctx, &mut egui::RawInput::default());
assert_eq!(app.control_synthetic.len(), 10000);
assert_eq!(call(&mut app, &ctx, "ui.click", json!({}))["ok"], true);
assert_eq!(app.control_synthetic.len(), 10003);
@@@ -786,7 -786,7 +786,7 @@@ mod deferred_clipboard_tests
assert!(!app.in_control);
for step in 0..3 {
let mut raw = egui::RawInput { time: Some(step as f64 * 0.05), ..Default::default() };
-- app.raw_input_hook(&mut raw);
++ app.raw_input_hook(&ctx, &mut raw);
ctx.run_ui(raw, |ui| menus::shortcuts(&mut app, ui.ctx())).textures_delta.clear();
}
let texts: Vec<String> = app.session.active().unwrap().doc.stories.values().map(|story| story.text.clone()).collect();
@@@ -794,7 -794,7 +794,7 @@@
assert!(!texts.iter().any(|text| text.contains("SYNTHETIC_CLIPBOARD_SENTINEL")));
// Once control input is drained, an ordinary user paste still reads its clipboard.
let mut raw = egui::RawInput::default();
-- app.raw_input_hook(&mut raw);
++ app.raw_input_hook(&ctx, &mut raw);
app.run("edit.paste", json!({})).unwrap();
assert_eq!(reads.load(Ordering::SeqCst), 1);
}
@@@ -805,12 -805,12 +805,12 @@@
let (req, _) = ControlRequest::new("ui.move", json!({"x":10,"y":10}));
let _ = handle(&mut app, &ctx, &req);
let mut raw = egui::RawInput::default();
-- app.raw_input_hook(&mut raw);
++ app.raw_input_hook(&ctx, &mut raw);
let mut private = ctx.run_ui(raw, |ui| ui.ctx().copy_text("control field".into()));
assert!(!private.platform_output.commands.iter().any(|cmd| matches!(cmd, egui::OutputCommand::CopyText(_))));
private.textures_delta.clear();
let mut raw = egui::RawInput::default();
-- app.raw_input_hook(&mut raw);
++ app.raw_input_hook(&ctx, &mut raw);
let mut native = ctx.run_ui(raw, |ui| ui.ctx().copy_text("native field".into()));
assert!(native.platform_output.commands.iter().any(|cmd| matches!(cmd, egui::OutputCommand::CopyText(text) if text=="native field")));
native.textures_delta.clear();
diff --cc crates/ui-egui/src/credits.rs
index b9efa035a,d4828b1f4..22937978d
--- a/crates/ui-egui/src/credits.rs
+++ b/crates/ui-egui/src/credits.rs
@@@ -244,6 -242,13 +242,13 @@@ fn controls(ui: &mut egui::Ui, v: &mut
v.table = true;
}
});
+ }
+
+ /// About ▸ Contributors: a name toggle, a sort, and the list as a grab bag or a table.
+ pub fn contributors_ui(ui: &mut egui::Ui, lang: &str) {
- let id = egui::Id::new("credits_view");
++ let id = egui::Id::unique("credits_view");
+ let mut v = ui.data_mut(|d| d.get_temp::<View>(id)).unwrap_or_default();
+ controls(ui, &mut v, lang);
let list = sorted(CONTRIBUTORS, v.names, v.key, v.ascending);
let totals = tr(lang, "{contributors} contributors · {commits} commits")
.replace("{contributors}", &list.len().to_string())
diff --cc crates/ui-egui/src/cursors.rs
index 28f98a5e0,28f98a5e0..96cf7a116
--- a/crates/ui-egui/src/cursors.rs
+++ b/crates/ui-egui/src/cursors.rs
@@@ -318,7 -318,7 +318,7 @@@ pub fn show(ctx: &egui::Context, images
system(c)
}
Mode::Painted => {
-- let layer = egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("tool-cursor"));
++ let layer = egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("tool-cursor"));
// Divide by the zoom factor so the glyph keeps its size in physical pixels.
let scale = 1.0 / ctx.zoom_factor().max(0.01);
let painter = ctx.layer_painter(layer);
diff --cc crates/ui-egui/src/dialogs.rs
index b412a06f0,04d2391f3..599159da7
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@@ -132,7 -132,7 +132,17 @@@ impl Dialog
fn text_field(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32) {
let mut s = d.s(key);
-- if ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).horizontal_align(egui::Align::Min)).changed() {
++ if ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP)).changed() {
++ d.fields.insert(key.into(), Value::String(s));
++ }
++}
++
++/// [`text_field`] with the visible caption's text as its accessible name (a text field with no
++/// label, hint or `labelled_by` is an unnamed input).
++fn text_field_named(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32, name: &str) {
++ let mut s = d.s(key);
++ let resp = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP)).accessible_name(name.to_owned());
++ if resp.changed() {
d.fields.insert(key.into(), Value::String(s));
}
}
@@@ -751,7 -784,7 +794,7 @@@ fn reference_point(ui: &mut egui::Ui, d
for (i, name) in designcraft_engine::autosize::REFERENCES.iter().enumerate() {
let c = r.min + egui::vec2(5.0 + 18.0 * (i % 3) as f32, 5.0 + 18.0 * (i / 3) as f32);
let dot = egui::Rect::from_center_size(c, egui::vec2(8.0, 8.0));
-- let resp = ui.interact(dot.expand(2.0), ui.id().with((key, i)), egui::Sense::click());
++ let resp = ui.interact(dot.expand(2.0), ui.scope_id().with((key, i)), egui::Sense::click());
if resp.clicked() {
d.fields.insert(key.into(), json!(name));
}
@@@ -994,7 -1051,7 +1061,7 @@@ fn margins_and_columns_dialog(app: &mu
crate::icons::button(ui, if linked { "link" } else { "link-broken" }, 20.0, linked, &tip)
})
.inner;
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &tip));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &tip));
if resp.clicked() {
d.fields.insert("link".into(), json!(!linked));
}
@@@ -1103,7 -1160,7 +1170,7 @@@ fn create_guides_dialog(app: &mut Desig
/// InDesign shows it ("click in another field to see the value multiplied by two").
fn measure_field(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32) {
let mut s = d.s(key);
-- let r = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).horizontal_align(egui::Align::Min));
++ let r = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP));
if r.changed() {
d.fields.insert(key.into(), Value::String(s));
}
@@@ -1277,7 -1334,7 +1344,7 @@@ fn setup_spin(ui: &mut egui::Ui, d: &mu
(1.0, egui::Rect::from_min_max(seg.min, egui::pos2(seg.max.x, seg.center().y))),
(-1.0, egui::Rect::from_min_max(egui::pos2(seg.min.x, seg.center().y), seg.max)),
] {
-- let resp = ui.interact(half, ui.id().with((key, dir < 0.0)), egui::Sense::click());
++ let resp = ui.interact(half, ui.scope_id().with((key, dir < 0.0)), egui::Sense::click());
if resp.hovered() {
ui.painter().rect_filled(half.shrink(1.0), 1.0, t.hover);
}
@@@ -1296,7 -1353,7 +1363,8 @@@
let text = egui::Rect::from_min_max(egui::pos2(seg.right() + 5.0, r.top() + 1.0), egui::pos2(r.right() - 3.0, r.bottom() - 1.0));
let mut s = d.s(key);
let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text).layout(egui::Layout::left_to_right(egui::Align::Center)));
-- let resp = child.add(egui::TextEdit::singleline(&mut s).id(ui.id().with((key, "text"))).frame(egui::Frame::NONE).desired_width(text.width()));
++ let resp =
++ child.add(egui::TextEdit::singleline(&mut s).id(ui.scope_id().with((key, "text"))).frame(egui::Frame::NONE).desired_width(text.width()));
if resp.changed() {
d.fields.insert(key.into(), Value::String(s));
changed = true;
@@@ -2100,7 -2161,7 +2172,7 @@@ pub fn show(app: &mut DesignApp, ctx: &
},
};
// No dimmed backdrop: the page behind a dialog is what its settings and colours are judged against.
-- let host = egui::Id::new("dialog");
++ let host = egui::Id::unique("dialog");
let instance = host.with(&d.id);
crate::modal_drag::modal(ctx, host, instance).backdrop_color(egui::Color32::TRANSPARENT).show(ctx, |ui| {
let frame_margin = egui::Frame::popup(ui.style()).total_margin().sum();
@@@ -4167,7 -4011,7 +4022,7 @@@ fn paragraph_style_options(app: &mut De
"chars" => basic_character_formats(app, ui, d, &CharFields { base: &cv, sparse: false }),
"indents" => {
egui::Grid::new("psi").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
-- crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Alignment:"));
++ let alignment_label = crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Alignment:"));
let a: designcraft_doc::Align = serde_json::from_value(cur(d, "p.align", &pv["align"])).unwrap_or_default();
egui::ComboBox::from_id_salt("psalign")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, a.label())))
@@@ -4178,7 -4022,7 +4033,9 @@@
d.fields.insert("p.align".into(), serde_json::to_value(al).unwrap_or_default());
}
}
-- });
++ })
++ .response
++ .labelled_by(alignment_label.id);
ui.end_row();
for (label, key) in [
("Left Indent:", "leftIndent"),
@@@ -4194,7 -4038,32 +4051,34 @@@
}
ui.end_row();
}
+ // The CJK Grid Settings section edits the same `p.gridAlign` field.
+ use designcraft_doc::GridAlign;
+ const GRID_ALIGN: [(GridAlign, &str); 3] =
+ [(GridAlign::None, "None"), (GridAlign::AllLines, "All Lines"), (GridAlign::FirstLineOnly, "First Line Only")];
- crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Align to Grid:"));
++ let grid_label = crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Align to Grid:"));
+ let g: GridAlign = serde_json::from_value(cur(d, "p.gridAlign", &pv["gridAlign"])).unwrap_or_default();
+ let shown = GRID_ALIGN.iter().find(|o| o.0 == g).map_or("", |o| o.1);
+ egui::ComboBox::from_id_salt("psgridalign")
+ .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, shown)))
+ .width(240.0)
+ .show_ui(ui, |ui| {
+ for (v, label) in GRID_ALIGN {
+ if ui.selectable_label(v == g, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked()
+ && let Ok(v) = serde_json::to_value(v)
+ {
+ d.fields.insert("p.gridAlign".into(), v);
+ }
+ }
- });
++ })
++ .response
++ .labelled_by(grid_label.id);
+ ui.end_row();
});
+ ui.add_space(6.0);
+ let mut ignore = cur(d, "p.ignoreOpticalMargin", &pv["ignoreOpticalMargin"]).as_bool().unwrap_or(false);
+ if ui.checkbox(&mut ignore, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Ignore Optical Margin"))).changed() {
+ d.fields.insert("p.ignoreOpticalMargin".into(), json!(ignore));
+ }
}
"tabs" => style_tabs(&app.ui.language, ui, d, &pv, &doc),
"rules" => paragraph_rules(app, ui, d, "p.", &pv),
@@@ -4243,7 -4092,7 +4107,10 @@@
d.fields.insert("rename".into(), json!(name));
}
let mut rn = d.s("rename");
-- if ui.add(egui::TextEdit::singleline(&mut rn).desired_width(220.0)).changed() {
++ let name_field = ui
++ .add(egui::TextEdit::singleline(&mut rn).desired_width(220.0))
++ .accessible_name(crate::i18n::tr(&app.ui.language, "Style Name").to_owned());
++ if name_field.changed() {
d.fields.insert("rename".into(), json!(rn));
}
ui.end_row();
@@@ -4255,7 -4104,7 +4122,7 @@@
.map(str::to_string)
.or(style.based_on.clone())
.unwrap_or_else(|| "[No Paragraph Style]".into());
-- egui::ComboBox::from_id_salt("psbased")
++ let combo = egui::ComboBox::from_id_salt("psbased")
.selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &based)))
.width(220.0)
.show_ui(ui, |ui| {
@@@ -4265,6 -4114,6 +4132,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Based On"));
ui.end_row();
});
ui.add_space(8.0);
@@@ -4408,12 -4257,12 +4276,16 @@@ fn style_tabs(lang: &str, ui: &mut egui
});
}
crate::rtl::label(ui, crate::i18n::tr(lang, "Leader:"));
-- if let (Some(l), Some(i)) = (text_commit(ui, "psleader", stop.as_ref().map_or("", |s| s.leader.as_str()), 36.0, stop.is_some()), sel) {
++ let leader_name = crate::i18n::tr(lang, "Leader:");
++ let leader = text_commit(ui, "psleader", stop.as_ref().map_or("", |s| s.leader.as_str()), 36.0, stop.is_some(), leader_name);
++ if let (Some(l), Some(i)) = (leader, sel) {
result = Some(tabs::leader_value(&l, "tabs").map_err(|e| e.to_string()).and_then(|l| tabs::change(&mut list, i, None, Some(l), None)));
}
crate::rtl::label(ui, crate::i18n::tr(lang, "Align On:"));
let on_char = stop.as_ref().is_some_and(|s| s.align == designcraft_doc::TabAlign::Char);
-- if let (Some(c), Some(i)) = (text_commit(ui, "psalignon", stop.as_ref().map_or("", |s| s.align_on.as_str()), 18.0, on_char), sel) {
++ let align_name = crate::i18n::tr(lang, "Align On:");
++ let align_on = text_commit(ui, "psalignon", stop.as_ref().map_or("", |s| s.align_on.as_str()), 18.0, on_char, align_name);
++ if let (Some(c), Some(i)) = (align_on, sel) {
result = Some(tabs::align_on_value(&c, "tabs").map_err(|e| e.to_string()).and_then(|c| tabs::change(&mut list, i, None, None, Some(c))));
}
ui.add_space(6.0);
@@@ -5186,6 -5292,57 +5315,58 @@@ pub fn open_new_style(app: &mut DesignA
app.ui.dialog = Some(Dialog::new(id, json!({"new": true, "rename": name})));
}
+ /// The General section of the Character Style Options dialog: name, Based On, and a summary of
+ /// the style's settings.
+ fn character_style_general(
+ lang: &str,
+ ui: &mut egui::Ui,
+ d: &mut Dialog,
+ styles: &designcraft_doc::Styles,
+ style: &designcraft_doc::CharacterStyle,
+ based: &str,
+ ) {
+ let (name, new) = (d.s("name"), d.b("new"));
+ egui::Grid::new("csg").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
+ crate::rtl::label(ui, crate::i18n::tr(lang, "Style Name:"));
- text_field(ui, d, "rename", 220.0);
++ text_field_named(ui, d, "rename", 220.0, crate::i18n::tr(lang, "Style Name"));
+ ui.end_row();
+ crate::rtl::label(ui, crate::i18n::tr(lang, "Based On:"));
- egui::ComboBox::from_id_salt("csbased").selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, based))).width(220.0).show_ui(
- ui,
- |ui| {
++ let combo = egui::ComboBox::from_id_salt("csbased")
++ .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, based)))
++ .width(220.0)
++ .show_ui(ui, |ui| {
+ // Not itself, nor a style based on it.
+ for s in styles.character.iter().filter(|s| new || !styles.char_based_on_cycles(&name, &s.name)) {
+ if ui.selectable_label(s.name == based, crate::rtl::widget(ui, crate::i18n::style_name(lang, &s.name))).clicked() {
+ d.fields.insert("basedOn".into(), json!(s.name));
+ }
+ }
- },
- );
++ });
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(lang, "Based On"));
+ ui.end_row();
+ });
+ let status = d.s("status");
+ if !status.is_empty() {
+ crate::rtl::label(ui, egui::RichText::new(status).color(crate::theme::Tokens::get(ui.ctx()).text_strong));
+ }
+ ui.add_space(8.0);
+ crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(lang, "Style Settings:")).font(semibold(12.0)));
+ // What OK would leave the style setting, after its Based On.
+ let mut own = serde_json::to_value(&style.chars).unwrap_or_default();
+ if let Some(o) = own.as_object_mut() {
+ for (k, v) in d.fields.iter().filter_map(|(k, v)| Some((k.strip_prefix("c.")?, v))) {
+ if v.is_null() {
+ o.remove(k);
+ } else {
+ o.insert(k.to_string(), v.clone());
+ }
+ }
+ }
+ let mut parts = vec![crate::i18n::style_name(lang, based).to_string()];
+ parts.extend(own.as_object().into_iter().flatten().map(|(k, v)| format!("{}: {}", setting_label(lang, k), setting_text(v))));
+ ui.add(egui::Label::new(egui::RichText::new(parts.join(" + ")).color(crate::theme::Tokens::get(ui.ctx()).text_dim)).wrap());
+ }
+
/// Character Style Options: General, then the character sections it shares with Paragraph Style
/// Options. A character style sets only some attributes: the fields show those it and its Based
/// On set and leave the rest blank. Edits are `c.<attr>` fields (`null` = no longer set), applied
@@@ -6436,7 -6706,7 +6730,7 @@@ fn toc_dialog(app: &mut DesignApp, ui:
toc_style_combo(ui, "page_number", &char_styles, none, &mut r.page_number_style);
ui.end_row();
crate::rtl::label(ui, tr("Between Entry and Number:"));
-- ui.add(egui::TextEdit::singleline(&mut r.separator).desired_width(80.0).horizontal_align(egui::Align::Min));
++ ui.add(egui::TextEdit::singleline(&mut r.separator).desired_width(80.0).align(egui::Align2::LEFT_TOP));
crate::rtl::label(ui, tr("Style:"));
toc_style_combo(ui, "separator", &char_styles, none, &mut r.separator_style);
ui.end_row();
@@@ -6715,7 -6985,7 +7009,7 @@@ fn color_picker(ui: &mut egui::Ui, d: &
let mut cmyk = nums::<4>(d, "cmyk").unwrap_or_else(|| cmyk_of(rgb));
let mut model = if d.s("model") == "cmyk" || (!d.fields.contains_key("model") && d.fields.contains_key("cmyk")) { "cmyk" } else { "rgb" };
let mut edit = ColorEdit::None;
-- let hex_id = egui::Id::new("color_picker_hex");
++ let hex_id = egui::Id::unique("color_picker_hex");
ui.horizontal_top(|ui| {
let mut c = egui::Color32::from_rgb(to8(rgb[0]), to8(rgb[1]), to8(rgb[2]));
let shown = c;
@@@ -6729,7 -6999,7 +7023,9 @@@
for (v, l) in cmyk.iter_mut().zip(["C", "M", "Y", "K"]) {
if let Some((rv, rl)) = rgb_rows.next() {
ui.label(rl);
-- if ui.add(egui::DragValue::new(rv).range(0.0..=255.0).max_decimals(1)).changed() {
++ // The channel letter is a label beside a bare spinner: name the spinner.
++ let field = ui.add(egui::DragValue::new(rv).range(0.0..=255.0).max_decimals(1)).accessible_name(rl.to_owned());
++ if field.changed() {
edit = ColorEdit::Rgb;
}
} else {
@@@ -6737,7 -7007,7 +7033,8 @@@
ui.label("");
}
ui.label(l);
-- if ui.add(egui::DragValue::new(v).range(0.0..=100.0).max_decimals(1).suffix("%")).changed() {
++ let field = ui.add(egui::DragValue::new(v).range(0.0..=100.0).max_decimals(1).suffix("%")).accessible_name(l.to_owned());
++ if field.changed() {
edit = ColorEdit::Cmyk;
}
ui.end_row();
@@@ -6748,7 -7018,7 +7045,8 @@@
ui.label("#");
let editing = ui.memory(|m| m.has_focus(hex_id));
let mut h = if editing { d.s("hexEdit") } else { format!("{:02x}{:02x}{:02x}", to8(rgb[0]), to8(rgb[1]), to8(rgb[2])) };
-- if ui.add(egui::TextEdit::singleline(&mut h).id(hex_id).desired_width(70.0)).changed()
++ let hex_field = ui.add(egui::TextEdit::singleline(&mut h).id(hex_id).desired_width(70.0)).accessible_name("Hex".to_owned());
++ if hex_field.changed()
&& let Some(v) = hex_rgb(&h)
{
rgb = v;
@@@ -7602,6 -7872,35 +7900,35 @@@ mod tests
assert_eq!(props.number_label(3), "III)\t");
}
+ #[test]
+ fn paragraph_style_options_ignore_optical_margin_is_set_on_ok() {
+ use egui_kittest::{Harness, kittest::Queryable};
+ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.run("file.new", json!({})).unwrap();
+ app.run("style.paragraph.create", json!({"name": "Flush"})).unwrap();
+ app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Flush", "section": "indents"})));
+ let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
+ |ui, app: &mut DesignApp| {
- let key = egui::Id::new("ignore_optical_margin_fonts");
++ let key = egui::Id::unique("ignore_optical_margin_fonts");
+ if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+ crate::theme::install_fonts(ui.ctx(), "");
+ ui.data_mut(|d| d.insert_temp(key, true));
+ return;
+ }
+ show(app, ui.ctx());
+ },
+ app,
+ );
+ h.run_steps(3);
+ h.get_by_label("Ignore Optical Margin").click();
+ h.run_steps(3);
+ h.get_by_label(" OK ").click();
+ h.run_steps(3);
+ let app = h.state();
+ assert!(app.ui.dialog.is_none());
+ assert_eq!(app.session.doc().unwrap().doc.styles.para("Flush").unwrap().para.ignore_optical_margin, Some(true));
+ }
+
#[test]
fn paragraph_style_options_keep_a_bad_grep_pattern_open_with_the_error() {
let (mut app, _) = ruled_paragraph();
@@@ -7799,7 -8238,7 +8266,7 @@@
open_style_options(&mut app, true, "Tutorial");
let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let key = egui::Id::new("style_preview_remember_fonts");
++ let key = egui::Id::unique("style_preview_remember_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
@@@ -7834,7 -8273,7 +8301,7 @@@
open_style_options(&mut app, paragraph, "Tutorial");
let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let key = egui::Id::new("style_preview_test_fonts");
++ let key = egui::Id::unique("style_preview_test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
@@@ -8232,7 -8700,7 +8728,13 @@@
screen,
vec![
egui::Event::PointerMoved(pos),
-- egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta, phase: egui::TouchPhase::Move, modifiers: egui::Modifiers::NONE },
++ egui::Event::MouseWheel {
++ unit: egui::MouseWheelUnit::Point,
++ delta,
++ phase: egui::TouchPhase::Move,
++ modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
++ },
],
);
// Let smooth wheel scrolling and scrollbar visibility settle before clicking.
@@@ -9811,7 -10304,7 +10338,7 @@@
h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
h.run_steps(3);
}
-- let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::new("dialog"))).unwrap();
++ let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::unique("dialog"))).unwrap();
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
app.run("file.new", json!({})).unwrap();
app.ui.dialog = Some(Dialog::new("insertTable", Value::Null));
@@@ -9864,7 -10357,7 +10391,7 @@@
fn the_new_document_window_drags_mostly_aside_and_keeps_its_preview() {
use egui::{Event, Modifiers, PointerButton, vec2};
use egui_kittest::{Harness, kittest::Queryable};
-- let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::new("dialog"))).unwrap();
++ let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::unique("dialog"))).unwrap();
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
app.run("file.new", json!({"title": "A"})).unwrap();
app.ui.new_document_preview = true;
diff --cc crates/ui-egui/src/dialogs/options.rs
index d8aba2bea,d8aba2bea..4f192cd7d
--- a/crates/ui-egui/src/dialogs/options.rs
+++ b/crates/ui-egui/src/dialogs/options.rs
@@@ -3,7 -3,7 +3,7 @@@
use designcraft_color::{Color, ColorType, SwatchValue};
use serde_json::{Map, Value, json};
--use super::{Dialog, check, text_field};
++use super::{Dialog, check, text_field_named};
use crate::DesignApp;
use crate::i18n::tr;
@@@ -97,7 -97,7 +97,11 @@@ fn caption(ui: &mut egui::Ui, lang: &st
fn channel(ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str, max: f64, suffix: &str) {
ui.label(egui::RichText::new(label).monospace());
let mut v = d.n(key).unwrap_or(0.0);
-- if ui.add(egui::DragValue::new(&mut v).range(0.0..=max).speed(0.5).max_decimals(1).suffix(suffix)).changed() {
++ let resp = ui.add(egui::DragValue::new(&mut v).range(0.0..=max).speed(0.5).max_decimals(1).suffix(suffix));
++ let changed = resp.changed();
++ // The channel name is a painted label beside a bare spinner: name the spinner too.
++ let _ = resp.accessible_name(label.to_owned());
++ if changed {
d.fields.insert(key.into(), json!(v));
}
ui.end_row();
@@@ -112,7 -112,7 +116,7 @@@ pub fn swatch_options(app: &DesignApp,
}
egui::Grid::new("swatch_options").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
caption(ui, lang, "Swatch Name:");
-- ui.add_enabled_ui(!d.b("locked") && !auto, |ui| text_field(ui, d, "swatchName", 220.0));
++ ui.add_enabled_ui(!d.b("locked") && !auto, |ui| text_field_named(ui, d, "swatchName", 220.0, tr(lang, "Swatch Name")));
ui.end_row();
});
if kind == "color" {
@@@ -125,7 -125,7 +129,7 @@@
if kind == "color" {
caption(ui, lang, "Color Type:");
let cur = d.s("colorType");
-- egui::ComboBox::from_id_salt("swatch_color_type")
++ let combo = egui::ComboBox::from_id_salt("swatch_color_type")
.selected_text(crate::rtl::widget(ui, tr(lang, if cur == "spot" { "Spot" } else { "Process" })))
.show_ui(ui, |ui| {
for (v, l) in [("process", "Process"), ("spot", "Spot")] {
@@@ -134,6 -134,6 +138,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, tr(lang, "Color Type"));
ui.end_row();
}
caption(ui, lang, "Color Mode:");
@@@ -143,16 -143,16 +148,20 @@@
"gray" => "Gray",
_ => "CMYK",
};
-- egui::ComboBox::from_id_salt("swatch_color_mode").selected_text(crate::rtl::widget(ui, tr(lang, label(&cur)))).show_ui(ui, |ui| {
-- for m in ["cmyk", "rgb", "gray"] {
-- if ui.selectable_label(cur == m, crate::rtl::widget(ui, tr(lang, label(m)))).clicked()
-- && cur != m
-- && let Some(c) = dialog_color(&d.fields)
-- {
-- set_color(&mut d.fields, c, Some(m));
++ let combo = egui::ComboBox::from_id_salt("swatch_color_mode").selected_text(crate::rtl::widget(ui, tr(lang, label(&cur)))).show_ui(
++ ui,
++ |ui| {
++ for m in ["cmyk", "rgb", "gray"] {
++ if ui.selectable_label(cur == m, crate::rtl::widget(ui, tr(lang, label(m)))).clicked()
++ && cur != m
++ && let Some(c) = dialog_color(&d.fields)
++ {
++ set_color(&mut d.fields, c, Some(m));
++ }
}
-- }
-- });
++ },
++ );
++ let _ = crate::widgets::name_combo(combo, tr(lang, "Color Mode"));
ui.end_row();
match d.s("mode").as_str() {
"rgb" => {
@@@ -182,7 -182,7 +191,7 @@@
ui.end_row();
caption(ui, lang, "Tint:");
let mut v = d.n("tint").unwrap_or(100.0);
-- if ui.add(egui::Slider::new(&mut v, 0.0..=100.0).suffix("%").integer()).changed() {
++ if ui.add(egui::Slider::new(&mut v, 0.0..=100.0).suffix("%").integer()).accessible_name(tr(lang, "Tint")).changed() {
d.fields.insert("tint".into(), json!(v));
}
ui.end_row();
@@@ -239,7 -239,7 +248,7 @@@ pub fn open_color_group_options(app: &m
pub fn color_group_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
ui.horizontal(|ui| {
caption(ui, &app.ui.language, "Name:");
-- text_field(ui, d, "groupName", 220.0);
++ text_field_named(ui, d, "groupName", 220.0, tr(&app.ui.language, "Name"));
});
status(ui, d);
}
@@@ -269,11 -269,11 +278,11 @@@ pub fn layer_options(app: &DesignApp, u
let named = designcraft_doc::LAYER_COLORS.iter().find(|(_, c)| *c == rgb).map(|(n, _)| *n);
egui::Grid::new("layer_options").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
caption(ui, lang, "Name:");
-- text_field(ui, d, "name", 220.0);
++ text_field_named(ui, d, "name", 220.0, tr(lang, "Name"));
ui.end_row();
caption(ui, lang, "Color:");
ui.horizontal(|ui| {
-- egui::ComboBox::from_id_salt("layer_color")
++ let combo = egui::ComboBox::from_id_salt("layer_color")
.selected_text(crate::rtl::widget(ui, tr(lang, named.unwrap_or("Custom"))))
.width(140.0)
.show_ui(ui, |ui| {
@@@ -287,6 -287,6 +296,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, tr(lang, "Color"));
super::color_field(ui, d, "rgb");
});
ui.end_row();
@@@ -326,7 -326,7 +336,7 @@@ mod tests
let mut h = Harness::builder().with_size(vec2(360.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
move |ui, app: &mut DesignApp| {
// The fonts are installed before the first frame that draws.
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
diff --cc crates/ui-egui/src/dock.rs
index d4551e813,65e4420ad..aa8428469
--- a/crates/ui-egui/src/dock.rs
+++ b/crates/ui-egui/src/dock.rs
@@@ -90,11 -91,11 +91,9 @@@ pub fn show(app: &mut DesignApp, ui: &m
}
ui.painter().galley(egui::pos2(r.min.x + 13.0, r.center().y - g.size().y / 2.0), g, Color32::WHITE);
ui.painter().line_segment([r.right_top(), r.right_bottom()], Stroke::new(1.0, t.border));
-- let response = craft_ui::tabs::Tab::new(ui.id().with(("docktab", *id)), label, active).sense(Sense::click_and_drag()).show_at(
-- ui,
-- r,
-- |_, _| {},
-- );
++ let response = craft_ui::tabs::Tab::new(ui.scope_id().with(("docktab", *id)), label, active)
++ .sense(Sense::click_and_drag())
++ .show_at(ui, r, |_, _| {});
if response.clicked() {
app.ui.dock_tab = id.to_string();
}
@@@ -102,7 -103,7 +101,7 @@@
x += w;
}
let menu_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 24.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-- let menu = ui.interact(menu_r, ui.id().with("dock-menu"), Sense::click());
++ let menu = ui.interact(menu_r, ui.scope_id().with("dock-menu"), Sense::click());
if menu.hovered() {
ui.painter().rect_filled(menu_r, 3.0, t.hover);
}
@@@ -189,7 -190,7 +188,7 @@@ fn panel_entry(id: &str) -> Option<(&'s
fn icon_clicked(app: &mut DesignApp, ui: &mut egui::Ui, id: &str, response: &egui::Response) {
if response.clicked() {
if app.ui.floating.iter().any(|(p, _)| p == id) {
-- ui.ctx().move_to_top(egui::LayerId::new(egui::Order::Middle, egui::Id::new(("floating_panel", id))));
++ ui.ctx().move_to_top(egui::LayerId::new(egui::Order::Middle, egui::Id::unique(("floating_panel", id))));
} else {
let open = app.ui.open_panel.as_deref() == Some(id);
app.ui.open_panel = if open { None } else { Some(id.to_string()) };
@@@ -216,10 -217,10 +215,10 @@@ pub fn flyout(app: &mut DesignApp, ctx
let t = Tokens::get(ctx);
let label = crate::i18n::tr(&app.ui.language, panel_label(&id)).to_owned();
let screen = ctx.content_rect();
-- let dock_w = if app.ui.dock_expanded { ctx.memory(|m| m.area_rect(egui::Id::new("dock")).map(|r| r.width())).unwrap_or(280.0) } else { 0.0 };
++ let dock_w = if app.ui.dock_expanded { ctx.memory(|m| m.area_rect(egui::Id::unique("dock")).map(|r| r.width())).unwrap_or(280.0) } else { 0.0 };
let pos = egui::pos2(screen.max.x - icon_column_width(app) - dock_w - 262.0, 120.0);
let mut open = true;
-- egui::Area::new(egui::Id::new("panel_flyout")).order(egui::Order::Foreground).fixed_pos(pos).show(ctx, |ui| {
++ egui::Area::new(egui::Id::unique("panel_flyout")).order(egui::Order::Foreground).fixed_pos(pos).show(ctx, |ui| {
egui::Frame::popup(ui.style()).fill(t.panel).inner_margin(egui::Margin::same(0)).show(ui, |ui| {
ui.set_width(256.0);
// A previous shorter flyout must not constrain the next panel's scroll viewport.
@@@ -228,18 -229,18 +227,18 @@@
ui.painter().rect_filled(strip, 0.0, t.panel_darker);
crate::rtl::paint(ui.painter(), strip.min + vec2(10.0, 13.0), egui::Align2::LEFT_CENTER, &label, semibold(12.0), t.text_strong);
let close = egui::Rect::from_min_size(egui::pos2(strip.max.x - 22.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-- if ui.interact(close, ui.id().with("flyclose"), Sense::click()).clicked() {
++ if ui.interact(close, ui.scope_id().with("flyclose"), Sense::click()).clicked() {
open = false;
}
ui.painter().text(close.center(), egui::Align2::CENTER_CENTER, "×", egui::FontId::proportional(15.0), t.text_dim);
// Float: the button beside the close box, or drag the header away from the dock.
let float_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 44.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-- let fr = ui.interact(float_r, ui.id().with("flyfloat"), Sense::click()).on_hover_ui(|ui| {
++ let fr = ui.interact(float_r, ui.scope_id().with("flyfloat"), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Float panel"));
});
float_glyph(ui.painter(), float_r, t.text_dim);
let head = egui::Rect::from_min_max(strip.min, egui::pos2(float_r.min.x - 2.0, strip.max.y));
-- let hr = ui.interact(head, ui.id().with("flyhead"), Sense::drag());
++ let hr = ui.interact(head, ui.scope_id().with("flyhead"), Sense::drag());
let torn = hr.drag_stopped() && hr.total_drag_delta().is_some_and(|d| d.length() > 24.0);
if fr.clicked() || torn {
let at = if torn { ui.ctx().pointer_latest_pos().unwrap_or(pos) - vec2(20.0, 10.0) } else { pos - vec2(30.0, -30.0) };
@@@ -359,7 -361,7 +359,7 @@@ pub fn floating(app: &mut DesignApp, ct
let mut open = true;
let mut dock = false;
let mut w = egui::Window::new(label.clone())
-- .id(egui::Id::new(("floating_panel", &id)))
++ .id(egui::Id::unique(("floating_panel", &id)))
.title_bar(false)
.default_pos(egui::pos2(at[0], at[1]))
.default_width(if id == "tabs" { 560.0 } else { 256.0 })
@@@ -378,7 -380,7 +378,7 @@@
crate::rtl::paint(ui.painter(), strip.min + vec2(10.0, 12.0), egui::Align2::LEFT_CENTER, &label, semibold(12.0), t.text_strong);
let close = egui::Rect::from_min_size(egui::pos2(strip.max.x - 22.0, strip.min.y + 3.0), vec2(18.0, 18.0));
if ui
-- .interact(close, ui.id().with("fclose"), Sense::click())
++ .interact(close, ui.scope_id().with("fclose"), Sense::click())
.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Close"));
})
@@@ -390,7 -392,7 +390,7 @@@
let dock_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 44.0, strip.min.y + 3.0), vec2(18.0, 18.0));
if docks
&& ui
-- .interact(dock_r, ui.id().with("fdock"), Sense::click())
++ .interact(dock_r, ui.scope_id().with("fdock"), Sense::click())
.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Dock panel"));
})
@@@ -470,7 -472,7 +470,7 @@@ mod visual_regressions
harness.run_steps(4);
let stem = format!("designcraft-dock-{}-{width}-{scale}x", brightness.id());
harness.render().unwrap().save(directory.join(format!("{stem}.png"))).unwrap();
-- let panel = egui::containers::panel::PanelState::load(&harness.ctx, egui::Id::new("dock")).unwrap().outer_rect;
++ let panel = egui::containers::panel::PanelState::load(&harness.ctx, harness.ui_id().with("dock")).unwrap().outer_rect;
let region = serde_json::json!({
"screen": [width, 640.0], "scale": scale,
"regions": {"dock-tabs": [panel.left(), panel.top(), panel.width(), 45.0]}
@@@ -540,7 -542,7 +540,8 @@@ mod chevron_tests
/// The » / « chevron painted at the right end of a panel's 11 pt header.
fn chevron(harness: &Harness<'_, DesignApp>, panel: &str) -> egui::Pos2 {
-- let r = egui::containers::panel::PanelState::load(&harness.ctx, egui::Id::new(panel)).expect("the panel is laid out").outer_rect;
++ // A panel is keyed by the parent Ui the app draws in (see `test_window::panel_rect`).
++ let r = egui::containers::panel::PanelState::load(&harness.ctx, harness.ui_id().with(panel)).expect("the panel is laid out").outer_rect;
egui::pos2(r.max.x - 10.0, r.min.y + 5.0)
}
diff --cc crates/ui-egui/src/icons.rs
index a90fe989e,72c37fc83..f0486b97c
--- a/crates/ui-egui/src/icons.rs
+++ b/crates/ui-egui/src/icons.rs
@@@ -916,6 -922,6 +922,13 @@@ pub fn paint(p: &Painter, r: Rect, name
pen.line(&[(12.0, 3.5), (12.0, 16.5)]);
pen.line(&[(9.0, 10.0), (11.0, 10.0)]);
}
++ "small-caps" => {
++ // Two original T shapes share a baseline; no phonetic small-cap glyph is required.
++ pen.line(&[(3.0, 5.0), (10.0, 5.0)]);
++ pen.line(&[(6.5, 5.0), (6.5, 15.0)]);
++ pen.line(&[(12.0, 8.0), (17.0, 8.0)]);
++ pen.line(&[(14.5, 8.0), (14.5, 15.0)]);
++ }
"font-size" => {
pen.text(6.0, 12.5, "T", 10.0);
pen.text(13.0, 10.5, "T", 17.0);
@@@ -1058,7 -1158,7 +1165,7 @@@ pub fn button(ui: &mut egui::Ui, name:
let pad = size * 0.16;
paint(ui.painter(), r.shrink(pad), name, if selected { t.text_strong } else { t.icon });
let enabled = ui.is_enabled();
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, enabled, selected, tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, enabled, selected, tip));
if tip.is_empty() {
resp
} else {
diff --cc crates/ui-egui/src/lib.rs
index b149cea64,96c2c6eda..0141e16a4
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -566,6 -575,6 +575,59 @@@ pub struct Perf
pub fps: f64,
}
++/// The bounded admission policy for `ui.screenshot` captures.
++pub(crate) const SCREENSHOT_MAX_REQUESTS: usize = 4;
++pub(crate) const SCREENSHOT_MAX_IMAGE_BYTES: usize = 128 * 1024 * 1024;
++pub(crate) const SCREENSHOT_MAX_AGGREGATE_BYTES: usize = 256 * 1024 * 1024;
++
++/// The viewport geometry a capture was admitted for.
++#[derive(Clone, Copy, PartialEq, Debug)]
++struct ScreenshotGeometry {
++ width: usize,
++ height: usize,
++ /// The active document state epoch at admission; a switch or Revert invalidates it.
++ document: u64,
++ /// Logical size, DPI, zoom and fullscreen state. The window position is deliberately absent:
++ /// moving the window does not change the captured surface or its content. eframe 0.37 exposes
++ /// no portable surface-generation identity, so a same-size surface recreation is still a
++ /// documented qualification gap.
++ signature: [u32; 6],
++}
++
++/// The document, dialog and keyboard focus an injected input batch was captured for. If any of
++/// them changed before a settled UI pass took the batch, the batch no longer belongs to the new
++/// state and is discarded instead of replaying stale clicks or text.
++#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
++struct InputGeneration {
++ document: u64,
++ dialog: Option<egui::Id>,
++ focus: Option<egui::Id>,
++}
++
++/// One native file drop captured from the raw input. The generation travelled with it so a
++/// document, dialog or focus change before the next settled UI pass discards the stale drop.
++#[cfg(not(target_arch = "wasm32"))]
++#[derive(Clone, Debug)]
++struct PendingDrop {
++ path: String,
++ pointer: Option<egui::Pos2>,
++ generation: InputGeneration,
++}
++
++/// One admitted `ui.screenshot` request. The token, path, deadline and epoch are app-owned; the
++/// shared capture slot only correlates one completion with this record.
++struct ShotRequest {
++ token: u64,
++ path: Option<String>,
++ reply: Sender<ControlResponse>,
++ deadline: f64,
++ viewport: egui::ViewportId,
++ epoch: u64,
++ geometry: ScreenshotGeometry,
++ reserved_bytes: usize,
++ slot: Option<craft_ui::capture::CaptureSlot>,
++}
++
pub struct DesignApp {
pending_pdf: Option<ImportedFile>,
pub session: Session,
@@@ -592,14 -603,14 +656,47 @@@
pub synthetic: Vec<egui::Event>,
/// Control input stays separate from native-menu input until its frame is processed.
pub(crate) control_synthetic: Vec<egui::Event>,
++ /// Resolved native menu choices, kept stable across menu rebuilds until input settles.
++ native_actions: std::collections::VecDeque<(String, Value)>,
++ native_events_pending: std::sync::Arc<std::sync::atomic::AtomicBool>,
control_input_frame: std::sync::Arc<std::sync::atomic::AtomicBool>,
clipboard_guard_installed: bool,
/// Story open in the Story Editor.
pub story_editor: Option<story_editor::Target>,
control_rx: Option<Receiver<ControlRequest>>,
-- pending_shots: Vec<(u64, Option<String>, Sender<ControlResponse>, f64)>,
++ pending_shots: Vec<ShotRequest>,
queued_shots: Vec<(u64, f64, u32)>,
shot_token: u64,
++ /// The viewport geometry the live screenshot requests were admitted for.
++ screenshot_geometry: Option<ScreenshotGeometry>,
++ /// Advanced whenever the viewport size, DPI, zoom or surface changes (even back again).
++ screenshot_epoch: u64,
++ /// A synthetic input step was injected and has not yet reached a settled UI pass.
++ synthetic_injected: bool,
++ /// The exact events of that batch, so a generation change can remove them from the host's
++ /// pending raw input before they reach a UI pass.
++ injected_events: Vec<egui::Event>,
++ /// The batch came from the control channel (private clipboard and provenance).
++ injected_private: bool,
++ /// What the document, dialog and focus were when that batch was injected.
++ injected_generation: InputGeneration,
++ /// The batch is in the host's pending raw input and not yet consumed by a settled pass.
++ injected_pending: std::sync::Arc<std::sync::atomic::AtomicBool>,
++ /// A settled `run_ui` pass ended since the batch was injected; the next host iteration
++ /// acknowledges it. This also covers harnesses that consume the raw input without `app.ui`.
++ injected_settled: std::sync::Arc<std::sync::atomic::AtomicBool>,
++ /// The end-of-pass settlement observer is installed on the egui context.
++ injected_settle_hook: bool,
++ /// Native dropped files with the input generation they were captured for, buffered from the
++ /// raw input before a pass so hidden logic cannot replay a previous drop.
++ #[cfg(not(target_arch = "wasm32"))]
++ pending_drops: Vec<PendingDrop>,
++ #[cfg(test)]
++ logic_tick_ticks: u32,
++ #[cfg(test)]
++ logic_frame_ticks: u32,
++ #[cfg(test)]
++ input_ticks: u32,
styled: bool,
/// The interface language the UI fonts were installed for (it orders the CJK fallbacks).
fonts_lang: String,
@@@ -621,9 -632,9 +718,9 @@@
/// Shortcuts the native menu handles (skip them in the egui shortcut handler).
pub native_shortcuts: std::collections::HashSet<String>,
last_time: f64,
-- /// When recovery data was last written (seconds, egui time).
++ /// When recovery data was last written (seconds on the monotonic clock; see [`now_ms`]).
pub last_recovery: f64,
-- /// The egui context (set by the first frame): copied text goes to the system clipboard through it.
++ /// The egui context (set by the first UI pass): copied text goes to the system clipboard through it.
egui_ctx: Option<egui::Context>,
/// A control-channel request is being handled: commands it runs never read or write the
/// user's system clipboard (a control client must not see or replace it).
@@@ -640,8 -651,8 +737,21 @@@
/// The canvas asked for the system IME in the last frame (the web build's text input has the
/// keyboard then).
pub(crate) canvas_ime: bool,
++ /// Owner/generation/cause bookkeeping for the canvas story's custom IME producer.
++ pub(crate) ime_tracker: egui::ime_context::ImeContextTracker,
++ /// An IME delete-surrounding request waiting for the Commit in the same event batch.
++ pub(crate) pending_ime_delete: Option<(usize, usize, bool)>,
++ /// The owner the current composition began in: a late commit may only land there.
++ pub(crate) ime_target: Option<egui::ime_context::ImeTarget>,
++ /// This pass dropped a late commit or delete for a composition that had already ended: the
++ /// system IME must interrupt its copy (as for a click away).
++ pub(crate) ime_interrupt: bool,
++ /// What the canvas recorded for this pass's IME observation, applied at the end of the pass.
++ pub(crate) ime_canvas: Option<canvas::CanvasIme>,
/// Quit was chosen: close the window on the next frame, as its close button does.
quit_requested: bool,
++ /// An OS close event deferred while a synthetic gesture or native action is pending.
++ close_requested_pending: bool,
/// Close the window without asking about unsaved changes (the control channel's `app.quit`).
pub(crate) quit_without_asking: bool,
/// No document is discarded until every unsaved document has an up-to-date approval.
@@@ -669,6 -680,6 +779,9 @@@ impl DesignApp
pub fn new(session: Session, services: Services) -> Self {
// The font menus and the first file opened need the installed fonts: catalog them now.
designcraft_fonts::FontDb::global().scan_in_background();
++ // The app owns the monotonic origin for recovery timing and frame pacing; `now_ms` itself
++ // is process-global so screenshot deadlines stay comparable across hosts.
++ let now = now_ms() / 1000.0;
DesignApp {
pending_pdf: None,
session,
@@@ -687,6 -699,6 +801,8 @@@
perf: Perf::default(),
synthetic: vec![],
control_synthetic: vec![],
++ native_actions: Default::default(),
++ native_events_pending: Default::default(),
control_input_frame: Default::default(),
clipboard_guard_installed: false,
story_editor: None,
@@@ -694,6 -706,6 +810,23 @@@
pending_shots: vec![],
queued_shots: vec![],
shot_token: 0,
++ screenshot_geometry: None,
++ screenshot_epoch: 0,
++ synthetic_injected: false,
++ injected_events: Vec::new(),
++ injected_private: false,
++ injected_generation: InputGeneration::default(),
++ injected_pending: Default::default(),
++ injected_settled: Default::default(),
++ injected_settle_hook: false,
++ #[cfg(not(target_arch = "wasm32"))]
++ pending_drops: Vec::new(),
++ #[cfg(test)]
++ logic_tick_ticks: 0,
++ #[cfg(test)]
++ logic_frame_ticks: 0,
++ #[cfg(test)]
++ input_ticks: 0,
styled: false,
fonts_lang: String::new(),
fonts_system: false,
@@@ -706,15 -718,15 +839,21 @@@
pending_window_commands: vec![],
native_menu: false,
native_shortcuts: Default::default(),
-- last_time: 0.0,
-- last_recovery: 0.0,
++ last_time: now,
++ last_recovery: now,
egui_ctx: None,
in_control: false,
object_clip_text: None,
ime_marked: None,
ime_discard: false,
canvas_ime: false,
++ ime_tracker: egui::ime_context::ImeContextTracker::new(),
++ pending_ime_delete: None,
++ ime_target: None,
++ ime_interrupt: false,
++ ime_canvas: None,
quit_requested: false,
++ close_requested_pending: false,
quit_without_asking: false,
quitting: None,
cursors: cursors::Images::default(),
@@@ -805,6 -824,6 +951,11 @@@
self.canvas_ime
}
++ /// The second window uses a stable viewport id; forget its IME context when it closes.
++ pub(crate) fn end_second_ime_viewport(&mut self) {
++ self.ime_tracker.end_viewport(egui::ViewportId::from_hash_of("designcraft_second_window"));
++ }
++
/// "<feature>: <error>" in the status bar: the feature name is translated, the engine's own
/// error text stays as the engine wrote it.
pub fn status_error(&mut self, feature: &str, error: impl std::fmt::Display) {
@@@ -1137,8 -1156,8 +1288,51 @@@
self.ui.flyout = None;
}
-- /// Per-frame logic before layout.
++ /// Queue and deadline work, run once per app callback.
++ ///
++ /// `logic_tick` runs on every call (a first pass, a later discarded pass, or a hidden
++ /// `run_logic` tick) and consumes queues and deadlines once. Work that is genuinely once per
++ /// presented layout frame lives in [`Self::ui_setup`] / [`Self::ui_frame_end`], which only a
++ /// real `run_ui` pass calls. A hidden `run_logic` tick also reports pass index zero, so the
++ /// pass index alone cannot identify a UI pass.
pub fn logic(&mut self, ctx: &egui::Context) {
++ #[cfg(test)]
++ {
++ self.logic_tick_ticks += 1;
++ }
++ self.logic_tick(ctx);
++ }
++
++ /// Work whose identity is a consumed queue item, revision or deadline.
++ fn logic_tick(&mut self, ctx: &egui::Context) {
++ self.update_screenshot_epoch(ctx);
++ self.drain_control(ctx);
++ if self.fonts_ready && !self.host_order_pending() {
++ self.drain_inbox();
++ self.open_os_documents();
++ }
++ if self.host_order_pending() {
++ ctx.request_repaint();
++ }
++ self.collect_screenshots(ctx);
++ // Ending a stale preview is state cleanup after a control/menu action, not a frame effect:
++ // it stays here so a hidden tick still closes a preview whose dialog has gone.
++ if !self.host_order_pending() {
++ new_document::end_stale_preview(self);
++ }
++ self.request_hidden_paint_for_pending_input(ctx);
++ self.handle_quit(ctx);
++ self.flush_window_commands(ctx);
++ }
++
++ /// The first pass of a real `run_ui`: fonts, theme, scale and window state, before any widget
++ /// is laid out. It must run before the font gate in [`Self::ui`], or the app would wait for
++ /// fonts that this function is what installs.
++ pub(crate) fn ui_setup(&mut self, ctx: &egui::Context) {
++ #[cfg(test)]
++ {
++ self.logic_frame_ticks += 1;
++ }
if self.egui_ctx.is_none() {
self.egui_ctx = Some(ctx.clone());
}
@@@ -1190,7 -1209,7 +1384,12 @@@
theme::apply(ctx, &theme::Tokens::for_brightness(self.ui.brightness));
self.restyle = false;
}
-- let now = ctx.input(|i| i.time);
++ }
++
++ /// The end of a settled `run_ui` pass: pacing, recovery and screenshot settlement. Recovery
++ /// uses the monotonic clock, so a wall-clock/NTP jump cannot postpone or advance it.
++ fn ui_frame_end(&mut self, ctx: &egui::Context) {
++ let now = now_ms() / 1000.0;
// Crash recovery: unsaved documents are written to the recovery folder every 30 s.
#[cfg(not(target_arch = "wasm32"))]
if self.session.recovery_dir.is_some() && now - self.last_recovery > (self.session.prefs.recovery_minutes * 60.0).max(5.0) {
@@@ -1206,32 -1225,32 +1405,34 @@@
self.perf.fps = self.perf.fps * 0.9 + (1.0 / dt).min(240.0) * 0.1;
}
self.last_time = now;
-- self.drain_control(ctx);
-- new_document::end_stale_preview(self);
-- if self.fonts_ready {
-- self.drain_inbox();
-- self.open_os_documents();
-- }
-- if !self.synthetic.is_empty() || !self.control_synthetic.is_empty() {
-- ctx.request_repaint();
-- }
-- self.collect_screenshots(ctx);
self.issue_screenshots(ctx);
-- if self.fonts_ready {
-- menus::shortcuts(self, ctx);
++ }
++
++ /// Keep pending synthetic input and screenshot settlement repainting while the window may be
++ /// hidden.
++ ///
++ /// `visible() == None` means unknown and is treated like hidden. The command holds for one
++ /// frame and is sent once per tick until a settled UI pass has taken the injected step or
++ /// issued the queued capture.
++ fn request_hidden_paint_for_pending_input(&self, ctx: &egui::Context) {
++ let pending = self.host_order_pending() || !self.queued_shots.is_empty();
++ if !pending || ctx.input(|i| i.viewport().visible()) == Some(true) {
++ return;
}
-- self.flush_window_commands(ctx);
++ // The 0.37 web backend ignores `RequestPaintWhileHidden` until the fork carries it. Do not
++ // pretend a hidden-tab capture or gesture will run there; the request times out instead.
#[cfg(not(target_arch = "wasm32"))]
-- {
-- let (dropped, pointer) = ctx.input(|i| (i.raw.dropped_files.clone(), i.pointer.hover_pos()));
-- for f in dropped {
-- let p = f.path().to_string_lossy().to_string();
-- if !p.is_empty() {
-- let _ = self.open_dropped_at(&p, pointer);
-- }
-- }
++ ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaintWhileHidden);
++ }
++
++ /// Advance the screenshot geometry epoch whenever size, DPI, zoom or surface change.
++ fn update_screenshot_epoch(&mut self, ctx: &egui::Context) {
++ let Some(mut geometry) = screenshot_geometry(ctx) else { return };
++ geometry.document = self.active_document_epoch();
++ if self.screenshot_geometry != Some(geometry) {
++ self.screenshot_geometry = Some(geometry);
++ self.screenshot_epoch = self.screenshot_epoch.wrapping_add(1);
}
-- self.handle_quit(ctx);
}
/// Quit: close the window the way its close button does, so unsaved documents ask first.
@@@ -1242,10 -1261,10 +1443,20 @@@
/// Ask about unsaved documents without closing any of them yet. A later Cancel must also
/// keep documents whose earlier answer was Don't Save, including their history and recovery.
fn handle_quit(&mut self, ctx: &egui::Context) {
-- if std::mem::take(&mut self.quit_requested) {
++ let close_requested = ctx.input(|i| i.viewport().close_requested());
++ if self.host_order_pending() {
++ if close_requested {
++ self.close_requested_pending = true;
++ ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
++ }
++ ctx.request_repaint();
++ return;
++ }
++ let replay_close = std::mem::take(&mut self.close_requested_pending);
++ if std::mem::take(&mut self.quit_requested) || replay_close {
ctx.send_viewport_cmd(egui::ViewportCommand::Close);
}
-- if ctx.input(|i| i.viewport().close_requested()) {
++ if close_requested || replay_close {
if self.quit_without_asking {
self.quitting = None;
return;
@@@ -1505,31 -1524,31 +1716,207 @@@
self.clipboard_guard_installed = true;
}
-- /// Inject synthetic events (one pointer event per frame), retaining control provenance.
-- pub fn raw_input_hook(&mut self, raw: &mut egui::RawInput) {
-- let private = !self.control_synthetic.is_empty();
++ /// Inject synthetic events (one pointer event per host iteration), retaining control
++ /// provenance until a settled UI pass has actually taken the batch.
++ pub fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
++ if !self.injected_settle_hook {
++ let pending = self.injected_pending.clone();
++ let settled = self.injected_settled.clone();
++ ctx.on_end_pass(
++ "injected input settlement",
++ std::sync::Arc::new(move |ui| {
++ if ui.ctx().viewport_id() == egui::ViewportId::ROOT
++ && pending.load(std::sync::atomic::Ordering::Relaxed)
++ && !ui.ctx().will_discard()
++ {
++ settled.store(true, std::sync::atomic::Ordering::Relaxed);
++ }
++ }),
++ );
++ self.injected_settle_hook = true;
++ }
++ // A settled pass that did not go through `DesignApp::ui` (a harness consuming raw input
++ // directly) still consumed the batch; acknowledge it before considering the next step.
++ if self.injected_settled.swap(false, std::sync::atomic::Ordering::Relaxed) {
++ self.synthetic_injected = false;
++ self.injected_events.clear();
++ self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
++ self.injected_private = false;
++ }
++ #[cfg(not(target_arch = "wasm32"))]
++ {
++ let pointer = raw.events.iter().rev().find_map(|event| match event {
++ egui::Event::PointerMoved(pos) | egui::Event::PointerButton { pos, .. } => Some(*pos),
++ _ => None,
++ });
++ let generation = self.input_generation();
++ for file in std::mem::take(&mut raw.dropped_files) {
++ let path = file.path().to_string_lossy().to_string();
++ if !path.is_empty() {
++ self.pending_drops.push(PendingDrop { path, pointer, generation });
++ }
++ }
++ }
++ self.discard_stale_injected_batch(raw);
++ // A batch acknowledged by the previous pass keeps its private provenance through that
++ // pass's end hook (the clipboard guard), and is cleared at the next host iteration.
++ if !self.synthetic_injected {
++ self.injected_private = false;
++ }
++ let private = self.injected_private || !self.control_synthetic.is_empty();
self.control_input_frame.store(private, std::sync::atomic::Ordering::Relaxed);
++ // While the previous batch is still unapplied (it lives in eframe's pending raw input),
++ // inject nothing more: one pointer step per UI pass, not per hidden logic tick.
++ if self.synthetic_injected {
++ return;
++ }
++ let private = !self.control_synthetic.is_empty();
let events = if private { &mut self.control_synthetic } else { &mut self.synthetic };
let Some(first) = events.first() else { return };
let n = match first {
egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } => 1,
_ => events.iter().position(|e| matches!(e, egui::Event::Key { pressed: false, .. })).map_or(events.len(), |i| i + 1),
};
-- if let egui::Event::PointerMoved(p) | egui::Event::PointerButton { pos: p, .. } = first {
-- raw.events.push(egui::Event::PointerMoved(*p));
++ let batch: Vec<egui::Event> = events.drain(..n).collect();
++ self.injected_generation = self.input_generation();
++ self.injected_private = private;
++ self.injected_events = batch.clone();
++ self.injected_pending.store(true, std::sync::atomic::Ordering::Relaxed);
++ raw.events.extend(batch);
++ // Held until a settled UI pass runs with the fonts installed; a hidden logic tick, a
++ // discarded multipass first pass or a font-gated early return must not acknowledge it.
++ self.synthetic_injected = true;
++ }
++
++ /// Notify after enqueuing a native menu event, before waking the host. The returned callback
++ /// owns its state so the event handler never borrows the app.
++ pub fn native_action_notifier(&self, ctx: egui::Context) -> Box<dyn Fn() + Send + Sync> {
++ let pending = self.native_events_pending.clone();
++ Box::new(move || {
++ pending.store(true, std::sync::atomic::Ordering::Release);
++ ctx.request_repaint();
++ })
++ }
++
++ /// Poll from the first real UI pass, under the host's normal UI/watchdog guard. Resolve menu
++ /// choices before refreshing their IDs, then execute them once synthetic input has settled.
++ /// Event arrival already blocks logic deliveries, so a deferred action keeps its ordering
++ /// without executing native dialogs or menu commands from a hidden logic-only tick.
++ pub fn poll_native_actions(&mut self, ctx: &egui::Context, mut next: impl FnMut() -> Option<(String, Value)>) {
++ // Clear before draining: a notification arriving during the drain stays set for the
++ // next pass, even when its channel send races the final empty receive.
++ self.native_events_pending.swap(false, std::sync::atomic::Ordering::AcqRel);
++ while let Some((id, params)) = next() {
++ self.native_actions.push_back((id, params));
+ }
- raw.events.extend(events.drain(..n));
++ self.apply_native_actions(ctx);
++ }
++
++ fn synthetic_input_pending(&self) -> bool {
++ self.synthetic_injected || !self.control_synthetic.is_empty() || !self.synthetic.is_empty()
++ }
++
++ fn host_order_pending(&self) -> bool {
++ self.synthetic_input_pending() || !self.native_actions.is_empty() || self.native_events_pending.load(std::sync::atomic::Ordering::Acquire)
++ }
++
++ fn apply_native_actions(&mut self, ctx: &egui::Context) {
++ while !self.synthetic_input_pending() {
++ let Some((id, params)) = self.native_actions.pop_front() else { break };
++ menus::activate_native(self, ctx, &id, &params);
++ }
++ if self.host_order_pending() {
++ ctx.request_repaint();
++ }
++ }
++
++ /// The current state an injected batch belongs to.
++ fn input_generation(&self) -> InputGeneration {
++ InputGeneration {
++ document: self.active_document_epoch(),
++ dialog: self.ui.dialog.as_ref().map(|dialog| egui::Id::unique(&dialog.id)),
++ focus: self.egui_ctx.as_ref().and_then(|ctx| ctx.memory(|memory| memory.focused())),
+ }
- raw.events.extend(events.drain(..n));
++ }
++
++ /// Drop a batch whose document, dialog or focus changed before a UI pass could take it.
++ /// The batch is still in the host's pending raw input; remove exactly the events we appended
++ /// (contiguously, in order) so a subsequent forced paint cannot replay stale input.
++ fn discard_stale_injected_batch(&mut self, raw: &mut egui::RawInput) {
++ if !self.synthetic_injected || self.input_generation() == self.injected_generation {
++ return;
++ }
++ let events = std::mem::take(&mut self.injected_events);
++ if !events.is_empty()
++ && let Some(start) = raw.events.windows(events.len()).rposition(|window| window == events.as_slice())
++ {
++ raw.events.drain(start..start + events.len());
++ }
++ self.synthetic_injected = false;
++ self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
++ self.injected_private = false;
++ self.control_input_frame.store(false, std::sync::atomic::Ordering::Relaxed);
++ }
++
++ /// A font-gated first pass saw the events before any widget did. Put the same batch back at
++ /// the front of its queue (with the original provenance) so a later UI pass consumes it.
++ fn requeue_injected_batch(&mut self) {
++ if !std::mem::take(&mut self.synthetic_injected) {
++ return;
++ }
++ let events = std::mem::take(&mut self.injected_events);
++ if !events.is_empty() {
++ if self.injected_private {
++ self.control_synthetic.splice(0..0, events);
++ } else {
++ self.synthetic.splice(0..0, events);
++ }
++ }
++ self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
++ self.injected_private = false;
++ self.control_input_frame.store(false, std::sync::atomic::Ordering::Relaxed);
}
/// Lay out the whole window.
pub fn ui(&mut self, ui: &mut egui::Ui) {
++ #[cfg(test)]
++ {
++ self.input_ticks += 1;
++ }
let ctx = ui.ctx().clone();
self.canvas_ime = false;
++ self.ime_canvas = None;
++ self.ime_interrupt = false;
++ // Fonts/theme must be installed from the real UI pass, before the font gate below: doing
++ // this only from a hidden logic tick would make the first shown pass wait forever.
++ if ctx.current_pass_index() == 0 {
++ self.ui_setup(&ctx);
++ }
if !self.fonts_ready {
++ // The first pass installs fonts and returns before any widget sees this frame's input.
++ // Put an injected step back rather than acknowledge it as consumed.
++ self.requeue_injected_batch();
ctx.request_repaint();
return;
}
self.settle_live_preview();
++ // Input consumers run once, in the live first UI pass, before layout. Hidden logic ticks
++ // must not replay shortcuts or dropped files from stale input.
++ if ctx.current_pass_index() == 0 {
++ #[cfg(not(target_arch = "wasm32"))]
++ {
++ // Sample the generation once for the whole batch: placing the first valid file
++ // must not suppress later files that belong to the same captured batch.
++ let current = self.input_generation();
++ for drop in std::mem::take(&mut self.pending_drops) {
++ if drop.generation != current {
++ continue;
++ }
++ let _ = self.open_dropped_at(&drop.path, drop.pointer);
++ }
++ }
++ menus::shortcuts(self, &ctx);
++ }
let t0 = now_ms();
let t = theme::Tokens::get(&ctx);
let presenting = self.ui.screen_mode == ScreenMode::Presentation;
@@@ -1642,12 -1661,12 +2029,18 @@@
canvas::show(self, ui);
});
if ui.input(|i| i.viewport().close_requested()) {
++ self.end_second_ime_viewport();
self.second_window = false;
self.focus_pane = 0;
}
},
);
self.switch_pane(self.focus_pane);
++ } else if self.second_window {
++ // The child viewport does not run this pass (Presentation, or no document for its
++ // title): its pass counter stops advancing, so treat it as gone and let the tracker
++ // start a fresh context when the window is shown again.
++ self.end_second_ime_viewport();
}
// Tab, Shift+Tab and Presentation hide the floating panels with the docked ones.
if !presenting && self.ui.hidden_panels == 0 {
@@@ -1658,84 -1677,84 +2051,320 @@@
dialogs::show(self, &ctx);
about::show(self, &ctx);
menus::palette(self, &ctx);
++ // The IME is observed once, here: after the canvas, the floating panels, the story editor,
++ // dialogs and Quick Apply have all applied this pass's commands and focus changes.
++ canvas::ime_observe(self, &ctx);
if self.custom_titlebar {
chrome::resize_borders(self, ui);
}
for url in std::mem::take(&mut self.ui.pending_urls) {
ctx.open_url(egui::OpenUrl::new_tab(url));
}
++ if !ctx.will_discard() {
++ // A settled UI pass has taken the injected step (a discarded pass has not). Keep
++ // `injected_private` until the next raw-input hook, so this pass's end-pass clipboard
++ // guard still sees the control provenance.
++ self.synthetic_injected = false;
++ self.injected_events.clear();
++ self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
++ self.injected_settled.store(false, std::sync::atomic::Ordering::Relaxed);
++ self.ui_frame_end(&ctx);
++ }
self.perf.frame_ms = now_ms() - t0;
}
fn drain_control(&mut self, ctx: &egui::Context) {
++ // An injected batch may still be waiting in the host's pending raw input. Running another
++ // control command now could switch documents or dialogs under it, so keep the channel
++ // queued until a settled UI pass has taken the batch.
++ if self.host_order_pending() {
++ return;
++ }
let Some(rx) = self.control_rx.take() else { return };
-- while let Ok(req) = rx.try_recv() {
++ while !self.host_order_pending() {
++ let Ok(req) = rx.try_recv() else { break };
let reply = req.reply.clone();
match control::handle(self, ctx, &req) {
control::Outcome::Done(v) => {
let _ = reply.send(v);
}
control::Outcome::Screenshot { path } => {
-- self.shot_token += 1;
-- let token = self.shot_token;
-- self.queued_shots.push((token, now_ms() + 120.0, 0));
-- self.pending_shots.push((token, path, reply, now_ms() + 8000.0));
++ if let Err(e) = self.admit_screenshot(path, reply.clone()) {
++ let _ = reply.send(e);
++ }
}
}
}
self.control_rx = Some(rx);
}
++ /// Admit one `ui.screenshot` request against the app's count and byte budgets.
++ ///
++ /// Admission happens before any capture is issued: the checked, current viewport dimensions
++ /// reserve their RGBA bytes, and queued plus completed images are counted together.
++ fn admit_screenshot(&mut self, path: Option<String>, reply: Sender<ControlResponse>) -> Result<u64, serde_json::Value> {
++ let Some(mut geometry) = self.screenshot_geometry else {
++ return Err(json!({"ok": false, "error": "the window geometry is not known yet"}));
++ };
++ // The cached geometry may predate a document switch handled earlier in this same logic
++ // tick. Admit for the current document, not for the one the cache last saw.
++ geometry.document = self.active_document_epoch();
++ if self.pending_shots.len() >= SCREENSHOT_MAX_REQUESTS {
++ return Err(json!({"ok": false, "error": format!("at most {SCREENSHOT_MAX_REQUESTS} screenshot requests may be outstanding")}));
++ }
++ let reserved_bytes = geometry
++ .width
++ .checked_mul(geometry.height)
++ .and_then(|pixels| pixels.checked_mul(4))
++ .ok_or_else(|| json!({"ok": false, "error": "the screenshot dimensions overflow the addressable size"}))?;
++ if reserved_bytes > SCREENSHOT_MAX_IMAGE_BYTES {
++ return Err(json!({
++ "ok": false,
++ "error": format!(
++ "a screenshot of {}×{} exceeds the {SCREENSHOT_MAX_IMAGE_BYTES}-byte image limit",
++ geometry.width, geometry.height
++ )
++ }));
++ }
++ let used = self.pending_shots.iter().try_fold(0usize, |total, shot| total.checked_add(shot.reserved_bytes));
++ let over_budget = used.and_then(|used| used.checked_add(reserved_bytes)).is_none_or(|total| total > SCREENSHOT_MAX_AGGREGATE_BYTES);
++ if over_budget {
++ return Err(json!({"ok": false, "error": format!("the {SCREENSHOT_MAX_AGGREGATE_BYTES}-byte screenshot budget is exhausted")}));
++ }
++ self.shot_token += 1;
++ let token = self.shot_token;
++ let now = now_ms();
++ self.queued_shots.push((token, now + 120.0, 0));
++ self.pending_shots.push(ShotRequest {
++ token,
++ path,
++ reply,
++ deadline: now + 8000.0,
++ viewport: egui::ViewportId::ROOT,
++ epoch: self.screenshot_epoch,
++ geometry,
++ reserved_bytes,
++ slot: None,
++ });
++ Ok(token)
++ }
++
++ /// The current document state (`0` when none is open). Revert preserves the UID but
++ /// gives the replacement state a new epoch, invalidating old captures and input.
++ fn active_document_epoch(&self) -> u64 {
++ self.session.active().map_or(0, |document| document.identity_epoch)
++ }
++
++ /// Reject one admitted request: remove its admission and queued token and cancel any live
++ /// capture slot before replying with the error.
++ fn reject_screenshot(&mut self, index: usize, message: &str) {
++ let shot = self.pending_shots.remove(index);
++ self.queued_shots.retain(|(token, ..)| *token != shot.token);
++ if let Some(slot) = &shot.slot {
++ slot.cancel();
++ }
++ let _ = shot.reply.send(json!({"ok": false, "error": message}));
++ }
++
++ /// Settle and issue queued captures. Called only at the end of a settled `run_ui` pass, so
++ /// `frames` counts actual layout passes; hidden logic ticks never satisfy the three-frame
++ /// settling policy on their own.
fn issue_screenshots(&mut self, ctx: &egui::Context) {
let now = now_ms();
++ let mut due = Vec::new();
self.queued_shots.retain_mut(|(token, at, frames)| {
*frames += 1;
if now >= *at && *frames >= 3 {
-- ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(egui::UserData::new(*token)));
++ due.push(*token);
false
} else {
true
}
});
++ for token in due {
++ let Some(index) = self.pending_shots.iter().position(|shot| shot.token == token) else { continue };
++ if self.pending_shots[index].geometry.document != self.active_document_epoch() {
++ self.reject_screenshot(index, "the active document changed before the screenshot was issued");
++ continue;
++ }
++ let Some(current) = self.screenshot_geometry else {
++ let shot = self.pending_shots.remove(index);
++ let _ = shot.reply.send(json!({"ok": false, "error": "the window geometry is not known yet"}));
++ continue;
++ };
++ // Re-check the current dimensions before issuing: a request admitted before a resize,
++ // DPI or zoom change must renew its checked reservation (or fail, never overrun it).
++ if self.pending_shots[index].epoch != self.screenshot_epoch {
++ let bytes = current.width.checked_mul(current.height).and_then(|pixels| pixels.checked_mul(4));
++ let others = self
++ .pending_shots
++ .iter()
++ .enumerate()
++ .filter(|(i, _)| *i != index)
++ .try_fold(0usize, |total, (_, shot)| total.checked_add(shot.reserved_bytes));
++ let reserved = bytes.zip(others).and_then(|(bytes, others)| others.checked_add(bytes).map(|total| (bytes, total)));
++ let fits = reserved.is_some_and(|(bytes, total)| bytes <= SCREENSHOT_MAX_IMAGE_BYTES && total <= SCREENSHOT_MAX_AGGREGATE_BYTES);
++ let Some((bytes, _)) = reserved else {
++ let shot = self.pending_shots.remove(index);
++ let _ = shot.reply.send(json!({
++ "ok": false,
++ "error": "the window changed and the screenshot no longer fits the admitted budget"
++ }));
++ continue;
++ };
++ if !fits {
++ let shot = self.pending_shots.remove(index);
++ let _ = shot.reply.send(json!({
++ "ok": false,
++ "error": "the window changed and the screenshot no longer fits the admitted budget"
++ }));
++ continue;
++ }
++ let shot = &mut self.pending_shots[index];
++ shot.epoch = self.screenshot_epoch;
++ shot.geometry = current;
++ shot.reserved_bytes = bytes;
++ }
++ let shot = &mut self.pending_shots[index];
++ let (slot, callback) = craft_ui::capture::CaptureSlot::new(ctx, shot.viewport, SCREENSHOT_MAX_IMAGE_BYTES);
++ shot.slot = Some(slot);
++ // The callback holds only a weak slot: it never captures the app, writes a file, runs a
++ // command or wakes the context itself (the slot's live request does that).
++ ctx.send_viewport_cmd_to(shot.viewport, egui::ViewportCommand::Screenshot(callback));
++ }
if !self.queued_shots.is_empty() || !self.pending_shots.is_empty() {
ctx.request_repaint_after(std::time::Duration::from_millis(16));
}
++ // The screenshot command itself forces one hidden paint; the settling frames before it do
++ // not, so ask for them while the window may be hidden. The 0.37 web backend does not yet
++ // honor this command (fork follow-up): hidden-tab captures time out there rather than
++ // pretending to settle.
++ if !self.queued_shots.is_empty() && ctx.input(|i| i.viewport().visible()) != Some(true) {
++ #[cfg(not(target_arch = "wasm32"))]
++ ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaintWhileHidden);
++ }
}
++ /// Take completed captures out of their slots and write files only on this (UI) thread.
fn collect_screenshots(&mut self, ctx: &egui::Context) {
if self.pending_shots.is_empty() {
return;
}
-- let events: Vec<_> = ctx.input(|i| {
-- i.raw
-- .events
-- .iter()
-- .filter_map(|e| match e {
-- egui::Event::Screenshot { user_data, image, .. } => {
-- let token = user_data.data.as_ref().and_then(|d| d.downcast_ref::<u64>()).copied()?;
-- Some((token, image.clone()))
++ let now = now_ms();
++ let current_document = self.active_document_epoch();
++ let mut i = 0;
++ while i < self.pending_shots.len() {
++ // Check before taking the callback: a request whose document changed must not write,
++ // retry, or wait for its slot, even when no frame has completed yet.
++ if self.pending_shots.get(i).is_some_and(|shot| shot.geometry.document != current_document) {
++ self.reject_screenshot(i, "the active document changed while the screenshot was pending");
++ continue;
++ }
++ let taken = self.pending_shots.get(i).and_then(|shot| shot.slot.as_ref()).and_then(|slot| slot.take());
++ let Some(result) = taken else {
++ if now >= self.pending_shots[i].deadline {
++ let shot = self.pending_shots.remove(i);
++ self.queued_shots.retain(|(token, ..)| *token != shot.token);
++ if let Some(slot) = &shot.slot {
++ slot.cancel();
}
-- _ => None,
-- })
-- .collect()
-- });
-- for (token, image) in events {
-- if let Some(i) = self.pending_shots.iter().position(|(t, ..)| *t == token) {
-- let (_, path, reply, _) = self.pending_shots.remove(i);
-- let _ = reply.send(control::save_screenshot(self, &image, path.as_deref()));
++ let _ = shot.reply.send(json!({"ok": false, "error": "no frame was presented (screen locked or window hidden); use ui.render"}));
++ } else {
++ i += 1;
++ }
++ continue;
++ };
++ let (epoch_changed, within_reserved) = {
++ let shot = &self.pending_shots[i];
++ let within = match &result {
++ Ok(image) => {
++ let [width, height] = image.size;
++ width <= shot.geometry.width && height <= shot.geometry.height
++ }
++ Err(_) => true,
++ };
++ (shot.epoch != self.screenshot_epoch, within)
++ };
++ if !epoch_changed && within_reserved {
++ let shot = self.pending_shots.remove(i);
++ self.queued_shots.retain(|(token, ..)| *token != shot.token);
++ let value = match result {
++ Ok(image) => control::save_screenshot(self, image.as_ref(), shot.path.as_deref()),
++ Err(e) => json!({"ok": false, "error": e.to_string()}),
++ };
++ let _ = shot.reply.send(value);
++ continue;
}
-- }
-- let now = now_ms();
-- self.pending_shots.retain(|(_, _, reply, deadline)| {
-- if now < *deadline {
-- return true;
++ let (retry, retry_token) = {
++ let shot = &self.pending_shots[i];
++ (now < shot.deadline, shot.token)
++ };
++ if let Some(slot) = self.pending_shots[i].slot.take() {
++ slot.cancel();
}
-- let _ = reply.send(json!({"ok": false, "error": "no frame was presented (screen locked or window hidden); use ui.render"}));
-- false
-- });
++ if !retry {
++ let shot = self.pending_shots.remove(i);
++ self.queued_shots.retain(|(token, ..)| *token != shot.token);
++ let message = match result {
++ Err(e) => e.to_string(),
++ Ok(_) if epoch_changed => "the window changed while the screenshot was captured".to_string(),
++ Ok(_) => "the screenshot is larger than the admitted viewport".to_string(),
++ };
++ let _ = shot.reply.send(json!({"ok": false, "error": message}));
++ continue;
++ }
++ // Reject the stale pixels and retry within the same deadline with a fresh epoch.
++ self.queued_shots.push((retry_token, now + 120.0, 0));
++ i += 1;
++ }
++ if !self.queued_shots.is_empty() || !self.pending_shots.is_empty() {
++ ctx.request_repaint_after(std::time::Duration::from_millis(16));
++ }
}
}
++/// The physical capture surface of the root viewport, from its logical rect and DPI.
++fn screenshot_geometry(ctx: &egui::Context) -> Option<ScreenshotGeometry> {
++ let zoom = ctx.zoom_factor();
++ let fallback = ctx.pixels_per_point();
++ let (rect, native, fullscreen) = ctx.input(|i| {
++ let viewport = i.viewport();
++ // Web (eframe's web backend) and egui_kittest set `screen_rect` but not `inner_rect`;
++ // both describe the same logical content rect for this viewport.
++ (viewport.inner_rect.or(i.raw.screen_rect), viewport.native_pixels_per_point, viewport.fullscreen)
++ });
++ let rect = rect?;
++ let pixels_per_point = match native {
++ // `native_pixels_per_point` is before egui's zoom
++ // (`Context::pixels_per_point() == zoom_factor * native_pixels_per_point`), so apply the
++ // zoom exactly once. The fallback already includes it.
++ Some(native) => native * zoom,
++ None => fallback,
++ };
++ if !pixels_per_point.is_finite() || pixels_per_point <= 0.0 {
++ return None;
++ }
++ let width = (rect.width() * pixels_per_point).ceil();
++ let height = (rect.height() * pixels_per_point).ceil();
++ if !width.is_finite() || !height.is_finite() || width < 1.0 || height < 1.0 {
++ return None;
++ }
++ Some(ScreenshotGeometry {
++ width: width as usize,
++ height: height as usize,
++ document: 0,
++ signature: [
++ rect.width().to_bits(),
++ rect.height().to_bits(),
++ pixels_per_point.to_bits(),
++ u32::from(fullscreen.unwrap_or(false)),
++ zoom.to_bits(),
++ // Reserved for a surface-generation counter once a backend exposes one.
++ 0,
++ ],
++ })
++}
++
/// Whether CJK-only interface is shown (Preferences › Type › Show CJK Features): the explicit
/// preference, else on for a Japanese, Chinese or Korean interface language.
///
@@@ -1755,16 -1774,16 +2384,15 @@@ pub fn opens_as_document(name: &str) -
[".designcraft", ".idml", ".indd", ".indt"].iter().any(|ext| n.ends_with(ext))
}
++/// Milliseconds from a monotonic process-local origin, on native and web alike.
++///
++/// Screenshot settlement, deadlines and retries must not use wall time: an NTP/manual clock jump
++/// would expire or postpone a capture, and `Context::input(i.time)` is stale inside `run_logic`.
++/// `web_time::Instant` is `std::time::Instant` natively and `performance.now()` on wasm.
pub fn now_ms() -> f64 {
-- #[cfg(not(target_arch = "wasm32"))]
-- {
-- use std::time::{SystemTime, UNIX_EPOCH};
-- SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs_f64() * 1000.0).unwrap_or(0.0)
-- }
-- #[cfg(target_arch = "wasm32")]
-- {
-- 0.0
-- }
++ use std::sync::OnceLock;
++ static START: OnceLock<web_time::Instant> = OnceLock::new();
++ START.get_or_init(web_time::Instant::now).elapsed().as_secs_f64() * 1000.0
}
/// Named `KeyboardEvent.key` values (W3C UI Events) that a browser reports for a key that types
@@@ -1835,10 -1854,10 +2463,10 @@@ mod tests
app,
);
h.run_steps(4);
-- let bar = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("control_bar")).unwrap().outer_rect;
++ let bar = egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with("control_bar")).unwrap().outer_rect;
assert!(bar.height() > 40.0, "{bar:?}");
// The X/Y/W/H group: its second row holds Y: and H:.
-- let group = h.ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
++ let group = h.ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
assert!(bar.contains(group.left_top()), "the X/Y/W/H group {group:?} is in the Control panel {bar:?}");
assert!(group.bottom() <= bar.bottom(), "X/Y/W/H group {group:?} hangs below the Control panel {bar:?}");
}
@@@ -2715,6 -2734,6 +3343,1119 @@@
app.run("text.select", json!({"story": story, "anchor": 2})).unwrap();
assert_eq!(app.run("edit.paste", json!({})).unwrap()["anchored"], 1);
}
++
++ // ---------------------------------------------------------------------------------------
++ // egui 0.37 lifecycle, hidden input and screenshot completion regressions.
++ // ---------------------------------------------------------------------------------------
++
++ /// One frame of the real callback order the native and web hosts use.
++ fn shot_frame(app: &mut DesignApp, ctx: &egui::Context, size: egui::Vec2) -> egui::FullOutput {
++ shot_frame_at(app, ctx, egui::Rect::from_min_size(egui::Pos2::ZERO, size), true)
++ }
++
++ /// One frame at a chosen window rect. `inner_rect = false` is the web/egui_kittest shape:
++ /// `screen_rect` is set but `ViewportInfo::inner_rect` is not.
++ fn shot_frame_at(app: &mut DesignApp, ctx: &egui::Context, rect: egui::Rect, inner_rect: bool) -> egui::FullOutput {
++ let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
++ raw.viewports.insert(
++ egui::ViewportId::ROOT,
++ egui::ViewportInfo {
++ inner_rect: inner_rect.then_some(rect),
++ native_pixels_per_point: Some(1.0),
++ minimized: Some(false),
++ occluded: Some(false),
++ ..Default::default()
++ },
++ );
++ let mut output = ctx.run_ui(raw, |ui| {
++ let ctx = ui.ctx().clone();
++ app.logic(&ctx);
++ app.ui(ui);
++ });
++ output.textures_delta.clear();
++ output
++ }
++
++ /// A hidden host iteration: the raw input is prepared and then only the logic callback runs.
++ fn hidden_tick(app: &mut DesignApp, ctx: &egui::Context, raw: &mut egui::RawInput) -> egui::LogicOutput {
++ app.raw_input_hook(ctx, raw);
++ ctx.run_logic(raw, |ctx| app.logic(ctx))
++ }
++
++ fn hidden_raw() -> egui::RawInput {
++ let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(640.0, 480.0));
++ let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
++ raw.viewports.insert(
++ egui::ViewportId::ROOT,
++ egui::ViewportInfo {
++ inner_rect: Some(rect),
++ native_pixels_per_point: Some(1.0),
++ minimized: Some(true),
++ occluded: Some(true),
++ ..Default::default()
++ },
++ );
++ raw
++ }
++
++ fn hidden_paints(output: &egui::LogicOutput) -> usize {
++ output
++ .viewport_commands
++ .get(&egui::ViewportId::ROOT)
++ .map_or(0, |commands| commands.iter().filter(|c| matches!(c, egui::ViewportCommand::RequestPaintWhileHidden)).count())
++ }
++
++ fn screenshot_callback(output: &mut egui::FullOutput) -> Option<egui::ScreenshotCallback> {
++ let viewport = output.viewport_output.get_mut(&egui::ViewportId::ROOT)?;
++ for command in &mut viewport.commands {
++ if matches!(command, egui::ViewportCommand::Screenshot(_)) {
++ let egui::ViewportCommand::Screenshot(callback) = std::mem::replace(command, egui::ViewportCommand::Focus) else {
++ return None;
++ };
++ return Some(callback);
++ }
++ }
++ None
++ }
++
++ fn screenshot_app() -> (DesignApp, egui::Context, std::sync::Arc<std::sync::Mutex<Vec<(String, usize)>>>) {
++ let writes: std::sync::Arc<std::sync::Mutex<Vec<(String, usize)>>> = Default::default();
++ let sink = writes.clone();
++ let mut app = DesignApp::new(
++ Session::new(),
++ Services {
++ write: Some(Box::new(move |path, bytes| {
++ sink.lock().unwrap().push((path.to_string(), bytes.len()));
++ Ok(())
++ })),
++ ..Default::default()
++ },
++ );
++ app.run("file.new", json!({"title": "shots"})).unwrap();
++ let ctx = egui::Context::default();
++ for _ in 0..4 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ output.textures_delta.clear();
++ }
++ (app, ctx, writes)
++ }
++
++ #[test]
++ fn screenshot_callback_stays_weak_and_writes_only_from_logic() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let (reply, replies) = std::sync::mpsc::channel();
++ let path = std::env::temp_dir().join(format!("designcraft-shot-{}.png", std::process::id()));
++ app.admit_screenshot(Some(path.to_string_lossy().to_string()), reply).unwrap();
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ callback = Some(cb);
++ }
++ }
++ let callback = callback.expect("the settling frames issue one capture");
++ assert!(writes.lock().unwrap().is_empty());
++ // The callback only fills its slot; writing happens in the next logic pass.
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ assert!(writes.lock().unwrap().is_empty(), "the callback must not write files");
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ let written = writes.lock().unwrap().clone();
++ assert_eq!(written.len(), 1, "one file after the logic drain");
++ assert_eq!(written[0].0, path.to_string_lossy());
++ let reply = replies.recv().unwrap();
++ assert_eq!(reply["ok"], true, "{reply}");
++ assert_eq!(reply["result"]["width"], 640);
++ assert_eq!(reply["result"]["height"], 480);
++ assert!(app.pending_shots.is_empty(), "the reservation is released");
++ }
++
++ #[test]
++ fn screenshot_admission_bounds_count_aggregate_and_image_bytes() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let admit = |app: &mut DesignApp, path: &str| {
++ let (reply, _replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(Some(path.into()), reply)
++ };
++ for i in 0..SCREENSHOT_MAX_REQUESTS {
++ assert!(admit(&mut app, &format!("shot-{i}.png")).is_ok(), "request {i}");
++ }
++ let error = admit(&mut app, "too-many.png").unwrap_err();
++ assert_eq!(error["ok"], false, "{error}");
++ // Drain the admitted requests without replying so the byte-budget check is exercised.
++ app.pending_shots.clear();
++ app.queued_shots.clear();
++ for _ in 0..2 {
++ shot_frame(&mut app, &ctx, egui::vec2(5120.0, 5120.0));
++ }
++ assert!(admit(&mut app, "hundred-a.png").is_ok());
++ assert!(admit(&mut app, "hundred-b.png").is_ok());
++ let error = admit(&mut app, "over-aggregate.png").unwrap_err();
++ assert!(error["error"].as_str().unwrap_or_default().contains("budget"), "{error}");
++ app.pending_shots.clear();
++ app.queued_shots.clear();
++ for _ in 0..2 {
++ shot_frame(&mut app, &ctx, egui::vec2(6000.0, 6000.0));
++ }
++ let error = admit(&mut app, "too-large.png").unwrap_err();
++ assert!(error["error"].as_str().unwrap_or_default().contains("image limit"), "{error}");
++ }
++
++ #[test]
++ fn screenshot_epoch_change_and_timeout_drop_stale_pixels() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let (reply, replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(Some("stale.png".into()), reply).unwrap();
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ callback = Some(cb);
++ }
++ }
++ let callback = callback.expect("issued");
++ // Resize away and back: the epoch advances even though the size ends up the same.
++ shot_frame(&mut app, &ctx, egui::vec2(800.0, 600.0));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ callback.clone().complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert!(replies.try_recv().is_err(), "stale pixels must not be replied");
++ assert!(!app.queued_shots.is_empty(), "the request is retried inside its deadline");
++ assert!(writes.lock().unwrap().is_empty());
++ // Let the deadline pass: the retry reports an error and a later callback is inert.
++ app.pending_shots[0].deadline = 0.0;
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ let reply = replies.try_recv().unwrap();
++ assert_eq!(reply["ok"], false, "{reply}");
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert!(replies.try_recv().is_err(), "no second reply from a late callback");
++ assert!(writes.lock().unwrap().is_empty());
++ assert!(app.pending_shots.is_empty());
++ }
++
++ #[test]
++ fn screenshot_geometry_uses_screen_rect_when_inner_rect_is_absent() {
++ let (mut app, ctx, writes) = screenshot_app();
++ app.screenshot_geometry = None;
++ app.screenshot_epoch = 0;
++ let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(640.0, 480.0));
++ // Web eframe and egui_kittest set screen_rect but not ViewportInfo::inner_rect.
++ for _ in 0..2 {
++ shot_frame_at(&mut app, &ctx, rect, false);
++ }
++ let geometry = app.screenshot_geometry.expect("the screen rect is the logical viewport");
++ assert_eq!((geometry.width, geometry.height), (640, 480), "the fallback is the same logical geometry");
++ let (reply, replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(Some("web-like.png".into()), reply).expect("an inner-rect-less host admits screenshots");
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ for _ in 0..3 {
++ if let Some(cb) = screenshot_callback(&mut shot_frame_at(&mut app, &ctx, rect, false)) {
++ callback = Some(cb);
++ }
++ }
++ callback.expect("the capture is issued").complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame_at(&mut app, &ctx, rect, false);
++ let reply = replies.recv().unwrap();
++ assert_eq!(reply["ok"], true, "{reply}");
++ assert_eq!(writes.lock().unwrap().len(), 1);
++ }
++
++ #[test]
++ fn screenshot_geometry_applies_native_dpi_and_zoom_once() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ app.ui.ui_scale = 1.5;
++ let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(100.0, 50.0));
++ let raw = {
++ let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
++ raw.viewports.insert(
++ egui::ViewportId::ROOT,
++ egui::ViewportInfo { inner_rect: Some(rect), native_pixels_per_point: Some(2.0), minimized: Some(false), ..Default::default() },
++ );
++ raw
++ };
++ // The first pass applies the zoom; the next logic tick measures the new geometry.
++ for _ in 0..2 {
++ let mut raw = raw.clone();
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().inner_rect = Some(rect);
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ }
++ let geometry = app.screenshot_geometry.expect("geometry");
++ // 100 x 50 points at 2 physical pixels per point and 1.5 UI zoom: apply each exactly once.
++ assert_eq!((geometry.width, geometry.height), (300, 150));
++ }
++
++ #[test]
++ fn screenshot_epoch_ignores_window_position_but_tracks_size_changes() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let before = app.screenshot_epoch;
++ let moved = egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(640.0, 480.0));
++ shot_frame_at(&mut app, &ctx, moved, true);
++ assert_eq!(app.screenshot_epoch, before, "moving the window is not a capture-surface change");
++ shot_frame_at(&mut app, &ctx, egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(800.0, 600.0)), true);
++ let resized = app.screenshot_epoch;
++ assert_ne!(resized, before, "a size change advances the epoch");
++ shot_frame_at(&mut app, &ctx, egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(640.0, 480.0)), true);
++ assert_ne!(app.screenshot_epoch, resized, "and resizing back advances it again");
++ }
++
++ #[test]
++ fn control_screenshot_replies_with_the_saved_capture() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let (requests, receiver) = std::sync::mpsc::channel();
++ app = app.with_control(receiver);
++ let (reply, replies) = std::sync::mpsc::channel();
++ requests.send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "control.png", "focus": false}), reply }).unwrap();
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert_eq!(app.pending_shots.len(), 1, "ui.screenshot is admitted, not issued from the queue");
++ assert!(replies.try_recv().is_err(), "the reply waits for the capture");
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ for _ in 0..3 {
++ if let Some(cb) = screenshot_callback(&mut shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0))) {
++ callback = Some(cb);
++ }
++ }
++ let callback = callback.expect("the settled frames issue one capture");
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ let reply = replies.recv().unwrap();
++ assert_eq!(reply["ok"], true, "{reply}");
++ assert_eq!(reply["result"]["width"], 640);
++ assert_eq!(reply["result"]["height"], 480);
++ let written = writes.lock().unwrap().clone();
++ assert_eq!(written.len(), 1);
++ assert_eq!(written[0].0, "control.png");
++ assert!(written[0].1 > 0);
++ assert!(app.pending_shots.is_empty(), "the reservation is released");
++ assert!(app.queued_shots.is_empty());
++ }
++
++ #[test]
++ fn control_screenshot_times_out_without_writing_a_file() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let (requests, receiver) = std::sync::mpsc::channel();
++ app = app.with_control(receiver);
++ let (reply, replies) = std::sync::mpsc::channel();
++ requests.send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "control.png", "focus": false}), reply }).unwrap();
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert_eq!(app.pending_shots.len(), 1);
++ app.pending_shots[0].deadline = 0.0;
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ let reply = replies.recv().unwrap();
++ assert_eq!(reply["ok"], false, "{reply}");
++ assert!(reply["error"].as_str().unwrap_or_default().contains("no frame"), "{reply}");
++ assert!(writes.lock().unwrap().is_empty(), "a timed-out request writes no file");
++ assert!(app.pending_shots.is_empty());
++ }
++
++ #[test]
++ fn discarded_pass_runs_the_frame_stage_once_but_ticks_every_pass() {
++ let mut app = DesignApp::new(Session::new(), Services::default());
++ app.run("file.new", json!({"title": "multipass"})).unwrap();
++ let ctx = egui::Context::default();
++ let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 600.0));
++ let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
++ raw.viewports
++ .insert(egui::ViewportId::ROOT, egui::ViewportInfo { inner_rect: Some(rect), native_pixels_per_point: Some(1.0), ..Default::default() });
++ let mut passes = 0;
++ let mut output = ctx.run_ui(raw, |ui| {
++ passes += 1;
++ if passes == 1 {
++ // Requested before `app.ui` so the first pass is a discarded one and must not
++ // acknowledge injected input.
++ ui.ctx().request_discard("forced multipass regression");
++ }
++ let ctx = ui.ctx().clone();
++ app.logic(&ctx);
++ app.ui(ui);
++ });
++ assert_eq!(output.platform_output.num_completed_passes, 2, "the frame really was multipass");
++ // 0.37's TexturesDelta panics if dropped unapplied; this test only inspects the passes.
++ output.textures_delta.clear();
++ assert_eq!(app.logic_tick_ticks, 2, "every pass ticks queues and deadlines");
++ assert_eq!(app.logic_frame_ticks, 1, "once-per-frame work runs once");
++ assert_eq!(app.input_ticks, 2);
++ }
++
++ #[test]
++ fn hidden_logic_requests_exactly_one_paint_per_tick_until_a_settled_ui_pass() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let mut raw = hidden_raw();
++ // Three pointer steps queued: one batch may be in the host's pending raw input at a time.
++ app.control_synthetic = vec![
++ egui::Event::PointerMoved(egui::pos2(10.0, 10.0)),
++ egui::Event::PointerMoved(egui::pos2(20.0, 20.0)),
++ egui::Event::PointerMoved(egui::pos2(30.0, 30.0)),
++ ];
++ app.raw_input_hook(&ctx, &mut raw);
++ let injected = raw.events.clone();
++ assert_eq!(app.injected_events.len(), 1, "one pointer event in the batch");
++ assert_eq!(app.control_synthetic.len(), 2, "the rest wait for later host iterations");
++ for tick in 0..3 {
++ let output = hidden_tick(&mut app, &ctx, &mut raw);
++ assert_eq!(hidden_paints(&output), 1, "tick {tick}: exactly one hidden paint request");
++ assert!(app.synthetic_injected, "the injected step is still unapplied");
++ assert!(app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "control provenance is retained while hidden");
++ assert_eq!(raw.events, injected, "tick {tick}: no second batch accumulated into the pending raw input");
++ assert_eq!(app.control_synthetic.len(), 2, "tick {tick}: the queue did not drain another step");
++ }
++ // A real visible UI pass takes exactly the one pending event (no duplicated PointerMoved).
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().occluded = Some(false);
++ let mut seen = Vec::new();
++ ctx.run_ui(raw, |ui| {
++ seen = ui.ctx().input(|i| i.events.clone());
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert_eq!(seen.iter().filter(|event| matches!(event, egui::Event::PointerMoved(_))).count(), 1);
++ assert!(!app.synthetic_injected, "a settled UI pass acknowledges delivery");
++ assert!(app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "the pass's end guard still sees the provenance");
++ app.control_synthetic.clear();
++ app.raw_input_hook(&ctx, &mut egui::RawInput::default());
++ assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "the next host iteration clears it");
++ // Unknown visibility is treated like hidden, and the next queued step is injected.
++ let mut unknown = egui::RawInput::default();
++ unknown.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo::default());
++ app.control_synthetic.push(egui::Event::Text("x".into()));
++ app.raw_input_hook(&ctx, &mut unknown);
++ let output = ctx.run_logic(&unknown, |ctx| app.logic(ctx));
++ assert_eq!(hidden_paints(&output), 1, "visible() == None is treated like hidden");
++ }
++
++ #[test]
++ fn font_gated_first_pass_requeues_injected_input_instead_of_acknowledging_it() {
++ let mut app = DesignApp::new(Session::new(), Services::default());
++ app.run("file.new", json!({"title": "fonts"})).unwrap();
++ let ctx = egui::Context::default();
++ app.control_synthetic.push(egui::Event::Text("x".into()));
++ let mut raw = hidden_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(app.synthetic_injected);
++ // The first real pass installs fonts and returns before any widget consumes input.
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert!(!app.synthetic_injected, "a font-gated pass is not an acknowledgement");
++ assert_eq!(app.control_synthetic, vec![egui::Event::Text("x".into())], "the batch is back in its queue");
++ assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed));
++ // Once fonts are ready the same step is injected and a settled pass consumes it.
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert!(app.fonts_ready);
++ let mut raw = hidden_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(app.synthetic_injected);
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert!(!app.synthetic_injected);
++ assert!(app.control_synthetic.is_empty());
++ }
++
++ #[test]
++ fn discarded_pass_does_not_acknowledge_injected_input() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ app.control_synthetic.push(egui::Event::Text("d".into()));
++ let mut raw = hidden_raw();
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(app.synthetic_injected);
++ let mut passes = 0;
++ let output = ctx.run_ui(raw, |ui| {
++ passes += 1;
++ if passes == 1 {
++ ui.ctx().request_discard("injected input must survive a discarded pass");
++ }
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ });
++ assert_eq!(output.platform_output.num_completed_passes, 2);
++ assert!(!app.synthetic_injected, "the settled second pass acknowledges it");
++ assert!(app.control_synthetic.is_empty());
++ }
++
++ #[test]
++ fn a_document_switch_before_the_ui_pass_drops_the_pending_batch() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let pos = egui::pos2(10.0, 10.0);
++ app.control_synthetic.push(egui::Event::PointerMoved(pos));
++ let mut raw = hidden_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(app.synthetic_injected);
++ let _ = hidden_tick(&mut app, &ctx, &mut raw);
++ // A menu/control action switched documents before the forced paint.
++ app.run("file.new", json!({"title": "handoff"})).unwrap();
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(!app.synthetic_injected, "the stale batch was discarded");
++ assert!(app.injected_events.is_empty());
++ assert!(
++ !raw.events.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)),
++ "the event was removed from pending input"
++ );
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
++ let mut seen = Vec::new();
++ ctx.run_ui(raw, |ui| {
++ seen = ui.ctx().input(|i| i.events.clone());
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert!(!seen.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)), "the new document did not receive it");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn prepare_revert(app: &mut DesignApp) -> tempfile::TempDir {
++ let dir = tempfile::tempdir().unwrap();
++ app.run("file.saveAs", json!({"path": dir.path().join("revert.designcraft")})).unwrap();
++ app.run("frame.create", json!({"rect": [72, 72, 144, 144], "content": "text", "text": "unsaved"})).unwrap();
++ assert!(app.session.active().unwrap().is_dirty());
++ dir
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn revert_preserving_uid(app: &mut DesignApp) {
++ let before = app.session.active().unwrap();
++ let (uid, epoch) = (before.uid, before.identity_epoch);
++ app.run("file.revert", json!({})).unwrap();
++ let after = app.session.active().unwrap();
++ assert_eq!(after.uid, uid, "Revert keeps the open document's stable identity");
++ assert_ne!(after.identity_epoch, epoch, "Revert replaces the document state");
++ assert!(!after.is_dirty());
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_revert_discards_a_buffered_input_batch() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ let pos = egui::pos2(10.0, 10.0);
++ app.control_synthetic.push(egui::Event::PointerMoved(pos));
++ let mut raw = hidden_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(app.synthetic_injected);
++ revert_preserving_uid(&mut app);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(!app.synthetic_injected, "input captured before Revert must not reach the restored document");
++ assert!(app.injected_events.is_empty());
++ assert!(!raw.events.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)));
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn visible_raw() -> egui::RawInput {
++ let mut raw = hidden_raw();
++ let viewport = raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap();
++ viewport.minimized = Some(false);
++ viewport.occluded = Some(false);
++ raw
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn command_key(key: egui::Key) -> Vec<egui::Event> {
++ let modifiers = egui::Modifiers { command: true, mac_cmd: true, ..egui::Modifiers::NONE };
++ [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }).to_vec()
++ }
++
++ /// A different document with one selectable item, for an asynchronous open.
++ #[cfg(not(target_arch = "wasm32"))]
++ fn document_with_a_frame() -> Vec<u8> {
++ let mut session = Session::new();
++ session.execute("file.new", &json!({"title": "Incoming"})).unwrap();
++ session.execute("frame.create", &json!({"rect": [10, 10, 50, 50]})).unwrap();
++ let serialized = session.execute("file.serialize", &json!({})).unwrap();
++ designcraft_engine::cmd::base64_decode(serialized["base64"].as_str().unwrap())
++ }
++
++ /// One host iteration in eframe's order: `raw_input_hook`, then `run_ui` calling
++ /// `App::logic` and `App::ui` (eframe native `update`).
++ #[cfg(not(target_arch = "wasm32"))]
++ fn run_host_frame(app: &mut DesignApp, ctx: &egui::Context, mut raw: egui::RawInput) {
++ app.raw_input_hook(ctx, &mut raw);
++ ctx.run_ui(raw, |ui| {
++ let ctx = ui.ctx().clone();
++ app.logic(&ctx);
++ if ctx.current_pass_index() == 0 {
++ app.poll_native_actions(&ctx, || None);
++ }
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_native_revert_waits_for_the_control_gesture() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
++ for pressed in [true, false] {
++ app.control_synthetic.push(egui::Event::PointerButton {
++ pos: egui::pos2(320.0, 240.0),
++ button: egui::PointerButton::Primary,
++ pressed,
++ modifiers: egui::Modifiers::NONE,
++ });
++ }
++ for step in 0..3 {
++ let mut raw = visible_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ ctx.run_ui(raw, |ui| {
++ let ctx = ui.ctx().clone();
++ app.logic(&ctx);
++ if ctx.current_pass_index() == 0 {
++ app.poll_native_actions(&ctx, || actions.pop_front());
++ }
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert_eq!(app.session.active().unwrap().is_dirty(), step < 2, "Revert runs only after the release");
++ assert_eq!(ctx.input(|input| input.pointer.primary_down()), step == 0, "pointer state is not reset by the boundary");
++ }
++ assert!(actions.is_empty());
++ assert!(app.session.active().unwrap().selection.is_empty());
++ assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "native actions keep user clipboard provenance");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_close_waits_for_input_and_keeps_the_request() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ let mut raw = visible_raw();
++ raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().events.push(egui::ViewportEvent::Close);
++ app.raw_input_hook(&ctx, &mut raw);
++ let mut out = ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ assert!(app.ui.dialog.is_none(), "the close dialog must not receive the old document's input");
++ app.ui(ui);
++ });
++ assert!(out.viewport_output[&egui::ViewportId::ROOT].commands.contains(&egui::ViewportCommand::CancelClose));
++ out.textures_delta.clear();
++ assert_eq!(app.session.documents().len(), 1);
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(dialog_uid(&app), Some(app.session.active().unwrap().uid), "the close request survives the deferred frame");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_control_command_waits_for_the_preceding_input() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let (requests, receiver) = std::sync::mpsc::channel();
++ app = app.with_control(receiver);
++ let (movement, first_reply) = ControlRequest::new("ui.move", json!({"x": 10, "y": 10}));
++ let (command, second_reply) = ControlRequest::new("engine.execute", json!({"command": "frame.create", "params": {"rect": [72,72,144,144]}}));
++ requests.send(movement).unwrap();
++ requests.send(command).unwrap();
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(first_reply.try_recv().unwrap()["ok"], true);
++ assert!(second_reply.try_recv().is_err(), "later commands must not overtake queued input");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert!(second_reply.try_recv().is_err(), "the injected input must settle first");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(second_reply.try_recv().unwrap()["ok"], true, "the later command is eventually handled");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_native_revert_precedes_the_deferred_os_open() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let dir = prepare_revert(&mut app);
++ let original = app.session.active().unwrap().uid;
++ let path = dir.path().join("incoming.designcraft");
++ std::fs::write(&path, document_with_a_frame()).unwrap();
++ app.open_documents_later([path.to_string_lossy().to_string()]);
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
++ let mut raw = visible_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ if ui.ctx().current_pass_index() == 0 {
++ app.poll_native_actions(ui.ctx(), || actions.pop_front());
++ }
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert_eq!(app.session.documents().len(), 1);
++ assert!(app.session.active().unwrap().is_dirty());
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.active().unwrap().uid, original);
++ assert!(!app.session.active().unwrap().is_dirty(), "Revert runs before delivery resumes");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2);
++ assert_ne!(app.session.active().unwrap().uid, original);
++ assert!(!app.session.documents().iter().find(|doc| doc.uid == original).unwrap().is_dirty(), "Revert targeted the original document");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_stale_preview_waits_for_the_input_batch() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let original = app.session.active().unwrap().uid;
++ app.session.preview_new_document(&json!({"title": "Preview"})).unwrap();
++ let preview = app.session.new_document_preview();
++ assert!(preview.is_some());
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.new_document_preview(), preview, "preview cleanup cannot replace the input's document");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert!(app.session.new_document_preview().is_none());
++ assert_eq!(app.session.active().unwrap().uid, original);
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_native_choices_wait_for_forwarded_text_input() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ let mut text = String::from("native field");
++ ctx.run_ui(visible_raw(), |ui| {
++ ui.text_edit_singleline(&mut text).request_focus();
++ })
++ .textures_delta
++ .clear();
++ assert!(ctx.text_edit_focused(), "the native edit command must forward to an actual text field");
++ let mut actions = std::collections::VecDeque::from([("edit.selectAll".to_owned(), Value::Null), ("file.revert".to_owned(), json!({}))]);
++ app.poll_native_actions(&ctx, || actions.pop_front());
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert!(app.session.active().unwrap().is_dirty(), "Revert waits for Select All's forwarded input");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert!(!app.session.active().unwrap().is_dirty());
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_arriving_native_event_blocks_an_os_open_without_synthetic_input() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let dir = prepare_revert(&mut app);
++ let original = app.session.active().unwrap().uid;
++ let path = dir.path().join("incoming.designcraft");
++ std::fs::write(&path, document_with_a_frame()).unwrap();
++ app.open_documents_later([path.to_string_lossy().to_string()]);
++ let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
++ app.native_action_notifier(ctx.clone())();
++ let mut raw = visible_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ assert_eq!(app.session.documents().len(), 1, "a menu event already queued by the host must precede the OS open");
++ if ui.ctx().current_pass_index() == 0 {
++ app.poll_native_actions(ui.ctx(), || actions.pop_front());
++ }
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert!(!app.session.active().unwrap().is_dirty(), "the menu action ran in the real UI callback");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2);
++ assert_ne!(app.session.active().unwrap().uid, original);
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_deferred_native_action_waits_for_a_real_ui_pass() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
++ let mut raw = visible_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ ctx.run_ui(raw, |ui| {
++ app.logic(&ui.ctx().clone());
++ if ui.ctx().current_pass_index() == 0 {
++ app.poll_native_actions(ui.ctx(), || actions.pop_front());
++ }
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ assert!(app.session.active().unwrap().is_dirty());
++ let mut raw = hidden_raw();
++ app.raw_input_hook(&ctx, &mut raw);
++ let _ = ctx.run_logic(&raw, |ctx| app.logic(ctx));
++ assert!(app.session.active().unwrap().is_dirty(), "a hidden logic-only tick must not execute native menu actions");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert!(!app.session.active().unwrap().is_dirty(), "the deferred action runs when a UI callback resumes");
++ }
++
++ /// An inbox delivery runs only after input sampled for the current document has settled.
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_inbox_open_must_not_receive_a_pending_shortcut() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ app.services.inbox = Some(Inbox::default());
++ let request = app.import_request("open");
++ let file = ImportedFile { request, name: "incoming.designcraft".into(), bytes: document_with_a_frame() };
++ app.services.inbox.as_ref().unwrap().lock().unwrap().push(file);
++ app.control_synthetic.extend(command_key(egui::Key::A));
++ run_host_frame(&mut app, &ctx, visible_raw());
++ // A deferred delivery is handled by the next settled host iteration.
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2, "the inbox file is still opened");
++ assert!(
++ app.session.active().unwrap().selection.is_empty(),
++ "Select All sampled before the asynchronous open must not reach the opened document"
++ );
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_os_document_must_not_receive_a_pending_shortcut() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let dir = tempfile::tempdir().unwrap();
++ let path = dir.path().join("incoming.designcraft");
++ std::fs::write(&path, document_with_a_frame()).unwrap();
++ app.open_documents_later([path.to_string_lossy().to_string()]);
++ app.control_synthetic.extend(command_key(egui::Key::A));
++ run_host_frame(&mut app, &ctx, visible_raw());
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2, "the OS document is still opened");
++ assert!(app.session.active().unwrap().selection.is_empty(), "Select All sampled before the OS open must not reach the opened document");
++ }
++
++ /// The intended boundary: an imported file waits while the batch that was sampled for the
++ /// current document is pending, and is handled once that batch has settled.
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_inbox_delivery_waits_for_a_settled_batch_then_runs() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ app.services.inbox = Some(Inbox::default());
++ let request = app.import_request("open");
++ let file = ImportedFile { request, name: "incoming.designcraft".into(), bytes: document_with_a_frame() };
++ app.services.inbox.as_ref().unwrap().lock().unwrap().push(file);
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 1, "the delivery waited for the injected step");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2, "the deferred delivery is not lost");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_host_order_os_document_waits_for_a_settled_batch_then_runs() {
++ let (mut app, ctx, _writes) = screenshot_app();
++ let dir = tempfile::tempdir().unwrap();
++ let path = dir.path().join("incoming.designcraft");
++ std::fs::write(&path, document_with_a_frame()).unwrap();
++ app.open_documents_later([path.to_string_lossy().to_string()]);
++ app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 1, "the OS open waited for the injected step");
++ run_host_frame(&mut app, &ctx, visible_raw());
++ assert_eq!(app.session.documents().len(), 2, "the deferred OS open is not lost");
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_revert_discards_a_buffered_native_drop() {
++ let (mut app, ctx) = drop_test_app();
++ let dir = prepare_revert(&mut app);
++ let path = dir.path().join("drop.png");
++ std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
++ let mut raw = visible_raw_with_drop(&[&path]);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert_eq!(app.pending_drops.len(), 1);
++ revert_preserving_uid(&mut app);
++ let assets_before = app.session.active().unwrap().doc.assets.len();
++ run_ui_pass(&mut app, &ctx, raw);
++ assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "a stale native drop must not modify the restored document");
++ assert!(app.pending_drops.is_empty());
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_revert_rejects_screenshots_before_issue_and_in_flight() {
++ for in_flight in [false, true] {
++ let (mut app, ctx, writes) = screenshot_app();
++ let _dir = prepare_revert(&mut app);
++ let (reply, replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(Some("revert-stale.png".into()), reply).unwrap();
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ if in_flight {
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ callback = Some(cb);
++ }
++ }
++ assert!(callback.is_some(), "the in-flight case must actually issue a capture");
++ }
++ revert_preserving_uid(&mut app);
++ if let Some(callback) = callback {
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ }
++ for _ in 0..4 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert!(screenshot_callback(&mut output).is_none(), "Revert must not issue or retry an old capture (in_flight={in_flight})");
++ }
++ let reply = replies.try_recv().expect("the replaced document's screenshot receives an error");
++ assert_eq!(reply["ok"], false, "in_flight={in_flight}: {reply}");
++ assert!(reply["error"].as_str().unwrap_or_default().contains("document"));
++ assert!(writes.lock().unwrap().is_empty(), "stale pixels must not be saved");
++ assert!(app.pending_shots.is_empty());
++ assert!(app.queued_shots.is_empty());
++ }
++ }
++
++ // ---------------------------------------------------------------------------------------
++ // Document-generation regressions: reused screenshot slots and buffered native drops must
++ // not cross a document/dialog/focus change.
++ // ---------------------------------------------------------------------------------------
++
++ #[test]
++ fn design_generation_screenshot_switch_before_issue_does_not_capture_the_new_document() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let document_a = app.session.active().unwrap().uid;
++ let (requests, receiver) = std::sync::mpsc::channel();
++ app = app.with_control(receiver);
++ let (reply, replies) = std::sync::mpsc::channel();
++ requests
++ .send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "switch-before-issue.png", "focus": false}), reply })
++ .unwrap();
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ assert_eq!(app.pending_shots.len(), 1, "ui.screenshot is admitted");
++ assert_eq!(app.pending_shots[0].geometry.document, document_a);
++ // A menu/control action switches documents before the settling rule issues the capture.
++ app.run("file.new", json!({"title": "handoff-before-issue"})).unwrap();
++ let document_b = app.session.active().unwrap().uid;
++ assert_ne!(document_b, document_a);
++ if let Some(at) = app.queued_shots.first_mut() {
++ at.1 = 0.0;
++ }
++ let mut callback = None;
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ callback = Some(cb);
++ }
++ }
++ if let Some(callback) = callback {
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ }
++ assert!(writes.lock().unwrap().is_empty(), "the switched request must not write a file");
++ let reply = replies.try_recv().expect("the switched request must receive an error receipt");
++ assert_eq!(reply["ok"], false, "the old document's request must not succeed on the new one: {reply}");
++ assert!(reply["error"].as_str().unwrap_or_default().contains("document"), "the error must name the document change: {reply}");
++ assert!(app.pending_shots.is_empty(), "the stale request released its admission");
++ assert!(app.queued_shots.is_empty(), "the stale request left no repaint token");
++ }
++
++ #[test]
++ fn design_generation_screenshot_in_flight_after_switch_does_not_complete_on_the_new_document() {
++ let (mut app, ctx, writes) = screenshot_app();
++ let document_a = app.session.active().unwrap().uid;
++ let (reply, replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(Some("switch-in-flight.png".into()), reply).unwrap();
++ app.queued_shots[0].1 = 0.0;
++ let mut callback = None;
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ callback = Some(cb);
++ }
++ }
++ let callback = callback.expect("the request is issued on the first document");
++ assert_eq!(app.pending_shots[0].geometry.document, document_a);
++ // The capture is in flight on A when the app switches to B.
++ app.run("file.new", json!({"title": "handoff-in-flight"})).unwrap();
++ assert_ne!(app.session.active().unwrap().uid, document_a);
++ callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ // Old code retries the stale request on B; follow any retry through a completion so the
++ // regression proves that B never receives the old capture.
++ if let Some(at) = app.queued_shots.first_mut() {
++ at.1 = 0.0;
++ }
++ let mut retried = None;
++ for _ in 0..3 {
++ let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ if let Some(cb) = screenshot_callback(&mut output) {
++ retried = Some(cb);
++ }
++ }
++ if let Some(retried) = retried {
++ retried.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
++ shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
++ }
++ assert!(writes.lock().unwrap().is_empty(), "the in-flight request must not write a file after the switch");
++ let reply = replies.try_recv().expect("the in-flight request must receive an error receipt");
++ assert_eq!(reply["ok"], false, "the in-flight request must not succeed on the new document: {reply}");
++ assert!(reply["error"].as_str().unwrap_or_default().contains("document"), "the error must name the document change: {reply}");
++ assert!(app.pending_shots.is_empty(), "the stale request released its admission");
++ assert!(app.queued_shots.is_empty(), "the stale request left no repaint token");
++ }
++
++ #[test]
++ fn design_generation_screenshot_admission_uses_the_current_document_not_the_cached_geometry() {
++ let (mut app, _ctx, _writes) = screenshot_app();
++ let document_a = app.session.active().unwrap().uid;
++ // `screenshot_app` populated the geometry cache for A. Switch documents without a frame
++ // between the switch and admission, as two control requests in one logic tick would.
++ app.run("file.new", json!({"title": "admission-current-document"})).unwrap();
++ let document_b = app.session.active().unwrap().uid;
++ assert_ne!(document_b, document_a);
++ let (reply, replies) = std::sync::mpsc::channel();
++ app.admit_screenshot(None, reply).unwrap();
++ assert_eq!(
++ app.pending_shots[0].geometry.document, document_b,
++ "admission must use the current session document, not the last cached geometry"
++ );
++ assert!(replies.try_recv().is_err(), "admission alone replies only when it fails");
++ app.pending_shots.clear();
++ app.queued_shots.clear();
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[derive(Debug)]
++ struct TestDroppedFile(std::path::PathBuf);
++
++ #[cfg(not(target_arch = "wasm32"))]
++ impl egui::DroppedFile for TestDroppedFile {
++ fn path(&self) -> &std::path::Path {
++ &self.0
++ }
++
++ fn bytes(&self) -> Result<Vec<u8>, String> {
++ std::fs::read(&self.0).map_err(|error| error.to_string())
++ }
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn dropped_file(path: &std::path::Path) -> egui::DroppedFileHandle {
++ std::sync::Arc::new(TestDroppedFile(path.to_path_buf()))
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn drop_test_app() -> (DesignApp, egui::Context) {
++ let (mut app, ctx, _writes) = screenshot_app();
++ app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
++ let _ = app.view_mut();
++ (app, ctx)
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn temporary_png(name: &str) -> std::path::PathBuf {
++ let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}.png", std::process::id()));
++ std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
++ path
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn visible_raw_with_drop(paths: &[&std::path::Path]) -> egui::RawInput {
++ let mut raw = hidden_raw();
++ let viewport = raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap();
++ viewport.minimized = Some(false);
++ viewport.occluded = Some(false);
++ raw.events.push(egui::Event::PointerMoved(egui::pos2(100.0, 100.0)));
++ raw.dropped_files.extend(paths.iter().map(|path| dropped_file(path)));
++ raw
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ fn run_ui_pass(app: &mut DesignApp, ctx: &egui::Context, raw: egui::RawInput) {
++ ctx.run_ui(raw, |ui| {
++ let ctx = ui.ctx().clone();
++ app.logic(&ctx);
++ app.ui(ui);
++ })
++ .textures_delta
++ .clear();
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_generation_native_drop_is_discarded_when_the_document_changes_before_ui() {
++ let (mut app, ctx) = drop_test_app();
++ let path = temporary_png("drop-document-change");
++ let mut raw = visible_raw_with_drop(&[&path]);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert!(raw.dropped_files.is_empty(), "raw_input_hook captures the native drop");
++ assert_eq!(app.pending_drops.len(), 1, "the raw drop is buffered for the UI pass");
++ // A menu/control action switches documents before the settled UI pass consumes it.
++ app.run("file.new", json!({"title": "drop-target"})).unwrap();
++ let assets_before = app.session.active().unwrap().doc.assets.len();
++ run_ui_pass(&mut app, &ctx, raw);
++ assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land in the switched document");
++ assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
++ let _ = std::fs::remove_file(path);
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_generation_native_drop_is_discarded_when_a_dialog_opens_before_ui() {
++ let (mut app, ctx) = drop_test_app();
++ let path = temporary_png("drop-dialog-change");
++ let mut raw = visible_raw_with_drop(&[&path]);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert_eq!(app.pending_drops.len(), 1);
++ app.run("app.preferences", json!({})).unwrap();
++ assert!(app.ui.dialog.is_some(), "a real dialog changed the generation");
++ let assets_before = app.session.active().unwrap().doc.assets.len();
++ run_ui_pass(&mut app, &ctx, raw);
++ assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land behind the dialog");
++ assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
++ let _ = std::fs::remove_file(path);
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_generation_native_drop_is_discarded_when_focus_changes_before_ui() {
++ let (mut app, ctx) = drop_test_app();
++ let path = temporary_png("drop-focus-change");
++ let mut raw = visible_raw_with_drop(&[&path]);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert_eq!(app.pending_drops.len(), 1);
++ let focus = egui::Id::unique("design-generation-drop-focus");
++ assert_ne!(app.input_generation().focus, Some(focus));
++ ctx.memory_mut(|memory| memory.request_focus(focus));
++ assert_eq!(app.input_generation().focus, Some(focus), "keyboard focus changed after the drop was buffered");
++ let assets_before = app.session.active().unwrap().doc.assets.len();
++ run_ui_pass(&mut app, &ctx, raw);
++ assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land after a focus change");
++ assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
++ let _ = std::fs::remove_file(path);
++ }
++
++ #[cfg(not(target_arch = "wasm32"))]
++ #[test]
++ fn design_generation_native_drop_batch_without_a_change_still_places_every_file() {
++ let (mut app, ctx) = drop_test_app();
++ let first = temporary_png("drop-batch-a");
++ let second = temporary_png("drop-batch-b");
++ let mut raw = visible_raw_with_drop(&[&first, &second]);
++ app.raw_input_hook(&ctx, &mut raw);
++ assert_eq!(app.pending_drops.len(), 2, "both files were captured from the raw input");
++ let assets_before = app.session.active().unwrap().doc.assets.len();
++ run_ui_pass(&mut app, &ctx, raw);
++ assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before + 2, "both files in the valid batch are placed");
++ assert!(app.pending_drops.is_empty());
++ let _ = std::fs::remove_file(first);
++ let _ = std::fs::remove_file(second);
++ }
}
#[cfg(test)]
@@@ -2881,13 -2900,13 +4622,32 @@@ pub(crate) mod test_window
delta,
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
});
h.run_steps(10);
}
++ /// Ensure a Hebrew face is available for the interface's glyph assertions.
++ ///
++ /// Canonical craft-fonts builds bundle the face. Optional-input builds can pass
++ /// `DESIGNCRAFT_TEST_HEBREW_FONT=/abs/path/NotoSansHebrew.ttf` (the pinned OFL fixture)
++ /// and otherwise skip their Hebrew-only assertions explicitly.
++ pub fn install_test_hebrew_face() -> bool {
++ let db = designcraft_fonts::FontDb::global();
++ if db.has_family("Noto Sans Hebrew") {
++ return true;
++ }
++ let Ok(path) = std::env::var("DESIGNCRAFT_TEST_HEBREW_FONT") else { return false };
++ designcraft_engine::io::read(path).is_ok_and(|bytes| db.add_font(bytes) > 0)
++ }
++
/// The outer rect of a side or top panel, from egui's memory.
++ ///
++ /// 0.37 keys a panel by its *parent Ui's* scope: `Ui::scope_id().with_salt(salt)`. In this
++ /// harness the app draws into a Ui the harness owns (a child of the viewport root Ui), so
++ /// `Harness::ui_id()` — not the viewport's root id — is the parent to salt.
pub fn panel_rect(h: &Harness<'static, Window>, id: &str) -> egui::Rect {
-- egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new(id)).map(|s| s.outer_rect).unwrap()
++ egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with(id)).map(|s| s.outer_rect).unwrap()
}
/// A primary click at `pos`, then a few frames.
diff --cc crates/ui-egui/src/menus.rs
index d97dcdeba,5e751fbe9..9d4c694e5
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@@ -1781,6 -1833,6 +1833,9 @@@ fn run_ui_inner(app: &mut DesignApp, id
let on = p.get("on").and_then(Value::as_bool).unwrap_or(!app.split);
app.split = on;
if on {
++ if app.second_window {
++ app.end_second_ime_viewport();
++ }
app.second_window = false;
} else {
app.switch_pane(0);
@@@ -1790,7 -1842,7 +1845,11 @@@
}
"window.newWindow" => {
// The second view moves into its own window (on the web: a floating window).
-- app.second_window = p.get("on").and_then(Value::as_bool).unwrap_or(true);
++ let on = p.get("on").and_then(Value::as_bool).unwrap_or(true);
++ if app.second_window && !on {
++ app.end_second_ime_viewport();
++ }
++ app.second_window = on;
app.split = false;
if !app.second_window {
app.switch_pane(0);
@@@ -3179,7 -3254,7 +3261,7 @@@ pub fn palette(app: &mut DesignApp, ctx
let Some(mut q) = app.ui.palette.clone() else { return };
let mut close = false;
let mut run: Option<(String, Value)> = None;
-- egui::Modal::new(egui::Id::new("palette")).show(ctx, |ui| {
++ egui::Modal::new(egui::Id::unique("palette")).show(ctx, |ui| {
ui.set_width(480.0);
let r = ui.add(
egui::TextEdit::singleline(&mut q)
@@@ -3453,6 -3528,6 +3535,7 @@@ mod tests
delta: egui::vec2(0.0, -3000.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
},
],
);
@@@ -3710,6 -3785,6 +3793,7 @@@
delta: egui::vec2(0.0, -40.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
}],
);
let scrolled = cameras(&mut app);
@@@ -3760,8 -3835,8 +3844,9 @@@
output.textures_delta.clear();
}
assert!(warnings.is_empty(), "both bars reused the same interactive widget IDs: {warnings:?}");
-- let bars: Vec<_> =
-- (0_u8..2).map(|pane| ctx.memory(|memory| memory.area_rect(egui::Id::new(("task_bar", egui::ViewportId::ROOT, pane)))).unwrap()).collect();
++ let bars: Vec<_> = (0_u8..2)
++ .map(|pane| ctx.memory(|memory| memory.area_rect(egui::Id::unique(("task_bar", egui::ViewportId::ROOT, pane)))).unwrap())
++ .collect();
assert!(!bars[0].intersects(bars[1]), "each pane keeps its own bar: {bars:?}");
}
@@@ -3955,8 -4030,8 +4040,8 @@@
}
};
// The icon column's flyout (the classic dock) and a floating panel group (the docking layout).
-- let flyout = egui::LayerId::new(egui::Order::Foreground, egui::Id::new("panel_flyout"));
-- let group = egui::LayerId::new(egui::Order::Middle, egui::Id::new("designcraft-panel-docking").with(("floating", "preflight")));
++ let flyout = egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("panel_flyout"));
++ let group = egui::LayerId::new(egui::Order::Middle, egui::Id::unique("designcraft-panel-docking").with(("floating", "preflight")));
let shown = |layer: egui::LayerId| ctx.memory(|m| m.areas().is_visible(&layer));
let toggles = [
("window.hidePanels", json!({}), json!({})),
@@@ -4715,7 -5056,7 +5066,7 @@@
events,
..Default::default()
};
-- app.raw_input_hook(&mut input);
++ app.raw_input_hook(ctx, &mut input);
let mut menu = menu;
let mut out = ctx.run_ui(input, |ui| {
let ctx = ui.ctx().clone();
@@@ -5349,6 -5690,6 +5700,7 @@@
delta: egui::vec2(0.0, -5000.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
},
]);
for _ in 0..60 {
@@@ -5675,6 -6016,6 +6027,7 @@@
delta: egui::vec2(0.0, -400.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
};
let mut after = tile_y(vec![egui::Event::PointerMoved(at), wheel]);
for _ in 0..30 {
@@@ -5725,7 -6066,7 +6078,7 @@@
let mut row = egui::Rect::NOTHING;
let mut output =
ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-- egui::Area::new(egui::Id::new("menu_rows")).fixed_pos(egui::pos2(50.0, 50.0)).show(ui.ctx(), |ui| {
++ egui::Area::new(egui::Id::unique("menu_rows")).fixed_pos(egui::pos2(50.0, 50.0)).show(ui.ctx(), |ui| {
let before = ui.cursor().min;
menu_column(app, ui, &[("Test", entries.clone())]);
row = egui::Rect::from_min_max(before, ui.min_rect().max);
diff --cc crates/ui-egui/src/new_document.rs
index ee59de800,4fd5cc4e8..65e60329c
--- a/crates/ui-egui/src/new_document.rs
+++ b/crates/ui-egui/src/new_document.rs
@@@ -409,7 -411,7 +411,7 @@@ fn card(ui: &mut Ui, c: &Card, units: U
FontId::proportional(11.0),
t.text_dim,
);
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, selected, &c.label));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, selected, &c.label));
resp
}
@@@ -455,7 -457,7 +457,7 @@@ fn tabs(app: &DesignApp, ui: &mut Ui, d
select(d, &c);
}
}
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, on, text));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, text));
}
ui.min_rect()
});
@@@ -567,7 -569,7 +569,7 @@@ fn spin(ui: &mut Ui, d: &mut Dialog, ke
for (dir, half) in
[(1.0, Rect::from_min_max(seg.min, pos2(seg.max.x, seg.center().y))), (-1.0, Rect::from_min_max(pos2(seg.min.x, seg.center().y), seg.max))]
{
-- let resp = ui.interact(half, ui.id().with((key, dir < 0.0)), Sense::click());
++ let resp = ui.interact(half, ui.scope_id().with((key, dir < 0.0)), Sense::click());
if resp.hovered() {
ui.painter().rect_filled(half.shrink(1.0), 1.0, t.hover);
}
@@@ -587,11 -589,11 +589,10 @@@
let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_rect).layout(Layout::left_to_right(Align::Center)));
let resp = child.add(
egui::TextEdit::singleline(&mut s)
-- .id(ui.id().with((key, "text")))
++ .id(ui.scope_id().with((key, "text")))
.frame(egui::Frame::NONE)
.desired_width(text_rect.width())
-- .horizontal_align(Align::Min)
-- .vertical_align(Align::Center),
++ .align(egui::Align2::LEFT_CENTER),
);
if resp.changed() {
d.fields.insert(key.into(), Value::String(s));
@@@ -734,19 -736,19 +735,19 @@@ fn details(app: &mut DesignApp, ui: &mu
let mut name = d.s("name");
let hint = app.session.next_untitled_title();
let resp = ui.add(egui::TextEdit::singleline(&mut name).hint_text(hint).desired_width(2.0 * COLUMN_W - 10.0).font(semibold(13.0)));
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::TextEdit, true, tr("Document Name")));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TextInput, true, tr("Document Name")));
if resp.changed() {
d.fields.insert("name".into(), json!(name));
}
let save = crate::widgets::icon_toggle_sized(ui, "preset-save", false, tr("Save Document Preset"), vec2(30.0, 26.0));
-- save.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tr("Save Document Preset")));
++ save.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tr("Save Document Preset")));
// It holds a text field: clicks inside it don't close it.
egui::Popup::menu(&save).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
ui.set_min_width(220.0);
crate::rtl::label(ui, tr("Save Document Preset As:"));
let mut preset = d.s("presetName");
let field = ui.add(egui::TextEdit::singleline(&mut preset).hint_text(tr("Custom")).desired_width(200.0));
-- field.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::TextEdit, true, tr("Preset Name")));
++ field.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TextInput, true, tr("Preset Name")));
// Type the name as soon as the popup opens.
if save.clicked() {
field.request_focus();
@@@ -957,6 -959,6 +958,7 @@@ mod tests
delta: vec2(0.0, -400.0),
phase: egui::TouchPhase::Move,
modifiers: egui::Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
};
frame(&mut app, &ctx, vec![wheel]);
let texts = settle(&mut app, &ctx);
diff --cc crates/ui-egui/src/object_control.rs
index 0a845a38d,0a845a38d..ffa5ec2e6
--- a/crates/ui-egui/src/object_control.rs
+++ b/crates/ui-egui/src/object_control.rs
@@@ -13,7 -13,7 +13,7 @@@ pub(crate) const HEIGHT: f32 = ROW_PITC
fn group(ui: &mut Ui, id: &str, width: f32, draw: impl FnOnce(&mut Ui, Rect)) {
let (rect, _) = ui.allocate_exact_size(vec2(width, HEIGHT), Sense::hover());
-- ui.interact(rect, egui::Id::new(("object_control", id)), Sense::hover());
++ ui.interact(rect, egui::Id::unique(("object_control", id)), Sense::hover());
let mut child = ui.new_child(egui::UiBuilder::new().id_salt(id).max_rect(rect).layout(egui::Layout::left_to_right(egui::Align::Center)));
draw(&mut child, rect);
}
@@@ -32,8 -32,8 +32,8 @@@ fn cell<R>(ui: &mut Ui, group: Rect, x
fn icon(ui: &mut Ui, group: Rect, x: f32, row: usize, name: &str, tip: &str) {
let rect = Rect::from_min_size(group.min + vec2(x, row as f32 * ROW_PITCH + 2.5), vec2(16.0, 16.0));
icons::paint(ui.painter(), rect, name, Tokens::get(ui.ctx()).icon);
-- let resp = ui.interact(rect, ui.id().with(("caption", name, row)), Sense::hover());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
++ let resp = ui.interact(rect, ui.scope_id().with(("caption", name, row)), Sense::hover());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
resp.on_hover_ui(|ui| {
crate::rtl::label(ui, tip);
});
@@@ -45,7 -45,7 +45,7 @@@ fn separator(ui: &mut Ui)
}
fn toggle(ui: &mut Ui, group: Rect, x: f32, key: &str, tip: &str) -> bool {
-- let id = egui::Id::new(key);
++ let id = egui::Id::unique(key);
let on = ui.data(|d| d.get_temp::<bool>(id)).unwrap_or(false);
let rect = Rect::from_min_size(group.min + vec2(x, 12.5), vec2(20.0, FIELD_H));
if properties::place(ui, rect, |ui| widgets::icon_toggle(ui, if on { "link" } else { "link-broken" }, on, tip)).clicked() {
@@@ -184,7 -184,7 +184,7 @@@ pub(crate) fn show(app: &mut DesignApp
}
if let Some(resp) = chip_resp {
let label = tr(if stroke { "Stroke" } else { "Fill" });
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &label));
resp.on_hover_text(label);
}
});
@@@ -362,7 -362,7 +362,7 @@@ mod tests
fn bottom_row_spinner_edits_height_inside_the_control_panel() {
let (ctx, mut app) = fixture(true);
let before = panels::sel_info(&app).unwrap().page_rect.height();
-- let group = ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
++ let group = ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
assert!(group.bottom() <= 59.0, "second row is inside the panel: {group:?}");
let height_up = group.min + vec2(123.0 + widgets::SEG_W / 2.0, ROW_PITCH + FIELD_H / 4.0);
click(&ctx, &mut app, height_up);
@@@ -374,7 -374,7 +374,7 @@@
fn empty_selection_keeps_numeric_controls_inactive() {
let (ctx, mut app) = fixture(false);
let status = app.ui.status.clone();
-- let group = ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
++ let group = ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
click(&ctx, &mut app, group.min + vec2(24.0, FIELD_H / 4.0));
assert_eq!(app.ui.status, status, "disabled spinners do not attempt transforms");
assert!(panels::sel_info(&app).is_none());
@@@ -385,7 -385,7 +385,7 @@@
let (ctx, mut app) = fixture(true);
frame_with_width(&ctx, &mut app, vec![], 900.0);
frame_with_width(&ctx, &mut app, vec![], 900.0);
-- let id = egui::Id::new(("object_control", "align"));
++ let id = egui::Id::unique(("object_control", "align"));
let before = ctx.read_response(id).unwrap().rect;
assert!(before.right() > 900.0, "the toolbar overflows at the minimum width");
frame_with_width(
@@@ -398,6 -398,6 +398,7 @@@
delta: vec2(-500.0, 0.0),
phase: egui::TouchPhase::Move,
modifiers: Default::default(),
++ source: egui::MouseWheelSource::Unknown,
},
],
900.0,
diff --cc crates/ui-egui/src/panel_docking.rs
index bec168ea1,bec168ea1..b022f2647
--- a/crates/ui-egui/src/panel_docking.rs
+++ b/crates/ui-egui/src/panel_docking.rs
@@@ -15,14 -15,14 +15,14 @@@ struct LegacyDrag
pub(crate) fn cancel_gesture(app: &mut DesignApp, ctx: &egui::Context) {
cancel_legacy_drag(app, ctx);
-- craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::new("designcraft-panel-docking"));
++ craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::unique("designcraft-panel-docking"));
}
fn cancel_legacy_drag(app: &mut DesignApp, ctx: &egui::Context) -> bool {
-- let key = egui::Id::new("designcraft-panel-docking").with("legacy-origin");
++ let key = egui::Id::unique("designcraft-panel-docking").with("legacy-origin");
let previous = ctx.data_mut(|data| data.remove_temp::<LegacyDrag>(key));
if let Some(previous) = previous {
-- craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::new("designcraft-panel-docking"));
++ craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::unique("designcraft-panel-docking"));
if previous.generation != app.ui.docking_generation {
return false;
}
@@@ -431,7 -431,7 +431,7 @@@ fn change(app: &mut DesignApp, operatio
}
pub(crate) fn show(app: &mut DesignApp, ui: &mut egui::Ui) -> bool {
-- let area = egui::Id::new("designcraft-panel-docking");
++ let area = egui::Id::unique("designcraft-panel-docking");
let changed_workspace = ui.ctx().data_mut(|data| {
let previous = data.get_temp::<u64>(area.with("generation"));
data.insert_temp(area.with("generation"), app.ui.docking_generation);
@@@ -463,7 -463,7 +463,7 @@@
blocked.push(ui.ctx().content_rect());
} else if crate::story_editor::visible(app) {
// The editor is rendered after the dock; block its unmeasured first frame conservatively.
-- let rect = ui.ctx().memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap_or_else(|| ui.ctx().content_rect());
++ let rect = ui.ctx().memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap_or_else(|| ui.ctx().content_rect());
blocked.push(rect);
}
let t = crate::theme::Tokens::get(ui.ctx());
@@@ -484,7 -484,7 +484,7 @@@
style.panels_label = crate::i18n::tr(&language, "Panels").to_owned();
style.resize_label = crate::i18n::tr(&language, "Resize panels").to_owned();
style.resize_window_label = crate::i18n::tr(&language, "Resize panel window").to_owned();
-- let mut area = craft_ui::docking::DockArea::new(egui::Id::new("designcraft-panel-docking")).blocked_rects(&blocked);
++ let mut area = craft_ui::docking::DockArea::new(egui::Id::unique("designcraft-panel-docking")).blocked_rects(&blocked);
if let Some(panel) = &raise {
area = area.raise_panel(panel.clone());
}
@@@ -526,7 -526,7 +526,7 @@@
if !output.actions.iter().any(|action| matches!(action, Action::Move { .. } | Action::Float { .. })) && cancel_legacy_drag(app, ui.ctx()) {
return app.ui.docking.is_some();
}
-- ui.ctx().data_mut(|data| data.remove::<LegacyDrag>(egui::Id::new("designcraft-panel-docking").with("legacy-origin")));
++ ui.ctx().data_mut(|data| data.remove::<LegacyDrag>(egui::Id::unique("designcraft-panel-docking").with("legacy-origin")));
}
for action in output.actions {
if let Err(error) = app.run("window.panel.layout", json!({"action": action})) {
@@@ -580,11 -580,11 +580,11 @@@ pub(crate) fn legacy_tab(app: &mut Desi
egui::vec2(bounds.width().clamp(240.0, 600.0), bounds.height().clamp(200.0, 600.0)),
);
if ensure(&mut layout, id).is_ok()
-- && craft_ui::docking::begin_drag(ui.ctx(), egui::Id::new("designcraft-panel-docking"), id.to_string(), source)
++ && craft_ui::docking::begin_drag(ui.ctx(), egui::Id::unique("designcraft-panel-docking"), id.to_string(), source)
{
ui.ctx().data_mut(|data| {
data.insert_temp(
-- egui::Id::new("designcraft-panel-docking").with("legacy-origin"),
++ egui::Id::unique("designcraft-panel-docking").with("legacy-origin"),
LegacyDrag {
layout: app.ui.docking.clone(),
open_panel: app.ui.open_panel.clone(),
@@@ -614,7 -614,7 +614,7 @@@ fn three_line_button(app: &mut DesignAp
let t = crate::theme::Tokens::get(ui.ctx());
let area = ui.max_rect();
let r = egui::Rect::from_center_size(area.center(), egui::vec2(18.0, 18.0));
-- let menu = ui.interact(r, ui.id().with("panel-menu"), egui::Sense::click());
++ let menu = ui.interact(r, ui.scope_id().with("panel-menu"), egui::Sense::click());
if menu.hovered() {
ui.painter().rect_filled(r, 3.0, t.hover);
}
diff --cc crates/ui-egui/src/panel_docking_tests.rs
index f436cfb5e,f436cfb5e..f34af3c0c
--- a/crates/ui-egui/src/panel_docking_tests.rs
+++ b/crates/ui-egui/src/panel_docking_tests.rs
@@@ -88,8 -88,8 +88,9 @@@ fn ordinary_panel_tab_drag_enters_share
drag(&mut h, source, egui::pos2(160.0, 140.0));
let layout = h.state().ui.docking.as_ref().expect("ordinary tab drag starts shared docking");
assert!(layout.floating.iter().any(|g| g.panels.contains(&"layers".into())), "{layout:?}");
-- let source = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"layers".to_string()))).unwrap().rect.center();
-- let destination = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
++ let source = h.ctx.read_response(egui::Id::unique("designcraft-panel-docking").with(("tab", &"layers".to_string()))).unwrap().rect.center();
++ let destination =
++ h.ctx.read_response(egui::Id::unique("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
drag(&mut h, source, destination);
let layout = h.state().ui.docking.as_ref().unwrap();
assert!(!layout.floating.iter().any(|g| g.panels.contains(&"layers".into())));
@@@ -159,7 -159,7 +160,7 @@@ fn capture_custom_panel_docking_visual_
.save(directory.join(format!("designcraft-shared-docking-{}-{language}-{width}-{scale}x.png", theme.id())))
.unwrap();
if language == "ar" {
-- let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"swatches".to_string()));
++ let tab = egui::Id::unique("designcraft-panel-docking").with(("tab", &"swatches".to_string()));
let at = harness.ctx.read_response(tab).unwrap().rect.center();
harness.input_mut().events.extend([
Event::PointerMoved(at),
@@@ -291,8 -291,8 +292,8 @@@ fn populated_canvas_keeps_a_real_stroke
std::fs::create_dir_all(directory).unwrap();
h.render().unwrap().save(directory.join("designcraft-populated-stroke-floating.png")).unwrap();
}
-- let from = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"stroke".to_string()))).unwrap().rect.center();
-- let to = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
++ let from = h.ctx.read_response(egui::Id::unique("designcraft-panel-docking").with(("tab", &"stroke".to_string()))).unwrap().rect.center();
++ let to = h.ctx.read_response(egui::Id::unique("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
drag(&mut h, from, to);
assert!(h.state().ui.docking.as_ref().unwrap().floating.is_empty());
assert_eq!(h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().stroke.join, designcraft_doc::Join::Bevel);
@@@ -448,7 -448,7 +449,7 @@@ fn modal_overlay_blocks_a_real_tab_drag
let mut app = app();
app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
let mut h = harness(app, vec2(1280.0, 800.0));
-- let area = egui::Id::new("designcraft-panel-docking");
++ let area = egui::Id::unique("designcraft-panel-docking");
let source = h.ctx.read_response(area.with(("tab", &"properties".to_string()))).unwrap().rect.center();
h.event(Event::PointerMoved(source));
h.run_steps(1);
@@@ -498,7 -498,7 +499,7 @@@ fn first_story_editor_frame_conservativ
app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
-- let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()));
++ let tab = egui::Id::unique("designcraft-panel-docking").with(("tab", &"properties".to_string()));
let from = h.ctx.read_response(tab).unwrap().rect.center();
h.event(Event::PointerMoved(from));
h.run_steps(1);
@@@ -507,7 -507,7 +508,7 @@@
h.event(Event::PointerMoved(from - vec2(90.0, 0.0)));
h.run_steps(2);
assert_eq!(h.ctx.dragged_id(), Some(tab), "must own a real tab drag before opening editor");
-- assert!(h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).is_none());
++ assert!(h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).is_none());
let layout = h.state().app.ui.docking.clone();
let frame_before = h.ctx.cumulative_frame_nr();
h.state_mut().app.run("app.storyEditor", json!({"story":story})).unwrap();
@@@ -519,19 -519,19 +520,19 @@@
]);
h.run_steps(1);
assert_eq!(h.ctx.cumulative_frame_nr() - frame_before, 1, "release must occur in the first editor frame");
-- let measured = h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap();
++ let measured = h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap();
assert!(!measured.contains(release), "fixture exercises the conservative first-frame guard outside eventual editor bounds");
assert_eq!(h.state().app.ui.docking, layout, "first editor frame must block release before it has a measured rectangle");
assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), doc);
h.run_steps(3);
-- let editor = h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap();
++ let editor = h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap();
let screen = h.ctx.content_rect();
let outside = [screen.left_bottom() + vec2(80.0, -80.0), screen.right_bottom() + vec2(-450.0, -80.0)]
.into_iter()
.find(|p| !editor.contains(*p))
.expect("fixture has space outside editor");
let before_outside = h.state().app.ui.docking.clone();
-- let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"layers".to_string()));
++ let tab = egui::Id::unique("designcraft-panel-docking").with(("tab", &"layers".to_string()));
let from = h.ctx.read_response(tab).unwrap().rect.center();
h.event(Event::PointerMoved(from));
h.run_steps(1);
@@@ -608,7 -608,7 +609,13 @@@ fn capture_legacy_panel_menu_visual_fix
assert!(before.is_none_or(|rect| !submenu.contains_rect(rect)), "actual submenu must require scrolling to reach its last target");
h.input_mut().events.extend([
Event::PointerMoved(scroll_at),
-- Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, -1600.0), phase: egui::TouchPhase::Move, modifiers: Modifiers::NONE },
++ Event::MouseWheel {
++ unit: egui::MouseWheelUnit::Point,
++ delta: vec2(0.0, -1600.0),
++ phase: egui::TouchPhase::Move,
++ modifiers: Modifiers::NONE,
++ source: egui::MouseWheelSource::Unknown,
++ },
]);
h.run_steps(12);
let target = h.query_all_by_label(logical).find(|node| submenu.x_range().contains(node.rect().center().x)).unwrap().rect();
@@@ -636,7 -636,7 +643,7 @@@ fn legacy_dock_menu_button_opens_the_ac
let mut h = harness(app, vec2(1280.0, 800.0));
assert!(h.state().ui.docking.is_none());
let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
-- let dock = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("dock")).unwrap().outer_rect;
++ let dock = egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with("dock")).unwrap().outer_rect;
let at = egui::pos2(dock.right() - 15.0, tab.center().y);
h.event(Event::PointerMoved(at));
h.run_steps(1);
@@@ -768,7 -768,7 +775,7 @@@ fn pages_keeps_its_panel_menu_in_the_do
assert!(app.ui.docking.is_some());
let mut h = harness(app, vec2(1280.0, 800.0));
let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
-- let dock = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("shared-panel-dock")).unwrap().outer_rect;
++ let dock = egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with("shared-panel-dock")).unwrap().outer_rect;
click(&mut h, egui::pos2(dock.right() - 12.0, tab.center().y), PointerButton::Primary);
assert!(egui::Popup::is_any_open(&h.ctx), "the three-line button must open a menu");
for item in ["Numbering & Section Options…", "Close Tab Group", "Float Panel"] {
diff --cc crates/ui-egui/src/panels/cell_stroke.rs
index 750e180a8,750e180a8..b7f4eaa2e
--- a/crates/ui-egui/src/panels/cell_stroke.rs
+++ b/crates/ui-egui/src/panels/cell_stroke.rs
@@@ -111,7 -111,7 +111,7 @@@ pub fn edge_proxy(ui: &mut Ui, id: &str
let t = Tokens::get(ui.ctx());
let (r, resp) = ui.allocate_exact_size(vec2(PROXY_SIZE, PROXY_SIZE), Sense::click());
let label = tr(lang, "Cell edges").to_string();
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, &label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Unknown, true, &label));
let resp = resp.on_hover_text(tr(
lang,
"Click a line to include or exclude it. Double-click selects all outer or all inner lines; triple-click selects or clears all.",
@@@ -122,8 -122,8 +122,8 @@@
let (double, triple) = (resp.double_clicked(), resp.triple_clicked());
// A double-click counts only on the line of the click before it; a triple-click
// decides from the choice before the sequence's first click.
-- let last_key = ui.id().with((id, "proxy_last"));
-- let start_key = ui.id().with((id, "proxy_start"));
++ let last_key = ui.scope_id().with((id, "proxy_last"));
++ let start_key = ui.scope_id().with((id, "proxy_start"));
let last: Option<usize> = ui.data(|d| d.get_temp(last_key)).flatten();
if !double && !triple {
ui.data_mut(|d| d.insert_temp(start_key, *edges));
@@@ -192,7 -192,7 +192,7 @@@ pub fn stroke_fields(app: &mut DesignAp
ui.end_row();
caption(ui, tr(&lang, "Type:"));
let shown = type_label(&lang, &v["type"]);
-- egui::ComboBox::from_id_salt((id, "type")).selected_text(crate::rtl::widget(ui, &shown)).width(140.0).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt((id, "type")).selected_text(crate::rtl::widget(ui, &shown)).width(140.0).show_ui(ui, |ui| {
for kind in TYPES {
let text = tr(&lang, builtin(kind).label());
if ui.selectable_label(shown == text, crate::rtl::widget(ui, text)).clicked() {
@@@ -208,6 -208,6 +208,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, tr(&lang, "Type"));
ui.end_row();
for (label, key, tint_label, tint_key) in [("Color:", "color", "Tint:", "tint"), ("Gap Color:", "gapColor", "Gap Tint:", "gapTint")] {
caption(ui, tr(&lang, label));
@@@ -238,7 -238,7 +239,7 @@@ pub fn current(app: &mut DesignApp, edg
/// The Stroke panel for table cells: the proxy and the stroke fields, applied at once.
pub fn panel(app: &mut DesignApp, ui: &mut Ui) {
-- let key = egui::Id::new("cell_stroke_edges");
++ let key = egui::Id::unique("cell_stroke_edges");
let mut edges: Edges = ui.data(|d| d.get_temp(key)).unwrap_or([true; 6]);
let lang = app.ui.language.clone();
if edge_proxy(ui, "stroke_panel", &mut edges, &lang) {
@@@ -282,7 -282,7 +283,7 @@@ mod tests
app.run("table.select", json!({"what": "table"})).unwrap();
let mut h = Harness::builder().with_size(vec2(320.0, 600.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
diff --cc crates/ui-egui/src/panels/conditions.rs
index 45eddec20,a855b4820..f5f2c81c5
--- a/crates/ui-egui/src/panels/conditions.rs
+++ b/crates/ui-egui/src/panels/conditions.rs
@@@ -28,7 -40,7 +40,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
let (row, _) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::hover());
// Visibility (eye).
let eye = egui::Rect::from_min_size(row.min + vec2(2.0, 3.0), vec2(16.0, 16.0));
-- let er = ui.interact(eye, ui.id().with(("cond_eye", &c.name)), Sense::click()).on_hover_ui(|ui| {
++ let er = ui.interact(eye, ui.scope_id().with(("cond_eye", &c.name)), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show / hide text with this condition"));
});
if c.visible {
@@@ -47,7 -59,7 +59,7 @@@
}
// Name (click: toggle on the selected text) and indicator colour.
let name_r = egui::Rect::from_min_max(row.min + vec2(42.0, 0.0), row.max - vec2(24.0, 0.0));
-- let nr = ui.interact(name_r, ui.id().with(("cond_name", &c.name)), Sense::click());
++ let nr = ui.interact(name_r, ui.scope_id().with(("cond_name", &c.name)), Sense::click());
if nr.hovered() {
ui.painter().rect_filled(name_r, 0.0, t.hover);
}
@@@ -72,7 -77,7 +77,7 @@@
});
}
ui.add_space(6.0);
-- let id = egui::Id::new("new_condition_name");
++ let id = egui::Id::unique("new_condition_name");
let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
ui.horizontal(|ui| {
ui.add(
diff --cc crates/ui-egui/src/panels/datamerge.rs
index f0ae77279,f0ae77279..edf7b3261
--- a/crates/ui-egui/src/panels/datamerge.rs
+++ b/crates/ui-egui/src/panels/datamerge.rs
@@@ -97,7 -97,7 +97,9 @@@ pub fn show(app: &mut DesignApp, ui: &m
ui.separator();
crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Merge options")).strong().color(t.text_strong));
-- if let Some(records) = choice(ui, "dm_records", &options.records, &[("all", "All records"), ("one", "One record"), ("range", "Range")], &lang) {
++ let records_name = tr(&lang, "Merge options");
++ let record_options = [("all", "All records"), ("one", "One record"), ("range", "Range")];
++ if let Some(records) = choice(ui, "dm_records", &options.records, &record_options, &lang, records_name) {
let _ = app.run("data.options", json!({"records": records}));
}
if options.records == "one" {
@@@ -113,11 -113,11 +115,14 @@@
}
}
crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Records per page")).color(t.text));
-- if let Some(per_page) = choice(ui, "dm_per_page", &options.per_page, &[("single", "Single record"), ("multiple", "Multiple records")], &lang) {
++ let per_page_name = tr(&lang, "Records per page");
++ let per_page_options = [("single", "Single record"), ("multiple", "Multiple records")];
++ if let Some(per_page) = choice(ui, "dm_per_page", &options.per_page, &per_page_options, &lang, per_page_name) {
let _ = app.run("data.options", json!({"perPage": per_page}));
}
if options.per_page == "multiple" {
-- if let Some(arrange) = choice(ui, "dm_arrange", &options.arrange, &[("rows", "Rows first"), ("columns", "Columns first")], &lang) {
++ let arrange_options = [("rows", "Rows first"), ("columns", "Columns first")];
++ if let Some(arrange) = choice(ui, "dm_arrange", &options.arrange, &arrange_options, &lang, records_name) {
let _ = app.run("data.options", json!({"arrange": arrange}));
}
let labels = ["Top", "Right", "Bottom", "Left"];
@@@ -154,6 -154,6 +159,7 @@@
("none", "None"),
],
&lang,
++ "Image Fitting",
) {
let _ = app.run("data.options", json!({"fitting": fitting}));
}
@@@ -184,16 -184,16 +190,17 @@@ fn select_source(app: &mut DesignApp)
let _ = app.run("data.source.select", json!({"path": path}));
}
--fn choice(ui: &mut egui::Ui, id: &str, current: &str, options: &[(&str, &str)], lang: &str) -> Option<String> {
++fn choice(ui: &mut egui::Ui, id: &str, current: &str, options: &[(&str, &str)], lang: &str, name: &str) -> Option<String> {
let label = options.iter().find(|(value, _)| *value == current).map(|(_, text)| tr(lang, text)).unwrap_or(current);
let mut picked = None;
-- egui::ComboBox::from_id_salt(id).selected_text(label).width(ui.available_width().min(200.0)).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt(id).selected_text(label).width(ui.available_width().min(200.0)).show_ui(ui, |ui| {
for (value, text) in options {
if ui.selectable_label(*value == current, tr(lang, text)).clicked() {
picked = Some((*value).to_string());
}
}
});
++ let _ = crate::widgets::name_combo(combo, name.to_owned());
picked.filter(|value| value != current)
}
diff --cc crates/ui-egui/src/panels/font_menu.rs
index 84572a335,84572a335..f07e8a810
--- a/crates/ui-egui/src/panels/font_menu.rs
+++ b/crates/ui-egui/src/panels/font_menu.rs
@@@ -64,7 -64,7 +64,7 @@@ fn regular(styles: &[String]) -> Strin
}
fn meta(ui: &Ui, fonts: &designcraft_fonts::ScopedFonts<'static>, scope: u32, family: &str) -> FamilyMeta {
-- let key = egui::Id::new(("font_meta", family, scope));
++ let key = egui::Id::unique(("font_meta", family, scope));
if let Some(m) = ui.data(|d| d.get_temp::<FamilyMeta>(key)) {
return m;
}
@@@ -101,7 -101,7 +101,7 @@@ fn family_kind(fonts: &designcraft_font
/// The families' kinds, starting to read them the first time they're needed for `scope`.
fn kinds(ctx: &egui::Context, fonts: &designcraft_fonts::ScopedFonts<'static>, scope: u32) -> SharedKinds {
-- let shared: SharedKinds = ctx.data_mut(|d| d.get_temp_mut_or_default::<SharedKinds>(egui::Id::new("font_kinds")).clone());
++ let shared: SharedKinds = ctx.data_mut(|d| d.get_temp_mut_or_default::<SharedKinds>(egui::Id::unique("font_kinds")).clone());
let start = {
let mut k = lock(&shared);
let start = k.scope != Some(scope);
@@@ -225,8 -225,8 +225,8 @@@ fn preview
) -> egui::TextureHandle {
let ppp = ui.ctx().pixels_per_point();
let px = (size * ppp).round() as u32;
-- let key = egui::Id::new(("font_preview", family, style, scope, text, px, color.to_array()));
-- let cache_id = egui::Id::new("font_previews");
++ let key = egui::Id::unique(("font_preview", family, style, scope, text, px, color.to_array()));
++ let cache_id = egui::Id::unique("font_previews");
if let Some(t) = ui.data_mut(|d| d.get_temp_mut_or_default::<Previews>(cache_id).get(key)) {
return t;
}
@@@ -281,7 -281,7 +281,7 @@@ fn toggle(ui: &mut Ui, on: bool, tip: &
ui.painter().rect_filled(r, 3.0, t.hover);
}
paint(ui.painter(), r, if on { t.text_strong } else { t.icon });
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Checkbox, true, on, tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, true, on, tip));
resp.on_hover_text(tip).clicked()
}
@@@ -303,7 -303,7 +303,7 @@@ pub fn font_menu_body(app: &mut DesignA
let (fonts, scope) = (super::fonts(app), super::font_scope(app));
let english = app.session.prefs.show_font_names_in_english;
let mut favs = app.session.prefs.favorite_fonts.clone();
-- let state_id = egui::Id::new("font_menu_state");
++ let state_id = egui::Id::unique("font_menu_state");
let mut st: MenuState = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
let frame = ui.ctx().cumulative_frame_nr();
if st.frame.is_none_or(|f| f.saturating_add(1) < frame) {
@@@ -552,7 -552,7 +552,7 @@@
None => family.label(english).to_string(),
};
let is_current = style.is_none() && f == current;
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, is_current, &label));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, is_current, &label));
if style.is_none() && label != *f {
resp = resp.on_hover_text(f);
}
@@@ -571,7 -571,7 +571,7 @@@
// Favourite star.
let star = Rect::from_center_size(pos2(r.min.x + 10.0, cy), vec2(16.0, 16.0));
let fav = favs.contains(f);
-- let sr = ui.interact(star, ui.id().with(("fav", f, recent)), Sense::click());
++ let sr = ui.interact(star, ui.scope_id().with(("fav", f, recent)), Sense::click());
paint_star(&p, star.center(), 6.5, fav, if fav { t.accent } else { t.text_dim });
if sr.clicked() {
toggle_fav = Some(f.clone());
@@@ -580,13 -580,13 +580,9 @@@
// The arrow opens a family of several styles.
if m.styles.len() > 1 && !recent {
let arrow = Rect::from_center_size(pos2(r.min.x + 28.0, cy), vec2(16.0, 16.0));
-- let ar = ui.interact(arrow, ui.id().with(("open", f)), Sense::click());
++ let ar = ui.interact(arrow, ui.scope_id().with(("open", f)), Sense::click());
ar.widget_info(|| {
-- egui::WidgetInfo::labeled(
-- egui::WidgetType::Button,
-- true,
-- tr(if st.expanded.contains(f) { "Hide Styles" } else { "Show Styles" }),
-- )
++ egui::WidgetInfo::labeled(egui::Role::Button, true, tr(if st.expanded.contains(f) { "Hide Styles" } else { "Show Styles" }))
});
let open = st.expanded.contains(f);
crate::icons::paint(&p, arrow.shrink(2.0), if open { "chevron-down" } else { "chevron-right" }, t.icon);
@@@ -611,8 -611,8 +607,8 @@@
// Show Similar Fonts (on hover), and the format.
if style.is_none() && (hovered || st.similar.as_deref() == Some(f.as_str())) {
let sim = Rect::from_center_size(pos2(icons_x + 12.0, cy), vec2(18.0, 18.0));
-- let sr = ui.interact(sim, ui.id().with(("similar", f, recent)), Sense::click());
-- sr.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tr("Show Similar Fonts")));
++ let sr = ui.interact(sim, ui.scope_id().with(("similar", f, recent)), Sense::click());
++ sr.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tr("Show Similar Fonts")));
p.text(sim.center(), Align2::CENTER_CENTER, "≈", FontId::proportional(15.0), if sr.hovered() { t.text_strong } else { t.icon });
if sr.on_hover_text(tr("Show Similar Fonts")).clicked() {
similar = Some(f.clone());
@@@ -622,7 -622,7 +618,7 @@@
if style.is_none() {
let badge = Rect::from_center_size(pos2(r.max.x - 16.0, cy), vec2(20.0, 16.0));
paint_format(&p, badge, m.kind.format, t.text_dim, t.accent);
-- ui.interact(badge, ui.id().with(("format", f, recent)), Sense::hover()).on_hover_text(tr(format_name(m.kind.format)));
++ ui.interact(badge, ui.scope_id().with(("format", f, recent)), Sense::hover()).on_hover_text(tr(format_name(m.kind.format)));
}
if resp.clicked() && !handled {
pick = Some(FontPick { family: f.clone(), style: style.map(str::to_string) });
@@@ -673,7 -673,7 +669,7 @@@ mod preview_cache_tests
let ctx = egui::Context::default();
let tex = |i: usize| ctx.load_texture(format!("t{i}"), egui::ColorImage::new([1, 1], vec![egui::Color32::WHITE]), Default::default());
let mut c = Previews::default();
-- let key = |i: usize| egui::Id::new(("p", i));
++ let key = |i: usize| egui::Id::unique(("p", i));
for i in 0..Previews::CAP + 40 {
c.insert(key(i), tex(i));
// The first one stays in use, so it is kept.
diff --cc crates/ui-egui/src/panels/glyphs.rs
index 5d91c194f,5d91c194f..7d1da4ea3
--- a/crates/ui-egui/src/panels/glyphs.rs
+++ b/crates/ui-egui/src/panels/glyphs.rs
@@@ -21,7 -21,7 +21,7 @@@ struct State
pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
let t = Tokens::get(ui.ctx());
-- let id = egui::Id::new("glyphs_panel");
++ let id = egui::Id::unique("glyphs_panel");
let mut st: State = ui.data(|d| d.get_temp(id)).unwrap_or_default();
// Default to the font at the text cursor.
if st.family.is_empty() {
@@@ -38,13 -38,13 +38,14 @@@
st.style = f.style.clone().or_else(|| db.styles(&f.family).into_iter().next()).unwrap_or_else(|| "Regular".into());
st.family = f.family;
}
-- egui::ComboBox::from_id_salt("glyph_style").selected_text(&st.style).width(80.0).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt("glyph_style").selected_text(&st.style).width(80.0).show_ui(ui, |ui| {
for s in db.styles(&st.family) {
if ui.selectable_label(s == st.style, &s).clicked() {
st.style = s;
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Font Style"));
});
ui.add(
egui::TextEdit::singleline(&mut st.query)
@@@ -120,7 -120,7 +121,7 @@@ pub fn grid
let max_rows = (ui.ctx().input(|i| i.max_texture_side) as u32 / cell_px).max(1);
chars.truncate((max_rows * cols) as usize);
let ink = t.text_strong;
-- let key = egui::Id::new(("glyph_grid", family, style, scope, q, cols, cell_px, ink.to_array()));
++ let key = egui::Id::unique(("glyph_grid", family, style, scope, q, cols, cell_px, ink.to_array()));
let tex: egui::TextureHandle = match ui.data(|d| d.get_temp::<egui::TextureHandle>(key)) {
Some(t) => t,
None => {
diff --cc crates/ui-egui/src/panels/interactive.rs
index 5c3280142,5c3280142..7ca6cf595
--- a/crates/ui-egui/src/panels/interactive.rs
+++ b/crates/ui-egui/src/panels/interactive.rs
@@@ -20,7 -20,7 +20,7 @@@ fn dest_text(lang: &str, d: &Value) ->
pub fn hyperlinks(app: &mut DesignApp, ui: &mut egui::Ui) {
let t = Tokens::get(ui.ctx());
-- let id = egui::Id::new("new_hyperlink_url");
++ let id = egui::Id::unique("new_hyperlink_url");
let mut url: String = ui.data(|d| d.get_temp(id)).unwrap_or_else(|| "https://".into());
let has_target = app.session.active().is_some_and(|d| d.selection.text.is_some_and(|t| !t.is_caret()) || !d.selection.items.is_empty());
ui.horizontal(|ui| {
@@@ -168,7 -168,7 +168,7 @@@ pub fn tags(app: &mut DesignApp, ui: &m
let has_sel = app.session.active().is_some_and(|d| !d.selection.items.is_empty());
// Selected text is tagged inline instead of its frame.
let text_sel = app.session.active().and_then(|d| d.selection.text).is_some_and(|t| !t.range().is_empty());
-- let id = egui::Id::new("new_tag_name");
++ let id = egui::Id::unique("new_tag_name");
let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
ui.horizontal(|ui| {
ui.add(
@@@ -227,7 -227,7 +227,7 @@@
}
}
// DTD: load, validate (problems listed until the next validation), delete.
-- let vid = egui::Id::new("dtd_problems");
++ let vid = egui::Id::unique("dtd_problems");
let mut problems: Option<Vec<String>> = ui.data(|d| d.get_temp(vid));
ui.horizontal(|ui| {
if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load DTD…"))).clicked()
@@@ -365,7 -365,7 +365,7 @@@ pub fn buttons(app: &mut DesignApp, ui
let mut pick = None;
ui.horizontal(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "On Release"));
-- egui::ComboBox::from_id_salt("button_action")
++ let combo = egui::ComboBox::from_id_salt("button_action")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, labels.iter().find(|l| l.0 == kind).map_or("", |l| l.1))))
.show_ui(ui, |ui| {
for (k, l) in labels {
@@@ -374,6 -374,6 +374,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "On Release Action"));
});
let mut params = None;
if let Some(k) = pick {
@@@ -390,7 -390,7 +391,7 @@@
});
}
if kind == "url" {
-- let key = egui::Id::new(("button_url", id.0));
++ let key = egui::Id::unique(("button_url", id.0));
let mut u: String = ui.data(|d| d.get_temp(key)).unwrap_or(url.clone());
let r = ui.add(egui::TextEdit::singleline(&mut u).desired_width(f32::INFINITY));
if r.lost_focus() && u != url {
@@@ -425,7 -425,7 +426,7 @@@
let cur = ff.as_ref().map(|f| f.kind);
ui.horizontal(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Form Field"));
-- egui::ComboBox::from_id_salt("form_kind")
++ let combo = egui::ComboBox::from_id_salt("form_kind")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, kinds.iter().find(|k| k.0 == cur).map_or("", |k| k.1))))
.show_ui(ui, |ui| {
for (k, l) in kinds {
@@@ -437,9 -437,9 +438,10 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Form Field Type"));
});
if let Some(f) = ff {
-- let key = egui::Id::new(("form_edit", id.0));
++ let key = egui::Id::unique(("form_edit", id.0));
let (mut name, mut value, mut opts): (String, String, String) =
ui.data(|d| d.get_temp(key)).unwrap_or((f.name.clone(), f.value.clone(), f.options.join(", ")));
let mut commit = false;
@@@ -537,7 -537,7 +539,7 @@@ pub fn liquid(app: &mut DesignApp, ui:
crate::widgets::caption(ui, &format!("{} {}", crate::i18n::tr(&lang, "Page:"), d.page_name(page)));
});
});
-- egui::ComboBox::from_id_salt("liquid_rule")
++ let combo = egui::ComboBox::from_id_salt("liquid_rule")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&lang, liquid_rule_label(pg.liquid))))
.width(190.0)
.show_ui(ui, |ui| {
@@@ -547,6 -547,6 +549,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&lang, "Liquid Page Rule"));
ui.separator();
// The selected object (one on this page).
let item = app
@@@ -666,7 -666,7 +669,7 @@@ pub fn transitions(app: &mut DesignApp
use designcraft_doc::TransitionKind as K;
crate::rtl::label(ui, egui::RichText::new(format!("{} {}", crate::i18n::tr(&app.ui.language, "Spread"), si + 1)).strong());
let mut kind = cur.map(|c| c.kind);
-- egui::ComboBox::from_id_salt("transition_kind")
++ let combo = egui::ComboBox::from_id_salt("transition_kind")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, kind.map_or("None", K::label))))
.show_ui(ui, |ui| {
ui.selectable_value(&mut kind, None, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "None")));
@@@ -674,6 -674,6 +677,7 @@@
ui.selectable_value(&mut kind, Some(k), crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, k.label())));
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Transition"));
let mut duration = cur.map_or(1.0, |c| c.duration);
let mut horizontal = cur.is_some_and(|c| c.horizontal);
let mut changed = kind != cur.map(|c| c.kind);
@@@ -789,7 -789,7 +793,7 @@@ mod liquid_panel_tests
let id = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
let mut h = Harness::builder().with_size(egui::vec2(260.0, 420.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let key = egui::Id::new("test_fonts");
++ let key = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
diff --cc crates/ui-egui/src/panels/layers.rs
index 657e9b611,657e9b611..1f5382ac2
--- a/crates/ui-egui/src/panels/layers.rs
+++ b/crates/ui-egui/src/panels/layers.rs
@@@ -80,10 -80,10 +80,10 @@@ fn eye_lock
if locked {
icons::paint(ui.painter(), Rect::from_center_size(lock.center(), vec2(13.0, 13.0)), "lock", col);
}
-- let e = ui.interact(eye, ui.id().with(("eye", key)), Sense::click()).on_hover_ui(|ui| {
++ let e = ui.interact(eye, ui.scope_id().with(("eye", key)), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(language, if visible { "Hide" } else { "Show" }));
});
-- let l = ui.interact(lock, ui.id().with(("lock", key)), Sense::click()).on_hover_ui(|ui| {
++ let l = ui.interact(lock, ui.scope_id().with(("lock", key)), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(language, if locked { "Unlock" } else { "Lock" }));
});
(e.clicked(), l.clicked())
@@@ -103,7 -103,7 +103,7 @@@ fn selection_square
let s = if small { 7.0 } else { 8.0 };
let r = Rect::from_center_size(pos2(row.max.x - 12.0, row.center().y), vec2(s, s));
let sense = if selected && !small { Sense::click_and_drag() } else { Sense::click() };
-- let resp = ui.interact(r.expand(4.0), ui.id().with(("selsq", key)), sense);
++ let resp = ui.interact(r.expand(4.0), ui.scope_id().with(("selsq", key)), sense);
if selected {
ui.painter().rect_filled(r, 0.0, color);
} else if resp.hovered() {
@@@ -267,16 -267,16 +267,16 @@@ fn object_rows
let (eye, lock) = eye_lock(ui, ls.language, row, !it.hidden, it.locked, !ls.layer_visible, ("item", it.id.0));
let indent = 14.0 * depth as f32;
let expandable = !it.children().is_empty() && it.states.is_empty() && depth < MAX_DEPTH;
-- let open_id = egui::Id::new(("group_open", it.id.0));
++ let open_id = egui::Id::unique(("group_open", it.id.0));
let open = expandable && ui.data(|d| d.get_temp(open_id)).unwrap_or(false);
let mut tri_clicked = false;
if expandable {
let tri = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 14.0 + indent, 0.0), vec2(14.0, ROW_H));
disclosure(ui, tri, open, t.icon);
-- tri_clicked = ui.interact(tri, ui.id().with(("gtri", it.id.0)), Sense::click()).clicked();
++ tri_clicked = ui.interact(tri, ui.scope_id().with(("gtri", it.id.0)), Sense::click()).clicked();
}
let name = item_label(ls.doc, it);
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, is_sel, &name));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, is_sel, &name));
let field = Rect::from_min_max(row.min + vec2(2.0 * COL_W + 28.0 + indent, 3.0), pos2(row.max.x - 28.0, row.max.y - 3.0));
let renaming = match rename_field(ui, field, it.id.0) {
// An empty name goes back to the automatic label.
@@@ -287,7 -287,7 +287,7 @@@
false
}
Some(None) => false,
-- None => ui.data(|d| d.get_temp::<RenameState>(egui::Id::new(RENAME))).is_some_and(|(k, ..)| k == it.id.0),
++ None => ui.data(|d| d.get_temp::<RenameState>(egui::Id::unique(RENAME))).is_some_and(|(k, ..)| k == it.id.0),
};
if !renaming {
let clip = Rect::from_min_max(row.min, pos2(row.max.x - 26.0, row.max.y));
@@@ -323,7 -323,7 +323,7 @@@
// after the double-click delay) renames it; a quick double-click only selects.
let (now, add) = ui.input(|i| (i.time, i.modifiers.shift || i.modifiers.command));
let delay = ui.ctx().options(|o| o.input_options.max_double_click_delay);
-- let last_id = egui::Id::new(("layers_last_click", it.id.0));
++ let last_id = egui::Id::unique(("layers_last_click", it.id.0));
let last: Option<f64> = ui.data(|d| d.get_temp(last_id));
ui.data_mut(|d| d.insert_temp(last_id, now));
let slow = !sq && !add && !resp.double_clicked() && last.is_some_and(|t| now - t > delay && now - t < SLOW_RENAME_WINDOW);
@@@ -377,7 -377,7 +377,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
let shown: Vec<ItemId> = selected.iter().map(|i| doc.top_level_of(*i).unwrap_or(*i)).collect();
// A new selection (made on the canvas or anywhere else) is revealed: its layer opens and its row
// scrolls into view, once, so the panel can still be scrolled and closed freely afterwards.
-- let last_id = egui::Id::new("layers_revealed_selection");
++ let last_id = egui::Id::unique("layers_revealed_selection");
let now: Vec<u64> = shown.iter().map(|i| i.0).collect();
let reveal = !now.is_empty() && ui.data(|d| d.get_temp::<Vec<u64>>(last_id)).as_ref() != Some(&now);
ui.data_mut(|d| d.insert_temp(last_id, now));
@@@ -391,7 -391,7 +391,7 @@@
ui.spacing_mut().item_spacing.y = 0.0;
// `doc.layers` runs top (frontmost) to bottom, as the panel lists them.
for (li, l) in doc.layers.iter().enumerate() {
-- let open_id = egui::Id::new(("layer_open", l.id.0));
++ let open_id = egui::Id::unique(("layer_open", l.id.0));
let mut open: bool = ui.data(|d| d.get_temp(open_id)).unwrap_or(l.id == active);
if reveal && sel_layers.contains(&l.id) && !open {
open = true;
@@@ -399,7 -399,7 +399,7 @@@
}
let lc = c32(l.color);
let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), ROW_H), Sense::click_and_drag());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &l.name));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &l.name));
if l.id == active {
ui.painter().rect_filled(row, 0.0, t.row_selected);
} else if resp.hovered() {
@@@ -408,7 -408,7 +408,7 @@@
let (eye, lock) = eye_lock(ui, &language, row, l.visible, l.locked, false, ("layer", l.id.0));
let tri = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 2.0, 0.0), vec2(14.0, ROW_H));
disclosure(ui, tri, open, t.icon);
-- let tri_r = ui.interact(tri, ui.id().with(("tri", l.id.0)), Sense::click());
++ let tri_r = ui.interact(tri, ui.scope_id().with(("tri", l.id.0)), Sense::click());
// Layer colour chip and name.
let chip = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 18.0, 7.0), vec2(4.0, 10.0));
ui.painter().rect_filled(chip, 0.0, lc);
@@@ -570,7 -570,7 +570,7 @@@ const RENAME: &str = "layers_rename"
/// or a click elsewhere confirms it with a changed text, `Some(None)` when Esc cancels or the text
/// is the one it started with, `None` while typing or when this row isn't being renamed.
fn rename_field(ui: &mut Ui, r: Rect, key: RenameKey) -> Option<Option<String>> {
-- let id = egui::Id::new(RENAME);
++ let id = egui::Id::unique(RENAME);
let (k, mut text, start): RenameState = ui.data(|d| d.get_temp(id))?;
if k != key {
return None;
@@@ -601,7 -601,7 +601,7 @@@
/// Start renaming row `key`, its field showing `name`.
fn start_rename(ui: &Ui, key: RenameKey, name: &str) {
-- ui.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (key, name.to_string(), name.to_string())));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (key, name.to_string(), name.to_string())));
}
#[cfg(test)]
@@@ -739,13 -739,13 +739,13 @@@ mod tests
app.run("selection.set", json!({"ids": []})).unwrap();
let mut h = Harness::builder().with_size(egui::vec2(260.0, 400.0)).build_ui_state(|ui, app: &mut DesignApp| show(app, ui), app);
h.run_steps(2);
-- let open = |h: &Harness<'_, DesignApp>| h.ctx.data(|d| d.get_temp::<bool>(egui::Id::new(("layer_open", first.0)))).unwrap_or(false);
++ let open = |h: &Harness<'_, DesignApp>| h.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("layer_open", first.0)))).unwrap_or(false);
assert!(!open(&h), "closed while nothing on it is selected");
h.state_mut().run("selection.set", json!({"ids": [id]})).unwrap();
h.run_steps(2);
assert!(open(&h), "selecting the object opens its layer");
// Closed again by hand, it stays closed while the selection stays the same.
-- h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(("layer_open", first.0)), false));
++ h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("layer_open", first.0)), false));
h.run_steps(2);
assert!(!open(&h));
}
@@@ -760,7 -760,7 +760,7 @@@
app.run("selection.set", json!({"ids": []})).unwrap();
let mut h =
Harness::builder().with_size(egui::vec2(260.0, 400.0)).with_step_dt(0.05).build_ui_state(|ui, app: &mut DesignApp| show(app, ui), app);
-- h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(("layer_open", h.state().session.active().unwrap().active_layer.0)), true));
++ h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("layer_open", h.state().session.active().unwrap().active_layer.0)), true));
h.run_steps(2);
let row = h.get_by_label("<rectangle>").rect().center();
let click = |h: &mut Harness<'_, DesignApp>| {
@@@ -799,7 -799,7 +799,7 @@@
h.run_steps(2);
let rename = |h: &mut Harness<'_, DesignApp>, key: RenameKey, typed: &str| {
// As a slow double-click starts it (with an emptied field here, so the typing is the name).
-- h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (key, String::new(), String::new())));
++ h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (key, String::new(), String::new())));
h.run_steps(2);
h.get_by_role(egui::accesskit::Role::TextInput).type_text(typed);
h.run_steps(1);
@@@ -809,7 -809,7 +809,7 @@@
rename(&mut h, id, "Hero bottle");
assert_eq!(h.state().session.active().unwrap().doc.item(ItemId(id)).unwrap().name, "Hero bottle");
// Esc leaves the name as it was.
-- h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (id, String::new(), String::new())));
++ h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (id, String::new(), String::new())));
h.run_steps(2);
h.get_by_role(egui::accesskit::Role::TextInput).type_text("Oops");
h.key_press(egui::Key::Escape);
@@@ -828,7 -828,7 +828,7 @@@
let name = |h: &Harness<'_, DesignApp>| h.state().session.active().unwrap().doc.item(ItemId(id)).unwrap().name.clone();
// As a slow double-click on the unnamed row starts it: the field shows the automatic label.
let start = |h: &mut Harness<'_, DesignApp>| {
-- h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (id, "Rectangle".to_string(), "Rectangle".to_string())));
++ h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (id, "Rectangle".to_string(), "Rectangle".to_string())));
h.run_steps(2);
};
start(&mut h);
diff --cc crates/ui-egui/src/panels/library.rs
index 65fb16862,2199e571e..689b43ffa
--- a/crates/ui-egui/src/panels/library.rs
+++ b/crates/ui-egui/src/panels/library.rs
@@@ -165,7 -173,7 +173,7 @@@ pub fn book(app: &mut DesignApp, ui: &m
/// Scripts panel: saved command scripts — run (one undo step), edit, add, delete, load.
pub fn scripts(app: &mut DesignApp, ui: &mut egui::Ui) {
let t = Tokens::get(ui.ctx());
-- let sel_id = egui::Id::new("scripts_sel");
++ let sel_id = egui::Id::unique("scripts_sel");
let mut sel: usize = ui.data(|d| d.get_temp(sel_id)).unwrap_or(0);
if app.ui.scripts.is_empty() {
crate::rtl::label(
diff --cc crates/ui-egui/src/panels/mod.rs
index f2229b604,0624d0c66..b7085b050
--- a/crates/ui-egui/src/panels/mod.rs
+++ b/crates/ui-egui/src/panels/mod.rs
@@@ -292,7 -293,7 +293,7 @@@ fn swatch_menu_font() -> egui::FontId
pub fn swatch_menu_row(ui: &mut egui::Ui, doc: &designcraft_doc::Document, name: &str, current: &str, width: f32) -> bool {
let t = Tokens::get(ui.ctx());
let (row, resp) = ui.allocate_exact_size(vec2(width, SWATCH_MENU_ROW_H), egui::Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, name == current, name));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, name == current, name));
let hovered = resp.hovered();
if hovered {
ui.painter().rect_filled(row, 2.0, t.accent_strong);
@@@ -403,9 -404,9 +404,10 @@@ pub fn font_combo
pub fn font_popup(app: &mut DesignApp, field: &egui::Response, menu: &[designcraft_fonts::FamilyInfo], current: &str) -> Option<FontPick> {
let shown = if current.is_empty() { "—".to_string() } else { font_label(app, menu, current) };
field.widget_info(|| {
-- let mut info = egui::WidgetInfo::new(egui::WidgetType::ComboBox);
++ let mut info = egui::WidgetInfo::new(egui::Role::ComboBox);
info.enabled = true;
info.current_text_value = Some(shown.clone());
++ info.label = Some(crate::i18n::tr(&app.ui.language, "Font Family").to_owned());
info
});
egui::Popup::menu(field)
@@@ -451,13 -452,13 +453,14 @@@ pub fn style_shown(current: &str) -> St
pub fn font_style_picker(app: &mut DesignApp, ui: &mut egui::Ui, family: &str, current: &str, width: f32) {
let styles = fonts(app).styles(family);
let mut pick = None;
-- egui::ComboBox::from_id_salt("font_style").selected_text(style_shown(current)).width(width).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt("font_style").selected_text(style_shown(current)).width(width).show_ui(ui, |ui| {
for s in &styles {
if ui.selectable_label(s == current, s).clicked() {
pick = Some(s.clone());
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Font Style"));
if let Some(s) = pick {
let _ = app.run("type.char", json!({"attrs": {"fontStyle": s}}));
}
@@@ -468,13 -469,13 +471,14 @@@ pub fn para_style_picker(app: &mut Desi
let mut pick = None;
let shown = crate::i18n::style_name(&app.ui.language, current);
let label = if overridden { format!("{shown}+") } else { shown.to_string() };
-- egui::ComboBox::from_id_salt("para_style").selected_text(crate::rtl::widget(ui, label)).width(width).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt("para_style").selected_text(crate::rtl::widget(ui, label)).width(width).show_ui(ui, |ui| {
for n in names.iter().filter(|n| *n != designcraft_doc::NO_PARA_STYLE) {
if ui.selectable_label(n == current, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
pick = Some(n.clone());
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Paragraph Style"));
if let Some(n) = pick {
let _ = app.run("style.paragraph.apply", json!({"name": n, "clearOverrides": false}));
}
@@@ -499,17 -500,17 +503,26 @@@ mod font_menu_tests
const FAMILY: &str = "DC UI Test Mincho";
let font = font_with(FAMILY, &['a']).unwrap();
let font = with_names(&font, &[(3, 1, 0x409, 1, FAMILY), (3, 1, 0x409, 2, "Regular"), (3, 1, 0x0411, 1, "UIテスト明朝")]).unwrap();
-- designcraft_fonts::FontDb::global().add_font(font);
++ // A database of this test's own: a font added to the process-wide one stays there, and its
++ // Japanese native name would then need CJK glyphs in every later test that draws the menu.
++ let db = designcraft_fonts::FontDb::with_font_dirs(Vec::new());
++ db.add_font(font);
++ let menu = |app: &DesignApp| {
++ let mut v: Vec<designcraft_fonts::FamilyInfo> = db.scoped(0).family_infos();
++ v.retain(|f| !f.family.starts_with('.'));
++ designcraft_fonts::sort_for_menu(&mut v, app.session.prefs.show_font_names_in_english);
++ v
++ };
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-- let menu = font_menu(&app);
-- let at = menu.iter().position(|f| f.family == FAMILY).unwrap();
-- assert_eq!(menu[at].group, FontGroup::Japanese);
-- assert!(menu[..at].iter().any(|f| f.family == designcraft_fonts::DEFAULT_FAMILY), "Western fonts first");
-- assert!(menu.windows(2).all(|w| w[0].group <= w[1].group), "grouped");
-- assert_eq!(font_label(&app, &menu, FAMILY), "UIテスト明朝");
-- assert_eq!(font_label(&app, &menu, designcraft_fonts::DEFAULT_FAMILY), designcraft_fonts::DEFAULT_FAMILY);
++ let entries = menu(&app);
++ let at = entries.iter().position(|f| f.family == FAMILY).unwrap();
++ assert_eq!(entries[at].group, FontGroup::Japanese);
++ assert!(entries[..at].iter().any(|f| f.family == designcraft_fonts::DEFAULT_FAMILY), "Western fonts first");
++ assert!(entries.windows(2).all(|w| w[0].group <= w[1].group), "grouped");
++ assert_eq!(font_label(&app, &entries, FAMILY), "UIテスト明朝");
++ assert_eq!(font_label(&app, &entries, designcraft_fonts::DEFAULT_FAMILY), designcraft_fonts::DEFAULT_FAMILY);
app.run("prefs.set", json!({"showFontNamesInEnglish": true})).unwrap();
-- assert_eq!(font_label(&app, &font_menu(&app), FAMILY), FAMILY);
++ assert_eq!(font_label(&app, &menu(&app), FAMILY), FAMILY);
}
#[test]
diff --cc crates/ui-egui/src/panels/notes.rs
index 6eebb7411,6eebb7411..da250bff5
--- a/crates/ui-egui/src/panels/notes.rs
+++ b/crates/ui-egui/src/panels/notes.rs
@@@ -11,7 -11,7 +11,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
let Ok(list) = app.session.execute("note.list", &json!({})) else { return };
let notes = list.as_array().cloned().unwrap_or_default();
let has_text = app.session.active().is_some_and(|d| d.selection.text.is_some());
-- let id = egui::Id::new("new_note_text");
++ let id = egui::Id::unique("new_note_text");
let mut draft: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
ui.add(
egui::TextEdit::multiline(&mut draft)
diff --cc crates/ui-egui/src/panels/pages.rs
index 4b2360f8f,534eb4aa1..acb05f9f4
--- a/crates/ui-egui/src/panels/pages.rs
+++ b/crates/ui-egui/src/panels/pages.rs
@@@ -366,7 -366,7 +366,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
t.text_strong,
);
}
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, active, label));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, active, label));
let resp = if opts.parents_vertical { resp } else { resp.on_hover_text(label) };
resp.dnd_set_drag_payload(PageDrag::Parent(row.parent.map(|(_, id)| id)));
if resp.double_clicked()
@@@ -448,11 -448,11 +448,11 @@@
let abs = first + pi;
let x0 = row.min.x + center + (p.x as f32 - spine) * scale;
let pr = egui::Rect::from_min_size(egui::pos2(x0, top), vec2(p.width as f32 * scale, p.height as f32 * scale));
-- let resp = ui.interact(pr, ui.id().with(("page", abs)), Sense::click_and_drag());
++ let resp = ui.interact(pr, ui.scope_id().with(("page", abs)), Sense::click_and_drag());
let selected = abs == cur && !editing_parents;
// Screen readers hear "Page 3".
resp.widget_info(|| {
-- egui::WidgetInfo::selected(egui::WidgetType::Button, true, selected, format!("Page {}", app.session.page_label(abs)))
++ egui::WidgetInfo::selected(egui::Role::Button, true, selected, format!("Page {}", app.session.page_label(abs)))
});
let tint = if selected { SELECTED_TINT } else { Color32::WHITE };
match thumbnails.then(|| thumb(app, ui.ctx(), ThumbOf::Page(abs), th)).flatten() {
@@@ -547,7 -547,7 +547,7 @@@
let dy = dresp.drag_delta().y * if opts.pages_on_top { -1.0 } else { 1.0 };
app.ui.pages_parents_height = Some([(parents_h + dy).clamp(parents_min, parents_max), space]);
}
-- dresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, "Parents and pages divider"));
++ dresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Splitter, true, "Parents and pages divider"));
};
if opts.pages_on_top {
pages_part(app, ui);
@@@ -771,7 -771,7 +771,7 @@@ fn page_menu(app: &mut DesignApp, ui: &
/// A small label following the pointer while dragging.
pub(crate) fn drag_ghost(ui: &egui::Ui, label: &str, t: &Tokens) {
let Some(p) = ui.ctx().pointer_interact_pos() else { return };
-- let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("page_drag")));
++ let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("page_drag")));
let g = painter.layout_no_wrap(label.to_string(), egui::FontId::proportional(11.0), t.text_strong);
let r = egui::Rect::from_min_size(p + vec2(10.0, 8.0), g.size() + vec2(10.0, 6.0));
painter.rect(r, 2.0, t.panel_darker, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
@@@ -857,7 -857,7 +857,7 @@@ mod tests
fn sized_harness(app: DesignApp, size: egui::Vec2) -> Harness<'static, DesignApp> {
let mut h = Harness::builder().with_size(size).build_ui_state(
|ui, app: &mut DesignApp| {
-- let key = egui::Id::new("test_fonts");
++ let key = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
@@@ -886,7 -886,7 +886,7 @@@
fn menu_harness(app: DesignApp, abs: usize, si: usize) -> Harness<'static, DesignApp> {
let mut h = Harness::builder().with_size(vec2(320.0, 600.0)).build_ui_state(
move |ui, app: &mut DesignApp| {
-- let key = egui::Id::new("test_fonts");
++ let key = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
@@@ -988,7 -988,7 +988,9 @@@
assert!(window.contains_rect(h.get_by_label(label).rect()), "{label} is on screen");
}
// Seven parent rows: four and a half show at first; the rest scroll.
-- let divider = h.get_by_label("Parents and pages divider").rect();
++ let divider_node = h.get_by_label("Parents and pages divider");
++ assert_eq!(divider_node.accesskit_node().role(), egui::accesskit::Role::Splitter, "the divider is a splitter, not an unknown node");
++ let divider = divider_node.rect();
let before = divider.center().y;
assert!(h.query_by_label("G-Parent").is_none_or(|n| n.rect().top() > divider.top()), "the last parent is scrolled away");
let (a, b) = (divider.center(), divider.center() + vec2(0.0, 80.0));
diff --cc crates/ui-egui/src/panels/properties.rs
index 0422936e3,fda46efad..f3dc60e3f
--- a/crates/ui-egui/src/panels/properties.rs
+++ b/crates/ui-egui/src/panels/properties.rs
@@@ -46,11 -46,11 +46,11 @@@ pub(crate) fn place<R>(ui: &mut Ui, r:
}
fn temp_bool(ui: &Ui, key: &str, default: bool) -> bool {
-- ui.data(|d| d.get_temp::<bool>(egui::Id::new(key))).unwrap_or(default)
++ ui.data(|d| d.get_temp::<bool>(egui::Id::unique(key))).unwrap_or(default)
}
fn set_temp_bool(ui: &Ui, key: &str, v: bool) {
-- ui.data_mut(|d| d.insert_temp(egui::Id::new(key), v));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique(key), v));
}
/// Label of the current selection for the selection-type band.
@@@ -402,7 -402,7 +402,7 @@@ fn document_sections(app: &mut DesignAp
for (k, (icon, tip, v, x, y)) in fields.into_iter().enumerate() {
let ir = sub(b, x, y + 2.0, 17.0, 17.0);
icons::paint(ui.painter(), ir, icon, t.icon);
-- ui.interact(ir, ui.id().with(("micon", k)), Sense::hover()).on_hover_ui(|ui| {
++ ui.interact(ir, ui.scope_id().with(("micon", k)), Sense::hover()).on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
});
let nv = place(ui, sub(b, x + 20.0, y, 73.0, FIELD_H), |ui| {
@@@ -545,7 -545,7 +545,7 @@@ pub(crate) fn ref_point_proxy(ui: &mut
for i in 0..9u8 {
let c = pos2(r.min.x + pitch * (i % 3) as f32 + pitch / 2.0, r.min.y + pitch * (i / 3) as f32 + pitch / 2.0);
let sq = Rect::from_center_size(c, vec2(6.0, 6.0));
-- let resp = ui.interact(sq.expand(1.5), ui.id().with(("refpt", i)), Sense::click());
++ let resp = ui.interact(sq.expand(1.5), ui.scope_id().with(("refpt", i)), Sense::click());
if i == cur {
ui.painter().rect_filled(sq.expand(0.5), 0.0, egui::Color32::WHITE);
} else {
@@@ -664,7 -664,7 +664,7 @@@ fn transform_angles(app: &mut DesignApp
let x = if col == 0 { 40.0 } else { 120.0 };
let ir = sub(b, x, yy + 2.0, 17.0, 17.0);
icons::paint(ui.painter(), ir, icon, t.icon);
-- ui.interact(ir, ui.id().with(id), Sense::hover()).on_hover_text(crate::i18n::tr(&lang, tip));
++ ui.interact(ir, ui.scope_id().with(id), Sense::hover()).on_hover_text(crate::i18n::tr(&lang, tip));
if let Some(v) = place(ui, sub(b, x + 19.0, yy, 54.0, FIELD_H), |ui| widgets::number(ui, id, tv_get(key), suffix, 54.0, 1)) {
set.insert(key.into(), json!(v));
}
@@@ -686,7 -686,7 +686,7 @@@
] {
let label = crate::i18n::tr(&lang, tip);
let resp = icon_toggle(ui, icon, false, label);
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, label));
if resp.clicked() {
let _ = app.run(cmd, params);
}
@@@ -814,12 -814,12 +814,12 @@@ fn appearance_section(app: &mut DesignA
let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
widgets::paint_chip(ui.painter(), chip, fc, fg);
ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-- let resp = ui.interact(chip, ui.id().with("fillchip"), Sense::click()).on_hover_text(format!(
++ let resp = ui.interact(chip, ui.scope_id().with("fillchip"), Sense::click()).on_hover_text(format!(
"{}: {}",
crate::i18n::tr(&app.ui.language, "Fill"),
i.fill
));
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Fill swatch"));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Fill swatch"));
swatch_menu(app, &resp, &doc, &i.fill, false, i.is_text && i.count == 1, false);
crate::rtl::paint(
ui.painter(),
@@@ -836,12 -836,12 +836,12 @@@
let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
widgets::paint_stroke_chip(ui.painter(), chip, sc, egui::Color32::from_gray(20));
ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-- let resp = ui.interact(chip, ui.id().with("strokechip"), Sense::click()).on_hover_text(format!(
++ let resp = ui.interact(chip, ui.scope_id().with("strokechip"), Sense::click()).on_hover_text(format!(
"{}: {}",
crate::i18n::tr(&app.ui.language, "Stroke"),
i.stroke
));
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Stroke swatch"));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Stroke swatch"));
swatch_menu(app, &resp, &doc, &i.stroke, true, i.is_text && i.count == 1, false);
if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Stroke"), 56.0)).clicked() {
show_panel(app, "stroke");
@@@ -884,7 -884,7 +884,7 @@@
let _ = app.run("object.opacity", json!({"opacity": v / 100.0}));
}
let more = sub(b, 147.0, 0.0, 18.0, FIELD_H);
-- let mresp = ui.interact(more, ui.id().with("opmore"), Sense::click());
++ let mresp = ui.interact(more, ui.scope_id().with("opmore"), Sense::click());
ui.painter().rect(more, 0.0, if mresp.hovered() { t.hover } else { t.input }, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
icons::paint(ui.painter(), more.shrink(4.0), "chevron-right", t.icon);
if mresp.clicked() {
@@@ -916,7 -916,7 +916,7 @@@ fn swatch_menu
) {
let lang = app.ui.language.clone();
let tr = |s: &'static str| crate::i18n::tr(&lang, s);
-- let to_text_id = egui::Id::new(("swatch_apply_to_text", stroke));
++ let to_text_id = egui::Id::unique(("swatch_apply_to_text", stroke));
let to_text = text_only || text_frame && resp.ctx.data(|d| d.get_temp::<bool>(to_text_id)).unwrap_or(false);
// What the popup shows and changes: the frame's fill or stroke, or its text's.
let (key, tint_key) = if stroke { ("stroke", "strokeTint") } else { ("fill", "fillTint") };
@@@ -1167,6 -1167,6 +1167,9 @@@ fn text_style_section(app: &mut DesignA
let shown = crate::i18n::style_name(&app.ui.language, &cur);
let label = if ov > 0 { format!("{shown}+") } else { shown.to_string() };
let resp = widgets::dropdown_h(ui, "", fw, 34.0);
++ // The row paints its own swatch and name, so the dropdown itself has no text to name it.
++ let style_kind = crate::i18n::tr(&app.ui.language, if tab == 0 { "Paragraph Style" } else { "Character Style" }).to_owned();
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &style_kind));
// "Ag" swatch + style name.
let ag = Rect::from_min_size(resp.rect.min + vec2(6.0, 6.0), vec2(22.0, 22.0));
ui.painter().rect_filled(ag, 1.0, egui::Color32::WHITE);
@@@ -1254,7 -1254,7 +1257,7 @@@ fn text_appearance_section(app: &mut De
if k == 0 {
ui.painter().text(chip.center(), egui::Align2::CENTER_CENTER, "T", crate::theme::semibold(12.0), tc);
}
-- let resp = ui.interact(chip, ui.id().with(("tchip", k)), Sense::click()).on_hover_text(format!("{label}: {sw}"));
++ let resp = ui.interact(chip, ui.scope_id().with(("tchip", k)), Sense::click()).on_hover_text(format!("{label}: {sw}"));
swatch_menu(app, &resp, &doc, &sw, k != 0, false, true);
if k == 0 {
crate::rtl::paint(
@@@ -1296,6 -1296,6 +1299,9 @@@ fn character_section(app: &mut DesignAp
let fonts = super::fonts(app);
let menu = super::font_menu(app);
let resp = widgets::dropdown(ui, "", fw);
++ // A painted search icon and family name, as in the font menus: name the field itself.
++ let family_label = crate::i18n::tr(&app.ui.language, "Font Family:").to_owned();
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &family_label));
let r = resp.rect;
icons::paint(ui.painter(), Rect::from_min_size(r.min + vec2(3.0, 3.0), vec2(14.0, 14.0)), "search", t.icon);
widgets::chevron_down(ui.painter(), r.min + vec2(22.0, 10.5), t.icon);
@@@ -1348,21 -1348,141 +1354,145 @@@
}) {
let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
}
- // Language: hyphenation, spelling and typographer's quotes follow it.
- ui.add_space(1.0);
+ // ••• shows the rest in place, as InDesign's Properties panel does.
+ let more = temp_bool(ui, "props_char_more", false);
+ if more {
+ character_more(app, ui, &c, fw);
+ }
+ if more_options(ui, &app.ui.language).clicked() {
+ set_temp_bool(ui, "props_char_more", !more);
+ }
+ }
+
+ /// A percentage or other number field in one half of a two-field row, with its icon.
+ #[allow(clippy::too_many_arguments)]
+ fn half_field(ui: &mut Ui, b: Rect, right: bool, y: f32, half: f32, icon: &str, tip: &str, field: NumField) -> Option<f64> {
+ half_field_or_clear(ui, b, right, y, half, icon, tip, field).flatten()
+ }
+
+ /// [`half_field`] for a value that may be unset: emptying the field commits `Some(None)`.
+ #[allow(clippy::too_many_arguments)]
+ fn half_field_or_clear(ui: &mut Ui, b: Rect, right: bool, y: f32, half: f32, icon: &str, tip: &str, field: NumField) -> Option<Option<f64>> {
+ let t = Tokens::get(ui.ctx());
+ let x = if right { half + 10.0 } else { 0.0 };
+ let ir = sub(b, x, y + 1.0, 19.0, 19.0);
+ icons::paint(ui.painter(), ir, icon, t.icon);
- let resp = ui.interact(ir, ui.id().with(("half_icon", icon)), Sense::hover());
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
++ let resp = ui.interact(ir, ui.scope_id().with(("half_icon", icon)), Sense::hover());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
+ let label = resp.id;
+ resp.on_hover_text(tip);
+ place(ui, sub(b, x + 24.0, y, half - 24.0, FIELD_H), |ui| field.width(half - 24.0).labelled_by(label).show_or_clear(ui))
+ }
+
+ /// Properties › Character after •••: vertical and horizontal scale, baseline shift and skew,
+ /// language and OpenType, then All Caps, Small Caps, Superscript, Subscript, Underline and
+ /// Strikethrough, as InDesign lays them out.
+ fn character_more(app: &mut DesignApp, ui: &mut Ui, c: &Value, fw: f32) {
+ let lang_ui = app.ui.language.clone();
+ let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
+ let half = (fw - 10.0) / 2.0;
+ let b = block(ui, 2.0 * FIELD_H + 5.0);
+ const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
+ let pct = |v: &Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
+ let field = |id, v, suffix, decimals| NumField::number(id, v, suffix, decimals).spinner();
+ if let Some(v) = half_field(
+ ui,
+ b,
+ false,
+ 0.0,
+ half,
+ "vscale",
+ &tr("Vertical Scale"),
+ field("cvscale", pct(&c["vScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
+ }
+ if let Some(v) = half_field(
+ ui,
+ b,
+ true,
+ 0.0,
+ half,
+ "hscale",
+ &tr("Horizontal Scale"),
+ field("chscale", pct(&c["hScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
+ }
+ if let Some(v) = half_field(
+ ui,
+ b,
+ false,
+ 26.0,
+ half,
+ "baseline-shift",
+ &tr("Baseline Shift"),
+ field("cbshift", c["baselineShift"].as_f64(), " pt", 2).range(-5000.0, 5000.0),
+ ) {
+ let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
+ }
+ if let Some(v) =
+ half_field(ui, b, true, 26.0, half, "skew", &tr("Skew (False Italic)"), field("cskew", c["skew"].as_f64(), "°", 1).range(-85.0, 85.0))
+ {
+ let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
+ }
+ // Language (hyphenation, spelling and typographer's quotes follow it) and OpenType.
+ ui.add_space(4.0);
let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
- let label = crate::i18n::tr(&app.ui.language, "Language");
- let resp = widgets::dropdown(ui, crate::i18n::tr(&app.ui.language, &lang), fw).on_hover_ui(|ui| {
- crate::rtl::label(ui, label);
+ let label = tr("Language");
+ let row = block(ui, FIELD_H);
+ let resp = place(ui, sub(row, 0.0, 0.0, half, FIELD_H), |ui| widgets::dropdown(ui, crate::i18n::tr(&lang_ui, &lang), half)).on_hover_ui(|ui| {
+ crate::rtl::label(ui, label.clone());
});
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, label));
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, &label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &label));
egui::Popup::menu(&resp).show(|ui| {
- ui.set_min_width(fw);
+ ui.set_min_width(half);
egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| language_menu(app, ui, &lang));
});
- if more_options(ui, &app.ui.language).clicked() {
- show_panel(app, "character");
+ if place(ui, sub(row, half + 10.0, 0.0, half, FIELD_H), |ui| widgets::outline_button(ui, &tr("OpenType"), half)).clicked() {
+ show_typography_panel(app);
+ }
+ // The case and position buttons.
+ ui.add_space(8.0);
+ let caps = c["capitalization"].as_str().unwrap_or("normal").to_string();
+ let pos = c["position"].as_str().unwrap_or("normal").to_string();
+ let (ul, st) = (c["underline"].as_bool().unwrap_or(false), c["strikethrough"].as_bool().unwrap_or(false));
+ let buttons: [(&str, &str, bool, Value); 6] = [
+ ("TT", "All Caps", caps == "allCaps", json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }})),
- ("Tᴛ", "Small Caps", caps == "smallCaps", json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }})),
++ ("small-caps", "Small Caps", caps == "smallCaps", json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }})),
+ ("T¹", "Superscript", pos == "superscript", json!({"position": if pos == "superscript" { "normal" } else { "superscript" }})),
+ ("T₁", "Subscript", pos == "subscript", json!({"position": if pos == "subscript" { "normal" } else { "subscript" }})),
+ ("T̲", "Underline", ul, json!({"underline": !ul})),
+ ("T", "Strikethrough", st, json!({"strikethrough": !st})),
+ ];
+ let pitch = fw / 6.0;
+ let row = block(ui, 22.0);
+ for (i, (text, tip, on, attrs)) in buttons.into_iter().enumerate() {
+ let r = Rect::from_center_size(row.min + vec2(pitch * (i as f32 + 0.5), 11.0), vec2(26.0, 22.0));
- let resp = ui.interact(r, ui.id().with(("case", i)), Sense::click());
++ let resp = ui.interact(r, ui.scope_id().with(("case", i)), Sense::click());
+ let t = Tokens::get(ui.ctx());
+ if on {
+ ui.painter().rect_filled(r, 2.0, t.tool_active);
+ } else if resp.hovered() {
+ ui.painter().rect_filled(r, 2.0, t.hover);
+ }
+ let col = if on { t.text_strong } else { t.icon };
- ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
++ if text == "small-caps" {
++ crate::icons::paint(ui.painter(), r, "small-caps", col);
++ } else {
++ ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
++ }
+ // Strikethrough: the T struck through (a combining stroke doesn't draw in every font).
+ if i == 5 {
+ ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
+ }
+ let tip = tr(tip);
- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, &tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, &tip));
+ if resp.on_hover_text(&tip).clicked() {
+ let _ = app.run("type.char", json!({"attrs": attrs}));
+ }
}
+ ui.add_space(4.0);
}
/// Paragraph section: the 9 alignment buttons and •••.
@@@ -1528,7 -1709,7 +1719,7 @@@ pub(crate) fn kerning_control(app: &mu
};
let resp = widgets::dropdown(ui, crate::i18n::tr(&app.ui.language, &label), width);
let name = crate::i18n::tr(&app.ui.language, "Kerning");
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, name));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, name));
egui::Popup::menu(&resp).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
for (text, v) in [("Metrics", json!({"kind": "metrics"})), ("Optical", json!({"kind": "optical"})), ("0", json!({"kind": "none"}))] {
if ui.selectable_label(label == text, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, text))).clicked() {
@@@ -1539,7 -1720,7 +1730,13 @@@
ui.separator();
// A manual value in 1/1000 em: after each selected character, or between the two at a caret.
let field = format!("{id}_manual");
-- if let Some(v) = NumField::number(&field, Some(manual.unwrap_or(0.0)), "", 0).width(90.0).spinner().step(5.0).range(-1000.0, 10000.0).show(ui)
++ if let Some(v) = NumField::number(&field, Some(manual.unwrap_or(0.0)), "", 0)
++ .name("Manual Kerning")
++ .width(90.0)
++ .spinner()
++ .step(5.0)
++ .range(-1000.0, 10000.0)
++ .show(ui)
{
let _ = app.run("type.kernPair", json!({"kerning": {"kind": "manual", "value": v}}));
}
@@@ -1561,10 -1742,10 +1758,11 @@@ pub fn character_panel(app: &mut Design
let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
ui.horizontal(|ui| {
caption(ui, crate::i18n::tr(&app.ui.language, "Language"));
-- egui::ComboBox::from_id_salt("char_language")
++ let combo = egui::ComboBox::from_id_salt("char_language")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &lang)))
.width(170.0)
.show_ui(ui, |ui| language_menu(app, ui, &lang));
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Language"));
});
// Digits (World-Ready): how the figures 0-9 are drawn (Arabic 0123, Hindi ٠١٢٣, Farsi ۰۱۲۳).
let digits = c["digits"].as_str().unwrap_or("default").to_string();
@@@ -1574,13 -1755,13 +1772,14 @@@
.iter()
.find(|o| o.0 == digits)
.map_or_else(|| digit_label(&app.ui.language, DIGIT_OPTIONS[0]), |o| digit_label(&app.ui.language, *o));
-- egui::ComboBox::from_id_salt("char_digits").selected_text(crate::rtl::widget(ui, cur)).width(150.0).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt("char_digits").selected_text(crate::rtl::widget(ui, cur)).width(150.0).show_ui(ui, |ui| {
for o in DIGIT_OPTIONS {
if ui.selectable_label(o.0 == digits, crate::rtl::widget(ui, digit_label(&app.ui.language, o))).clicked() {
let _ = app.run("type.char", json!({"attrs": {"digits": o.0}}));
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Digits"));
});
// Two columns: Size, Kerning and Baseline on the left, Leading and Tracking on the right. A
// column's captions share the width of its widest one and each field takes the rest of the
@@@ -1610,7 -1791,7 +1809,7 @@@
}
});
ui.horizontal(|ui| {
-- caption(ui, crate::i18n::tr(&app.ui.language, "Color"));
++ caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
super::swatch_picker(app, ui, "tfill", c["fill"].as_str().map(str::to_string), |app, n| {
let _ = app.run("type.char", json!({"attrs": {"fill": n}}));
});
@@@ -1717,7 -1898,7 +1916,7 @@@
ui.end_row();
});
ui.horizontal(|ui| {
-- caption(ui, crate::i18n::tr(&app.ui.language, "Color"));
++ caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
let cur = c[format!("{key}Color")].as_str().filter(|s| !s.is_empty()).map(str::to_string);
super::swatch_picker(app, ui, &format!("{key}c"), cur.clone(), |app, n| {
let _ = app.run("type.char", json!({"attrs": {format!("{key}Color"): n}}));
@@@ -1960,7 -2216,7 +2234,7 @@@ pub fn stroke_panel(app: &mut DesignApp
StrokeType::Style { name } => name.clone(),
k => k.label().to_string(),
};
-- egui::ComboBox::from_id_salt("stype")
++ let combo = egui::ComboBox::from_id_salt("stype")
.selected_text(crate::rtl::widget(
ui,
if matches!(st.kind, StrokeType::Style { .. }) { &shown } else { crate::i18n::tr(&app.ui.language, &shown) },
@@@ -1996,10 -2252,10 +2270,11 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Type"));
ui.end_row();
for (key, label, cur, flip) in [("start", "Start/End:", st.start, true), ("end", "", st.end, false)] {
caption(ui, crate::i18n::tr(&app.ui.language, label));
-- egui::ComboBox::from_id_salt(key)
++ let combo = egui::ComboBox::from_id_salt(key)
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, cur.label())))
.width(140.0)
.show_ui(ui, |ui| {
@@@ -2012,6 -2268,6 +2287,9 @@@
});
}
});
++ // The second arrowhead reuses the shared caption, so it needs its own semantic name.
++ let name = crate::i18n::tr(&app.ui.language, if flip { "Start/End" } else { "End" }).to_owned();
++ let _ = crate::widgets::name_combo(combo, name);
ui.end_row();
}
caption(ui, crate::i18n::tr(&app.ui.language, "Gap Color:"));
@@@ -2116,7 -2372,7 +2394,7 @@@ pub fn wrap_panel(app: &mut DesignApp,
let u = units(app);
let offsets = info.as_ref().map(|i| i.wrap_offsets);
// Linked while the offsets are all the same, until the link is clicked.
-- let linked_id = egui::Id::new("wrap_offsets_linked");
++ let linked_id = egui::Id::unique("wrap_offsets_linked");
let linked = ui.data(|d| d.get_temp::<bool>(linked_id)).unwrap_or_else(|| offsets.is_none_or(|o| o.iter().all(|v| (v - o[0]).abs() < 1e-9)));
let mut set: Option<[f64; 4]> = None;
ui.add_enabled_ui(mode != "none" && info.is_some(), |ui| {
@@@ -2195,16 -2451,16 +2473,17 @@@ fn wrap_combo
ui.horizontal(|ui| {
caption(ui, crate::i18n::tr(&app.ui.language, caption_text));
let shown = opts.iter().chain(shown_only).find(|o| o.0 == cur).map_or(cur, |o| o.1).to_string();
-- egui::ComboBox::from_id_salt(salt).selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &shown))).width(170.0).show_ui(
-- ui,
-- |ui| {
++ let combo = egui::ComboBox::from_id_salt(salt)
++ .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &shown)))
++ .width(170.0)
++ .show_ui(ui, |ui| {
for (k, l) in opts {
if ui.selectable_label(*k == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, l))).clicked() {
let _ = app.run("object.textWrap", json!({ key: k }));
}
}
-- },
-- );
++ });
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, caption_text));
});
}
@@@ -2366,7 -2622,7 +2645,7 @@@ pub fn links_panel(app: &mut DesignApp
let Some(st) = app.session.active() else { return };
let t = Tokens::get(ui.ctx());
// The list checks files on disk: refresh it at most twice a second.
-- let key = egui::Id::new("links_panel");
++ let key = egui::Id::unique("links_panel");
let now = ui.input(|i| i.time);
let rev = (st.uid, st.revision);
let cached: Option<(f64, (u64, u64), Vec<Value>)> = ui.data(|d| d.get_temp(key));
@@@ -2382,7 -2638,7 +2661,7 @@@
crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "No placed graphics.")).color(t.text_dim));
return;
}
-- let sel_key = egui::Id::new("links_panel_sel");
++ let sel_key = egui::Id::unique("links_panel_sel");
let mut chosen: Option<u64> = ui.data(|d| d.get_temp(sel_key));
// Leave room for Status and Page/PPI instead of widening the grid for long source paths.
let name_width = (ui.available_width() - 160.0).max(50.0);
@@@ -2608,7 -2864,7 +2887,7 @@@ pub fn effects_panel(app: &mut DesignAp
B::Luminosity,
];
ui.horizontal(|ui| {
-- egui::ComboBox::from_id_salt("blend")
++ let combo = egui::ComboBox::from_id_salt("blend")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, it.blend.label())))
.width(130.0)
.show_ui(ui, |ui| {
@@@ -2618,6 -2874,6 +2897,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Blending"));
caption(ui, crate::i18n::tr(&app.ui.language, "Opacity"));
if let Some(v) = number(ui, "eop", Some(it.opacity as f64 * 100.0), "%", 46.0, 0) {
let _ = app.run("object.opacity", json!({"opacity": (v / 100.0).clamp(0.0, 1.0)}));
@@@ -2798,7 -3054,7 +3078,8 @@@ fn variable_font_axes(app: &mut DesignA
ui.spacing_mut().slider_width = (ui.available_width() - PANEL_FIELD_W - ui.spacing().item_spacing.x * 2.0).max(40.0);
let (step, decimals) = axis_step(*min, *max);
// The field beside the slider takes typed values, so the slider's own is hidden.
-- let slider = ui.add(egui::Slider::new(&mut value.1, *min..=*max).step_by(f64::from(step)).show_value(false));
++ let slider =
++ ui.add(egui::Slider::new(&mut value.1, *min..=*max).step_by(f64::from(step)).show_value(false)).accessible_name((*name).to_owned());
// Only the user's own change counts: the slider also reports one when it snaps a value
// that is off its steps, which it would then do on every frame.
let pressed = slider.is_pointer_button_down_on() || slider.dragged();
@@@ -3083,7 -3360,7 +3385,7 @@@ mod tests
let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
|ui, app: &mut DesignApp| {
// The panel's fonts are installed before its first frame.
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -3109,7 -3565,7 +3590,7 @@@
fn panel_harness(app: DesignApp, panel: fn(&mut DesignApp, &mut egui::Ui)) -> Harness<'static, DesignApp> {
Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
move |ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -3236,7 -3692,7 +3717,7 @@@
// The app commits a preview no panel held at the start of each frame (DesignApp::ui).
let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -3278,8 -3734,8 +3759,8 @@@
// The caption and the control share the name: click the control.
h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
h.run_steps(2);
-- // The menu's field is drawn after the panel's own fields.
-- let field = h.get_all_by_role(egui::accesskit::Role::TextInput).last().unwrap();
++ // Address the manual-value editor by semantics, not tree traversal order.
++ let field = h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Manual Kerning");
field.focus();
field.type_text("-40");
h.run_steps(1);
@@@ -3297,7 -3753,7 +3778,7 @@@
h.run_steps(3);
h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
h.run_steps(2);
-- let field = h.get_all_by_role(egui::accesskit::Role::TextInput).last().unwrap();
++ let field = h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Manual Kerning");
field.focus();
field.type_text("-80");
h.run_steps(1);
@@@ -3319,7 -3775,7 +3800,7 @@@
assert_ne!(before, "[Paper]");
let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -3350,7 -3806,7 +3831,7 @@@
fn panel(app: DesignApp) -> Harness<'static, DesignApp> {
let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -3659,7 -4144,7 +4169,7 @@@ fn selected_container(app: &DesignApp)
fn flex_grid(ui: &mut Ui, r: Rect, f: Option<&designcraft_doc::FlexLayout>) -> Option<u8> {
use designcraft_doc::{FlexAlign, FlexJustify};
let t = Tokens::get(ui.ctx());
-- let resp = ui.interact(r, ui.id().with("flex_grid"), Sense::click());
++ let resp = ui.interact(r, ui.scope_id().with("flex_grid"), Sense::click());
ui.painter().rect_stroke(r, 2.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
let cell = r.width() / 3.0;
let pos = |a: FlexAlign| match a {
@@@ -3847,7 -4332,7 +4357,7 @@@ fn flex_section(app: &mut DesignApp, ui
{
let ir = sub(b, x, y + 2.0, 17.0, 17.0);
icons::paint(ui.painter(), ir, icon, t.icon);
-- ui.interact(ir, ui.id().with(("flex_pad", k)), Sense::hover()).on_hover_ui(|ui| {
++ ui.interact(ir, ui.scope_id().with(("flex_pad", k)), Sense::hover()).on_hover_ui(|ui| {
crate::rtl::label(ui, tr(tip));
});
let value = f.as_ref().map(|_| pad[k]);
@@@ -3888,7 -4373,7 +4398,7 @@@
let y = 2.0 * FIELD_H + 10.0;
let ir = sub(b, x, y + 2.0, 17.0, 17.0);
icons::paint(ui.painter(), ir, icon, if live { t.icon } else { t.text_dim });
-- ui.interact(ir, ui.id().with(("flex_gap", k)), Sense::hover()).on_hover_ui(|ui| {
++ ui.interact(ir, ui.scope_id().with(("flex_gap", k)), Sense::hover()).on_hover_ui(|ui| {
crate::rtl::label(ui, tr(tip));
});
let nv = place(ui, sub(b, x + 20.0, y, 76.0, FIELD_H), |ui| {
diff --cc crates/ui-egui/src/panels/story.rs
index 000000000,adb2ed1d5..b2d53bff1
mode 000000,100644..100644
--- a/crates/ui-egui/src/panels/story.rs
+++ b/crates/ui-egui/src/panels/story.rs
@@@ -1,0 -1,106 +1,106 @@@
+ //! Window › Type & Tables › Story: the story-wide options.
+
+ use serde_json::{Value, json};
+
+ use crate::DesignApp;
+ use crate::widgets::{self, NumField};
+
+ /// The Story panel: Optical Margin Alignment for the stories of the text selection or the
+ /// selected text frames, and the type size its hang amounts are set for. Without text or a text
+ /// frame selected, the controls are disabled.
+ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
+ let options = super::text_attrs(app).map(|a| a["storyOptions"].clone());
+ let enabled = options.is_some();
+ let options = options.unwrap_or(Value::Null);
+ let lang = app.ui.language.clone();
+ let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
+ ui.add_enabled_ui(enabled, |ui| {
+ ui.horizontal_wrapped(|ui| {
+ // Stories that differ show unchecked; a click turns it on for all of them.
+ let mut on = options["opticalMargin"].as_bool().unwrap_or(false);
+ if widgets::checkbox(ui, &mut on, &tr("Optical Margin Alignment")).changed() {
+ let _ = app.run("story.options", json!({"opticalMargin": on}));
+ }
+ let field = NumField::number("storyOpticalMarginSize", options["opticalMarginSize"].as_f64(), " pt", 2)
+ .width(72.0)
+ .range(designcraft_doc::OpticalMargin::MIN_SIZE, designcraft_doc::OpticalMargin::MAX_SIZE);
+ if let Some(size) = crate::chrome::icon_field(ui, "font-size", &tr("Optical Margin Size"), field) {
+ let _ = app.run("story.options", json!({"opticalMarginSize": size}));
+ }
+ });
+ });
+ }
+
+ #[cfg(test)]
+ mod tests {
+ use egui_kittest::{
+ Harness,
+ kittest::{NodeT, Queryable},
+ };
+
+ use super::*;
+
+ fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
+ let mut h = Harness::builder().with_size(egui::vec2(260.0, 200.0)).build_ui_state(
+ |ui, app: &mut DesignApp| {
- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
+ if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+ crate::theme::install_fonts(ui.ctx(), "");
+ ui.data_mut(|d| d.insert_temp(id, true));
+ return;
+ }
+ show(app, ui);
+ },
+ app,
+ );
+ h.run_steps(3);
+ h
+ }
+
+ fn optical_margin(h: &Harness<'static, DesignApp>, story: u64) -> designcraft_doc::OpticalMargin {
+ h.state().session.active().unwrap().doc.story(designcraft_doc::StoryId(story)).unwrap().optical_margin
+ }
+
+ fn size_field_text(h: &Harness<'static, DesignApp>) -> Option<String> {
+ h.get_all_by_role(egui::accesskit::Role::TextInput).next().unwrap().value()
+ }
+
+ #[test]
+ fn story_panel_sets_and_shows_the_storys_optical_margin() {
+ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.run("file.new", json!({})).unwrap();
+ let story =
+ app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "“Hung”", "caret": true})).unwrap()["story"]
+ .as_u64()
+ .unwrap();
+ app.run("edit.selectAll", json!({})).unwrap();
+ let mut h = harness(app);
+ assert_eq!(size_field_text(&h).as_deref(), Some("12 pt"));
+ h.get_by_label("Optical Margin Alignment").click();
+ h.run_steps(3);
+ assert!(optical_margin(&h, story).on);
+ assert_eq!(h.get_by_label("Optical Margin Alignment").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
+ h.get_all_by_role(egui::accesskit::Role::TextInput).next().unwrap().click();
+ h.run_steps(2);
+ h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+ h.event(egui::Event::Text("18".into()));
+ h.key_press(egui::Key::Enter);
+ h.run_steps(3);
+ assert_eq!(optical_margin(&h, story), designcraft_doc::OpticalMargin { on: true, size: 18.0 });
+ // A value set elsewhere shows in the panel.
+ h.state_mut().run("story.options", json!({"opticalMarginSize": 30})).unwrap();
+ h.run_steps(3);
+ assert_eq!(size_field_text(&h).as_deref(), Some("30 pt"));
+ }
+
+ #[test]
+ fn story_panel_is_disabled_without_text() {
+ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.run("file.new", json!({})).unwrap();
+ let mut h = harness(app);
+ assert!(h.get_by_label("Optical Margin Alignment").accesskit_node().is_disabled());
+ h.get_by_label("Optical Margin Alignment").click();
+ h.run_steps(3);
+ assert_eq!(h.get_by_label("Optical Margin Alignment").accesskit_node().toggled(), Some(egui::accesskit::Toggled::False));
+ }
+ }
diff --cc crates/ui-egui/src/panels/styles.rs
index f7e6fa803,f7e6fa803..ea13bdb40
--- a/crates/ui-egui/src/panels/styles.rs
+++ b/crates/ui-egui/src/panels/styles.rs
@@@ -117,7 -117,7 +117,7 @@@ fn style_row(app: &mut DesignApp, ui: &
let shown = n.rsplit('/').next().unwrap_or(n);
let label = if n.contains('/') { shown } else { crate::i18n::style_name(&app.ui.language, shown) };
let row_label = format!("{label}{}", if current == Some(n) && overridden { "+" } else { "" });
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, current == Some(n), &row_label));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, current == Some(n), &row_label));
crate::rtl::paint(ui.painter(), row.min + vec2(8.0, 11.0), egui::Align2::LEFT_CENTER, &row_label, egui::FontId::proportional(12.5), t.text);
let editable = n != if para { designcraft_doc::NO_PARA_STYLE } else { designcraft_doc::NO_CHAR_STYLE };
if resp.double_clicked() && editable {
@@@ -169,7 -169,7 +169,7 @@@
}
}
ui.separator();
-- let id = egui::Id::new(("new_style_group", para));
++ let id = egui::Id::unique(("new_style_group", para));
let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
let r = ui.add(
egui::TextEdit::singleline(&mut name)
@@@ -298,7 -298,7 +298,7 @@@ mod tests
let undo_len = app.session.doc().unwrap().history.undo.len();
let mut h = Harness::builder().with_size(vec2(360.0, 240.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
diff --cc crates/ui-egui/src/panels/swatches.rs
index 878904a5f,878904a5f..560fd0966
--- a/crates/ui-egui/src/panels/swatches.rs
+++ b/crates/ui-egui/src/panels/swatches.rs
@@@ -25,10 -25,10 +25,10 @@@ pub fn show(app: &mut DesignApp, ui: &m
swatch_row(app, ui, &doc, sw, 0.0, fill_cur.as_deref());
}
for g in &doc.color_groups {
-- let open_id = egui::Id::new(("color_group_open", &g.name));
++ let open_id = egui::Id::unique(("color_group_open", &g.name));
let mut open: bool = ui.data(|d| d.get_temp(open_id)).unwrap_or(true);
let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &g.name));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &g.name));
if resp.hovered() {
ui.painter().rect_filled(row, 0.0, t.hover);
}
@@@ -78,7 -78,7 +78,7 @@@
}
ui.add_space(6.0);
// InDesign's bottom row: New Color Group, New Swatch, Delete Swatch (the one last clicked).
-- let picked: Option<String> = ui.data(|d| d.get_temp(egui::Id::new(PICKED))).filter(|n: &String| doc.swatch(n).is_some_and(|w| !w.locked));
++ let picked: Option<String> = ui.data(|d| d.get_temp(egui::Id::unique(PICKED))).filter(|n: &String| doc.swatch(n).is_some_and(|w| !w.locked));
ui.horizontal(|ui| {
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
let del = ui
@@@ -88,7 -88,7 +88,7 @@@
&& let Some(name) = &picked
&& app.run("swatch.delete", json!({"name": name})).is_ok()
{
-- ui.data_mut(|d| d.remove::<String>(egui::Id::new(PICKED)));
++ ui.data_mut(|d| d.remove::<String>(egui::Id::unique(PICKED)));
}
// The selection's fill or stroke (whichever is in front) becomes a swatch; with nothing
// selected, a new colour.
@@@ -167,7 -167,7 +167,7 @@@ fn header(app: &mut DesignApp, ui: &mu
ui.horizontal(|ui| {
let (r, resp) = ui.allocate_exact_size(vec2(27.0, 27.0), Sense::click());
let tip = crate::i18n::tr(&app.ui.language, if stroke_front { "Stroke" } else { "Fill" });
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tip));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tip));
let fill_r = egui::Rect::from_min_size(r.min + vec2(1.0, 2.0), vec2(16.0, 16.0));
let stroke_r = egui::Rect::from_min_size(r.min + vec2(10.0, 10.0), vec2(16.0, 16.0));
let paint = |stroke: bool| {
@@@ -230,7 -230,7 +230,7 @@@ fn set_tint(app: &mut DesignApp, percen
fn folder_button(ui: &mut egui::Ui, tip: &str) -> egui::Response {
let t = Tokens::get(ui.ctx());
let (r, resp) = ui.allocate_exact_size(vec2(20.0, 20.0), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tip));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tip));
if resp.hovered() {
ui.painter().rect_filled(r, 3.0, t.hover);
}
@@@ -256,14 -256,14 +256,14 @@@ fn swatch_row
let t = Tokens::get(ui.ctx());
// Rows can be dragged onto the Gradient panel's ramp.
let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click_and_drag());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &sw.name));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &sw.name));
resp.dnd_set_drag_payload(SwatchDrag(sw.name.clone()));
if resp.dragged()
&& let Some(p) = ui.ctx().pointer_interact_pos()
{
// The swatch's chip follows the pointer.
let (c, g) = crate::widgets::swatch_colors(doc, &sw.name, 1.0);
-- let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("swatch_drag")));
++ let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("swatch_drag")));
let chip = egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(16.0, 16.0));
crate::widgets::paint_chip(&painter, chip, c, g);
painter.rect_stroke(chip, 0.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Outside);
@@@ -296,7 -296,7 +296,7 @@@
}
ui.painter().text(row.right_center() - vec2(6.0, 0.0), egui::Align2::RIGHT_CENTER, kind, egui::FontId::proportional(10.5), t.text_dim);
if resp.clicked() && !resp.double_clicked() {
-- ui.data_mut(|d| d.insert_temp(egui::Id::new(PICKED), sw.name.clone()));
++ ui.data_mut(|d| d.insert_temp(egui::Id::unique(PICKED), sw.name.clone()));
let _ = super::apply_swatch(app, app.ui.stroke_front, &sw.name, None);
}
// Double-click: Swatch Options (the first click has applied the swatch).
@@@ -359,7 -359,7 +359,7 @@@ pub fn color_panel(app: &mut DesignApp
};
let text = super::colors_affect_text(app);
let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
-- let mode_id = egui::Id::new("color_panel_mode");
++ let mode_id = egui::Id::unique("color_panel_mode");
let mut stroke = app.ui.stroke_front;
let default_mode = if doc.settings.intent == designcraft_doc::Intent::Print { ColorMode::Cmyk } else { ColorMode::Rgb };
let mut mode: ColorMode = ui.data(|d| d.get_temp(mode_id)).unwrap_or(default_mode);
@@@ -391,7 -391,7 +391,7 @@@
}
ui.label(egui::RichText::new(&name).size(11.0).color(t.text_dim));
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-- egui::ComboBox::from_id_salt("color_mode")
++ let combo = egui::ComboBox::from_id_salt("color_mode")
.width(64.0)
.selected_text(match mode {
ColorMode::Cmyk => "CMYK",
@@@ -403,6 -403,6 +403,7 @@@
ui.selectable_value(&mut mode, ColorMode::Cmyk, "CMYK");
ui.selectable_value(&mut mode, ColorMode::Rgb, "RGB");
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Color Mode"));
});
});
app.ui.stroke_front = stroke;
@@@ -427,7 -427,7 +428,11 @@@
// tint is read back from the document every frame) and applies it, clamped, on Enter
// or when it loses focus.
ui.spacing_mut().slider_width = (ui.available_width() - 60.0).max(60.0);
-- if ui.add(egui::Slider::new(&mut tint, 0.0..=100.0).integer().show_value(false)).drag_stopped() {
++ // The painted "T" caption is not a text node next to the slider, so name it here.
++ let slider = ui
++ .add(egui::Slider::new(&mut tint, 0.0..=100.0).integer().show_value(false))
++ .accessible_name(crate::i18n::tr(&app.ui.language, "Tint"));
++ if slider.drag_stopped() {
commit = Some(tint);
}
if let Some(v) =
@@@ -530,9 -530,9 +535,11 @@@ fn channel(ui: &mut egui::Ui, label: &s
changed |= resp.drag_stopped() || resp.clicked();
// The value is applied when typing ends or a drag stops; until then the field's number
// lives here, because `v` is read back from the document every frame.
-- let pending_id = ui.id().with(("channel", label));
++ let pending_id = ui.scope_id().with(("channel", label));
let mut num = ui.data(|d| d.get_temp::<f32>(pending_id)).unwrap_or((*v * scale).round());
-- let field = ui.add(egui::DragValue::new(&mut num).range(0.0..=scale).suffix(suffix).update_while_editing(false));
++ // The channel name is a painted label beside a bare spinner: name the spinner too.
++ let field =
++ ui.add(egui::DragValue::new(&mut num).range(0.0..=scale).suffix(suffix).update_while_editing(false)).accessible_name(label.to_owned());
if field.dragged() {
ui.data_mut(|d| d.insert_temp(pending_id, num));
} else {
@@@ -681,8 -681,8 +688,8 @@@ pub fn gradient_panel(app: &mut DesignA
let is_gradient = cur.is_some();
let g = cur.unwrap_or_default();
let radial = g.kind == designcraft_color::GradientKind::Radial;
-- let sel_id = egui::Id::new("grad_sel");
-- let drag_id = egui::Id::new("grad_drag");
++ let sel_id = egui::Id::unique("grad_sel");
++ let drag_id = egui::Id::unique("grad_drag");
let mut sel: RampSel = ui.data(|d| d.get_temp(sel_id)).unwrap_or(RampSel::Stop(0));
let last = g.stops.len().saturating_sub(1);
sel = match sel {
@@@ -703,7 -703,7 +710,7 @@@
if resp.dragged()
&& let Some(p) = ui.ctx().pointer_interact_pos()
{
-- let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("gradient_drag")));
++ let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("gradient_drag")));
thumbnail(&painter, egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(18.0, 18.0)), &g, t.field_border);
}
}
@@@ -717,13 -717,13 +724,18 @@@
ui.horizontal(|ui| {
crate::widgets::caption_w(ui, crate::i18n::tr(&lang, "Type:"), 52.0);
let shown = if is_gradient { crate::i18n::tr(&lang, g.kind.label()) } else { "" };
-- egui::ComboBox::from_id_salt("grad_type").selected_text(crate::rtl::widget(ui, shown)).width(104.0).show_ui(ui, |ui| {
-- for (k, v) in [("Linear", "linear"), ("Radial", "radial")] {
-- if ui.selectable_label(is_gradient && g.kind.label() == k, crate::rtl::widget(ui, crate::i18n::tr(&lang, k))).clicked() {
-- send = Some(json!({"kind": v}));
++ let combo =
++ egui::ComboBox::from_id_salt("grad_type").selected_text(crate::rtl::widget(ui, shown)).width(104.0).show_ui(ui, |ui| {
++ for (k, v) in [("Linear", "linear"), ("Radial", "radial")] {
++ if ui
++ .selectable_label(is_gradient && g.kind.label() == k, crate::rtl::widget(ui, crate::i18n::tr(&lang, k)))
++ .clicked()
++ {
++ send = Some(json!({"kind": v}));
++ }
}
-- }
-- });
++ });
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&lang, "Type"));
});
ui.horizontal(|ui| {
crate::widgets::caption_w(ui, crate::i18n::tr(&lang, "Location:"), 52.0);
@@@ -1025,7 -1025,7 +1037,7 @@@ mod gradient_panel_tests
let app = app_with_frame();
let mut h = Harness::builder().with_size(vec2(280.0, 200.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
@@@ -1166,7 -1166,7 +1178,7 @@@ mod swatches_header_tests
fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
Harness::builder().with_size(vec2(300.0, 520.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
diff --cc crates/ui-egui/src/panels/table.rs
index ba653364e,ba653364e..5bda05989
--- a/crates/ui-egui/src/panels/table.rs
+++ b/crates/ui-egui/src/panels/table.rs
@@@ -69,13 -69,13 +69,14 @@@ pub fn show(app: &mut DesignApp, ui: &m
for (label, kind, names, cur) in [("Table Style", "table", tnames, tcur), ("Cell Style", "cell", cnames, ccur)] {
ui.horizontal(|ui| {
caption(ui, crate::i18n::tr(&app.ui.language, label));
-- egui::ComboBox::from_id_salt(("tp_style", kind)).selected_text(&cur).width(130.0).show_ui(ui, |ui| {
++ let combo = egui::ComboBox::from_id_salt(("tp_style", kind)).selected_text(&cur).width(130.0).show_ui(ui, |ui| {
for n in &names {
if ui.selectable_label(*n == cur, n).clicked() {
run(app, &format!("style.{kind}.apply"), json!({"name": n, "table": tid}));
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, label));
if crate::icons::button(
ui,
"plus",
@@@ -125,7 -125,7 +126,7 @@@
let row = rows.get(r0).cloned().unwrap_or(Value::Null);
let exactly = row["mode"] == "exactly";
caption(ui, crate::i18n::tr(&app.ui.language, "Row Height"));
-- egui::ComboBox::from_id_salt("tp_rowmode")
++ let combo = egui::ComboBox::from_id_salt("tp_rowmode")
.selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, if exactly { "Exactly" } else { "At Least" })))
.width(70.0)
.show_ui(ui, |ui| {
@@@ -136,6 -136,6 +137,7 @@@
}
}
});
++ let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Row Height"));
if let Some(h) = measure(ui, "tp_rowh", row["height"].as_f64(), unit, 64.0) {
run(app, "table.setRowHeight", json!({"height": h}));
}
diff --cc crates/ui-egui/src/panels/tabs.rs
index db5353afe,db5353afe..49910ca31
--- a/crates/ui-egui/src/panels/tabs.rs
+++ b/crates/ui-egui/src/panels/tabs.rs
@@@ -130,7 -130,7 +130,7 @@@ pub(crate) fn ruler(ui: &mut Ui, salt:
Some(nearest.map_or(Grab::New, |(i, _)| Grab::Tab(i)))
};
-- let key = ui.id().with(("tab_ruler", salt));
++ let key = ui.scope_id().with(("tab_ruler", salt));
let mut drag: Option<Drag> = ui.data(|d| d.get_temp(key));
let mut edit = None;
if resp.drag_started()
@@@ -266,11 -266,11 +266,14 @@@ pub(crate) fn align_buttons(ui: &mut Ui
}
/// A one-line text field that commits on Enter or when it loses focus.
--pub(crate) fn text_commit(ui: &mut Ui, id: &str, current: &str, width: f32, enabled: bool) -> Option<String> {
-- let tid = ui.id().with(("tabs_text", id));
++///
++/// `name` is the visible caption's text (`Leader:`, `Align On:`): the field has no label widget of
++/// its own, so screen readers and tests need it named here.
++pub(crate) fn text_commit(ui: &mut Ui, id: &str, current: &str, width: f32, enabled: bool, name: &str) -> Option<String> {
++ let tid = ui.scope_id().with(("tabs_text", id));
let focused = ui.memory(|m| m.has_focus(tid));
let mut buf: String = if focused { ui.data(|d| d.get_temp(tid)).unwrap_or_else(|| current.to_string()) } else { current.to_string() };
-- let r = ui.add_enabled(enabled, egui::TextEdit::singleline(&mut buf).id(tid).desired_width(width));
++ let r = ui.add_enabled(enabled, egui::TextEdit::singleline(&mut buf).id(tid).desired_width(width)).accessible_name(name.to_owned());
ui.data_mut(|d| d.insert_temp(tid, buf.clone()));
(r.lost_focus() && buf != current).then_some(buf)
}
@@@ -321,7 -321,7 +324,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
let zoom = app.view().map(|v| v.zoom as f32);
// Panel position above the frame: on request (the magnet, or opening the panel).
-- let win = ui.ctx().memory(|m| m.area_rect(egui::Id::new(("floating_panel", "tabs"))));
++ let win = ui.ctx().memory(|m| m.area_rect(egui::Id::unique(("floating_panel", "tabs"))));
let state = &mut app.ui.tabs_panel;
if state.selected.is_some_and(|i| i >= tabs.len()) {
state.selected = None;
@@@ -364,12 -364,12 +367,14 @@@
}
}
crate::rtl::label(ui, tr("Leader:"));
-- if let (Some(l), Some(i)) = (text_commit(ui, "leader", sel.map_or("", |s| s.leader.as_str()), 36.0, sel.is_some()), selected) {
++ let leader = text_commit(ui, "leader", sel.map_or("", |s| s.leader.as_str()), 36.0, sel.is_some(), tr("Leader:"));
++ if let (Some(l), Some(i)) = (leader, selected) {
cmds.push(("type.tabs.change", json!({"index": i, "leader": l})));
}
crate::rtl::label(ui, tr("Align On:"));
let char_tab = sel.is_some_and(|s| s.align == TabAlign::Char);
-- if let (Some(c), Some(i)) = (text_commit(ui, "alignOn", sel.map_or("", |s| s.align_on.as_str()), 18.0, char_tab), selected) {
++ let align_on = text_commit(ui, "alignOn", sel.map_or("", |s| s.align_on.as_str()), 18.0, char_tab, tr("Align On:"));
++ if let (Some(c), Some(i)) = (align_on, selected) {
cmds.push(("type.tabs.change", json!({"index": i, "alignOn": c})));
}
ui.add_space(6.0);
diff --cc crates/ui-egui/src/panels/typography.rs
index 4206459d0,4206459d0..71358c41a
--- a/crates/ui-egui/src/panels/typography.rs
+++ b/crates/ui-egui/src/panels/typography.rs
@@@ -322,7 -322,7 +322,7 @@@ mod tests
app.run("edit.selectAll", json!({})).unwrap();
let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
|ui, app: &mut DesignApp| {
-- let id = egui::Id::new("test_fonts");
++ let id = egui::Id::unique("test_fonts");
if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(id, true));
diff --cc crates/ui-egui/src/rtl.rs
index cb88619ec,cb88619ec..55473469d
--- a/crates/ui-egui/src/rtl.rs
+++ b/crates/ui-egui/src/rtl.rs
@@@ -1,12 -1,12 +1,15 @@@
--//! Read-only interface text: Unicode bidi run ordering followed by Arabic shaping.
--//! Source strings stay logical. Never use these galleys for editable text/caret mapping.
++//! Read-only interface text in any script. Source strings stay logical: epaint resolves each
++//! paragraph's direction (`LayoutJob::direction == Auto`), runs the Unicode bidi algorithm once
++//! and orders a row's glyphs for painting while the glyph array and `Galley::job.text` stay
++//! logical. Never use these galleys for editable text/caret mapping (the canvas has its own
++//! composer).
++use egui::epaint::text::TextDirection;
use egui::text::{LayoutJob, TextWrapping};
--use egui::{Align, Align2, Color32, FontFamily, FontId, Galley, Pos2, Rect, WidgetText};
--use std::{collections::HashMap, ops::Range, sync::Arc};
--use unicode_bidi::{BidiClass, BidiInfo, bidi_class};
--use unicode_segmentation::UnicodeSegmentation;
++use egui::{Align, Align2, Color32, FontId, Galley, Pos2, Rect, WidgetText};
++use std::{collections::HashMap, sync::Arc};
++use unicode_bidi::{BidiClass, bidi_class};
--/// Allocation-free preflight: ordinary Latin, CJK and emoji labels need no bidi analysis.
++/// Allocation-free preflight: ordinary Latin, CJK and emoji labels need no cache lookup.
/// Include directional controls so explicit embeddings/overrides keep their existing behavior.
fn may_have_rtl(text: &str) -> bool {
!text.is_ascii()
@@@ -29,26 -29,26 +32,28 @@@
})
}
--fn has_rtl(text: &str) -> bool {
-- may_have_rtl(text) && BidiInfo::new(text, None).has_rtl()
--}
--
--/// Resolve translated labels through bidi, without changing IDs, commands or stored text.
++/// Resolve translated labels through the shaper, without changing IDs, commands or stored text.
pub fn widget(ui: &egui::Ui, text: impl Into<WidgetText>) -> WidgetText {
let text = text.into();
-- if !has_rtl(text.text()) {
++ if !may_have_rtl(text.text()) {
return text;
}
let mut job = (*text.into_layout_job(ui.style(), egui::FontSelection::Default, Align::Center)).clone();
++ // The shaper owns bidi: it keeps the glyphs in logical order and gives each row a visual
++ // order (and the paragraph's start edge), so nothing here may reorder or mirror text.
++ job.direction = TextDirection::Auto;
++ if job.language.is_none() {
++ job.language = ui.language();
++ }
job.wrap = TextWrapping::from_wrap_mode_and_width(ui.wrap_mode(), ui.available_width());
WidgetText::Galley(layout(ui.ctx(), job))
}
--/// Labels are read-only: egui's LTR selection indices cannot map bidi glyph order.
--/// Accessibility still receives the original logical string through Galley::job.
++/// Labels are read-only: no editable text/caret mapping is derived from a shaped galley.
++/// Accessibility still receives the original logical string through `Galley::job`.
pub fn label(ui: &mut egui::Ui, text: impl Into<WidgetText>) -> egui::Response {
let text = text.into();
-- let rtl = has_rtl(text.text());
++ let rtl = may_have_rtl(text.text());
if !rtl {
return ui.label(text);
}
@@@ -90,62 -90,62 +95,6 @@@ pub fn paint(p: &egui::Painter, pos: Po
p.galley(rect.min, galley, color);
}
--/// Reorder directional runs, not characters: the shaper needs logical Arabic to join letters.
--fn visual_line(job: &LayoutJob, bidi: &BidiInfo<'_>, line: Range<usize>) -> LayoutJob {
-- let mut visual = LayoutJob { break_on_newline: false, ..Default::default() };
-- if line.is_empty() {
-- if let Some(section) =
-- job.sections.iter().find(|s| usize::from(s.byte_range.start) <= line.start && line.start <= usize::from(s.byte_range.end))
-- {
-- visual.append("", 0.0, section.format.clone());
-- }
-- return visual;
-- }
-- let Some(para) = bidi.paragraphs.iter().find(|p| p.range.start <= line.start && line.start < p.range.end) else {
-- // Preserve the font/height for an empty line.
-- if let Some(section) = job.sections.first() {
-- visual.append("", 0.0, section.format.clone());
-- }
-- return visual;
-- };
-- let (levels, runs) = bidi.visual_runs(para, line);
-- for run in runs {
-- let rtl = levels[run.start].is_rtl();
-- let mut sections: Vec<_> = job
-- .sections
-- .iter()
-- .filter_map(|section| {
-- let start = run.start.max(section.byte_range.start.into());
-- let end = run.end.min(section.byte_range.end.into());
-- (start < end).then_some((section, start..end))
-- })
-- .collect();
-- if rtl {
-- sections.reverse();
-- }
-- for (section, range) in sections {
-- let mut format = section.format.clone();
-- if rtl {
-- let bold = format.font_id.family == FontFamily::Name("semibold".into());
-- format.font_id.family = FontFamily::Name(if bold { "arabic-semibold" } else { "arabic" }.into());
-- if bold {
-- format.coords = egui::epaint::text::VariationCoords::new([(*b"wght", 600.0)]);
-- }
-- }
-- let text = &job.text[range];
-- if rtl && !text.chars().any(designcraft_fonts::is_rtl) {
-- // Neutral-only RTL runs have no script for the shaper to infer a direction.
-- // Apply UBA L4 mirroring here; Arabic runs are mirrored by the shaper.
-- let neutral: String = text.chars().rev().map(|c| unicode_bidi_mirroring::get_mirrored(c).unwrap_or(c)).collect();
-- visual.append(&neutral, section.leading_space, format);
-- } else {
-- visual.append(text, section.leading_space, format);
-- }
-- }
-- }
-- visual
--}
--
const MAX_CACHED_LABELS: usize = 256;
const MAX_CACHED_TEXT_BYTES: usize = 4096;
@@@ -200,7 -200,7 +149,7 @@@ fn layout(ctx: &egui::Context, job: Lay
return layout_uncached(ctx, job);
}
let token = ctx.fonts_mut(|fonts| fonts.layout_no_wrap(String::new(), FontId::default(), Color32::TRANSPARENT));
-- let id = egui::Id::new("designcraft.rtl.layout-cache");
++ let id = egui::Id::unique("designcraft.rtl.layout-cache");
let key = egui::util::hash(&job);
let cached = ctx.data_mut(|data| data.get_temp_mut_or_default::<LayoutCache>(id).lookup(token, key, &job));
if let Some(galley) = cached {
@@@ -212,99 -212,99 +161,16 @@@
}
fn layout_uncached(ctx: &egui::Context, mut job: LayoutJob) -> Arc<Galley> {
-- if !has_rtl(&job.text) {
-- return ctx.fonts_mut(|fonts| fonts.layout_job(job));
-- }
-- let original = Arc::new(job.clone());
-- if !job.break_on_newline {
-- // Single-line widgets show line separators as spaces; byte offsets stay unchanged.
-- job.text = job.text.replace(['\n', '\r'], " ");
-- }
-- let bidi = BidiInfo::new(&job.text, None);
-- let shape = |range| ctx.fonts_mut(|fonts| fonts.layout_job(visual_line(&job, &bidi, range)));
-- // Wrap in logical reading order BEFORE applying bidi separately to each line.
-- let mut ranges = Vec::new();
-- let mut start = 0;
-- for paragraph in job.text.split_inclusive('\n') {
-- let end = start + paragraph.len();
-- let content_end = if paragraph.ends_with('\n') { end - 1 } else { end };
-- if !job.wrap.max_width.is_finite() || shape(start..content_end).size().x <= job.wrap.max_width {
-- ranges.push(start..content_end);
-- start = end;
-- continue;
-- }
-- let mut line_start = start;
-- let mut word_break = start;
-- for (offset, cluster) in job.text[start..content_end].grapheme_indices(true) {
-- let index = start + offset;
-- let boundary = index + cluster.len();
-- if job.wrap.max_width.is_finite() && index > line_start && shape(line_start..boundary).size().x > job.wrap.max_width {
-- let cut = if !job.wrap.break_anywhere && word_break > line_start { word_break } else { index };
-- ranges.push(line_start..cut);
-- line_start = cut;
-- }
-- if cluster.chars().all(char::is_whitespace) {
-- word_break = boundary;
-- }
-- }
-- ranges.push(line_start..content_end);
-- start = end;
-- }
-- if job.text.ends_with('\n') {
-- ranges.push(start..start);
-- }
-- let elided = ranges.len() > job.wrap.max_rows;
-- ranges.truncate(job.wrap.max_rows);
-- let mut lines = Vec::new();
-- for (i, range) in ranges.iter().enumerate() {
-- if elided && i + 1 == ranges.len() {
-- // Append the ellipsis in logical order, then reorder and shape the final line.
-- let mut last = LayoutJob::default();
-- for section in &job.sections {
-- let start = range.start.max(section.byte_range.start.into());
-- let end = range.end.min(section.byte_range.end.into());
-- if start < end {
-- last.append(&job.text[start..end], 0.0, section.format.clone());
-- }
-- }
-- let format = last.sections.last().or(job.sections.first()).map(|s| s.format.clone()).unwrap_or_default();
-- let tail = job.wrap.overflow_character.map_or(String::new(), |c| c.to_string());
-- let base = bidi.paragraphs.iter().find(|p| p.range.contains(&range.start)).map(|p| p.level);
-- loop {
-- let mut candidate = last.clone();
-- candidate.append(&tail, 0.0, format.clone());
-- let info = BidiInfo::new(&candidate.text, base);
-- let shaped = ctx.fonts_mut(|fonts| fonts.layout_job(visual_line(&candidate, &info, 0..candidate.text.len())));
-- if shaped.size().x <= job.wrap.max_width || last.text.is_empty() {
-- lines.push(shaped);
-- break;
-- }
-- let end = last.text.grapheme_indices(true).next_back().map_or(0, |(i, _)| i);
-- last.text.truncate(end);
-- for section in &mut last.sections {
-- section.byte_range.end = usize::from(section.byte_range.end).min(end).into();
-- }
-- last.sections.retain(|s| s.byte_range.start < s.byte_range.end);
-- }
-- } else {
-- lines.push(shape(range.clone()));
-- }
-- }
-- let mut galley = Galley::concat(original, &lines, ctx.pixels_per_point());
-- galley.elided = elided;
-- // Each Arabic line shares the right edge; Latin runs and numbers remain LTR.
-- let width = galley.rect.width();
-- galley.mesh_bounds = Rect::NOTHING;
-- for row in &mut galley.rows {
-- row.pos.x += width - row.size.x;
-- galley.mesh_bounds |= row.visuals.mesh_bounds.translate(row.pos.to_vec2());
-- }
-- Arc::new(galley)
++ job.direction = TextDirection::Auto;
++ // The 0.37 shaper owns single-line handling as well as bidi. Preserve the logical source
++ // for accessibility and cache equality, including line separators in a single-line label.
++ ctx.fonts_mut(|fonts| fonts.layout_job(job))
}
#[cfg(test)]
mod tests {
use super::*;
++ use egui::FontFamily;
fn with_fonts(test: impl FnOnce(&egui::Context)) {
let ctx = egui::Context::default();
@@@ -317,6 -317,6 +183,20 @@@
output.textures_delta.clear();
}
++ /// The glyphs in the order they are painted, left to right per row.
++ fn drawn(galley: &Galley) -> String {
++ let mut out = String::new();
++ for row in &galley.rows {
++ for i in row.row.visual_order().filter(|&i| row.row.glyphs.get(i).is_some_and(|g| g.advance_width > 0.0)) {
++ if let Some(glyph) = row.row.glyphs.get(i) {
++ out.push(glyph.chr);
++ }
++ }
++ }
++ out
++ }
++
++ /// The glyphs in logical order (the stored order, independent of the paragraph direction).
fn displayed(galley: &Galley) -> String {
galley.rows.iter().flat_map(|row| row.glyphs.iter().filter(|g| g.advance_width > 0.0).map(|g| g.chr)).collect()
}
@@@ -439,21 -439,21 +319,19 @@@
}
#[test]
-- fn ordinary_multilingual_labels_skip_bidi_analysis() {
++ fn ordinary_multilingual_labels_skip_the_rtl_layout_cache() {
for text in ["", "File (123)", "Édition", "中文排版", "スウォッチ", "e\u{301}", "🎨 🙂"] {
assert!(!may_have_rtl(text), "{text:?}");
-- assert!(!BidiInfo::new(text, None).has_rtl(), "{text:?}");
}
for text in ["ملف", "עברית", "PDF ملف 123", "\u{1e900}", "\u{200f}", "\u{202e}abc\u{202c}", "\u{2067}abc\u{2069}", "١٢٣"] {
assert!(may_have_rtl(text), "{text:?}");
-- assert_eq!(has_rtl(text), BidiInfo::new(text, None).has_rtl(), "{text:?}");
}
}
#[test]
fn non_rtl_widgets_keep_native_text_and_formatting() {
with_fonts(|ctx| {
-- egui::Area::new(egui::Id::new("rtl-fast-path-test")).show(ctx, |ui| {
++ egui::Area::new(egui::Id::unique("rtl-fast-path-test")).show(ctx, |ui| {
for text in ["中文", "日本語", "Édition", "🎨"] {
let rendered = widget(ui, egui::RichText::new(text).strong());
assert!(matches!(rendered, WidgetText::RichText(_)));
@@@ -469,20 -469,20 +347,21 @@@
with_fonts(|ctx| {
let text = "ملف (PDF 123) جديد";
let galley = plain(ctx, text, FontId::proportional(15.0), Color32::WHITE);
++ // The source stays logical in both the job and the glyph array.
assert_eq!(galley.job.text, text);
-- let visual = displayed(&galley);
++ let row = &galley.rows[0].row;
++ assert_eq!(row.text(), text);
++ // Painting is reordered once by the shaper: the last logical word is drawn leftmost,
++ // and the Latin number inside the Arabic sentence still reads left to right.
++ let visual = drawn(&galley);
assert!(visual.contains("PDF 123"), "{visual}");
-- let row = &galley.rows[0];
-- let left_bracket = row.glyphs.iter().find(|g| g.chr == ')' && !g.uv_rect.is_nothing()).unwrap();
-- // A neutral-only final bracket must be mirrored even without an Arabic script run.
-- let job = LayoutJob::simple_singleline("ملف (PDF 123)".to_owned(), FontId::proportional(15.0), Color32::WHITE);
-- let bidi = BidiInfo::new(&job.text, None);
-- let visual_job = visual_line(&job, &bidi, 0..job.text.len());
-- assert!(visual_job.text.starts_with("(PDF 123"), "{}", visual_job.text);
-- let p = row.glyphs.iter().find(|g| g.chr == 'P').unwrap();
-- let three = row.glyphs.iter().find(|g| g.chr == '3').unwrap();
-- assert!(left_bracket.pos.x < p.pos.x && p.pos.x < three.pos.x);
assert!(visual.starts_with('د'), "Arabic final word belongs at the left: {visual}");
++ let x = |c: char| row.glyphs.iter().find(|g| g.chr == c && g.advance_width > 0.0).unwrap().pos.x;
++ // The shaper mirrors the brackets: the logical ')' is drawn as '(' left of the number,
++ // the logical '(' as ')' right of it.
++ assert!(x(')') < x('P') && x('3') < x('('), "brackets around the number: {visual}");
++ // Letters inside the right-to-left words are placed right to left.
++ assert!(x('ج') < x('ف'), "Arabic word order: {visual}");
assert!(galley.rect.is_finite());
assert!(galley.mesh_bounds.is_finite());
});
@@@ -503,18 -503,18 +382,26 @@@
}
#[test]
-- fn joins_arabic_letters_using_one_font_including_spaces() {
++ fn arabic_fallback_matches_the_native_shaper_including_spaces() {
with_fonts(|ctx| {
let text = "بِدء مُستند جَديد";
let galley = plain(ctx, text, FontId::proportional(15.0), Color32::WHITE);
let expected = ctx.fonts_mut(|fonts| {
-- fonts.layout_job(LayoutJob::simple_singleline(text.to_owned(), FontId::new(15.0, FontFamily::Name("arabic".into())), Color32::WHITE))
++ // The native shaper resolves Arabic clusters from the requested UI family. A
++ // different Arabic-primary family changes spaces and line metrics too; it is
++ // not an oracle for fallback shaping in a proportional UI label.
++ let mut job = LayoutJob::simple_singleline(text.to_owned(), FontId::proportional(15.0), Color32::WHITE);
++ job.direction = TextDirection::Auto;
++ fonts.layout_job(job)
});
++ assert_eq!(galley.job.text, text);
assert_eq!(displayed(&galley), displayed(&expected));
assert_eq!(galley.size(), expected.size());
-- // Contextual glyphs (atlas positions) must match the unbroken Arabic shaping run.
++ assert_eq!(galley.rows[0].glyphs.len(), expected.rows[0].glyphs.len());
++ // Contextual glyphs (atlas positions) must match the native logical shaping run.
for (actual, expected) in galley.rows[0].glyphs.iter().zip(&expected.rows[0].glyphs) {
assert_eq!(actual.uv_rect, expected.uv_rect);
++ assert_eq!(actual.advance_width, expected.advance_width);
}
});
}
@@@ -530,8 -530,8 +417,10 @@@
assert!(galley.rows.len() >= 3);
let first: String = galley.rows[0].glyphs.iter().map(|g| g.chr).collect();
assert!(first.contains('م') && first.contains('س') && !first.contains('ج'), "{first}");
++ // Every right-to-left row is flush with the right edge. Rows are pixel-snapped, so the
++ // shared edge can differ from the galley width by less than one pixel.
for row in &galley.rows {
-- assert!((row.pos.x + row.size.x - galley.size().x).abs() < 0.01);
++ assert!((row.pos.x + row.size.x - galley.size().x).abs() < 1.0, "{:?}", row.pos);
}
assert_eq!(galley.job.text, text);
});
diff --cc crates/ui-egui/src/story_editor.rs
index 2bd481d82,2bd481d82..e19efe8e4
--- a/crates/ui-egui/src/story_editor.rs
+++ b/crates/ui-egui/src/story_editor.rs
@@@ -45,7 -45,7 +45,7 @@@ pub fn show(app: &mut DesignApp, ctx: &
let mut edit: Option<(usize, usize, String)> = None;
let words = story.text.split_whitespace().count().to_string();
egui::Window::new(crate::i18n::tr(&app.ui.language, "Story Editor — {count} words").replace("{count}", &words))
-- .id(egui::Id::new("story_editor"))
++ .id(egui::Id::unique("story_editor"))
.open(&mut open)
.default_size(vec2(560.0, 520.0))
.show(ctx, |ui| {
diff --cc crates/ui-egui/src/taskbar.rs
index 5b7d34b92,5b7d34b92..88c152f5b
--- a/crates/ui-egui/src/taskbar.rs
+++ b/crates/ui-egui/src/taskbar.rs
@@@ -16,7 -16,7 +16,7 @@@ const GRIP: &str = "task_bar_grip"
/// Show the bar under `sel` (screen rect of the selection), or where it is pinned, kept inside
/// `canvas`.
pub fn show(app: &mut DesignApp, ctx: &egui::Context, sel: Rect, canvas: Rect) {
-- let grip_id = egui::Id::new((GRIP, ctx.viewport_id(), app.pane));
++ let grip_id = egui::Id::unique((GRIP, ctx.viewport_id(), app.pane));
// (Two separate context calls: `is_pointer_over_egui` inside an `input` closure deadlocks.)
let dragging = ctx.dragged_id() == Some(grip_id);
if !app.ui.task_bar || (ctx.input(|i| i.pointer.any_down()) && !ctx.is_pointer_over_egui() && !dragging) {
@@@ -29,7 -29,7 +29,7 @@@
}
let t = Tokens::get(ctx);
// The same selection can be shown in two canvases; each bar needs its own area and widgets.
-- let id = egui::Id::new(("task_bar", ctx.viewport_id(), app.pane));
++ let id = egui::Id::unique(("task_bar", ctx.viewport_id(), app.pane));
// Width from the previous frame (content-sized).
let w = ctx.memory(|m| m.area_rect(id).map(|r| r.width())).unwrap_or(420.0);
let at = match app.ui.task_bar_pin {
@@@ -100,8 -100,8 +100,8 @@@ fn split_button(ui: &mut Ui, icon: &str
let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
let main = Rect::from_min_max(r.min, pos2(r.max.x - widgets::SEG_W, r.max.y));
let seg = Rect::from_min_max(pos2(main.max.x, r.min.y), r.max);
-- let mr = ui.interact(main, ui.id().with(("split", label)), Sense::click());
-- let sr = ui.interact(seg, ui.id().with(("splitseg", label)), Sense::click());
++ let mr = ui.interact(main, ui.scope_id().with(("split", label)), Sense::click());
++ let sr = ui.interact(seg, ui.scope_id().with(("splitseg", label)), Sense::click());
for (rr, resp) in [(main, &mr), (seg, &sr)] {
if resp.hovered() {
ui.painter().rect_filled(rr, 0.0, t.hover);
@@@ -165,7 -165,7 +165,7 @@@ fn text_controls(app: &mut DesignApp, u
let sw = c["fill"].as_str().unwrap_or("[Black]").to_string();
let (col, g) = widgets::swatch_colors(&doc, &sw, 1.0);
let resp = widgets::swatch_chip(ui, 17.0, col, g).on_hover_text(format!("{}: {sw}", crate::i18n::tr(&app.ui.language, "Fill")));
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Task Bar fill"));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Task Bar fill"));
let mut picked = None;
egui::Popup::menu(&resp).show(|ui| {
picked = panels::swatch_list(ui, &doc, &sw);
@@@ -227,9 -227,9 +227,7 @@@ fn object_controls(app: &mut DesignApp
widgets::paint_stroke_chip(ui.painter(), r, col, egui::Color32::from_gray(20));
}
let resp = resp.on_hover_text(format!("{}: {sw}", if k == 0 { "Fill" } else { "Stroke" }));
-- resp.widget_info(|| {
-- egui::WidgetInfo::labeled(egui::WidgetType::Button, true, format!("Task Bar {}", if k == 0 { "fill" } else { "stroke" }))
-- });
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("Task Bar {}", if k == 0 { "fill" } else { "stroke" })));
let mut picked = None;
egui::Popup::menu(&resp).show(|ui| {
picked = panels::swatch_list(ui, &doc, &sw);
@@@ -311,7 -311,7 +309,7 @@@ mod tests
}
fn bar(h: &Harness<'static, Window>) -> egui::Rect {
-- h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), h.state().app.pane)))).unwrap()
++ h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), h.state().app.pane)))).unwrap()
}
fn grip(h: &Harness<'static, Window>) -> egui::Pos2 {
@@@ -371,7 -371,7 +369,7 @@@
h.state_mut().app.run("window.split", json!({"on":true})).unwrap();
h.run_steps(6);
let area =
-- |h: &Harness<'static, Window>, pane| h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), pane)))).unwrap();
++ |h: &Harness<'static, Window>, pane| h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), pane)))).unwrap();
for pane in [0_u8, 1] {
h.state_mut().app.run("window.taskBarPin", json!({"at":[100,120]})).unwrap();
h.run_steps(4);
@@@ -397,7 -397,7 +395,7 @@@
h.state_mut().app.switch_pane(0);
h.run_steps(4);
let expected = h.state().app.ui.task_bar_at.unwrap();
-- let left = h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), 0_u8)))).unwrap();
++ let left = h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), 0_u8)))).unwrap();
click_at(&mut h, pos2(left.max.x - 19.0, left.center().y));
let pin = h.get_by_label_contains("Pin Bar Position").rect();
let at = pos2(pin.max.x - 2.0, pin.center().y);
diff --cc crates/ui-egui/src/theme.rs
index 666394e09,666394e09..846cf2e89
--- a/crates/ui-egui/src/theme.rs
+++ b/crates/ui-egui/src/theme.rs
@@@ -269,11 -269,11 +269,12 @@@ pub fn install_fonts(ctx: &egui::Contex
let craft = designcraft_fonts::CRAFT_FONTS;
let mut defs = font_definitions(craft, lang);
let system = system_ui_fonts(craft);
-- if let Some(system) = system {
++ let found = system.is_some();
++ if let Some(system) = &system {
add_system_fallbacks(&mut defs, system, lang);
}
ctx.set_fonts(defs);
-- system.is_some()
++ found
}
/// Whether [`install_fonts`] would find the installed fonts cataloged.
@@@ -282,6 -282,6 +283,7 @@@ pub fn system_fonts_ready() -> bool
}
/// An installed font the UI falls back to for a script the built-in faces lack.
++#[derive(Clone)]
pub(crate) struct SystemFont {
/// The ISO 15924 code of the script it is for ("Jpan", "Kore", "Taml"…).
script: &'static str,
@@@ -350,17 -350,17 +352,25 @@@ const SYSTEM_UI_FONTS: &[(&str, char, &
/// Traditional Chinese (font names in the font menus), Indic, Southeast Asian and other scripts
/// in any build. egui can't find system fonts itself; the document font scan (not on the web)
/// does.
--fn system_ui_fonts(craft: &[designcraft_fonts::CraftFont]) -> Option<&'static [SystemFont]> {
++fn system_ui_fonts(craft: &[designcraft_fonts::CraftFont]) -> Option<Vec<SystemFont>> {
static FACES: std::sync::OnceLock<Vec<SystemFont>> = std::sync::OnceLock::new();
let db = designcraft_fonts::FontDb::global();
// Never wait for the font scan here (the first frame): it runs in the background, and the
// faces are read once, when it is done.
-- // (Tests wait instead, so that the fonts don't change in the middle of one.)
if !db.system_fonts_cataloged() && !cfg!(test) {
db.scan_in_background();
return None;
}
-- Some(FACES.get_or_init(|| installed_ui_fonts(db, craft)))
++ if cfg!(test) {
++ // Tests install controlled faces in the process-wide database (`testing::font_with`),
++ // so the set cannot be cached across them; a cached empty first call would otherwise
++ // hide every face a later test adds. Cataloging here is a no-op once it is done (the
++ // web has no system fonts).
++ #[cfg(not(target_arch = "wasm32"))]
++ let _ = db.load_system_fonts();
++ return Some(installed_ui_fonts(db, craft));
++ }
++ Some(FACES.get_or_init(|| installed_ui_fonts(db, craft)).to_vec())
}
/// The faces of [`SYSTEM_UI_FONTS`] that `db` has, for the scripts `craft` doesn't cover.
@@@ -375,8 -375,8 +385,12 @@@ fn installed_ui_fonts(db: &designcraft_
return None;
}
let face = db.face(family, "Regular");
-- // `face` falls back to another family when this one can't be read: keep only the real one.
-- (face.family.eq_ignore_ascii_case(family) && !face.data().is_empty() && face.covers(*sample)).then_some((family, face))
++ // Keep the requested family, and leave bundled document faces to the craft UI stack.
++ (face.family.eq_ignore_ascii_case(family)
++ && !matches!(&face.source, designcraft_fonts::FontSource::Bundled)
++ && !face.data().is_empty()
++ && face.covers(*sample))
++ .then_some((family, face))
});
let Some((family, face)) = found else { continue };
if !faces.iter().any(|f| f.family.eq_ignore_ascii_case(family)) {
@@@ -454,6 -454,6 +468,11 @@@ pub(crate) fn font_definitions(craft: &
let add = |fonts: &mut FontDefinitions, name: &str, data: &'static [u8]| {
fonts.font_data.insert(name.into(), Arc::new(FontData::from_static(data)));
};
++ // egui's last-resort faces (Ubuntu-Light, egui-icons and, with `monochrome_emoji_fonts`,
++ // NotoEmoji-Regular and emoji-icon-font): every family ends with them so a glyph outside
++ // the requested face and the script faces (☰, ⚠, 📋) is not tofu. Captured before the
++ // interface face is added.
++ let last_resort: Vec<String> = fonts.families.get(&FontFamily::Proportional).cloned().unwrap_or_default();
add(&mut fonts, "ui", include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf"));
add(&mut fonts, "ui-semibold", include_bytes!("../../../assets/fonts/SourceSans3-Semibold.ttf"));
add(&mut fonts, "mono", include_bytes!("../../../assets/fonts/JetBrainsMono-Regular.ttf"));
@@@ -467,12 -467,12 +486,15 @@@
let chinese = pick("Hans");
let arabic = pick("Arab");
let georgian = pick("Geor");
++ // The manifest can add scripts without a special UI preference order (Hebrew, Devanagari,
++ // ...). They still need installing: system fallback discovery skips scripts supplied here.
++ let other: Vec<_> = craft.iter().filter(|f| !["Jpan", "Hans", "Arab", "Geor"].iter().any(|s| f.scripts.contains(s))).collect();
let name = |f: &designcraft_fonts::CraftFont| format!("craft-{}-{}", f.family, f.style);
for f in japanese.iter().chain(&chinese) {
// CJK faces sit on the Latin baseline (see `baseline_tweak`).
fonts.font_data.insert(name(f), Arc::new(FontData { tweak: baseline_tweak(f.bytes, 0), ..FontData::from_static(f.bytes) }));
}
-- for f in arabic.iter().chain(&georgian) {
++ for f in arabic.iter().chain(&georgian).chain(&other) {
add(&mut fonts, &name(f), f.bytes);
}
// Han characters take the forms of the interface language: Chinese faces first for Chinese.
@@@ -484,16 -484,16 +506,25 @@@
ja.sort_by_key(|f| (f.family != "BIZ UDPGothic", f.style != "Bold"));
}
let (first, second) = if zh { (&chinese, &ja) } else { (&ja, &chinese) };
-- stack.extend(first.iter().chain(second).chain(&arabic).chain(&georgian).map(|f| name(f)));
++ stack.extend(first.iter().chain(second).chain(&arabic).chain(&georgian).chain(&other).map(|f| name(f)));
++ }
++ // A bold label keeps every icon/emoji glyph the regular one has: the semibold family ends
++ // with the same last-resort faces, after the script faces.
++ if let Some(stack) = fonts.families.get_mut(&FontFamily::Name("semibold".into())) {
++ stack.extend(last_resort.iter().cloned());
}
-- // Arabic runs (rtl.rs): the Arabic face first, so letters and spaces shape as one run.
++ // Arabic runs: the Arabic face first, so letters and spaces shape as one run. These families
++ // keep every other family's fallbacks (the interface faces, the CJK, Arabic and Georgian
++ // script faces, then egui's last-resort icon/emoji faces) so Latin, symbols and emoji inside
++ // Arabic text are not tofu.
for family in ["arabic", "arabic-semibold"] {
let ui = if family == "arabic" { "ui" } else { "ui-semibold" };
let stack = arabic
.iter()
.map(|f| name(f))
.chain([ui.to_string(), "ui".to_string()])
-- .chain(japanese.iter().chain(&chinese).chain(&georgian).map(|f| name(f)));
++ .chain(japanese.iter().chain(&chinese).chain(&georgian).chain(&other).map(|f| name(f)))
++ .chain(last_resort.iter().cloned());
let mut seen = std::collections::HashSet::new();
fonts.families.insert(FontFamily::Name(family.into()), stack.filter(|n| seen.insert(n.clone())).collect());
}
@@@ -572,6 -572,6 +603,26 @@@ mod japanese_font_tests
ctx
}
++ /// A newly supplied script must remain usable without any matching installed system font.
++ /// Previously craft's script coverage suppressed system discovery while these faces were
++ /// omitted from the actual UI font definitions, so a Hebrew tab panicked on its first glyph.
++ #[test]
++ fn additional_craft_scripts_render_in_every_ui_family() {
++ let bytes = Box::leak(designcraft_fonts::testing::font_with("DC extra scripts", &['ד', 'क']).unwrap().into_boxed_slice());
++ let craft = Box::leak(
++ vec![designcraft_fonts::CraftFont { family: "DC extra scripts", style: "Regular", scripts: &["Hebr", "Deva"], bytes }].into_boxed_slice(),
++ );
++ let ctx = ctx_with(craft);
++ ctx.fonts_mut(|fonts| {
++ for family in families().into_iter().chain([egui::FontFamily::Name("arabic".into()), egui::FontFamily::Name("arabic-semibold".into())]) {
++ let font = egui::FontId::new(13.0, family);
++ assert!(fonts.has_glyph(&font, 'ד') && fonts.has_glyph(&font, 'क'), "missing supplied script in {font:?}");
++ let galley = fonts.layout_no_wrap("דक".into(), font, egui::Color32::WHITE);
++ assert!(galley.size().x > 0.0 && galley.rect.is_finite());
++ }
++ });
++ }
++
#[test]
fn japanese_ui_glyphs_are_available_in_every_family() {
if designcraft_fonts::CRAFT_FONTS.is_empty() {
@@@ -766,9 -766,9 +817,9 @@@ mod ukrainian_font_tests
for (name, family, style) in
[("ui", "Source Sans 3", "Regular"), ("ui-semibold", "Source Sans 3", "Semibold"), ("mono", "JetBrains Mono", "Regular")]
{
-- let data = &definitions.font_data[name].font;
++ let data = definitions.font_data[name].bytes();
let face = db.face(family, style);
-- assert_eq!(face.data(), data.as_ref(), "configured UI face {name}");
++ assert_eq!(face.data(), data, "configured UI face {name}");
for character in &characters {
assert_ne!(face.glyph_for(*character), 0, "missing {character} in {name}");
}
@@@ -793,9 -793,9 +844,9 @@@ mod russian_font_tests
for (name, family, style) in
[("ui", "Source Sans 3", "Regular"), ("ui-semibold", "Source Sans 3", "Semibold"), ("mono", "JetBrains Mono", "Regular")]
{
-- let data = &definitions.font_data[name].font;
++ let data = definitions.font_data[name].bytes();
let face = db.face(family, style);
-- assert_eq!(face.data(), data.as_ref(), "configured UI face {name}");
++ assert_eq!(face.data(), data, "configured UI face {name}");
for character in &characters {
assert_ne!(face.glyph_for(*character), 0, "missing {character} in {name}");
}
diff --cc crates/ui-egui/src/title_bar.rs
index a369fa9fb,a369fa9fb..dc4d00d10
--- a/crates/ui-egui/src/title_bar.rs
+++ b/crates/ui-egui/src/title_bar.rs
@@@ -71,7 -71,7 +71,7 @@@ pub fn double_click_command(action: Dou
/// detected here as a press on the empty area that has stopped being a click.
pub fn empty_area(ui: &mut egui::Ui, rect: egui::Rect) {
prefetch();
-- let resp = ui.interact(rect, ui.id().with("title_bar_empty"), egui::Sense::click());
++ let resp = ui.interact(rect, ui.scope_id().with("title_bar_empty"), egui::Sense::click());
// A control in this layer covers the empty area under the pointer. Another layer on top (a
// modal's backdrop, a tooltip) leaves the window movable, as AppKit's own title bar would be.
let on_control =
@@@ -100,7 -100,7 +100,7 @@@
}
fn movable_id() -> egui::Id {
-- egui::Id::new("title_bar_window_movable")
++ egui::Id::unique("title_bar_window_movable")
}
/// Whether AppKit may move the window when a drag starts in the title-bar band: false while the
diff --cc crates/ui-egui/src/toolbar.rs
index 6b7d2c1c2,6b7d2c1c2..a6b03f668
--- a/crates/ui-egui/src/toolbar.rs
+++ b/crates/ui-egui/src/toolbar.rs
@@@ -15,7 -15,7 +15,7 @@@ pub fn show(app: &mut DesignApp, ui: &m
let frame = egui::Frame::NONE.fill(t.panel).stroke(Stroke::new(1.0, t.divider));
// A single column that doesn't fit the window's height becomes two, without changing the
// preference; whatever two columns still can't fit scrolls.
-- let single_h_id = egui::Id::new("tools_single_column_height");
++ let single_h_id = egui::Id::unique("tools_single_column_height");
let single_h: Option<f32> = ui.data(|d| d.get_temp(single_h_id));
let viewport_h = ui.available_height() - frame.total_margin().sum().y;
let crowded = !app.ui.tools_double_column && single_h.is_some_and(|h| h > viewport_h);
@@@ -101,7 -101,7 +101,7 @@@
}
// The release that ends a hold which opened the flyout isn't a click
// on the tool (egui reports releases within 0.8 s as clicks).
-- let hold_id = egui::Id::new(("flyout_hold", gi));
++ let hold_id = egui::Id::unique(("flyout_hold", gi));
let ended_hold = resp.clicked() && ui.data_mut(|d| d.remove_temp::<bool>(hold_id)).unwrap_or(false);
if resp.clicked() && !ended_hold {
chosen = Some(shown.id);
@@@ -131,7 -131,7 +131,7 @@@
}
if app.ui.flyout == Some(gi) {
let pos = resp.rect.right_top() + vec2(4.0, 0.0);
-- egui::Area::new(egui::Id::new(("flyout", gi))).order(egui::Order::Foreground).fixed_pos(pos).show(
++ egui::Area::new(egui::Id::unique(("flyout", gi))).order(egui::Order::Foreground).fixed_pos(pos).show(
ui.ctx(),
|ui| {
egui::Frame::popup(ui.style()).show(ui, |ui| {
@@@ -166,7 -166,7 +166,7 @@@
t.text_dim,
);
}
-- row.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl.label));
++ row.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tl.label));
if row.clicked() {
chosen = Some(tl.id);
}
@@@ -195,7 -195,7 +195,7 @@@
&& chosen.is_none()
&& !opened_now
{
-- let area = ui.ctx().memory(|m| m.area_rect(egui::Id::new(("flyout", gi))));
++ let area = ui.ctx().memory(|m| m.area_rect(egui::Id::unique(("flyout", gi))));
let outside = ui.input(|i| i.pointer.any_pressed() && i.pointer.interact_pos().is_some_and(|p| area.is_none_or(|a| !a.contains(p))));
let esc = ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape));
if outside || esc {
@@@ -241,7 -241,7 +241,7 @@@ fn fill_stroke_proxy(app: &mut DesignAp
let def = egui::Rect::from_min_size(egui::pos2(x0, row.min.y), vec2(10.0, 10.0));
icons::paint(ui.painter(), def, "default-colors", t.icon);
if ui
-- .interact(def, ui.id().with("proxy_default"), Sense::click())
++ .interact(def, ui.scope_id().with("proxy_default"), Sense::click())
.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Default Fill and Stroke (D)"));
})
@@@ -252,7 -252,7 +252,7 @@@
let swap = egui::Rect::from_min_size(egui::pos2(x0 + 19.0, row.min.y), vec2(11.0, 11.0));
icons::paint(ui.painter(), swap, "swap", t.icon);
if ui
-- .interact(swap, ui.id().with("proxy_swap_btn"), Sense::click())
++ .interact(swap, ui.scope_id().with("proxy_swap_btn"), Sense::click())
.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Swap Fill and Stroke (Shift+X)"));
})
@@@ -297,15 -297,15 +297,15 @@@
paint_fill(p);
}
let fill_tip = crate::i18n::tr(&app.ui.language, "Fill (X)");
-- let fresp = ui.interact(fill_r, ui.id().with("proxy_fill"), Sense::click()).on_hover_ui(|ui| {
++ let fresp = ui.interact(fill_r, ui.scope_id().with("proxy_fill"), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, fill_tip);
});
-- fresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, fill_tip));
++ fresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, fill_tip));
let stroke_tip = crate::i18n::tr(&app.ui.language, "Stroke (X)");
-- let sresp = ui.interact(stroke_r.translate(vec2(0.0, 0.0)), ui.id().with("proxy_stroke"), Sense::click()).on_hover_ui(|ui| {
++ let sresp = ui.interact(stroke_r.translate(vec2(0.0, 0.0)), ui.scope_id().with("proxy_stroke"), Sense::click()).on_hover_ui(|ui| {
crate::rtl::label(ui, stroke_tip);
});
-- sresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, stroke_tip));
++ sresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, stroke_tip));
if fresp.clicked() || sresp.clicked() {
let front =
if stroke_front { !fresp.clicked() } else { sresp.clicked() && !fill_r.contains(sresp.interact_pointer_pos().unwrap_or_default()) };
@@@ -334,7 -334,7 +334,7 @@@
}
icons::paint(ui.painter(), r.shrink(1.5), icon, if on { t.text_strong } else { t.icon });
if ui
-- .interact(r, ui.id().with(("proxy_fmt", k)), Sense::click())
++ .interact(r, ui.scope_id().with(("proxy_fmt", k)), Sense::click())
.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
})
@@@ -373,8 -373,8 +373,8 @@@
for (k, (tip, id)) in applies.into_iter().enumerate() {
let c = egui::pos2(row.min.x + width / 2.0 + (k as f32 - 1.0) * pitch, row.center().y);
let r = egui::Rect::from_center_size(c, vec2(18.0, 18.0));
-- let resp = ui.interact(r, ui.id().with(("proxy_apply", k)), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(&app.ui.language, tip)));
++ let resp = ui.interact(r, ui.scope_id().with(("proxy_apply", k)), Sense::click());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(&app.ui.language, tip)));
if k == front_kind {
ui.painter().rect(r, 2.0, t.well, Stroke::new(1.0, t.well_rim), StrokeKind::Outside);
}
@@@ -391,8 -391,8 +391,8 @@@
} else {
let well = egui::Rect::from_center_size(egui::pos2(row.min.x + width / 2.0, row.center().y), vec2(28.0, 21.0));
let (tip, id) = applies[front_kind];
-- let resp = ui.interact(well, ui.id().with("proxy_apply"), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(&app.ui.language, tip)));
++ let resp = ui.interact(well, ui.scope_id().with("proxy_apply"), Sense::click());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(&app.ui.language, tip)));
let resp = resp.on_hover_ui(|ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
});
@@@ -460,13 -460,13 +460,13 @@@
flyout_triangle(ui.painter(), other, t.icon);
let tr = |s: &str| crate::i18n::tr(&app.ui.language, s).to_string();
let (normal_tip, other_tip) = (tr("Normal"), format!("{} (W)", tr("Preview")));
-- let resp = ui.interact(normal, ui.id().with("screen_normal"), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &normal_tip));
++ let resp = ui.interact(normal, ui.scope_id().with("screen_normal"), Sense::click());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &normal_tip));
if resp.on_hover_text(&normal_tip).clicked() {
let _ = app.run("view.screenMode", json!({"mode": "normal"}));
}
-- let resp = ui.interact(other, ui.id().with("screen_mode"), Sense::click());
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &other_tip));
++ let resp = ui.interact(other, ui.scope_id().with("screen_mode"), Sense::click());
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &other_tip));
let resp = resp.on_hover_text(&other_tip);
if resp.clicked() {
let _ = app.run("view.screenMode", json!({"mode": "preview"}));
@@@ -482,7 -482,7 +482,7 @@@
return;
}
let well = egui::Rect::from_center_size(egui::pos2(row.min.x + width / 2.0, row.center().y), vec2(28.0, 21.0));
-- let resp = ui.interact(well, ui.id().with("screen_mode"), Sense::click());
++ let resp = ui.interact(well, ui.scope_id().with("screen_mode"), Sense::click());
ui.painter().rect(well, 2.0, t.well, Stroke::new(1.0, t.well_rim), StrokeKind::Outside);
let preview = mode == crate::ScreenMode::Preview;
icons::paint(
@@@ -550,7 -550,7 +550,7 @@@ fn tool_button(ui: &mut egui::Ui, icon
}
icons::paint(ui.painter(), egui::Rect::from_center_size(r.center(), egui::vec2(17.0, 17.0)), icon, if active { t.text_strong } else { t.icon });
let enabled = ui.is_enabled();
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, enabled, tip));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, enabled, tip));
resp.on_hover_ui(|ui| {
crate::rtl::label(ui, tip);
})
diff --cc crates/ui-egui/src/widgets.rs
index fb9876aa2,e820e21a8..01877304c
--- a/crates/ui-egui/src/widgets.rs
+++ b/crates/ui-egui/src/widgets.rs
@@@ -71,6 -71,6 +71,7 @@@ impl NumKind<'_>
/// A numeric field. Build with [`NumField::measure`] / [`NumField::number`], then [`NumField::show`].
pub struct NumField<'a> {
id: &'a str,
++ name: Option<&'a str>,
value: Option<f64>,
kind: NumKind<'a>,
width: f32,
@@@ -90,8 -94,21 +95,39 @@@ impl<'a> NumField<'a>
Self::new(id, value, NumKind::Number { suffix, decimals })
}
fn new(id: &'a str, value: Option<f64>, kind: NumKind<'a>) -> Self {
- NumField { id, value, kind, width: 72.0, spinner: false, presets: &[], step: None, range: (f64::MIN, f64::MAX), enabled: true, parens: false }
+ NumField {
+ id,
++ name: None,
+ value,
+ kind,
+ width: 72.0,
+ spinner: false,
+ presets: &[],
+ step: None,
+ range: (f64::MIN, f64::MAX),
+ enabled: true,
+ parens: false,
+ label: None,
+ empty: None,
+ }
+ }
++ /// The field's user-facing name, independent of its stable internal ID.
++ pub fn name(mut self, name: &'a str) -> Self {
++ self.name = Some(name);
++ self
++ }
++ /// The editor is labelled by widget `id` (an icon or caption that names the field), so
++ /// assistive technology reads the field's name with its value.
++ pub fn labelled_by(mut self, id: egui::Id) -> Self {
++ self.label = Some(id);
++ self
++ }
++ /// An unset value shows `text` (dimmed), and the preset menu offers it first: picking it, or
++ /// emptying the field, commits `Some(None)` from [`NumField::show_or_clear`].
++ pub fn empty_text(mut self, text: &'a str) -> Self {
++ self.empty = Some(text);
++ self
+ }
/// Total width (spinner and preset segments included).
pub fn width(mut self, w: f32) -> Self {
self.width = w;
@@@ -141,7 -171,7 +177,8 @@@
/// values that may be unset, like a character style's attributes).
pub fn show_or_clear(self, ui: &mut Ui) -> Option<Option<f64>> {
let t = Tokens::get(ui.ctx());
-- let key = ui.id().with(self.id);
++ let name = self.name.unwrap_or(self.id);
++ let key = ui.scope_id().with(self.id);
let (rect, _) = ui.allocate_exact_size(vec2(self.width, FIELD_H), Sense::hover());
let step = self.step.unwrap_or_else(|| self.kind.step());
let clamp = |v: f64| v.clamp(self.range.0, self.range.1);
@@@ -175,6 -205,6 +212,15 @@@
[pos2(c.x, c.y + b), pos2(c.x + 4.0, c.y + a * 0.6)],
Stroke::new(1.0, if self.enabled { t.icon } else { t.text_disabled }),
);
++ // The two spinner halves are real inputs: name them for screen readers and strict
++ // accessibility checks, which would otherwise see unnamed clickable nodes.
++ resp.widget_info(|| {
++ egui::WidgetInfo::labeled(
++ egui::Role::Button,
++ self.enabled,
++ format!("{} {}", if dir > 0.0 { "Increase" } else { "Decrease" }, name),
++ )
++ });
if resp.clicked() {
let mul = if ui.input(|i| i.modifiers.shift) { 10.0 } else { 1.0 };
out = Some(clamp(self.value.unwrap_or(0.0) + dir * step * mul));
@@@ -186,9 -216,9 +232,10 @@@
if !self.presets.is_empty() {
let seg = Rect::from_min_max(pos2(rect.max.x - SEG_W, rect.min.y), rect.max);
text_rect.max.x = seg.min.x;
-- let resp = ui.interact(seg, key.with("presets"), Sense::click());
-- ui.painter().rect_filled(seg, 0.0, if resp.hovered() { t.hover } else { t.input });
-- chevron_down(ui.painter(), seg.center(), t.icon);
++ let resp = ui.interact(seg, key.with("presets"), if self.enabled { Sense::click() } else { Sense::hover() });
++ ui.painter().rect_filled(seg, 0.0, if resp.hovered() && self.enabled { t.hover } else { t.input });
++ chevron_down(ui.painter(), seg.center(), if self.enabled { t.icon } else { t.text_disabled });
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, self.enabled, format!("{name} presets")));
preset_resp = Some(resp);
}
// Value.
@@@ -200,7 -230,10 +247,10 @@@
.font(label_font())
.text_color(fg)
.margin(egui::Margin::ZERO)
-- .vertical_align(egui::Align::Center);
++ .align(egui::Align2::LEFT_CENTER);
+ if let Some(empty) = self.empty {
+ te = te.hint_text(egui::RichText::new(empty).font(label_font()).color(t.text_dim));
+ }
// The field already allocated its slot. A scoped allocation here would consume another
// grid cell and enlarge toolbar rows; the value editor must stay inside that same slot.
let value_rect = Rect::from_min_max(text_rect.min + vec2(5.0, 1.0), text_rect.max - vec2(1.0, 1.0));
@@@ -209,7 -242,11 +259,11 @@@
if !self.enabled {
editor_ui.disable();
}
-- let r = editor_ui.put(value_rect, te);
++ let r = editor_ui.put(value_rect, te).accessible_name(name);
+ let r = match self.label {
+ Some(id) => r.labelled_by(id),
+ None => r,
+ };
if r.has_focus() {
// ↑/↓ step the value while typing.
let (up, down, shift) = ui.input_mut(|i| {
@@@ -250,9 -293,15 +310,17 @@@
if !self.presets.is_empty() {
p.line_segment([pos2(rect.max.x - SEG_W, rect.min.y), pos2(rect.max.x - SEG_W, rect.max.y)], Stroke::new(1.0, t.field_border));
}
-- if let Some(resp) = preset_resp {
++ if let Some(resp) = preset_resp
++ && self.enabled
++ {
egui::Popup::menu(&resp).show(|ui| {
ui.set_min_width(self.width);
+ if let Some(empty) = self.empty
+ && ui.selectable_label(self.value.is_none(), empty).clicked()
+ {
+ cleared = self.value.is_some();
+ ui.close();
+ }
for v in self.presets {
if ui.selectable_label(self.value.is_some_and(|c| (c - v).abs() < 1e-9), self.kind.format(*v)).clicked() {
out = Some(*v);
@@@ -290,6 -339,6 +358,16 @@@ pub fn chevron_down(p: &egui::Painter,
p.line_segment([pos2(c.x, c.y + 2.0), pos2(c.x + 4.0, c.y - 2.0)], Stroke::new(1.0, col));
}
++/// Name a combo box for screen readers and tests.
++///
++/// `egui::ComboBox` announces its current value, not the field it belongs to, so every combo box
++/// is otherwise an unnamed input. Pass the visible caption (or a semantic name when a painted
++/// caption has no text node of its own).
++pub fn name_combo<R>(combo: egui::InnerResponse<Option<R>>, name: impl Into<String>) -> egui::InnerResponse<Option<R>> {
++ let egui::InnerResponse { inner, response } = combo;
++ egui::InnerResponse { inner, response: response.accessible_name(name) }
++}
++
/// A dropdown box (field style, ⌄ segment on the right). Returns the response; open a popup on it
/// with [`egui::Popup::menu`].
pub fn dropdown(ui: &mut Ui, text: &str, width: f32) -> Response {
@@@ -307,6 -356,6 +385,8 @@@ pub fn dropdown_h(ui: &mut Ui, text: &s
chevron_down(p, seg.center(), t.icon);
let clip = Rect::from_min_max(r.min, pos2(seg.min.x - 2.0, r.max.y));
p.with_clip_rect(clip).text(pos2(r.min.x + 7.0, r.center().y), egui::Align2::LEFT_CENTER, text, label_font(), t.text);
++ // A painted, clickable box is otherwise an unidentified input; it opens a choice list.
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, ui.is_enabled(), text));
resp
}
@@@ -341,7 -390,7 +421,7 @@@ pub fn outline_button(ui: &mut Ui, labe
p.rect_stroke(r, 2.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
crate::rtl::paint(p, r.center(), egui::Align2::CENTER_CENTER, label, label_font(), t.text);
// Screen readers (and tests) find it by its label.
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, label));
resp
}
@@@ -372,7 -421,7 +452,7 @@@ pub fn link_label(ui: &mut Ui, text: &s
ui.painter().galley(pos, g, t.text);
let y = r.center().y + 6.5;
ui.painter().line_segment([pos2(r.min.x, y), pos2(r.min.x + w, y)], Stroke::new(1.0, if resp.hovered() { t.text_strong } else { t.text_dim }));
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Link, true, text));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Link, true, text));
resp.on_hover_cursor(egui::CursorIcon::PointingHand)
}
@@@ -381,7 -430,9 +461,9 @@@ pub fn more_options(ui: &mut Ui, langua
let t = Tokens::get(ui.ctx());
let (row, _) = ui.allocate_exact_size(vec2(ui.available_width(), 14.0), Sense::hover());
let r = Rect::from_min_max(pos2(row.max.x - 26.0, row.min.y), pos2(row.max.x - 4.0, row.max.y));
-- let resp = ui.interact(r, ui.id().with(("more", row.min.y as i32)), Sense::click());
++ let resp = ui.interact(r, ui.scope_id().with(("more", row.min.y as i32)), Sense::click());
+ let label = crate::i18n::tr(language, "More Options");
- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), label));
for i in 0..3 {
ui.painter().circle_filled(pos2(r.min.x + 4.0 + i as f32 * 7.0, r.center().y), 1.9, if resp.hovered() { t.text_strong } else { t.icon });
}
@@@ -401,7 -452,7 +483,7 @@@ pub fn caption_w(ui: &mut Ui, s: &str,
let t = Tokens::get(ui.ctx());
let (r, resp) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
// Painted, so tell screen readers (and UI tests) what it says.
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, s));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, s));
crate::rtl::paint(ui.painter(), pos2(r.max.x - 2.0, r.center().y), egui::Align2::RIGHT_CENTER, s, egui::FontId::proportional(11.5), t.text);
}
@@@ -422,7 -473,7 +504,7 @@@ pub fn section(ui: &mut Ui, title: &str
let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 16.0), Sense::hover());
crate::rtl::paint(ui.painter(), r.left_center(), egui::Align2::LEFT_CENTER, title, egui::FontId::proportional(11.5), t.text_strong);
// Screen readers hear the section's title.
-- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, title));
++ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, title));
ui.add_space(3.0);
true
}
@@@ -539,7 -590,7 +621,7 @@@ pub fn icon_toggle_sized(ui: &mut Ui, i
let s = (size.y - 4.0).min(17.0);
crate::icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(s, s)), icon, if on { t.text_strong } else { t.icon });
// Named by its tooltip, for screen readers.
-- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, tip));
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, tip));
if tip.is_empty() {
resp
} else {
@@@ -567,6 -618,8 +649,8 @@@ pub fn checkbox(ui: &mut Ui, on: &mut b
*on = !*on;
resp.mark_changed();
}
- let checked = *on;
- resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Checkbox, true, checked, label));
++ // A painted check box must still report its role, label and toggled state.
++ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, ui.is_enabled(), *on, label));
resp
}
@@@ -578,7 -631,7 +662,7 @@@ pub fn segmented(ui: &mut Ui, labels: &
let mut out = None;
for (i, l) in labels.iter().enumerate() {
let sr = Rect::from_min_size(pos2(r.min.x + w * i as f32, r.min.y), vec2(w, BUTTON_H));
-- let resp = ui.interact(sr, ui.id().with(("seg", l)), Sense::click());
++ let resp = ui.interact(sr, ui.scope_id().with(("seg", l)), Sense::click());
if i == active {
ui.painter().rect_filled(sr, 0.0, t.well);
} else if resp.hovered() {
@@@ -754,6 -807,6 +838,36 @@@ mod tests
assert_eq!(m.parse("1p0+0p6"), Some(18.0));
assert_eq!(m.step(), 1.0);
}
++
++ #[test]
++ fn disabled_numeric_presets_are_disabled_and_do_not_open() {
++ use egui_kittest::kittest::{NodeT, Queryable};
++
++ const PRESETS: &[f64] = &[0.0, 50.0, 100.0];
++ let mut h = egui_kittest::Harness::builder().with_size(vec2(420.0, 240.0)).build_ui(|ui| {
++ assert!(NumField::number("Opacity", Some(50.0), "%", 0).presets(PRESETS).enabled(false).show(ui).is_none());
++ });
++ h.run_steps(2);
++ assert!(h.get_by_label("Opacity presets").accesskit_node().is_disabled());
++ h.get_by_label("Opacity presets").click();
++ h.run_steps(3);
++ assert!(!egui::Popup::is_any_open(&h.ctx), "a disabled preset button must not open its menu");
++ h.check_accessibility();
++ }
++
++ /// Strict accessibility: every input in these fields is named and reports the right role.
++ #[test]
++ fn numeric_dropdown_and_checkbox_inputs_have_accessible_names_and_roles() {
++ const PRESETS: &[f64] = &[0.0, 50.0, 100.0];
++ let mut h = egui_kittest::Harness::builder().with_size(vec2(420.0, 240.0)).build_ui(|ui| {
++ let _ = NumField::number("Opacity", Some(50.0), "%", 0).spinner().presets(PRESETS).show(ui);
++ let _ = dropdown(ui, "Paragraph Styles", 160.0);
++ let mut on = true;
++ let _ = checkbox(ui, &mut on, "Preview");
++ });
++ h.run_steps(2);
++ h.check_accessibility();
++ }
}
/// `img` made to fit the GPU's largest texture (`max_side` pixels a side), sampled down
diff --cc crates/ui-egui/tests/it/color_profiles_restart.rs
index ad7ebcc75,ad7ebcc75..e84022b6f
--- a/crates/ui-egui/tests/it/color_profiles_restart.rs
+++ b/crates/ui-egui/tests/it/color_profiles_restart.rs
@@@ -6,9 -6,9 +6,13 @@@ use designcraft_engine::Session
use designcraft_ui_egui::{DesignApp, Services, UiState};
use serde_json::json;
--/// The app's first frame, where saved settings are applied.
++/// The app's first frame, where saved settings are applied: the host's `logic` tick and the
++/// first real `run_ui` pass (where fonts, theme and colour settings are installed).
fn start(app: &mut DesignApp) {
-- let mut out = egui::Context::default().run_ui(egui::RawInput::default(), |ui| app.logic(&ui.ctx().clone()));
++ let mut out = egui::Context::default().run_ui(egui::RawInput::default(), |ui| {
++ app.logic(&ui.ctx().clone());
++ app.ui(ui);
++ });
out.textures_delta.clear();
}
diff --cc docs/egui-037-migration-plan.md
index 000000000,000000000..dc76b9265
new file mode 100644
--- /dev/null
+++ b/docs/egui-037-migration-plan.md
@@@ -1,0 -1,0 +1,1422 @@@
++# egui 0.37 migration plan for DesignCraft
++
++Status: planning only. No production change, build, test, GUI run, browser run, benchmark,
++push, pull request or publication was performed while writing this document. Every future test
++or build runs through `maintenance/task.py run/status/finish` with its own task, source and
++evidence; never run a build directly. Every future push or new pull request needs fresh explicit
++human approval after the exact contents and validation are shown. The contributor credit
++preference remains username-only (`@skylartaylor`); do not add display or real names or any
++agent/model/tool attribution.
++
++This plan covers only `storytold/designcraft`. It records the work needed to move the
++DesignCraft desktop, web and UI crates from the current coherent 0.36.2 dependency set to
++egui 0.37.0, the final reviewed suite fork and the matching final reviewed winit revision.
++Shared-library work remains in `storytold/craft-libs`; this plan consumes it but does not
++redefine it. Candidate `aiongg` revisions below are comparison inputs only. A production
++manifest must name the final reviewed `storytold` revisions, which do not exist until the
++fork/winit/craft-libs publication is reviewed and approved.
++
++Capture acceptance follows the suite contract: a queued-not-issued hidden request and
++each settling frame must request `RequestPaintWhileHidden` from logic; only an issued
++screenshot command forces paint itself. Callback arrival has no implicit wake, so the
++live request owns the viewport waker. Record known issuance UI bounds and a geometry
++epoch, reject/retry any intervening resize/DPI/zoom/surface change even if it changes
++back, and derive pixel scale from returned dimensions only under an unchanged epoch.
++Default limits are 4 requests, 128 MiB/image and 256 MiB aggregate. Count reserved
++in-flight and completed images together.
++
++
++## 1. Baseline and provenance
++
++### 1.1 Exact source baseline
++
++| Item | Value |
++| --- | --- |
++| DesignCraft checkout | `/home/codex/work/CraftApps/egui037-migration-20261022/designcraft` |
++| Baseline commit | `e74208dd7e0c801d15dfdf926d64cfe5e3b346d3` (`Merge pull request #1642 from aiongg/ci-speed`) |
++| Workspace version / edition / MSRV | `0.12.0` / edition 2024 / Rust 1.95 |
++| Lockfile | `Cargo.lock`, format version 4 |
++| Current egui family | `egui`, `epaint`, `ecolor`, `emath`, `eframe`, `egui-wgpu`, `egui-winit`, `egui_kittest`, `epaint_default_fonts` all `0.36.2` from crates.io |
++| Current winit | `git+https://github.com/storytold/winit.git?rev=3d51077fd1a966f84df9ef287839dc84fd5b4ca7` (0.30.13, W1–W14) |
++| Current `craft-ui` | `git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51...` |
++| Upstream egui 0.37.0 | `841a328ba2dd8f6996beb7189ebb7fc00e668a2a` (release commit, not the annotated-tag object) |
++| Candidate egui fork (comparison only) | `aiongg/egui` `craft/0.37` = `a4f9a17f64a6bae61350fb85804c9df0d9865916` (E1–E21; E21b/P7b still to be added) |
++| Candidate winit (comparison only) | `aiongg/winit` `craft/0.30.13-lang` = `8b35388bd719e8cc86a95971ba0bc026c9a8f058` (W1–W27; W15P still to be added) |
++| Final storytold egui pin | **Unknown until approved publication**: a reviewed immutable `storytold/egui` revision containing the complete P8 handoff: E1–E21, E21b/P7b, E4/P2b, P7 key pairing and P7c fixes. Never ship the candidate hash. |
++| Final storytold winit pin | **Unknown until approved publication**: a reviewed immutable `storytold/winit` revision containing W1–W27 plus native W15P PRIMARY. Never ship the candidate hash. |
++| Final `craft-ui` pin | **Unknown until approved publication**: `<FINAL_CRAFT_UI_REV>`, the reviewed CL-2F revision (including CL-1, and CL-3 if it has landed) derived from current craft-libs, not a PR head. D1 uses the reviewed CL-1 + CL-2 provisional revision as a pilot; CL-2F follows the DesignCraft/GridCraft adapter reviews. |
++| Published predecessor | `storytold/egui` `craft/0.36.2` = `767b1cad294120689a514bb4bd68c077e46679b9`; published `storytold/winit` = `ffae5198770d7730e718043f035a772b7dbc3b1b` |
++| craft-libs PR 199 | head `b68de8c5f4f1c060904d211a7b1320aa0f7bce78`; audit tree `ec8840af8c5fda695cf195cdd05e5ae078415c07`. Both are **stale trees, not bases**: they omit `crates/platform` and revert current security/settings/docking/printer fixes. Apply only the API-port hunks from `8614e4a04fae516fba16c22b31ff1008cb6be10b` (and relevant README changes from `1764bca`) onto current craft-libs `49190884278f16c9a9f5823d7698a8ffb5deb062`. |
++| Related language work | `storytold/craft-libs#198`, delivered through fork E5/E9/E12–E17/E19–E21, E21b and winit W17–W27 plus W15P |
++
++Authoritative lifecycle evidence for this plan is
++`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md`.
++It was checked against upstream `841a328b` and candidate `a4f9a17f`: both native
++`EpiIntegration::update` and web `AppRunner::logic` call `app.logic` then `app.ui` inside
++`Context::run_ui`, so `App::logic` can run once per layout pass in both hosts. After a normally
++completed `run_ui`, `current_pass_index()` is zero even after multiple passes. `run_logic` does
++not restore an old index. `ViewportInfo::visible()` is a method derived from `minimized`/
++`occluded`; it is not a callback-phase signal, and `None` means unknown.
++
++The IME gap is recorded in
++`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/ime-surrounding-gap.md`. The
++candidate never calls W27 `set_ime_surrounding_text`, and `IMEOutput` has no logical text. E21b/P7b
++is a required new change, not existing capability.
++
++The historical compiler diagnostics at
++`/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/designcraft.errors`
++are clues only. They were produced against an earlier prepare state, their counts are not
++acceptance, and the current source may differ. They do show the first API breaks: missing
++`Event::source`, removed `egui::UserData`/`Event::Screenshot`, renamed roles in
++`new_document.rs`, `font_menu.rs`, `panels/*`, and `FontData` blob typing in `theme.rs`.
++
++### 1.2 Packages, binaries, examples and feature targets
++
++| Target | Kind | Relevant manifest | Notes |
++| --- | --- | --- | --- |
++| `designcraft-ui-egui` | library | `crates/ui-egui/Cargo.toml` | The swappable L6 UI. Production depends on `craft-ui`, `egui`; dev depends on `egui_kittest` (`wgpu`, `snapshot`) and `designcraft-fonts` (`testing`). D1 adds an explicit `egui/default_fonts` dev feature (see §3.7). Build script only bakes contributor credits. |
++| `designcraft` | binary | `apps/designcraft/Cargo.toml` | eframe features `default_fonts`, `wgpu`, `accesskit`, `wayland`, `x11`, `links`. D1 adds `clipboard` to preserve Copy/Cut and Paste on 0.37 (0.36.2 forced it through eframe; see §3.5). Native-only `rfd`, `arboard`, `winit`; macOS `muda`, `objc2*`, `fmv-macos-events`; Windows `winsafe`. |
++| `designcraft-web` | wasm binary | `apps/designcraft-web/Cargo.toml` | `eframe` features `default_fonts`, `wgpu`, `accesskit`; `rfd`, `wasm-bindgen`, `web-sys`; `trunk` build. Browser clipboard/drop paths are web-specific. |
++| `designcraft-cli` | binary | `apps/designcraft-cli/Cargo.toml` | No egui/eframe/winit/rfd; headless and MCP. |
++| `ui_shot` | example | `crates/ui-egui/examples/ui_shot.rs` | `egui_kittest::Harness` with wgpu at 1440×900, 2×; drives control requests and saves whole-window PNGs. It steps one UI pass per `harness.step()` and is not native presentation evidence. |
++| `xtask` | workspace tool | `xtask/Cargo.toml` | `cargo xtask ci`, `wasm`, `layers`, `assets`, `pdf-deps`, `test`, `stats`, `parity`. |
++
++There are 22 workspace manifests (`Cargo.toml` plus `apps/*` and `crates/*`), no nested
++workspace, no `vendor/` directory, no examples or benchmarks that use egui other than
++`ui_shot`, and no `[[bench]]`, `[[test]]` or `[[example]]` entries in any manifest. The only
++workspace patch section is the root `[patch.crates-io]` in `Cargo.toml`.
++
++Relevant platform cfgs:
++
++| Cfg | Files | What must remain true |
++| --- | --- | --- |
++| `target_arch = "wasm32"` | `apps/designcraft-web/src/{main,web}.rs`, `crates/ui-egui/src/lib.rs` (`now_ms`, recovery, render worker) | Browser entry point and async file/drop/download paths build and run; native-only recovery, dropped-file paths and render worker stay out. |
++| `not(target_arch = "wasm32")` | `crates/ui-egui/src/lib.rs`, `apps/designcraft/Cargo.toml` | Native recovery, `arboard`, `rfd`, control server, `winit` and the enabled clipboard path keep compiling. |
++| `unix` and `not(target_os = "macos")` | `apps/designcraft/src/main.rs` X11 event-loop builder | XWayland selection and file drops still work; `winit` pin changes do not remove `EventLoopBuilderExtX11`. |
++| `windows` | `apps/designcraft/{Cargo.toml,src/gpu.rs}`, `build.rs` | `winsafe` display-GPU query and Windows resource build remain; DX12 backend selection and `WgpuError` fallback are tested. |
++| `target_os = "macos"` | `apps/designcraft/src/{main,native_menu,mac_window,apple_events}.rs`, `crates/fonts` CoreText | Native menu, Apple events, `movable_by_window_background`, IME marked-text discard and cancelable termination keep their winit W12/W14/W22/W26 behavior. |
++| X11/Wayland | `egui-winit` clipboard path, `apps/designcraft/src/main.rs` | D1 enables the explicit clipboard feature; D3 adds E4/W15P native PRIMARY on the winit data device. One regular data device only; password exclusion and unchanged-selection policy preserved. |
++| `cfg(test)` / `cfg(all(test, unix))` | `crates/ui-egui/src/*`, `apps/designcraft/src/main.rs` | Test-only counters and atomic-writer tests do not leak into release; kittest strict names and missing-glyph policy are explicit. |
++
++### 1.3 Current CI and validation commands
++
++All future commands below run through `maintenance/task.py run` with a unique `--job-id`, the
++owning `--task`, exact `--source` and durable `--evidence`; inspect with `status` and complete
++with `finish` after reviews.
++
++- `cargo xtask ci`: `fmt --all -- --check`, `pdf-deps`, `clippy --workspace --all-targets --
++ -D warnings`, `nextest run --workspace --lib --bins --tests` (or `cargo test`), doctests,
++ `assets`, `layers`, `wasm`.
++- `cargo xtask wasm`: one `cargo check --target wasm32-unknown-unknown --keep-going` over
++ L0–L5 plus `designcraft-ui-egui`.
++- `cargo test -p designcraft-ui-egui --lib` is the package-scoped UI row. It must run with the
++ explicit `egui/default_fonts` dev feature and with `theme::install_fonts` before layout.
++- Clean-checkout dependency gate: after publication, a fresh clone runs
++ `cargo fetch --locked` and `cargo metadata --locked --format-version 1` against the final
++ storytold revisions. A missing/unreachable revision or a machine-local path fails the gate.
++- CI workflow `.github/workflows/ci.yml` runs `cargo xtask ci` on Ubuntu 24.04 with pinned
++ craft-fonts `abb83316d96aa59c1cf64784289e378fe9fa5695`, nextest, and the apt/winit build
++ dependencies.
++- `windows-arm64.yml` packages and installs ARM64; `freebsd.yml` runs the workspace in a
++ FreeBSD VM; `release.yml` uses the shared release workflow.
++- Manual UI evidence: `cargo run --release -p designcraft -- --sample --control 7979`,
++ control requests, `ui.screenshot`, and `cargo run -p designcraft-ui-egui --example ui_shot
++ -- script.jsonl` for offscreen whole-window screenshots.
++- Native/browser workflows are listed in §6.4; `ui_shot` alone is not native focus, IME,
++ picker, clipboard or browser-presentation evidence.
++- There is no performance benchmark target today. `ui.inspect` exposes
++ `perf.frameMs`, `perf.renderMs`, `perf.fps`, `perf.patches`; `perf.frameMs` uses
++ `now_ms()` (`SystemTime` on native, `0.0` on wasm) and is not a monotonic acceptance
++ timer. §7 defines the test-only raw-sample harness.
++
++## 2. What 0.37 changes that actually affects DesignCraft
++
++DesignCraft already uses `eframe::App::logic`/`App::ui` and a root `Ui` on 0.36.2. The
++0.37 migration must preserve that structure; it is not a reason to rewrite panels into
++`Context::root_ui` calls or to move every action out of `logic`.
++
++| 0.37 change | Source anchor | DesignCraft impact |
++| --- | --- | --- |
++| `Event::MouseWheel` gains `source: MouseWheelSource` | `egui/src/data/input/event.rs`, `MouseWheelSource` | Every synthetic wheel event in tests must set `source` (`Unknown` for most; `Wheel`/`Trackpad`/`Momentum` where the behavior under test depends on it). Production matching already uses `..`, but the canvas's Alt-wheel state machine must be rechecked. |
++| `Event::Screenshot` and `egui::UserData` are removed; `ViewportCommand::Screenshot(ScreenshotCallback)` | `egui/src/data/screenshot_callback.rs`, `viewport.rs`; upstream #8489 | `ScreenshotCallback` is one-shot and does not repaint. Replace token/`UserData` correlation with a per-request completion slot owned by the request record and a weak callback; see §3.4. |
++| `WidgetType` is replaced by `accesskit::Role` (`egui::Role`); alias deprecated | `egui/src/lib.rs` compatibility table; #8555 | Map `SelectableLabel` → `Button`, `TextEdit` → `TextInput`, `CheckBox` → `CheckBox`, `Other` → `Unknown`. The full file list is in §3.7: `new_document.rs`, `panels/font_menu.rs`, `panels/pages.rs`, `panels/mod.rs`, `panels/styles.rs`, `panels/cell_stroke.rs`, `panels/properties.rs`, `panels/swatches.rs`, `panels/layers.rs`, `object_control.rs`, `widgets.rs`, `toolbar.rs`, `chrome.rs`, `taskbar.rs`, `icons.rs`, `dialogs.rs`. |
++| `Id::new` deprecated for `Id::unique`; `Ui::id` renamed `Ui::scope_id`; `UiBuilder::id` renamed `scope_id` | `egui/src/id.rs`, `egui/src/ui.rs`; #8534/#8542/#8586 | Mechanical but warning-sensitive because `clippy -D warnings` treats deprecations as failures. Use `Id::unique` for root IDs and `scope_id` for child scopes. Do not change the hashed values: `Id::new` now delegates to `Id::unique`, so state keys remain stable. |
++| `Panel` constructors take `impl AsIdSalt`; panel ID is `parent_ui.scope_id().with_salt(salt)`; `CentralPanel` remains last; root `Ui` is the normal app surface | `egui/src/containers/panel.rs`; #8592 | Existing `Panel::left("tools")`, `Panel::right("dock")`, etc. still type-check. Panel IDs are now parent-salted. DesignCraft does not persist egui memory (eframe persistence is off); update in-memory test lookup keys and retain the actual app-owned UiState/docking preferences. No PanelState migration is needed. Panel order must not change. `CentralPanel::default().show(ui, …)` is correct; `Context::root_ui` must not be called inside `App::ui`. |
++| `default_fonts` is no longer a default `egui`/`epaint` feature | `egui/Cargo.toml`; #8583 | `eframe` still enables it in the app, but `cargo test -p designcraft-ui-egui` does not build the app and `egui_kittest` disables egui defaults. Add `egui/default_fonts` explicitly to the ui crate's dev feature set and install DesignCraft fonts before layout; do not rely on workspace unification. |
++| `FontData.font` is now a shared `Blob` (`Arc<dyn AsRef<[u8]> + Send + Sync>`), not `Cow<[u8]>` | `epaint/src/text/font_data.rs` | Production struct-update code in `theme.rs` still works; tests that compare `data.as_ref()` must use `data.bytes()` or `data.font.as_ref().as_ref()`. This caused the historical `theme.rs:766/793` errors. |
++| `egui_kittest` fails unnamed input widgets and panics on missing glyphs by default | `egui_kittest/src/accessibility.rs`, `builder.rs`; #8589/#8601 | The first green stage must satisfy strict names/glyph policy, not disable it globally. D1 adds names/policy for the existing test surface; D4 completes coverage. Deliberate tofu fixtures use `HarnessBuilder::allow_missing_glyphs()` with a named reason. |
++| Native eframe can discover system fonts through `egui_system_font_provider`, and `NativeOptions::system_font_fallback` defaults true | `eframe/src/native/epi_integration.rs`; #8512 | DesignCraft already catalogs system fonts in `designcraft-fonts` with script-specific families and baseline tweaks. Set the option false and keep the feature off, or font order and line metrics change. Add the #8512 cold-start workload in §7. |
++| Clipboard is no longer forced on by eframe; `egui-winit` clipboard is an explicit feature | `eframe-0.36.2/Cargo.toml` target dep forces `egui-winit/clipboard`; `eframe-0.37.0/Cargo.toml` exposes `clipboard = ["egui-winit/clipboard"]` and depends on egui-winit with defaults off; `egui-winit-0.37.0/src/clipboard.rs` stores only in-process without arboard/smithay | 0.36.2 wrote Copy/Cut to the OS clipboard. On 0.37 without the feature, `ctx.copy_text` is in-process only and `RequestPaste` cannot read the OS clipboard. D1 enables `eframe/clipboard` to preserve native Copy/Cut/Paste, with the control-channel guard. D3 adds E4/W15P PRIMARY on the same winit data-device path. |
++| X11/Wayland PRIMARY selection is new in `egui-winit`, and the candidate's E4 path replaces arboard with winit's data device | `egui-winit/src/clipboard.rs`, `lib.rs`; #8428; E4 | Enabling clipboard makes PRIMARY reachable. The final fork must include E4 plus native W15P; test pointer- and keyboard-triggered ownership (including keyboard-only focus), serial freshness, owner/seat changes, empty/absent offers, self-paste, canceled/slow transfers on wlroots/KWin/Mutter, password exclusion and no second regular data device. |
++| `TextEdit` selection behavior changed on click-away | upstream #8763, unmerged PR #8764 | The fork owns the selected fix. Source audit finds no DesignCraft control that reads an egui `TextEdit` selection in the same pass: formatting acts on the engine `TextSel`; dialog/search buttons read buffers. The regression test documents stock 0.37 click-away behavior and asserts the app's engine selection/target is unchanged; if a future control reads `TextEdit` state, carry #8764 or defer the command with a tested app change. |
++| Text tessellation is reported ~60% slower for plain text | upstream #8731 | UI frame cost may rise even though layout is unchanged. The fix must keep color emoji correct; branch once per row, not clamp-only. Measure the fixed 120-label workload. |
++| DX12 pipeline creation is reported ~4× slower from `wrap_texel_coord` | upstream #8736 | Windows startup can get ~40 ms slower. Measure renderer/shader construction separately from first frame; do not call shader compile time UI performance. |
++| `#8748` hidden-parent/deferred-child is closed and unmerged | upstream #8748 | Do not assume hidden-window child viewport updates are fixed by 0.37. The fork owns a tested solution; DesignCraft must open/update/close its immediate second viewport while the parent is hidden/occluded/overdue, with unknown visibility (`visible() == None`) as well as `Some(false)`. |
++| `Context::root_ui`, `run_ui`, `run_pass`, `run_logic`; root `Ui` cannot be recursively entered; both native and web `App::logic` run per `run_ui` pass | `egui/src/context.rs`; `eframe/src/native/epi_integration.rs`; `eframe/src/web/app_runner.rs`; #8535; lifecycle audit | Use the passed `&mut Ui` in `DesignApp::ui`; use `run_ui` for UI tests and `run_logic` only for side-effect tests. Recursive `root_ui` panics. Do not use `visible()` as a logic/UI phase signal; a forced hidden paint is still a UI pass. |
++| Style defaults changed (roomier buttons, larger corner radius) | #8617/#8445 | Custom `Tokens` still drive most colors, but egui widget spacing/rounding inherited from `Visuals` can shift geometry. Visual baselines need an explained intended change, not a blind update. |
++| E21b/P7b outgoing IME surrounding text is missing | `IMEOutput`/`egui-winit` candidate source; `ime-surrounding-gap.md` | Add the bounded transient payload, built-in `TextEdit` producer and W27 Wayland adapter; DesignCraft's custom canvas editor supplies a real model/preedit/UTF-8 adapter, not `None`. |
++
++## 3. Source audit and concrete migration design
++
++### 3.1 Existing frame flow
++
++The desktop host implements `eframe::App` in `apps/designcraft/src/main.rs`:
++`App::logic` calls `startup.enter`, `take_notice`, the `frames == 2` presented check,
++`frames += 1`, startup error-log installation, macOS native menu/Apple-event polling, then
++`DesignApp::logic`; `App::ui` calls `DesignApp::ui`, then macOS IME/movable handling.
++`App::raw_input_hook` delegates to `DesignApp::raw_input_hook`. The web shell does the same
++in `apps/designcraft-web/src/web.rs`, with asynchronous drop-file reading and a graphics
++health check.
++
++Source facts that constrain the design (verified against the pinned trees):
++
++1. Native `EpiIntegration::update` (`eframe-0.37.0/src/native/epi_integration.rs:349-361`)
++ calls `Context::run_ui(raw_input, |ui| { app.logic(ui.ctx(), …); app.ui(ui, …) })`.
++ Web `AppRunner::logic` (`eframe-0.37.0/src/web/app_runner.rs:290-293`) does the same.
++ A multipass frame therefore calls host and app `logic` once per pass, not once per frame.
++2. `Context::run_logic` (`egui-0.37.0/src/context.rs:1174-1202`) only refreshes viewport/
++ window/focus input; events and time stay from the previous UI pass.
++3. `run_dyn` passes `new_input.take()` to each `begin_pass`; the second pass has no raw
++ events. `PointerState::button_clicked` scans `pointer_events`, which are cleared and
++ repopulated from that empty event list, so a button does not re-fire merely because a
++ pass was discarded. Command-producing UI still needs a one-pass/undo test because a
++ discarded first pass may act on pre-discard geometry; it does not need a global
++ `!will_discard()` ban.
++4. After a completed `run_ui`, `ContextImpl::end_pass` takes `viewport.output`; the returned
++ output owns the completed-pass count and `current_pass_index()` reads the now-zero
++ viewport output. `run_logic` does not restore a stale index. The earlier comment alleging
++ a leftover nonzero count was wrong.
++5. `ViewportInfo` has `minimized`/`occluded` fields and a `visible() -> Option<bool>` method;
++ there is no public `visible` field. `visible() == None` is unknown, and eframe forces a
++ real UI pass for `RequestPaintWhileHidden`/pending `Screenshot` even when hidden.
++6. `update_logic_only` stores the prepared raw input in `pending_raw_input`; the next
++ `update` prepends it to new input. Normal pointer/key/text/IME events can therefore be
++ replayed after hidden logic.
++
++`DesignApp::logic` (`crates/ui-egui/src/lib.rs:1102`) currently does all of:
++`egui_ctx` capture, `window_maximized`, one-time CMS activation through `color_applied`,
++`ctx.set_zoom_factor` from `ui.ui_scale`, `zoom_with_keyboard=false`, font installation and
++the 250 ms system-font poll, `theme::apply`/`restyle`, FPS smoothing from `i.time`, recovery
++autosave from `i.time`, control drain, stale new-document preview cleanup, inbox/open-OS-
++documents, synthetic repaint requests, screenshot collect/issue, shortcut handling, window-
++command flush, native dropped-file handling and quit handling. `DesignApp::ui` (`lib.rs:1472`)
++does layout: app bar, control bar, status bar, Tools, dock, central canvas, second viewport,
++floating panels/story editor/dialogs/about/palette, resize borders, URLs and frame timing.
++
++This is a 0.36.2-shaped flow, not a 0.37 regression. However, 0.37 makes the latent problems
++more important:
++
++1. Every per-frame side effect in `logic` runs again on a discarded second pass. That
++ includes font/theme setup, recovery checks, FPS sampling, screenshot issue/collect and
++ side effects that are not input-driven.
++2. While minimized/occluded, eframe normally runs `Context::run_logic` and no UI pass. All
++ `ctx.input` except viewport/window/focus information is stale. A forced hidden paint is
++ different: `run_ui` does run, with fresh prepared input, even though `visible()` may be
++ `false` or `None`.
++3. Host `App::logic` counts passes in `frames`; on a multipass frame `frames` advances twice,
++ so `startup.presented()` and startup error logging happen at the wrong pass.
++4. Input buffered by `update_logic_only`, and synthetic control events injected in
++ `raw_input_hook` during a hidden tick, can replay into a later UI pass with a different
++ focus or document state.
++
++The correct migration is to make the frame stages explicit, not to merge `logic` into
++`ui`, not to add a generic `Context` bridge, and not to use `visible()` as a phase signal.
++
++### 3.2 Frame-stage contract
++
++Introduce an explicit, testable split inside `DesignApp` while keeping the public
++`logic(&Context)` and `ui(&mut Ui)` entry points that hosts and tests use.
++
++```rust
++// crates/ui-egui/src/lib.rs
++pub fn logic(&mut self, ctx: &egui::Context) {
++ // Every call (first pass, later discarded pass, or hidden run_logic) may poll consumed
++ // queues and deadlines. It must never replay an already-consumed message.
++ self.logic_tick(ctx);
++ // current_pass_index is 0 on the first pass and on hidden run_logic, and >0 on later
++ // passes of the same run_ui. It is not a freshness test and must not gate input reads.
++ if ctx.current_pass_index() == 0 {
++ self.logic_frame(ctx);
++ }
++}
++
++pub fn ui(&mut self, ui: &mut egui::Ui) {
++ let first_pass = ui.ctx().current_pass_index() == 0;
++ self.layout(ui, first_pass);
++}
++```
++
++The guard is deliberately narrow: it removes duplicate per-run_ui side effects, but a hidden
++`run_logic` tick still has index 0, so autosave, control commands, inbox results and deadlines
++continue. A command that arrives between passes is retained in its queue (or its reply is
++pending); the control server requests a repaint, and the next frame's first pass consumes it.
++Never put an unconditional `return` for `current_pass_index() != 0` around queue draining,
++screenshot completion or background deadlines.
++
++`logic_tick` (every call) owns work whose identity is a consumed queue item, revision or
++monotonic deadline:
++
++- `drain_control`; each request is taken once. Screenshot requests add a request record and
++ do not issue from the queue.
++- `drain_inbox` and `open_os_documents` after fonts are ready; inbox items are consumed once.
++- `handle_quit` (fresh `close_requested` in `i.viewport()`), `flush_window_commands`.
++- Screenshot result draining, late-result rejection and deadline replies; take results out
++ of the slot under a short lock before encoding/writing.
++- While a control gesture still has queued synthetic events, request a paint while hidden
++ (§3.3). Never inject a synthetic event during a logic-only tick.
++- Filter buffered OS input after a hidden tick using the focus/document generation recorded
++ at the tick (§3.2 input policy).
++
++`logic_frame` (first pass only) owns genuine once-per-run_ui work:
++
++- `egui_ctx` capture; `window_maximized` update (`lib.rs:1106`).
++- One-time CMS activation through `color_applied` (`lib.rs:1107-1112`).
++- `ctx.set_zoom_factor` from `ui.ui_scale` and `zoom_with_keyboard=false` (`lib.rs:1114-1119`).
++- Font installation/reinstallation from `theme::install_fonts`, `fonts_system` readiness and
++ the 250 ms `request_repaint_after` while the font scan runs (`lib.rs:1121-1131`).
++- `theme::apply`/`restyle` (`lib.rs:1132-1135`).
++- Recovery autosave (`lib.rs:1136-1147`), changed from `ctx.input(i.time)` to a monotonic
++ `Instant` clock so it continues during hidden logic and never uses a stale frame time.
++ Recovery is native-only (`#[cfg(not(target_arch = "wasm32"))]`); wasm uses its browser
++ time source rather than `Instant`/`now_ms()`.
++- FPS smoothing only on a real UI pass, using a monotonic `Instant` on native and the
++ browser frame time on wasm; do not inject zero/duplicate samples from hidden logic.
++- `new_document::end_stale_preview(self)` (`lib.rs:1157`) and the synthetic/control
++ `ctx.request_repaint()` while events remain (`lib.rs:1160-1162`).
++- Screenshot issue after the 120 ms/3-frame settling rule (`lib.rs:1636-1648`).
++- `menus::shortcuts` moves out of `logic` into the first-pass `input_stage` below.
++- Native dropped files move out of `logic` into `pending_drops`, captured in
++ `raw_input_hook`; `logic` never reads stale `ctx.input` drops.
++- `handle_quit` stays in `logic_tick` because `close_requested` is fresh viewport data and a
++ close request must not wait for a first pass.
++
++`layout` calls `input_stage(ui)` only on the first pass, before the app bar:
++
++- `menus::shortcuts(self, ui.ctx())` runs against live input;
++- native dropped files are taken from `pending_drops` (captured in `raw_input_hook`), not
++ read from stale `ctx.input` in logic;
++- no other input event is read twice. `canvas::show` and text fields continue to use egui's
++ normal per-widget input. Shortcut consumption happens before layout, preserving the
++ existing order.
++
++`DesignApp::ui` must never call `ctx.root_ui(...)`: the root `Ui` is already borrowed by
++the host callback, and `Context::root_ui` panics in that situation (#8535). The passed
++`&mut Ui` is the one to use for `Panel`, `CentralPanel`, `Area`, and `show_viewport_immediate`.
++
++Host guard: `apps/designcraft/src/main.rs` must not increment `frames` or run macOS menu/
++Apple-event polling on every pass. Wrap the host body in the same first-pass condition (or
++dedupe with `ctx.cumulative_frame_nr()`), while always delegating to `self.app.logic(ctx)`,
++which has its own narrow guard. `frames` then counts presented `run_ui` frames, preserving
++the `frames == 2` startup.presented semantics. Add a host-level forced-multipass test through
++the actual `App` wrapper, not only `DesignApp`.
++
++`raw_input_hook` remains the one place that sees the exact `RawInput` before a pass. It
++continues the current batching: one pointer event per host iteration, a key press/release
++pair together, with trailing Text retained for a later iteration (`lib.rs:1456-1469`). Add:
++
++- native `raw.dropped_files` capture into `pending_drops` and removal from the raw input, so
++ a hidden `run_logic` cannot re-open the last drop;
++- a focus/document generation snapshot on each hidden logic tick;
++- a filter that drops buffered `Text`/`Ime`/`Paste` events when the focus target or active
++ document changed since the hidden tick, and drops an incomplete pointer chord (press
++ without release or release without press) across a hidden->visible transition. Complete
++ pointer/key events are replayed in order; pointer hover is refreshed or cleared with
++ `PointerGone`. Record the policy and counts in the test-only instrumentation.
++
++On web, `WebShell::raw_input_hook` is called in both the visible and hidden `AppRunner`
++paths. It must capture dropped files and start the asynchronous `bytes_async()` read there,
++pushing the result into the existing inbox. `WebShell::logic` must not take
++`ctx.input_mut` for drops. This is a source correction: the current
++`apps/designcraft-web/src/web.rs:351-370` reads drops in `logic`, while `raw_input_hook`
++(`web.rs:374-379`) does not.
++
++Test-only instrumentation may record stage counts:
++`#[cfg(test)] logic_tick_ticks`, `logic_frame_ticks`, `input_ticks`,
++`screenshot_callbacks`, so forced-multipass and hidden tests can prove one side effect and
++one input stage per frame. The counters must not exist in release builds.
++
++`Context::run_ui` is the test entry point for layout and `Context::run_logic` for
++side-effect-only tests. Do not initialize fonts inside `run_logic` in a UI test: no pass
++runs, so font installation/layout does not behave as in a visible frame. `ui_shot` and
++kittest harnesses call `app.logic(ui.ctx())` and `app.ui(ui)` inside the UI closure as they
++do now, with the same pass-index guard. Tests must also drive the real host/web callback
++order, not a fictional once-per-frame native host.
++
++### 3.3 Control input while hidden
++
++The control channel is used for automation even when the window is minimized. Under
++0.37, a hidden window normally runs only `logic`; synthetic pointer/key/text/IME events
++injected through `raw_input_hook` are not applied unless a UI pass runs. A
++`ViewportCommand::RequestPaintWhileHidden` holds for **one frame** and must be sent again for
++another (`egui/src/viewport.rs:1239-1247`); a plain `request_repaint` does not force a hidden
++paint (`egui-winit/src/lib.rs:1922-1924`).
++
++Policy:
++
++- Do not use `visible()` as a phase signal. Use it only as a hint for whether to request a
++ hidden paint. `None` (unknown visibility) is treated like hidden for this purpose.
++- raw_input_hook runs before both host paths, so deliberately allow its drain-based
++ injection into pending_raw_input during a logic-only iteration. Eframe retains those
++ events for the next full pass. Send RequestPaintWhileHidden while an admitted gesture
++ has queued OR injected-but-unapplied events; acknowledge delivery only from known UI
++ phase. Preserve current pointer/key batching, generation filtering and event order.
++ Test hidden injection followed by forced paint: one action/reply, no dropped or replayed
++ events. An empty synthetic queue alone does not mean pending input was already applied.
++- Pure engine commands (`engine.execute`) never request a hidden paint.
++- `ui.screenshot` already forces a paint through the `Screenshot` viewport command; do not
++ add a second `RequestPaintWhileHidden` for it. Still send `Focus` as today.
++- `ui.dialog.confirm` and other methods whose result depends on layout follow the same
++ pending-gesture rule.
++- The control reply may be `ok` before all events are applied (current behavior). Tests and
++ documentation must assert the final command/undo/document result, not the number of
++ events sent or a single paint request.
++
++### 3.4 Screenshot callback migration
++
++Current code (`lib.rs:587`, `drain_control`, `issue_screenshots` at 1636,
++`collect_screenshots` at 1652) stores `(token, path, reply, deadline)` in `pending_shots`,
++queues `(token, at, frames)` in `queued_shots`, sends
++`ViewportCommand::Screenshot(UserData::new(token))`, then scans `Event::Screenshot` for
++`user_data.downcast_ref::<u64>()`. All of that changes.
++
++Shared contract: the suite selects one bounded, cancelable completion slot per admitted
++request. Eleven existing craft-ui creative consumers adopt its helper; DeckCraft, FigCraft and ArtCraft Native keep a
++small local contract-compatible adapter. DesignCraft uses craft-ui. The helper is staged as
++CL-2 (provisional) and frozen as CL-2F after DesignCraft and GridCraft adapters are reviewed.
++
++DesignCraft request record:
++
++- Keep the existing token counter, path, reply channel, 8 s deadline and 120 ms/3-frame
++ settling rule in `DesignCraft`. These are app-owned.
++- Each `pending_shots` record owns one `craft_ui::capture::CaptureSlot` (provisional API;
++ final name/API after CL-2F). The slot holds the request id, target `ViewportId`, deadline,
++ a weak wake handle and at most one `Arc<ColorImage>`.
++- `issue_screenshots` sends
++ `ctx.send_viewport_cmd(ViewportCommand::Screenshot(ScreenshotCallback::new(move |image| {
++ if let Some(slot) = slot.upgrade() {
++ slot.complete(image); // weak slot; no DesignApp/Context strong capture
++ }
++ })))`.
++ The callback captures only a `Weak` reference to the slot. It must not capture
++ `egui::Context` strongly (no context self-retention cycle), must not encode PNGs, write
++ files, run commands, hold a long lock or borrow mutable app state.
++- `ScreenshotCallback` is one-shot; clones share one callback and complete at most once.
++- Bound admission by both request count and aggregate pending image bytes before issuing a
++ capture. Compute the allowed surface dimensions, reject an oversized/stale image on
++ completion, release its reservation and image, and account for renderer/readback transient
++ memory separately in peak RSS. A post-callback size check alone is not a bound.
++- Capture the target `ViewportId`; use `request_repaint_of(viewport)` from the live slot, not
++ an implicit current/default viewport. Release the slot lock before waking.
++- `drain_screenshot_results` runs in `logic_tick`, matches the slot record, takes the image
++ out under a short lock, then calls `control::save_screenshot(self, image.as_ref(), path)`
++ on the UI thread. Late callbacks for timed-out/canceled/closed records release the image
++ and send no reply/file.
++- Correlate only `ViewportId::ROOT` for `ui.screenshot` until the protocol grows an explicit
++ viewport field; do not guess from the pointer.
++- Account for E2 surface fitting: the returned image may be smaller than the window. Derive
++ x/y scale from the returned image dimensions and the recorded logical viewport rect/DPI;
++ a resize/DPI generation mismatch retries within the deadline or returns an error. Never
++ combine old pixels with current geometry.
++
++Tests: two outstanding tokens/viewports resolve to their own paths; completion is one-shot;
++out-of-order completion; timeout plus late callback; cancel/close/shutdown; delayed readback;
++hidden-window wakeup; aggregate memory returns to zero after drain; a reused viewport/document
++generation does not bind an old capture to a new document; no file/reply from a canceled
++capture; `ui_shot` still renders whole-window PNGs.
++
++### 3.5 Input, IME, clipboard and keyboard layouts
++
++`Event::MouseWheel` constructors in `canvas.rs`, `menus.rs`, `dialogs.rs`, `chrome.rs`,
++`new_document.rs`, `object_control.rs`, `panel_docking_tests.rs` and `lib.rs` must add
++`source`. Use `egui::MouseWheelSource::Unknown` for synthetic wheel input unless a test
++is specifically about `Trackpad`/`Momentum`; the canvas's `wheel_alt` only depends on
++`phase` and `modifiers`, so behavior is preserved.
++
++IME:
++
++- The canvas (`canvas::ime_event`, `canvas::delete_surrounding`) currently handles
++ `Preedit`, `Commit`, `DeleteSurrounding { before_chars, after_chars }`.
++ `delete_surrounding` loops `text.delete` up to 64 times (`canvas.rs:2695-2701`), and each
++ `text.delete` is an ordinary undoable command (`crates/engine/src/lib.rs:565-585`), so the
++ current path can create up to 64 undo entries.
++- E21 adds `ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes }`. Implement a
++ single mandatory engine command, `text.deleteSurroundingBytes { beforeBytes, afterBytes }`
++ (or an equivalent single `edit`), that deletes the exact UTF-8 ranges around the caret in
++ one `s.edit` call, producing one undo entry. Do not make this optional and do not
++ approximate bytes as characters/`text.delete` loops.
++- Validate both counts are bounded (default cap 4096 bytes each and no larger than the story/
++ selection), both ranges are valid UTF-8 boundaries via `str::get`, no range extends past
++ the story, and no split grapheme is produced. Preserve track-changes behavior by marking
++ deleted text and stepping the caret, as `text.delete` does. Test replacement, deletion-
++ only batches, combining mark/flag/ZWJ, preedit/commit sequencing, `tool_composing()`,
++ focus/serial changes and canceled compositions.
++- The web text agent keeps its existing `DeleteSurrounding` character behavior.
++- E21b/P7b: add the bounded outgoing surrounding-text payload to `IMEOutput`, the built-in
++ `TextEdit` producer and the egui-winit W27 Wayland adapter. DesignCraft's custom canvas
++ editor (`canvas::ime_output`, `canvas.rs:2720-2753`) supplies a real model/preedit/UTF-8
++ adapter: logical committed document text around the caret, preedit excluded, UTF-8 byte
++ cursor/anchor, at most 4000 bytes, explicit Unavailable context (distinct from available-empty) when the selection
++ cannot fit, and clearing on focus loss, no IME, reset and password/no-context. It must not
++ pass display-bidi text or set the payload to `None` as a placeholder. Audit every
++ `IMEOutput` constructor/destructure. Tests cover outgoing text after delete+commit and
++ deletion-only batches, supplementary/combining/RTL text, preedit exclusion, long lines,
++ field/window switching and the full E21b contract: owner/context generation even
++ when unavailable, available-empty distinct, W27 committed clear boundary, latest-pass
++ None replacing earlier payload, old-focus-epoch invalidation, and current-epoch done
++ serial mismatch applying incoming edits once while deferring outgoing until a match.
++ Include initially empty→non-empty and normal→password→normal protocol cases.
++
++Clipboard:
++
++- Source contract: `eframe-0.36.2/Cargo.toml:234-237` forces
++ `egui-winit` with `features = ["clipboard"]` even with eframe defaults off. 0.37's eframe
++ exposes `clipboard = ["egui-winit/clipboard"]` and depends on egui-winit with
++ `default-features = false` (`eframe-0.37.0/Cargo.toml:60,239-241`). Without the feature,
++ `egui-winit-0.37.0/src/clipboard.rs:113-141` stores `set_text` only in-process. DesignCraft's
++ Copy/Cut calls `ctx.copy_text` (`crates/ui-egui/src/lib.rs:806-824`), and its focused-field
++ Paste path sends `ViewportCommand::RequestPaste` (`menus.rs:2717`).
++- Enable `eframe/clipboard` in the D1 source-compatibility PR to preserve native OS
++ Copy/Cut/Paste. This activates arboard/smithay in egui-winit alongside the app's arboard
++ read path; keep the app-owned `install_clipboard_guard` so control actions never write or
++ read the user's clipboard, and keep `Services::clipboard_text` for the menu Paste path that
++ must not go through egui.
++- Native evidence in D1: select text, Copy/Cut, read from an independent arboard
++ process/handle on X11 and Wayland; test object copy and SVG/text paste; verify focused
++ `TextEdit` paste and canvas paste are not doubled; verify control-channel privacy.
++- D1 includes E4/W15P in its complete fork pin; D3 expands native policy coverage. E4 routes regular clipboard through winit's Wayland data device with an
++ arboard fallback; W15P adds a native PRIMARY path on the same connection/event queue and
++ per-seat lifecycle using SCTK 0.19.2 `PrimarySelectionManagerState`/devices/sources/offers.
++ Do not bind a second regular `wl_data_device`. Test PRIMARY pointer- and keyboard-triggered ownership (including keyboard-only focus), serial
++ freshness, owner/seat changes, empty/absent offers, self-paste, canceled/slow transfers,
++ password exclusion and no unchanged-selection reclaim on wlroots/KWin/Mutter. Native
++ capability evidence is still required; compile-only is not acceptance.
++- `Event::PasteImage` is new but DesignCraft has no image-paste contract. Leave it
++ unhandled rather than inventing a placement path. Add a test that it does not panic and
++ does not leak into text paste.
++
++Keyboard layouts: after the fork pin, `RawInput::keyboard_layout_is_latin` and
++`RawInput::latin_layout_chars` (E19) must preserve tool and command shortcuts on Russian,
++Arabic and Hebrew layouts. W25 covers Linux Latin-layout lookup, W26 macOS deletion and W27 Wayland surrounding
++text; Windows keeps its own native input path. E19 also needs a real Windows test
++with a non-Latin layout; a synthetic `KeyboardEvent` test is not enough
++for the OS layout table.
++
++### 3.6 Panels, docking and viewports
++
++`DesignApp::ui` keeps the existing order:
++
++1. `chrome::app_bar` (`Panel::top("app_bar")`)
++2. optional `chrome::control_bar`
++3. `chrome::status_bar` (`Panel::bottom("status_bar")`)
++4. `toolbar::show` (`Panel::left("tools")`)
++5. `dock::show` / `panel_docking::show` (`Panel::right("dock")`,
++ `Panel::right("shared-panel-dock")`, icon columns)
++6. `CentralPanel::default()` last among panels
++7. second-window `show_viewport_immediate`
++8. floating panels/flyouts, story editor, dialogs/about/palette (areas/windows/modals)
++9. custom-titlebar resize borders
++
++0.37's `Panel` constructors accept `AsIdSalt`; the string salts remain stable, but the
++panel `Id` is now `parent_ui.scope_id().with_salt(salt)` (`egui/src/containers/panel.rs:974-
++975`), whereas the 0.36 panel id was the salt alone. D1 updates test helpers such as `dock.rs:473` and `panel_docking_tests.rs:639` to
++load the parent-salted key using the actual parent Ui scope. Eframe persistence is disabled:
++there is no saved egui PanelState migration. Preserve app-owned UiState/docking layout through
++`save_prefs` and test its save/reopen behavior and panel rectangles. Keep the docking identity
++`designcraft-panel-docking` unchanged for saved layout and live drag state.
++
++`craft-ui` CL-1:
++
++- Do not use PR199's `b68de8c`/`ec8840a` trees as a base. They are stale relative to current
++ `4919088`, omit `crates/platform`, and revert current security/settings/docking/printer
++ fixes (including floating-group move/resize guards `d66e345`/`fd9cf54`).
++- Apply only the API-port hunks from `8614e4a` (and relevant README changes from
++ `1764bca`) onto current `4919088`, preserving intervening fixes, `crates/platform` and
++ unrelated crates. Review a diff against both `5c874d51` (the current DesignCraft pin) and
++ `4919088`; pin the exact resulting immutable revision.
++- `WidgetType` → `Role` in `buttons/mod.rs`, `docking/surface.rs`, `layout/resize.rs`,
++ `tabs/mod.rs`; `Id::new` → `Id::unique`; `Ui::id`/`UiBuilder::id` → `scope_id`.
++- The corrected revision keeps the same docking transaction model and `DockArea` API
++ DesignCraft uses. A model/permission change is not incidental: if intentionally changed,
++ state it as a product decision with tests.
++- CL-3 adds the explicit opt-in `DockArea::direction(DockDirection::{LeftToRight,
++ RightToLeft})` visual policy. DesignCraft calls `LeftToRight` explicitly for now (no E9
++ global mirroring) and relies on CL-3's geometry/hit/drag/keyboard tests. Saved physical
++ splits, rectangles and logical tab order must be unchanged by direction; never reverse
++ saved panel order or pass display-bidi text into shaping/clipboard.
++
++The second window uses
++`ViewportId::from_hash_of("designcraft_second_window")` and
++`ViewportBuilder::with_title(...).with_inner_size([960, 720])`. Keep the ID and the
++immediate viewport. Add tests for: opening/closing the second window through
++`window.newWindow`; the main window's pane focus returning on click; close-request
++cancellation of the main viewport; screenshot correlation to the root viewport only;
++`CentralPanel` not consuming the second window's available rect; and #8748 hidden-parent/
++deferred-child behavior while the root is occluded/minimized/overdue and while
++`visible() == None` (open, update, close, and acknowledge without restoring the parent).
++
++### 3.7 Fonts, glyphs, RTL and accessibility
++
++`theme::font_definitions` builds `FontDefinitions` from bundled Source Sans 3/JetBrains
++Mono plus optional craft-fonts (`CRAFT_FONTS_DIR`) and installed system faces selected by
++`SYSTEM_UI_FONTS`. `install_fonts` returns false while the background font scan is
++running and the app reinstalls when `system_fonts_ready()` becomes true. This must stay the
++source of truth.
++
++Concrete changes:
++
++- `theme::SystemFont::new` and the `FontData { index, tweak, ..from_owned }` constructions
++ are source-compatible with 0.37's `FontData`; only test assertions that read
++ `definitions.font_data[name].font` or `data.as_ref()` need `data.bytes()`/`font.as_ref()`.
++- Set `NativeOptions::system_font_fallback = false` explicitly and keep eframe's
++ `system_fonts` feature off. This prevents `egui_system_font_provider` from adding fonts
++ ahead of DesignCraft's script-specific order and makes the policy visible in code.
++ Document that DesignCraft's own `FontDb` provides system fallbacks.
++- `FontDefinitions::default()` is empty when `default_fonts` is off
++ (`epaint-0.37.0/src/text/font_definitions.rs:111-117`). Add `egui/default_fonts` explicitly
++ to the `designcraft-ui-egui` dev feature set and install DesignCraft's fonts before layout
++ in package-scoped tests, together with explicit `monochrome_emoji_fonts` where used.
++ This restores egui's built-in icon/emoji fallback without relying
++ on the app binary's feature unification.
++- Production keeps `MissingGlyphPolicy::Tofu` (the default). Tests that deliberately draw
++ unsupported scripts use `HarnessBuilder::allow_missing_glyphs()` with a named reason; tests
++ proving coverage keep the panic policy. Do not set tofu globally in production tests
++ merely to silence a regression.
++- Test fixtures use the licensed fonts pinned in the egui plan §10.6 (craft-fonts
++ `2481a8a`, Noto Sans Arabic/Thai/CJK, BIZ UDPGothic; Noto Sans Hebrew and Noto Color Emoji
++ from their upstream OFL sources with the recorded SHA256/licences). DesignCraft keeps its
++ own policy: Latin UI/document fonts stay in `assets/fonts/`; central craft-fonts remains an
++ optional `CRAFT_FONTS_DIR` input; do not copy new font binaries into this repository.
++ Fetch fixtures into the task's explicit fixture directory and retain licences.
++- Add a glyph-coverage test over every `i18n` catalog string and every UI font family,
++ using `FontDb` faces, not egui's `has_glyph` alone (it can report false for the face
++ that supplies the replacement glyph). Gate craft-fonts-specific CJK expectations on
++ `CRAFT_FONTS`; when absent, assert the built-in coverage and skip CJK glyph assertions
++ explicitly. Existing Ukrainian/Russian tests in `theme.rs` are the model.
++
++RTL/bidi single owner:
++
++- At D1 the fork's E5/E12 becomes the only bidi owner for egui-rendered UI/label text.
++ `rtl::widget`/`rtl::label` pass logical `LayoutJob`s (with explicit language/direction
++ where needed) to `fonts.layout_job`; remove the manual `BidiInfo::visual_runs` reordering,
++ section reversal, neutral-character mirroring, Arabic family swap and per-row
++ `row.pos.x += width - row.size.x` right-alignment in `rtl.rs`. Keeping them would process
++ Arabic/Hebrew a second time in epaint's `BidiLevels::new` (the fork's
++ `text_layout.rs:120` always runs bidi; `LayoutJob::direction` defaults to `Auto`).
++ The document composer's own `crates/compose/src/bidi.rs`/`shape.rs` remains the bidi
++ owner for document text and canvas glyph placement; this change is about the egui label
++ path, not a rewrite of document composition.
++- Keep `Galley::job.text` as the logical source and use logical strings for clipboard,
++ save, accessibility, search and commands. Never pass visual-order/display-bidi text to
++ shaping or the clipboard. Keep the bounded layout cache (256 labels/4096 bytes) keyed by
++ the logical job, font token and language/direction.
++- Editable `TextEdit` paths use the fork's logical text and grapheme/caret mapping; the
++ custom canvas editor must not feed visual-order strings.
++- D3 differential tests: Arabic/Hebrew/mixed fixtures assert visual glyph order, logical
++ `Galley::job.text`, row widths, caret/hit positions, selection across boundaries, marks,
++ end caret and exactly one alignment (no double right-shift). ASCII fixtures must remain
++ identical to stock 0.37 where the API is shared. Run the fixtures at D3, not "only if
++ replaced".
++
++`Context::set_language` (E17, fork only) is applied once when `ui.language` changes,
++after fonts are installed and before layout. It must not change stored document text,
++ids, commands or persisted workspace data. `Context::language` is the fallback on the
++web if eframe does not set it.
++
++Do not enable `Style::right_to_left` (E9). DesignCraft keeps an LTR panel/docking model with
++RTL text inside labels, matching the persisted `craft_ui::docking::Layout` and existing
++workspaces. Enabling E9 would mirror menus, scrollbars and docking chrome without a product
++decision and would double-mirror shaped text. The explicit `DockArea::direction(LeftToRight)`
++above is the only docking direction policy in this migration.
++
++Accessibility labels: kittest's `check_accessibility` now runs by default, and the first
++green stage must satisfy strict names/glyph policy. Add explicit names where a control is
++an input (`Role::Button`, `TextInput`, `CheckBox`, `Slider`, `SpinButton`, `ComboBox`, `Tab`,
++`Splitter`):
++
++- `icons::button`, `widgets::icon_toggle_sized`, `widgets::checkbox`,
++ `widgets::dropdown`, toolbar/fill/stroke chips: use the existing localized tip/`label`
++ via `Response::accessible_name` or `WidgetInfo`.
++- `widgets::NumField`: add a label field or `.accessible_name`; do not leave the
++ internal `id` as the only name.
++- `dialogs::text_field`: pass the visible label id and use `ui.label_inputs_by(label.id,
++ …)` or `ui.name_inputs(tr(key), …)`; section labels added as plain `ui.label` do not
++ automatically name the field.
++- `panels/font_menu.rs`, `panels/pages.rs`, `panels/layers.rs`, `panels/library.rs`,
++ `story_editor.rs`, `new_document.rs`: bind each field to its visible label; icon-only
++ star/expand buttons use their localized tooltip.
++- Role migration files: the plan's earlier list omitted `panels/properties.rs`,
++ `panels/swatches.rs`, `panels/layers.rs` and `object_control.rs`. Map: swatch/color well →
++ `Role::Button` with the swatch name/value; layer row → `Role::ListItem`/`Role::Button`
++ matching its selectable row behavior; object-control label → `Role::Label`; combo/dropdown →
++ `Role::ComboBox`; numeric field → `Role::SpinButton`; text field → `Role::TextInput`;
++ checkbox → `Role::CheckBox`; tab → `Role::Tab`; split/resize → `Role::Splitter`.
++- `craft_ui::docking::DockArea` already names tab/overflow/resize controls after CL-1/CL-3;
++ keep `Role::Tab`, `Role::Button`, `Role::Splitter` and labels stable.
++- `Response::labelled_by` is preferred when a visible label exists;
++ `Response::accessible_name` for icon-only controls; `Ui::name_inputs` only for
++ third-party/grouped widgets that cannot be named at their construction site. Do not
++ paper over a missing label with a generic "field" name.
++
++### 3.8 Theme and visual defaults
++
++`theme::apply` sets `Visuals`, text styles and widget palette from `Tokens`; most colors
++are explicit. 0.37's roomier button defaults and larger corner radius can change layout
++even when tokens are unchanged. Audit:
++- `v.button_padding`, `v.menu_margin`, `v.window_margin`, `v.item_spacing`,
++ `v.interact_size` and `CornerRadius` in `theme::apply`;
++- `widgets::FIELD_H`, `BUTTON_H`, `SEG_W`;
++- panel default sizes in `dock.rs`, `panel_docking.rs`, `toolbar.rs`;
++- menu popup width/height and `menus::menu_button`;
++- `chrome::app_bar` / `control_bar` / `status_bar` heights.
++
++Do not replace explicit geometry with 0.37 defaults. A visual diff is an intended change
++only after review and is recorded in evidence.
++
++## 4. Dependency and publication topology
++
++### 4.1 Intended suite graph
++
++For suite validation, DesignCraft resolves exactly one copy of each egui-family crate and
++one winit. The revisions below are placeholders until the reviewed `storytold` publications
++exist; candidate `aiongg` hashes are comparison inputs only.
++
++```
++designcraft / designcraft-web / designcraft-ui-egui
++ -> egui 0.37.0 git <FINAL_STORYTOLD_EGUI_REV> (contains E1-E21, E21b, E4/P2b)
++ -> eframe 0.37.0 git <FINAL_STORYTOLD_EGUI_REV>
++ -> egui-winit 0.37.0 git <FINAL_STORYTOLD_EGUI_REV>
++ -> egui-wgpu 0.37.0 git <FINAL_STORYTOLD_EGUI_REV>
++ -> egui_kittest 0.37.0 git <FINAL_STORYTOLD_EGUI_REV> (dev)
++ -> epaint/ecolor/emath/epaint_default_fonts git <FINAL_STORYTOLD_EGUI_REV>
++ -> winit 0.30.13 git <FINAL_STORYTOLD_WINIT_REV> (W1-W27 plus W15P PRIMARY)
++ -> craft-ui git <FINAL_CRAFT_UI_REV> (CL-2F after adapter review; includes CL-1/CL-3)
++ -> wgpu 30.0.1 registry
++ -> accesskit 0.25.1 registry
++```
++
++`egui_extras` is not used by DesignCraft; do not add or patch it. `egui_plot` and
++`egui_dock` are not used; do not assume version numbers for them. `egui_system_font_provider`
++is not used because the `system_fonts` feature stays off.
++
++### 4.2 Root `[patch.crates-io]` additions
++
++A dependency's own `[patch]` section does not propagate to this consumer. Add all of the
++following to the root `Cargo.toml`, each with the same full immutable git revision and no
++moving branch or machine-local path:
++
++```toml
++[patch.crates-io]
++egui = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++eframe = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++egui-winit = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++egui-wgpu = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++egui_kittest = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++epaint = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++epaint_default_fonts = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++ecolor = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++emath = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
++winit = { git = "https://github.com/storytold/winit", rev = "<FINAL_STORYTOLD_WINIT_REV>" }
++```
++
++The egui remote must be the published, reachable `storytold/egui` mirror containing the
++reviewed fork history. Pinning `aiongg/egui` directly is not the production plan; it would be
++an explicit policy decision, not a default. The winit remote must likewise be the final
++reviewed `storytold/winit`, not the candidate URL/revision. A branch name, a machine-local
++path, or a `path` override must never appear in a shipped manifest.
++
++Workspace dependency versions change from `0.36` to `0.37` for `egui`, `eframe` and
++`egui_kittest`. `egui_extras` is present in the workspace dependencies but is not used by
++DesignCraft; bump it only if a future consumer adds a real dependency on it.
++`apps/designcraft` keeps its eframe feature list and adds `clipboard` in D1 (see §3.5). Do
++not add `system_fonts`.
++
++### 4.3 Lockfile, clean checkout and duplicate checks
++
++After generating a lockfile through the managed build workflow, verify:
++
++- `Cargo.lock` has exactly one `egui`, `epaint`, `ecolor`, `emath`, `eframe`,
++ `egui-winit`, `egui-wgpu`, `egui_kittest` and `winit` entry.
++- Every egui-family source is `git+https://github.com/storytold/egui?rev=<FINAL...>#<FINAL...>`;
++ no `registry+.../egui-0.36.2` or `-0.37.0` remains and no candidate `aiongg` source is
++ shipped.
++- `winit` source is the exact final storytold revision; no registry 0.30.13 and no old
++ `3d51077f...` copy remains.
++- `wgpu` stays `30.0.1`; `accesskit` moves to the version egui 0.37 requires
++ (`0.25.1` in the reference graph).
++- `cargo metadata --locked --format-version 1` resolves the same graph as the lock.
++- `cargo tree -d` shows no duplicate egui-family crate and no duplicate winit. A
++ duplicate `accesskit_consumer` from unrelated crates is a warning to inspect, not an
++ automatic failure.
++- `cargo xtask layers` still reports `designcraft-ui-egui` as the only egui consumer
++ below L7, and `cargo xtask wasm` includes `designcraft-ui-egui`.
++- `cargo xtask ci` passes with the exact lock and with and without `CRAFT_FONTS_DIR` for
++ the font tests that support both.
++- Clean checkout: `cargo fetch --locked` and `cargo metadata --locked --format-version 1`
++ succeed without local overrides. Negative fixture: replacing the final egui/winit revision
++ with a candidate hash or the old DesignCraft winit override must fail the gate.
++
++The root `[patch.crates-io]` also contains the unrelated PDF entries. Keep
++`krilla`, `hayro`, `hayro-interpret`, `hayro-syntax` and `hayro-jbig2` at
++`storytold/craft-libs` `89dcbb3060377a26c99a6d80caa16084366704c4` unchanged. They are not
++egui vendors and have their own provenance, tests and removal conditions.
++
++### 4.4 craft-libs CL-1/CL-2 and language work
++
++CL-1 is a rebased API port, not a merge of PR 199's tree. Start from current
++`4919088`, apply only the `8614e4a` hunks (plus relevant `1764bca` README changes), and
++preserve `d66e345`/`fd9cf54`, `crates/platform`, security/settings/printing and unrelated
++crates. Review the diff against both `5c874d51` (DesignCraft's current pin) and `4919088`.
++The corrected revision must:
++- keep `craft-ui` production source compatible with **stock** egui 0.37.0;
++- expose the same docking transaction model and `DockArea` API DesignCraft uses, plus the
++ CL-3 opt-in direction API;
++- provide the CL-2 capture slot and CL-2F frozen API used by DesignCraft's screenshot adapter;
++- pass its registry-egui 0.37 check, all-feature clippy and tests;
++- publish an immutable revision that DesignCraft can pin.
++
++DesignCraft does not take fork-only API from `craft-ui`: the fork lives in the dependency
++patch table, not in `craft-ui`'s manifest. This keeps `craft-ui` publishable and lets
++DesignCraft choose the fork independently.
++
++Language work (#198) enters DesignCraft only through the final fork pin and the selected app
++changes in §3.5/§3.7. It must not introduce ICU locale conversion, change document language
++semantics, mirror the whole UI, add fonts, or replace the docking model.
++
++## 5. Existing patches and vendored fixes: keep/remove audit
++
++DesignCraft has no `vendor/` directory. Its relevant non-registry inputs are:
++
++| Patch / input | Current revision | Provenance | Decision for this migration | Removal condition |
++| --- | --- | --- | --- | --- |
++| `winit` | `storytold/winit` `3d51077f...` (W1–W14) | storytold/winit `craft/0.30.13`; X11 `with_x11`, macOS `with_close_requested_on_terminate`, `mac_window::sync_movable` | Replace with `<FINAL_STORYTOLD_WINIT_REV>` (W1–W27 plus W15P). W12/W14 remain; W15/W15P/W25/W26/W27 are needed by E4/E19/E21. | Upstream winit 0.30/0.31 contains the equivalent patches and the suite no longer needs the fork. |
++| `egui`/`eframe`/`egui-winit`/`egui-wgpu`/`egui_kittest`/`epaint`/`ecolor`/`emath` | registry 0.36.2 | crates.io | Replace by `<FINAL_STORYTOLD_EGUI_REV>` containing E1–E21, E21b and E4/P2b in D1 after the isolated stock-0.37 comparison, including P7c/P8. Candidate `a4f9a17f` is comparison input, not the pin. | Upstream egui release contains the equivalent behavior (or the suite drops each patch when its `PATCHES.md` condition is met). |
++| `egui_extras` | registry 0.36.2, only in `craft-ui` dev-dependencies | crates.io; not used by DesignCraft | Leave alone. Do not add a patch entry unless a DesignCraft crate directly uses it. | No removal needed. |
++| `krilla` | craft-libs `89dcbb30...`, version `=0.8.2` | PDF backend vendor patch in craft-libs; unrelated to egui | Keep exactly. | Its own PDF backend gate. |
++| `hayro`, `hayro-interpret`, `hayro-syntax`, `hayro-jbig2` | craft-libs `89dcbb30...`, pinned versions | PDF parser vendor patches in craft-libs | Keep exactly. | Their own PDF parser gates. |
++| `craft-ui` | `5c874d51...` | craft-libs published revision | Move to the reviewed CL-1/`<CL-2_PROVISIONAL_REV>` in the D1 capture pilot, then `<FINAL_CRAFT_UI_REV>` (CL-2F/CL-3). | Replaced by the final reviewed revisions. |
++| `craft-pdf`, `craft-atomic`, `craft-cms`, `craft-docpath`, `craft-print` | individual craft-libs revisions | Shared libraries, not egui | Keep. Do not conflate their revisions with the UI migration. | Their own release cadence. |
++
++Do not delete an unrelated vendor or patch merely because the lockfile changes. Do not copy
++`aiongg/egui`'s workspace `[patch]` section into DesignCraft's manifest; only the root
++`[patch.crates-io]` entries above apply.
++
++## 6. Test and regression strategy
++
++### 6.1 Fixtures and determinism
++
++- Use `file.newSample` / `designcraft_engine::sample::magazine()` for a deterministic
++ multi-page document. Avoid user files and environment-dependent font caches.
++- Run native tests with `DESIGNCRAFT_NO_PREFS=1` and a dedicated
++ `DESIGNCRAFT_CONFIG_DIR`, or an explicit empty override, so preferences and recovery do
++ not leak between runs.
++- Build with the pinned craft-fonts ref `abb83316d96aa59c1cf64784289e378fe9fa5695` for
++ release/font evidence, and also without `CRAFT_FONTS_DIR` to keep the bundled-font path
++ tested. Use the §10.6 font fixtures for Arabic/Thai/CJK/Japanese/Hebrew/color-emoji
++ coverage with their recorded SHA256/licences; keep them out of app source.
++- Use fixed window sizes 1440×900 and 1280×800, at 1× and 2× `pixels_per_point`, and
++ fixed themes `mediumDark`, `light`, `highContrast`. Record the exact fixture, font
++ directory, DPI and OS/renderer with every screenshot.
++- Use `CRAFT_UI_DOCKING_FIXTURES` for the existing explicit docking visual fixtures;
++ do not turn those optional captures into unconditional CI jobs.
++- Every command runs through `maintenance/task.py run/status/finish` with an allocated
++ target/VM and durable evidence; do not run tests directly.
++
++### 6.2 Unit / kittest regressions
++
++| Area | Test (new or adapted) | User-observable assertion |
++| --- | --- | --- |
++| Frame staging | `logic_frame_runs_once_across_a_discarded_pass` | Force a `request_discard` by making the Tools panel single-column too tall; assert one font/theme/recovery/FPS tick and one input stage, not two. |
++| Host staging | `host_multipass_counts_one_presented_frame` | Drive the real host `App` wrapper through a forced discard; `frames`/startup.presented/error logging advance once, and macOS menu/Apple-event polling is not duplicated when available. |
++| Hidden logic | `hidden_logic_ticks_after_completed_multipass_keep_working` | A completed multipass frame followed by repeated `run_logic` ticks runs font readiness/recovery/queue checks each tick with fresh viewport data and no stale index assumption. |
++| Hidden forced paint | `forced_hidden_paint_is_a_ui_pass` | `RequestPaintWhileHidden` with `visible() == Some(false)` and with `visible() == None` runs `logic` + `ui`; visibility is not used as a phase guard. |
++| Control while hidden | `control_gesture_requests_paint_until_all_events_apply` | A hidden multi-frame `ui.click`/`ui.drag`/`ui.key` sends `RequestPaintWhileHidden` on each hidden frame while events remain; the final command/undo result is correct. Pure `engine.execute` requests no paint. |
++| Screenshots | `two_screenshot_viewports_resolve_to_their_own_paths` | Internal capture-helper test (the `ui.screenshot` control method stays ROOT-only): two outstanding requests with different tokens/viewports receive the matching image; no cross-write. |
++| Screenshot lifecycle | `screenshot_cancel_timeout_and_late_callback_release` | Timeout/cancel/close writes no file and sends no second reply; a late callback releases its image; aggregate pending bytes return to zero. |
++| Screenshot memory | `screenshot_admission_bounds_aggregate_bytes` | Oversized/concurrent captures are rejected or bounded; peak retained bytes stay within the admitted budget; E2 surface-fit scaling is correct. |
++| Mouse wheel | `wheel_events_keep_their_source_and_phase` | Alt-wheel zoom, plain-wheel scroll, trackpad phase end and momentum source do not latch modifiers. |
++| Roles/IDs | `role_and_id_migration_keeps_existing_state_keys` | A saved `UiState`/workspace round-trips; panel tabs, layer rows and styles resolve by the same stable IDs. |
++| Panel state | `saved_panel_state_migrates_to_parent_salted_ids` | Old-format panel rects/widths load into the new parent-salted keys; the same outer rects and panel order result. |
++| Panels | `panel_order_and_central_rect_are_unchanged` | App bar/control/status/tools/dock occupy the same outer rects; central canvas rect is unchanged at 1440×900 and after narrow-resize. |
++| Docking | `saved_workspace_restores_tree_float_and_hidden_panel` (existing plus 0.37) | Docking tree, floating geometry and hidden placement survive serialization; invalid actions are atomic; direction changes do not reorder saved splits/tabs. |
++| Second window | `second_window_opens_closes_and_keeps_main_focus` | Popout exists, close request removes it, main pane focus returns; main close can still be cancelled. |
++| Hidden child (#8748) | `hidden_parent_child_viewport_updates_and_closes` | With the parent occluded/minimized/overdue and with `visible() == None`, the child opens/updates/closes and acknowledges without restoring the parent. |
++| Accessibility | `every_visible_input_has_an_accessible_name` | `Harness::unnamed_widgets()` is empty; specific roles/labels for tabs, icon buttons, numeric fields, combo boxes, layer rows, swatches and text fields. |
++| Glyphs | `every_catalog_character_has_a_face_or_a_declared_gap` | Bundled fonts cover Latin/Cyrillic catalogs; craft-fonts CJK assertions run when present; tests use panic policy for covered text and explicit tofu only for deliberate gaps. |
++| IME exact bytes | `ime_replacement_deletes_exact_bytes_in_one_undo_step` | `DeleteSurroundingBytes` replaces a combining mark/letter and Undo restores the exact prior text in one step; `DeleteSurrounding` character path still works; caps/UTF-8/track changes are enforced. |
++| IME surrounding text | `outgoing_surrounding_text_is_logical_and_bounded` | DesignCraft canvas emits logical model text after delete+commit/deletion-only; preedit excluded; <=4000 bytes at UTF-8 boundaries; focus/password/no-IME clears; no `None` placeholder; latest completed pass including None replaces the descriptor/payload atomically; owner remains present for Unavailable and W27 clear/epoch/serial behavior follows P7b. |
++| IME composition | existing `canvas`/`story_editor` preedit-commit-cancel tests | Marked text does not duplicate, click-away discards on macOS, no undo step for a cancelled composition. |
++| Text selection (#8763/#8764) | `click_away_then_button_acts_on_engine_selection` | A button reading the app's engine `TextSel` after clicking away from an egui `TextEdit` still acts on the intended range; stock 0.37's TextEdit cursor/selection loss is recorded and does not change the engine target; if a future control reads TextEdit state, the command is deferred with an explanation. |
++| Commands/undo | `multipass_edit_is_one_undo_step` | A text edit, live-preview commit, dialog apply or toolbar/app-bar button produces exactly one history entry across discarded passes (including the second viewport). |
++| Save/reopen | `save_reopen_preserves_document_and_workspace` | Save to a temp `.designcraft`, reopen through `file.openBytes`, compare document model/selection/style/swatches; saved workspace and panel layout restore. |
++| Clipboard native | `copy_cut_write_the_system_clipboard` | On X11 and Wayland, select text/objects, Copy/Cut, read from an independent arboard reader; paste back; control actions never read or replace the clipboard. |
++| CLI control privacy | existing `control_paste_never_reads_the_system_clipboard` | Control actions still never read or replace the user's clipboard. |
++| Web drop | `web_drop_is_captured_in_raw_input_hook` | A browser `drop` with a synthetic File starts the async read in `raw_input_hook`, reaches the inbox once, and opens the document; no drop read remains in `WebShell::logic`. |
++| Buffered input | `hidden_restore_drops_stale_text_ime_and_incomplete_pointer` | After a hidden tick, changed focus/document discards buffered text/IME/paste; a partial pointer chord is dropped; complete pointer/key events replay in order; two windows stay separate. |
++| Menu/palette | existing `menus` tests plus 0.37 role checks | Menus open/close, keyboard activation, overflow within viewport, Quick Apply runs one command. |
++| Canvas | existing guide/column/frame-hit tests plus new 0.37 geometry | Hit tests and smart guides do not regress from panel rect changes. |
++
++### 6.3 Semantic accessibility assertions
++
++Add `Harness::check_accessibility()` (the default) to UI tests and explicit queries:
++
++- Menus: root menu items have `Role::MenuItem` or `Role::MenuBar`; disabled items remain
++ reachable by name.
++- Panel tabs: `Role::Tab`, selected state and localized label; tab drag still starts from
++ the tab rect.
++- Icon-only controls: tooltip text is the accessible name; star/expand, eye/lock, fill/
++ stroke chips, screen-mode toggles, toolbar overflow.
++- Text fields: each has a visible `labelled_by` relationship or a `placeholder`; a blank
++ label is not an acceptable name. Numeric fields expose `Role::SpinButton` and a value.
++- Swatches/color wells, layer rows, object-control labels, combo boxes: the mappings in
++ §3.7, with name/value/selected state.
++- Sliders and split handles: `Role::Slider`/`Role::Splitter`, value/range and accessible
++ name; keyboard arrow changes still work.
++- Dialog modals: `Role::Dialog` or a named `Area`; the title is the name; Escape cancels.
++- Focus: Tab order reaches the control bar, panels, canvas and dialog buttons; focus ring
++ uses `Tokens::accent`/`focus_stroke`; no invisible widget is exposed.
++
++These are semantic assertions, not only screenshot checks. A screen reader sees the same
++names and roles across 0.36.2 -> 0.37 except where a deliberate mapping (e.g.
++`SelectableLabel` -> `Button`) requires a new role.
++
++### 6.4 Visual, native and browser workflows
++
++- Whole-window PNGs at 1440×900/1× and 2×, medium-dark and light, with the same sample
++ document and fonts. Compare against 0.36.2 baseline produced in the same environment.
++- Justify tolerances in advance: geometry assertions use exact `Rect` comparisons for
++ panel/canvas/tab rects (within 0.01 pt), and pixel comparisons allow antialiasing noise
++ only where the change is explained (for example 0.37 corner radius). Do not accept a
++ golden because it changed; inspect `.new` vs `.old`, list the intended deltas, and keep
++ the old baseline for rollback.
++- Add high-contrast, Arabic, Hebrew, CJK and color-emoji fixtures. For RTL, compare glyph
++ order, logical `Galley::job.text`, row width and caret/hit positions, not only pixels.
++- Windows: use a uniquely owned clone and `C:\CraftApps\Launch-CraftDesktop.ps1` through
++ the scheduled-task helper. Drive control-channel edit/save/reopen, dock/float/popout and
++ `ui.screenshot`, inspect fresh screenshots, and record the software renderer
++ (Microsoft Basic Render Driver) as a separate row.
++- Linux: native X11 and Wayland runs with compositor identity; exercise panels, second
++ window, copy/paste/PRIMARY, file drop, IME (Wayland) and visible edited/saved/reopened
++ workflows. No inherited display/compositor exists at planning time; provision an
++ isolated display/window manager and compositor before claiming this row.
++- Browser: run the Trunk build in a pinned browser with WebGPU and `?webgl`; load the sample,
++ edit, save/download, drag-drop a synthetic file, take screenshots and record the browser/
++ adapter/backend. Wasm compile and `ui_shot` are not browser presentation evidence.
++- Keep software-renderer and real-GPU results separate. Capture native screenshots with
++ `ui.screenshot` or a native window capture; `ui_shot` is offscreen only.
++
++### 6.5 Deliberate broken-behavior probes
++
++Before accepting the suite, temporarily break each behavior and confirm the test fails:
++
++1. Remove an `accessible_name` from a toolbar button -> accessibility test names it.
++2. Change a panel salt (`"dock"` -> `"dock2"`) or load the wrong parent-salted test key
++ -> panel identity/geometry test fails; app-owned saved layout remains separately asserted.
++3. Call `ctx.root_ui` inside `DesignApp::ui` -> test panics with the documented recursive
++ borrow message (run in a `catch_unwind` probe, not production).
++4. Remove the first-pass `logic_frame` guard -> forced-multipass test sees two logic-frame
++ ticks. Do not use `visible()` to "fix" it.
++5. Correlate screenshots by arrival order instead of the per-request slot -> two-token/
++ two-viewport test writes the wrong file; cancel a slot and let a late callback arrive ->
++ no file/reply.
++6. Drop `DeleteSurroundingBytes` handling or fall back to the 64-step `text.delete` loop ->
++ exact-byte/one-undo test leaves replacement text or extra undo steps.
++7. Remove the E21b surrounding-text adapter or emit display-bidi text -> logical/bounded
++ outgoing-text test fails.
++8. Restore `rtl.rs`'s manual reorder alongside fork E5/E12 -> RTL differential test shows
++ double processing/double alignment.
++9. Restore `Id::new`/`Ui::id` -> `clippy -D warnings` fails, proving the warning gate.
++10. Reintroduce `Event::Screenshot` scanning or a strong `Context` capture in the callback ->
++ compile/test or cancel/shutdown test fails.
++11. Move web drop reading back into `WebShell::logic` -> browser drop test fails.
++12. Remove the host first-pass guard -> host multipass test sees two frame counts.
++
++## 7. Performance measurement protocol
++
++### 7.1 Baseline timing and environment
++
++Record a baseline **before** changing production code, from the exact current SHA
++`e74208dd...`, lockfile, feature set and craft-ui revision. Run the candidate from the
++exact migration revision. Use separate fresh processes for each sample; do not compare a
++warm process with a cold one.
++
++The benchmark harness is test-only work and must exist in both baseline and candidate
++trees. Stage it in a separate test-only commit, cherry-pick it into a read-only baseline
++worktree at `e74208dd...`, and run the baseline first through `task.py`. It records
++`Instant`-based raw samples around `run_ui`/operation boundaries; it must not use
++`perf.frame_ms`/`now_ms()` (`SystemTime` on native, `0.0` on wasm) as the acceptance timer.
++`ui.inspect` reports only the last frame and `ui_shot` prints control replies, not per-frame
++timings; neither is a sample source.
++
++Record with every result:
++- source SHA (baseline/candidate/stock-0.37 control), `Cargo.lock` SHA-256, feature list,
++ `CRAFT_FONTS_DIR` and craft-fonts ref, fixture name/hash;
++- OS and version, CPU/GPU, driver, backend (`Vulkan`/`DX12`/`Metal`/`GL`/`WebGPU`),
++ renderer type (hardware vs WARP/llvmpipe), display scale, window size, pixels-per-point;
++- profile (`release` unless a debug-only diagnostic is named), warmups, repetitions,
++ raw samples, median/p95/p99, peak RSS, allocations, texture upload bytes and idle
++ CPU/repaint count.
++
++Host capacity/qualification facts: read-only inspection finds an i915 PCI `8086:3E96`
++render device and a readable/writable `/dev/dri/renderD128` to the parent; the worker
++sandbox may hide it. No display session or compositor is inherited. Availability is not a
++qualified Vulkan/OpenGL/native compositor result; the managed renderer probe must identify
++the actual backend. The Windows baseline is software-rendered (Microsoft Basic Render
++Driver). A 128 GiB Windows full clone may not fit current capacity; use an allocated
++baseline-backed overlay with an adequate reservation or retain the platform row as blocked.
++macOS and physical Windows/audio remain separate rows.
++
++### 7.2 Operations
++
++1. **Startup**: at least 20 fresh processes; measure wall/`Instant` from process start to
++ first presented frame and to first interactive sample document. Report RSS and the
++ #8512 system-font discovery/first-missing-glyph component separately. The #8736 DX12
++ renderer/shader/pipeline construction is a separate Windows row, never a UI frame.
++2. **Idle UI**: open the sample, leave it untouched for 60 s, count frames/repaints and CPU.
++ No continuous repaint storm; the font scan's 250 ms poll must stop once cataloged.
++3. **Frame distribution**: at least 1,000 individual frames per configuration, with at
++ least 10 warmups and raw per-frame samples; report p50/p95/p99. Run the sample, the Tools
++ panel two-column state and a floating dock. Record shapes, vertices/indices, texture
++ set/free count/bytes, galley cache size and requested-repaint count.
++4. **Steady operations**: at least 30 timed iterations per operation after 10 warmups:
++ layout, panel open/float/dock/activate latency, canvas zoom/pan/damage patches,
++ selection and caret movement, text layout/tessellation.
++5. **Text tessellation #8731**: fixed 120-label ASCII scene plus a mixed/color-glyph
++ control; time `Context::tessellate` separately for 0.36, stock 0.37 and the final fork.
++ If the ~60% plain-text regression reproduces, require a color-safe row-level fix or a
++ documented exception; clamp-only is not a fix.
++6. **#8736 DX12**: Windows clone; time renderer/pipeline/shader construction separately from
++ first frame, with predictable filtering disabled/enabled as applicable. Record adapter
++ and driver.
++7. **#8512 fonts**: cold process with bundled fonts, with `CRAFT_FONTS_DIR` and with a
++ test-only system provider fixture; compare discovery/startup and glyph coverage. Do not
++ enable the system provider in production to win the measurement.
++8. **#8763/#8764 selection**: select text then click a toolbar/context action; record
++ command latency and assert the intended range/undo. This is correctness evidence; the
++ tail timing is a separate sample.
++9. **#8748 hidden child**: open/update/close the second viewport while the parent is
++ hidden/occluded/overdue; record first visible child frame and close acknowledgement.
++10. **Screenshots**: visible and hidden `ui.screenshot` requests; record reply latency,
++ file size, retained bytes, cancellation/timeout and late-callback cleanup.
++11. **Memory**: RSS after sample load, after 10 pan cycles, after 30 screenshots and after
++ a drain/shutdown; retained image bytes must return to zero.
++12. **Stock-0.37 control**: where the operation exists unchanged on stock 0.37, run the same
++ minimal adapter/harness against 0.36, stock 0.37 and the final fork; explain semantic
++ differences. Unavailable equivalence is an attribution limitation, not proof an
++ upstream regression is unavoidable.
++
++Use matched commands and the same fonts/fixture for baseline and candidate. Do not report
++`cargo build` time as UI performance.
++
++### 7.3 Thresholds and noise policy
++
++Predefine before looking at candidate numbers. The shared suite floors are minimums; an app
++may tighten, never loosen:
++
++- UI frame median: candidate <= baseline + 5%; p95 <= baseline + 10%; p99 (>=1,000 frames)
++ <= baseline + 15%.
++- Canvas render median: <= baseline + 5%; p95 <= +10%; patch count no increase beyond
++ fixture determinism.
++- Idle CPU: <= baseline + 20% and no more than one extra repaint per second after fonts
++ are ready; zero paints in 2 s after settle.
++- Startup: <= baseline +5% median / +10% p95, with the #8736 DX12 shader-compilation component reported
++ separately. A #8736-sized regression needs the upstream/fork fix or explicit approval.
++- Screenshot reply p95: <= baseline + 10%; retained bytes bounded and zero after drain.
++- Peak RSS: investigate a repeatable increase over +5% or +16 MiB, whichever is reached
++ first; report absolute and percentage. (Use the app's existing stricter budget if one is
++ found.)
++- Text tessellation: if the isolated probe reproduces #8731's ~60% regression, require a
++ color-safe row-level fix or a documented exception; never accept a clamp-only shader
++ change.
++- Sub-millisecond operations: the relative increase must also exceed 0.05 ms or be
++ corroborated by stable instruction/allocation counts.
++
++Sample counts: at least 10 warmups and 30 timed iterations per steady operation; at least 20
++fresh processes for startup; at least 1,000 individual frames for frame distributions. Use
++five independent sessions of at least 200 frame samples for tail percentiles, and pool the
++raw samples for p99; do not report p99 from 30 samples. Alternate baseline/candidate rounds;
++discard a session if a build/test/profiling process competes for CPU or the coefficient of
++variation of medians exceeds 3% (5% for microbenchmarks), then rerun. If the difference is
++within 2×MAD of paired samples, call it equal and do not chase it. Re-run and profile before
++filing or accepting a regression. Never auto-update a snapshot or lower a threshold to hide
++a timing or geometry change.
++
++## 8. Staged implementation PRs and rollback
++
++The dependency DAG is:
++
++```text
++plans land -> baseline harness + measurements
++completed winit -> egui P8 (P2b/P7/P7b/P7c included)
++ -> craft-libs CL-1 -> CL-2 reviewed capture prototype
++ -> DesignCraft D1 / GridCraft G1 pilot adapters -> CL-2F API freeze
++DesignCraft D1 -> D2 lifecycle -> D3 extended native/language qualification
++craft-libs CL-3 + D1 -> D4 docking/accessibility
++D2/D3/D4 -> D5 visual/workflow acceptance -> D6 final platform/performance evidence
++```
++
++- **D1 — atomic final-fork compatibility pilot.** Pin the complete final storytold
++ egui/winit graph and reviewed craft-ui CL-1/CL-2 prototype; regenerate the lock.
++ Apply roles/IDs/FontData/wheel changes, explicit native clipboard and test fonts,
++ strict minimum names/glyphs, the shared capture-slot adapter and its cancellation/
++ bounds/wake tests, parent-salted test lookup keys, and the required E21/E21b custom
++ editor adapter. Remove `rtl.rs` duplicate visual reorder/alignment as the final fork
++ becomes the bidi owner. Preserve app-owned UiState/docking preferences; no invented
++ egui-memory migration. Gate: cargo xtask ci/wasm, UI/native tests, one-family graph,
++ clean locked fetch, capture and IME contract tests, clipboard and save/reopen. This
++ reviewed pilot plus GridCraft's adapter permits CL-2F; stock 0.37 is an isolated
++ benchmark/control workspace, never a production handoff. Rollback restores complete
++ e74208dd source/manifests/lock/executable and prior preferences.
++- **D2 — frame stages and hidden input.** Add the narrow once-per-layout-frame guard,
++ host pacing/queue separation, monotonic deadlines, buffered synthetic-input policy
++ and per-step hidden paint. The shared capture API is already adopted in D1; extend
++ hidden/multipass/restore stress tests here. Do not replace it with a local interim
++ slot. Revert D2 as a behavior/test unit only if D1's compatibility checks still pass.
++- **D3 — extended native/language qualification.** After D2 and CL-2F, use the same
++ complete final fork and frozen helper; qualify E4/W15P, P7 key release, E21/E21b and
++ P7c selection/hidden-child behavior on native platforms and add language policy as
++ required. Required IME/bidi API adaptations already land in D1. Rollback removes
++ only these later policy/test changes; it never strips fork patches while retaining
++ fork-only source. A dependency rollback restores the full D1 predecessor set.
++- **D4 — accessibility and glyph contracts.** Add the remaining names/roles, full role
++ file list, explicit `DockArea::direction(LeftToRight)`, and coverage tests. Gate:
++ `unnamed_widgets()` empty, explicit role/label queries, glyph coverage with and without
++ craft-fonts, direction geometry/hit/drag and saved-layout tests. Rollback: revert the
++ label/direction changes; no document or command behavior changes.
++- **D5 — visual/geometry baselines and workflows.** Review every intended 0.37 visual
++ delta, update fixtures only with explanation, add the save/reopen/dock/popout, native
++ X11/Wayland, Windows VM and browser workflow tests. Gate: geometry/hit tests, pixel
++ comparisons, deliberate broken-behavior probes. Rollback: restore the previous reviewed
++ baselines; production remains on D3/D4.
++- **D6 — qualification and performance.** Windows VM, Linux native, browser, macOS gate,
++ paired performance protocol with the stock-0.37 control. No production behavior change
++ unless a measured regression requires a separately reviewed fix. Rollback: no code
++ rollback expected; keep the evidence and the old dependency set until acceptance.
++
++Each PR must be one coherent outcome, use one task id per commit, and carry the validation
++results at the reviewed revision. No PR is published without fresh direct human approval.
++
++## 9. Risks, unresolved questions and blocking acceptance criteria
++
++### Blocking unknowns
++
++1. **Final dependency publications.** The final reviewed `storytold/egui` and
++ `storytold/winit` revisions do not exist yet. Candidate `aiongg` hashes are comparison
++ inputs only. D1 cannot ship until the complete P8 handoff and winit revisions are published with E1–E21,
++ E21b, E4/P2b, W1–W27 and W15P, and a clean checkout fetches them `--locked`.
++2. **craft-libs CL-1/CL-2F revisions.** The 0.37-compatible craft-ui revision must be the
++ `8614e4a` port onto current `4919088`, preserving `d66e345`/`fd9cf54`, `crates/platform`
++ and unrelated fixes. PR199's `b68de8c`/`ec8840a` trees are not bases. The capture API
++ freezes only after the DesignCraft/GridCraft adapter review.
++3. **Clipboard/PRIMARY.** D1 enables `eframe/clipboard` to preserve OS Copy/Cut/Paste. D3
++ needs E4/W15P native evidence on X11 and Wayland (wlroots/KWin/Mutter): pointer-
++ and keyboard-triggered ownership including keyboard-only focus, serial freshness, owner/seat changes, empty/absent offers, self-paste, canceled/
++ slow transfers, password exclusion, no unchanged-selection reclaim and no second regular
++ data device. A compile-only or X11-only result is not acceptance.
++4. **Windows GPU fallback.** E2/E3 turns some egui-wgpu configure/renderer failures into
++ `WgpuError` values rather than panics. DesignCraft's `gpu::finish` already handles
++ `eframe::Error::Wgpu(_)`, but the exact startup fallback behavior must be tested on the
++ Windows clone with a deliberately failing adapter/backend. Do not claim it from unit
++ tests only.
++5. **macOS native evidence.** macOS menu shortcuts, press-and-hold IME, `deleteSurrounding`
++ bytes, `movable_by_window_background`, Dock Quit and viewport screenshots need real
++ hardware or remain explicitly unresolved. A software/VM screenshot is not native
++ evidence.
++6. **`#8731` text tessellation.** The upstream report is a measured regression, not a
++ DesignCraft result. If the candidate reproduces it, a color-safe fix (row-level branch)
++ or an explicit exception is required before accepting the performance row.
++7. **`#8736` DX12 startup.** The shader-compile cost is a Windows startup risk. Measure it
++ separately and do not hide it inside a UI frame average.
++8. **`#8748` hidden-parent/deferred-child.** Closed and unmerged. The final fork must own a
++ tested solution; DesignCraft's immediate second viewport must open/update/close while the
++ parent is hidden/occluded/overdue and while visibility is unknown.
++9. **Accessibility scope.** The exact number of unnamed inputs will only be known after
++ D1's first strict `Harness::check_accessibility()` run. D1 must fix the existing test
++ surface or record an explicit per-test policy; D4 completes the remaining controls. If
++ the D4 remainder is large, split "core chrome/panels" and "dialogs/rare panels"; do not
++ disable the check globally.
++10. **Text selection #8763/#8764.** The source audit finds no control that reads an egui
++ `TextEdit` selection in the same pass, so no app workaround is planned. The fork owns
++ the upstream fix. If implementation finds such a control, carry #8764 or defer the
++ command with a tested app change; do not hide it in the test.
++11. **E21b/P7b.** The incoming E21/W27 path is not full surrounding-text integration.
++ DesignCraft's canvas needs a real logical model/preedit/UTF-8 adapter, bounded at 4000
++ bytes and cleared on focus/password/no-IME; `None` placeholders are not acceptance.
++ Native Wayland IME trace remains required.
++12. **DockArea direction.** CL-3's opt-in direction is a visual policy, not a schema change.
++ DesignCraft passes `LeftToRight` explicitly for now; saved physical splits/rectangles
++ and logical tab order must remain unchanged. No display-bidi text reaches shaping or
++ clipboard.
++13. **Platform capacity/qualification.** The parent can see i915 PCI `8086:3E96` and
++ `/dev/dri/renderD128`; the worker sandbox may hide it, and no display session/compositor
++ is inherited. Windows needs a uniquely owned clone/overlay within allocator capacity
++ (a 128 GiB full clone may not fit). Browser WebGPU/WebGL and real native X11/Wayland
++ workflows need provisioning. These rows remain blockers until executed; availability
++ alone is not a pass.
++14. **Capture API freeze.** CL-2F must be reviewed after both adapters. A strong `Context`
++ capture, unbounded pending images, a late file write/reply or a lock held across wakeup
++ is a blocking failure, not a follow-up.
++15. **`Cargo.lock` coherence.** Regenerate, never hand-edit. A lock with both 0.36.2 and
++ 0.37, a candidate `aiongg` source, or a machine-local path is an immediate failure.
++
++### Non-blocking but important
++
++- Style default changes may move toolbar/panel geometry even with explicit tokens.
++- `egui_kittest` 0.37's missing-glyph panic can make an unrelated test fail first; fix the
++ fixture/name or use a named per-test allow with a reason, not a global tofu/disable switch.
++- The web build's new glyph rasterizer can change emoji/fallback rendering. Verify with
++ WebGPU and `?webgl`, and keep texture filter/wrap expectations.
++- `Cargo.lock` must be regenerated through the managed workflow, not hand-edited.
++- The `designcraft-testkit` workspace dependency points at a missing `crates/testkit` in
++ the baseline; it is unused, but the dependency audit must not mistake it for an egui
++ consumer. Do not add or remove it as part of this migration.
++- Saved docking direction must never be implemented by reversing saved panel order or
++ serialized tab order.
++
++## 10. Acceptance checklist
++
++- [ ] Exact baseline SHA and dependency revisions recorded; old 0.36.2 set retained for
++ rollback.
++- [ ] All 22 manifests, root lockfile, root patch section, build scripts, `ui_shot`,
++ platform cfgs and CI workflows audited.
++- [ ] Exactly one egui family and one winit resolve from the final reviewed storytold
++ revisions; no registry 0.36.2, candidate `aiongg` source or machine-local path remains.
++- [ ] Clean checkout passes `cargo fetch --locked` and `cargo metadata --locked`.
++- [ ] `cargo xtask ci`, `cargo xtask wasm`, `cargo test -p designcraft-ui-egui --lib`,
++ `trunk build --release`, native Windows/Linux and browser workflows pass at the
++ reviewed revision.
++- [ ] `App::logic`/`App::ui` root-`Ui` flow preserved; native and web per-pass logic tested;
++ no recursive `root_ui`; multipass, repeated hidden ticks, forced hidden paint and
++ host counters tested; visibility is not used as a phase.
++- [ ] No egui PanelState persistence is invented; parent-salted test keys, panel order/rects and app-owned workspace
++ restore.
++- [ ] Screenshots use the craft-ui completion slot: weak callback, viewport-aware wakeup,
++ one-shot, timeout/cancel/close, out-of-order, bounded aggregate bytes and no strong
++ `Context` cycle.
++- [ ] Commands, undo transactions, save/reopen, workspace persistence, clipboard privacy
++ and native Copy/Cut/Paste are unchanged.
++- [ ] E4/W15P PRIMARY is evidenced natively on X11/Wayland, or explicitly unresolved;
++ password/unchanged-selection policy holds.
++- [ ] E21b outgoing surrounding text is logical, bounded at 4000 bytes, preedit-excluded and
++ cleared on focus/password/no-IME; no `None` placeholder.
++- [ ] Fork E5/E12 is the only bidi owner for egui UI/label text (the document composer
++ remains the document-text owner); no display-bidi text reaches UI shaping or clipboard.
++- [ ] Accessibility role/name assertions pass under strict kittest; glyph coverage is
++ explicit with and without craft-fonts.
++- [ ] Visual baselines have explained intended deltas; geometry/hit/direction/dock tests
++ pass; #8763/#8764 and #8748 tests have the documented expected outcome.
++- [ ] Paired performance results meet the predefined thresholds with >=10 warmups/30
++ steady iterations/20 fresh startups/1,000-frame distributions and a stock-0.37
++ control, or every regression has a reviewed fix/exception.
++- [ ] macOS, real-GPU, Wayland/GNOME and non-Latin-layout gates are either evidenced or
++ listed as unresolved; no result is implied from a compile or software renderer.
++
++## 11. References
++
++Primary source inspected locally (read-only; no checkout switch):
++
++- egui upstream `0.37.0` = `841a328ba2dd8f6996beb7189ebb7fc00e668a2a`:
++ `crates/egui/src/data/input/event.rs`, `data/input/mouse_wheel_source.rs`,
++ `data/input/viewport_info.rs`, `data/screenshot_callback.rs`, `viewport.rs`, `context.rs`,
++ `containers/panel.rs`, `id.rs`, `ui.rs`, `data/output.rs`, `accessibility.rs`,
++ `input_state/mod.rs`; `crates/epaint/src/text/font_definitions.rs`,
++ `crates/epaint/src/text/font_data.rs`;
++ `crates/eframe/src/{epi.rs,native/epi_integration.rs,native/wgpu_integration.rs,web/app_runner.rs}`;
++ `crates/egui-winit/src/{clipboard.rs,lib.rs}`; `crates/egui-wgpu/src/{setup.rs,winit.rs}`;
++ `crates/egui_kittest/src/{builder.rs,accessibility.rs}`.
++- Candidate fork for comparison: `aiongg/egui` `craft/0.37` =
++ `a4f9a17f64a6bae61350fb85804c9df0d9865916`, including `PATCHES.md` (E1–E21; E21b/P7b
++ still to be added). This is not the production pin.
++- Candidate winit for comparison: `aiongg/winit` `craft/0.30.13-lang` =
++ `8b35388bd719e8cc86a95971ba0bc026c9a8f058`, including `PATCHES.md` (W1–W27; W15P still
++ to be added). This is not the production pin.
++- `storytold/craft-libs` PR 199 head =
++ `b68de8c5f4f1c060904d211a7b1320aa0f7bce78`; audit merge
++ `ec8840af8c5fda695cf195cdd05e5ae078415c07`; API-port source
++ `8614e4a04fae516fba16c22b31ff1008cb6be10b`; current craft-libs baseline
++ `49190884278f16c9a9f5823d7698a8ffb5deb062`.
++- `storytold/egui` published 0.36.2 =
++ `767b1cad294120689a514bb4bd68c077e46679b9`; `storytold/winit` published 0.30.13 =
++ `ffae5198770d7730e718043f035a772b7dbc3b1b`.
++- DesignCraft baseline =
++ `e74208dd7e0c801d15dfdf926d64cfe5e3b346d3`.
++- Lifecycle evidence:
++ `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md`
++ (native/web per-pass logic, zero pass index after completed `run_ui`, `visible()` is not a
++ phase).
++- IME evidence:
++ `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/ime-surrounding-gap.md`
++ (E21b/P7b gap and custom-editor inventory).
++- Shared suite contract:
++ `/home/codex/work/CraftApps/egui037-migration-20261022/craft-libs/docs/egui-037-suite-rollout.md`
++ (completion slot, DockArea direction, performance sample counts, stock-0.37 control,
++ platform evidence) and `craft-libs/docs/egui-037-migration-plan.md` (§7.7, §7.8, §10).
++- Font fixtures: `egui/docs/egui-037-migration-plan.md` §10.6 (craft-fonts `2481a8a`,
++ Noto Sans Arabic/Thai/CJK, BIZ UDPGothic, Noto Sans Hebrew, Noto Color Emoji; exact
++ SHA256/licences). No font binaries are added by this plan.
++- Historical diagnostics:
++ `/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/designcraft.{errors,log,prepare.diff}`.
++- Upstream reports and notes reviewed through the local snapshot
++ `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/upstream-discussions.json`:
++ [#8731](https://github.com/emilk/egui/issues/8731),
++ [#8736](https://github.com/emilk/egui/issues/8736),
++ [#8763](https://github.com/emilk/egui/issues/8763) / PR
++ [#8764](https://github.com/emilk/egui/pull/8764) (unmerged),
++ [#8748](https://github.com/emilk/egui/pull/8748) (closed, not merged),
++ [#8631](https://github.com/emilk/egui/pull/8631),
++ [#8535](https://github.com/emilk/egui/pull/8535),
++ [#8489](https://github.com/emilk/egui/pull/8489),
++ [#8555](https://github.com/emilk/egui/pull/8555),
++ [#8583](https://github.com/emilk/egui/pull/8583),
++ [#8512](https://github.com/emilk/egui/pull/8512),
++ [#8428](https://github.com/emilk/egui/pull/8428),
++ [#8657](https://github.com/emilk/egui/pull/8657),
++ [#8577](https://github.com/emilk/egui/pull/8577),
++ [#8641](https://github.com/emilk/egui/pull/8641).
++
++These links identify the behavior and reports inspected. They are not fresh DesignCraft
++validation, and an upstream status may have changed since the snapshot.
++
++
++## Local implementation update — 2026-10-23
++
++The user clarified that reviewed plans remain local and implementation proceeds before publication. The earlier requirement to publish/land this plan first is superseded; pushes and PR publication still require explicit approval.
++
++Canonical `storytold/designcraft` `main` now resolves to `2e36dcf909627c8f0e5662fe6b4825b1c1c24420`. The owned checkout was fast-forwarded to this revision. Earlier baseline SHAs and line anchors above are retained as historical review evidence; use this new revision and its exact lockfile for current-main integration and paired measurements. The original refs remain reachable.
++
++Preserve browser page zoom and canvas touch-action:none alongside packaging fixes.
++
++The complete static delta review and exact old/new object identities are retained in the task evidence: `canonical-diffs-refresh-20261023.json` and `overnight-consumer-review-20261023.md`. This amendment claims no new build, native GUI or performance acceptance.
++
++### Local pinned font inputs (2026-10-23)
++
++Parent fetched and verified all eight manifest fonts at `storytold/craft-fonts`
++`2481a8a324b986a45954e90045ed1f8f2efaaf3c` into
++`/home/codex/work/CraftApps/egui037-migration-20261022/fixtures/craft-fonts`.
++Use this exact directory as the optional `CRAFT_FONTS_DIR` build input. All
++manifest SHA256 hashes match; licenses retained. This does not waive the
++required no-corpus test configuration. The separately pinned Hebrew fixture
++is at `/home/codex/work/CraftApps/egui037-migration-20261022/fixtures/noto-sans-hebrew/NotoSansHebrew.ttf`
++with adjacent OFL.txt/provenance.json. Keep these fonts out of app source;
++required test fixtures may use an explicit external input with verified hash
++and clear missing-input behavior, never silently disable glyph checks.
++
++## Final local landing record — 2026-10-25
++
++This section records the current local landing state. Everything above remains historical planning and
++implementation evidence: the older candidate hashes, baseline anchors and "planning only" wording
++describe earlier states and are not the current pins. No commit, index write, ref update, fetch,
++push, pull request, comment, merge, build, fmt, test, Cargo, VM, resource or cleanup action was
++performed while writing this record; the qualification results below were produced separately by
++the parent through the managed `task.py` workflow and are cited as evidence, not rerun here.
++
++### Current dependency pins
++
++| Item | Revision |
++| --- | --- |
++| egui family (`egui`, `epaint`, `ecolor`, `emath`, `eframe`, `egui-wgpu`, `egui-winit`, `egui_kittest`, `egui_extras`, `epaint_default_fonts`) | `storytold/egui` `6d518fc799681571963842f95b55a6b68431b15a` |
++| winit | `storytold/winit` `a517b3846ee8457d84ee4975110bfda6797c44dc` |
++| craft-libs (`craft-ui`, `craft-print`) | `storytold/craft-libs` `25da1314d443171b4adeaad2cd9454b273f35c6f` |
++| CI craft-fonts | `storytold/craft-fonts` `b076417b5880bd4154bd22f00695b1d28c6bea83` |
++
++`Cargo.toml` and `Cargo.lock` resolve one egui family and one winit from these storytold revisions;
++the lock has no registry 0.36.2 egui family and no candidate `aiongg` source. `crates/fonts/build.rs`
++continues to treat craft-fonts as an optional `CRAFT_FONTS_DIR` input, not a manifest dependency.
++
++### Exact dirty union
++
++| Item | Value |
++| --- | --- |
++| Checkout | `/home/codex/work/CraftApps/egui037-migration-20261022/designcraft-implementation` |
++| Git worktree HEAD (unchanged) | `80d13911b2d20fbb5cd9398696627bb3a715417b` |
++| Earlier integrated main base in the dirty state | `d8d78851729a2c1a10e5bfad7c591f3de78651a0` |
++| Imported new main | `45ed6cfce0f86e59ff66ab18a05c3ec03ccef531` (`refs/migration-observations/20261024-1610-main`) |
++| New-main distance from the earlier base | 141 commits, 127 changed paths |
++| Files in the union | 619 = 613 tracked + 6 untracked |
++| Worktree status | 186 entries = 180 modified + 6 untracked |
++| Merge state | no `MERGE_HEAD`; index empty; no conflict markers; `git diff --check` clean |
++
++The six untracked paths are exactly:
++
++- `crates/compose/src/placed.rs`
++- `crates/idml/src/tests/facing_ltr.rs`
++- `crates/idml/src/tests/frame_grid.rs`
++- `crates/ui-egui/src/page_history.rs`
++- `crates/ui-egui/src/panels/story.rs`
++- `docs/egui-037-migration-plan.md`
++
++The 16:28 reconciliation packet recorded 185 status entries: the 92 pre-existing dirty paths plus the
++127 imported paths with 34 overlaps. The current tree adds one later modified tracked path,
++`apps/designcraft/src/native_menu.rs` (the native-menu/action host-order repair), for 186. Of the 127 imported paths, 103 were adopted whole
++and 24 were reviewed 3-way content merges; later reviewed deviations are the Windows-only test fixtures
++in `apps/designcraft-cli/tests/it/cli.rs` and `crates/engine/src/file_access.rs`, the documented
++`Id::new` → `Id::unique` port in `crates/ui-egui/src/panels/story.rs`, and the host-order changes above.
++
++`80d13911` is an ancestor of `45ed6cf`, so an ordinary merge would fast-forward. The eventual manual
++union commit therefore needs both parents, `80d13911b2d20fbb5cd9398696627bb3a715417b` and
++`45ed6cfce0f86e59ff66ab18a05c3ec03ccef531`, to preserve both the migration branch and the imported
++main history. No such commit exists yet.
++
++### Review-1643 findings on the current source
++
++Both actionable defects from the 16:43 review are fixed in the current source:
++
++- **Document generation identity.** `InputGeneration` and `ScreenshotGeometry` now compare
++ `DocState::identity_epoch` through `active_document_epoch()` (`crates/ui-egui/src/lib.rs`), so a
++ `file.revert` that preserves the UID still invalidates buffered input, native drops and admitted or
++ in-flight screenshots. Regression tests cover a buffered input batch, a buffered native drop and
++ screenshots before issue and in flight; all pass in the Linux full-CI job below.
++- **NumField disabled presets.** The preset segment now uses `Sense::hover()` and reports
++ `self.enabled == false` when the field is disabled, does not open its menu, and dims its chevron;
++ `disabled_numeric_presets_are_disabled_and_do_not_open` passes.
++- The earlier `panels/properties.rs` evidence mismatch is also closed: the current file is
++ `9515f944ddbbf61bb2099324ac6825fd7603262adc605686c2a932948a81f768`, matching the later
++ Windows-qualified manifest and the current worktree.
++
++No other real source defect was found in this bounded audit. Residual items below are qualification
++limits, not claimed defects.
++
++### Current qualification evidence
++
++- **Linux full CI** `egui037-designcraft-final-characterization-ci-20261025-0050`: all 9 steps
++ passed (fmt, pdf-deps, clippy, test, i18n-report, doctest, assets, layers, wasm); 77 result
++ summaries total **3230 passed, 0 failed, 6 ignored**. The job's captured unstaged patch is
++ byte-identical to the current tracked worktree diff, so it qualifies the current tracked source.
++ The run includes the corrected canvas characterization test over three batch shapes and the
++ discard/no-discard matrix.
++- **Windows qualification** job 102: all 9 steps passed, **3198 passed across 77 result summaries**
++ on the 619-path source manifest `5208ddb75ad8d06a48c334b48e5e80dc193ae2b9739b119dd50942aa3ebd5a40`.
++ Exactly two test-only Windows fixture paths differ from the applied prior manifest
++ (`apps/designcraft-cli/tests/it/cli.rs`, `crates/engine/src/file_access.rs`); the engine production
++ prefix is unchanged. Qualified desktop executable
++ `a34478f09ccae2571320b3ada489665adae450031ca24918ec4e8b165edfc47a`; qualified CLI
++ `318ec6cb7521f941aaab01a63b2c0f970bd70bfb50e5545aa645f63d1589cbee`.
++- **Native Windows GUI** `native-gui-2238`: edit, undo, redo, selection, save and reopen were captured
++ with document, UI and window evidence; the native input diagnostic ordered three production
++ click/End replays on the qualified executable, each reaching click caret 6 and End caret 12, with
++ all three text strings unchanged and the document clean. Six screenshots were reviewed, but the state JSON is the exact caret
++ oracle because a blinking caret can make two screenshots share pixels.
++- **Native input diagnostic** `native-order-review0048.txt`: no application event loss is shown. The
++ trace records the End press/release pair arriving before the click pair; the app acted correctly
++ for the order it received. The temporary diagnostic build was fully restored to the exact 619-file
++ qualified source and binaries in the VM before the ordered production replays.
++- **Exact-source boundary.** The Windows 619-path manifest predates the host-only canvas
++ characterization test. In the current tree, `crates/ui-egui/src/canvas.rs` differs from that
++ manifest only inside `mod tests` (the first difference starts at line 6016; the test module starts
++ at line 4046), so production bytes are unchanged. The Windows run did not execute that new test;
++ Linux full CI did. This document is amended after the Windows manifest, so the documentation file
++ is also not byte-identical to that earlier snapshot.
++
++### Remaining limits and regression risk
++
++The union includes 141 upstream main commits and 127 changed paths, only part of which is egui 0.37
++API work. It also imports page history/Go Back, the Story panel, notes and table work, optical-margin
++options, linked-file read caps, SVG preflight, IDML facing/frame-grid tests, and other current-main
++features. Review the 180-file tracked diff and the 24 manual overlap resolutions as product changes,
++not as a mechanical dependency bump; the imported tests reduce but do not remove that risk.
++
++Still unqualified for this exact union: macOS native menus/IME/Apple events, real-GPU rendering and
++the DirectX 12 startup row, native Linux X11/Wayland presentation, native Windows IME and clipboard/
++PRIMARY selection, physical-device input ordering, browser presentation beyond the wasm check,
++paired performance against the thresholds in §7, and packaging/release artifacts. The Windows VM
++uses a software renderer. Cross-device QMP command order is not a guest-delivery guarantee; the
++ordered replay gates input on an observed click state rather than zero-delay host issuance.
diff --cc packaging/env.sh
index 55ff3943c,55ff3943c..833d69480
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@@ -49,7 -49,7 +49,7 @@@ warn()
# Copy licence and readme files that exist into a package directory.
copy_docs() {
local dest="$1" f
-- for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do
++ for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; do
if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
done
copy_font_licences "$dest"
diff --cc packaging/linux/flatpak/ai.storyteller.designcraft.yml
index aabee2ebb,aabee2ebb..5335d7a66
--- a/packaging/linux/flatpak/ai.storyteller.designcraft.yml
+++ b/packaging/linux/flatpak/ai.storyteller.designcraft.yml
@@@ -46,6 -46,6 +46,7 @@@ modules
build-commands:
- cargo --offline build --release --locked -p designcraft
- install -Dm755 target/release/designcraft /app/bin/designcraft
++ - install -Dm644 NOTICE /app/share/doc/designcraft/NOTICE
- install -Dm644 packaging/linux/ai.storyteller.designcraft.desktop /app/share/applications/ai.storyteller.designcraft.desktop
- install -Dm644 packaging/linux/ai.storyteller.designcraft.mime.xml /app/share/mime/packages/ai.storyteller.designcraft.xml
- mkdir -p /app/share/icons && cp -R assets/app-icon/hicolor /app/share/icons/
diff --cc packaging/linux/package.sh
index c4d843eca,c4d843eca..fa24385d5
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh
@@@ -142,7 -142,7 +142,6 @@@ if has appimage; the
esac
APPDIR="$WORK/DesignCraft.AppDir"
cp -R "$STAGE" "$APPDIR"
-- mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"
ln -s usr/bin/designcraft "$APPDIR/AppRun"
cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"
cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"
diff --cc packaging/macos/package.sh
index 21edfa574,21edfa574..c68ded7b5
--- a/packaging/macos/package.sh
+++ b/packaging/macos/package.sh
@@@ -103,6 -103,6 +103,8 @@@ mkdir -p "$APP/Contents/MacOS" "$APP/Co
# Executable and icon carry the display name (CFBundleExecutable / CFBundleIconFile).
cp "$WORK/bin/designcraft" "$APP/Contents/MacOS/DesignCraft"
cp "$ROOT/assets/app-icon/designcraft.icns" "$APP/Contents/Resources/DesignCraft.icns"
++# Required embedded-font notices are independent of optional font inputs.
++cp "$ROOT/NOTICE" "$APP/Contents/Resources/NOTICE"
# Licences of the embedded craft-fonts fonts (only when built with CRAFT_FONTS_DIR).
copy_font_licences "$APP/Contents/Resources"
sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" \
diff --cc packaging/windows/designcraft.wxs
index 8b41094ce,8b41094ce..c87ed4f19
--- a/packaging/windows/designcraft.wxs
+++ b/packaging/windows/designcraft.wxs
@@@ -9,6 -9,6 +9,9 @@@
default app for it).
-->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
++ <?ifndef HasCraftFontLicences ?>
++ <?define HasCraftFontLicences=0 ?>
++ <?endif ?>
<Package
Name="DesignCraft"
Manufacturer="Learning Machines LLC"
@@@ -38,6 -38,6 +41,9 @@@
<StandardDirectory Id="ProgramMenuFolder" />
<Feature Id="Main" Title="DesignCraft" Level="1">
++ <?if $(var.HasCraftFontLicences) = 1 ?>
++ <ComponentGroupRef Id="CraftFontLicences" />
++ <?endif ?>
<ComponentGroupRef Id="DesigncraftFiles" />
<ComponentGroupRef Id="CraftInstallerSettings" />
</Feature>
@@@ -46,7 -46,7 +52,15 @@@
</Package>
<Fragment>
++ <?if $(var.HasCraftFontLicences) = 1 ?>
++ <ComponentGroup Id="CraftFontLicences" Directory="INSTALLFOLDER">
++ <Files Include="$(var.DocsDir)\**" />
++ </ComponentGroup>
++ <?endif ?>
<ComponentGroup Id="DesigncraftFiles" Directory="INSTALLFOLDER">
++ <Component Id="DesigncraftNotice">
++ <File Id="DesigncraftNoticeFile" Source="$(var.BinDir)\NOTICE" KeyPath="yes" />
++ </Component>
<Component Id="DesigncraftApp" Guid="DE018EF3-EE87-4E36-9F76-0B7B060A195E">
<File Id="DesigncraftExe" Source="$(var.BinDir)\designcraft.exe" KeyPath="yes">
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="DesignCraft"
diff --cc packaging/windows/package.ps1
index d413442a6,d413442a6..d5ce3f388
--- a/packaging/windows/package.ps1
+++ b/packaging/windows/package.ps1
@@@ -90,11 -90,11 +90,28 @@@ Copy-Item (Join-Path $Bin 'designcraft.
& (Join-Path $PSScriptRoot 'sign.ps1') (Join-Path $Stage 'designcraft.exe') (Join-Path $Stage 'designcraft-cli.exe')
++# Required embedded-font notices ship independently of optional font inputs.
++Copy-Item -LiteralPath (Join-Path $Root 'NOTICE') -Destination $Stage
++
++# ---- font notices for the MSI ------------------------------------------------------------------
++# The portable ZIP already carries these notices; stage the complete files before MSI creation too.
++$Docs = Join-Path $Stage 'font-licences'
++New-Item -ItemType Directory -Force -Path $Docs | Out-Null
++$HasCraftFontLicences = 0
++if ($env:CRAFT_FONTS_DIR) {
++ foreach ($ofl in Get-ChildItem -Path (Join-Path $env:CRAFT_FONTS_DIR 'fonts\*\OFL.txt') -File -ErrorAction SilentlyContinue) {
++ Copy-Item -LiteralPath $ofl.FullName -Destination (Join-Path $Docs "OFL-$($ofl.Directory.Name).txt")
++ $HasCraftFontLicences = 1
++ }
++}
++# ---- end font notices for the MSI --------------------------------------------------------------
++
# ---- MSI ---------------------------------------------------------------------------------------
$Msi = Join-Path $Dist "designcraft-$Version-windows-$Arch.msi"
Invoke-Native 'wix build' {
wix build (Join-Path $PSScriptRoot 'designcraft.wxs') (Join-Path $PSScriptRoot 'installer-ui.wxs') -arch $Arch `
-d "Version=$MsiVersion" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\designcraft.ico')" `
++ -d "DocsDir=$Docs" -d "HasCraftFontLicences=$HasCraftFontLicences" `
-o $Msi
}
# wix writes its debug symbols (.wixpdb) next to the MSI; keep them out of the release assets.
@@@ -112,7 -112,7 +129,7 @@@ Set-Content -Encoding ascii -Path (Join
'DesignCraft portable: preferences, logs and crash recovery are kept in the DesignCraftData folder',
'next to designcraft.exe. Delete this file to use %APPDATA%\DesignCraft instead.'
)
--foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE') {
++foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE', 'NOTICE') {
$p = Join-Path $Root $f
if (Test-Path $p) { Copy-Item $p $Portable }
}