VectorCraft: An open-source, vector art tool written by scratch in pure Rust
feat(window): adopt shared craft-window for Linux decorations (depends on craft-libs#217) (#3366)
Dylan M. Taylorcb0a7d9b3152
diff --git a/Cargo.lock b/Cargo.lockindex 3078508fe..c3e7de4e4 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -64,7 +64,7 @@ dependencies = ["accesskit","accesskit_consumer 0.38.0","hashbrown 0.16.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-app-kit 0.2.2","objc2-foundation 0.2.2",]@@ -129,7 +129,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"dependencies = ["cfg-if","cipher",- "cpufeatures",+ "cpufeatures 0.2.17",][[package]]@@ -208,21 +208,21 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"[[package]]name = "arboard"-version = "3.6.1"+version = "3.7.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"+checksum = "aeb9553e62312c8756a5979254fc6d7da8bbeb5986a1e17037fab932f7037917"dependencies = ["clipboard-win","image","log",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-core-foundation","objc2-core-graphics","objc2-foundation 0.3.2","parking_lot","percent-encoding",- "windows-sys 0.60.2",+ "windows-sys 0.61.2","wl-clipboard-rs","x11rb",]@@ -344,13 +344,13 @@ dependencies = [[[package]]name = "async-recursion"-version = "1.1.1"+version = "1.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"+checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451"dependencies = ["proc-macro2","quote",- "syn 2.0.119",+ "syn 3.0.9",][[package]]@@ -385,7 +385,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -451,33 +451,37 @@ checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"[[package]]name = "bit-set"-version = "0.8.0"+version = "0.10.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"+checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d"dependencies = [- "bit-vec 0.8.0",+ "bit-vec 0.9.1",][[package]]name = "bit-set"-version = "0.10.0"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d"+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"dependencies = [- "bit-vec 0.9.1",+ "bit-vec 0.10.1",][[package]]name = "bit-vec"-version = "0.8.0"+version = "0.9.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"[[package]]name = "bit-vec"-version = "0.9.1"+version = "0.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"+dependencies = [+ "borsh",+ "serde",+][[package]]name = "bitflags"@@ -506,7 +510,7 @@ version = "0.5.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"dependencies = [- "objc2 0.5.2",+ "objc2 0.5.3",][[package]]@@ -515,7 +519,7 @@ version = "0.6.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"dependencies = [- "objc2 0.6.4",+ "objc2 0.6.5",][[package]]@@ -531,6 +535,30 @@ dependencies = ["piper",]+[[package]]+name = "borsh"+version = "1.8.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"+dependencies = [+ "borsh-derive",+ "bytes",+ "cfg_aliases",+]++[[package]]+name = "borsh-derive"+version = "1.8.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"+dependencies = [+ "once_cell",+ "proc-macro-crate",+ "proc-macro2",+ "quote",+ "syn 3.0.9",+]+[[package]]name = "brotli"version = "8.0.4"@@ -575,7 +603,7 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -606,14 +634,13 @@ dependencies = [[[package]]name = "calloop"-version = "0.14.4"+version = "0.14.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"+checksum = "43b32313e937c8721c9d17ee9bf60699a6402b4b7c2cb6ac1bee0ffcaa4b4e5e"dependencies = ["bitflags 2.13.2","polling","rustix 1.1.5",- "slab","tracing",]@@ -635,7 +662,7 @@ version = "0.4.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"dependencies = [- "calloop 0.14.4",+ "calloop 0.14.5","rustix 1.1.5","wayland-backend","wayland-client",@@ -643,9 +670,9 @@ dependencies = [[[package]]name = "cc"-version = "1.5.1"+version = "1.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f360145194ee8e21db5ee7f3fcd4fe52210864c75c985dae33218202c8bbe040"+checksum = "877bf67ac8e52449eb2f9e98a344ea163beb70dd1f9eebe3cc5357dcfeaee4df"dependencies = ["find-msvc-tools","jobserver",@@ -674,6 +701,17 @@ 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",+]+[[package]]name = "cipher"version = "0.4.4"@@ -731,9 +769,9 @@ dependencies = [[[package]]name = "combine"-version = "4.6.8"+version = "4.6.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"+checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92"dependencies = ["bytes","memchr",@@ -788,6 +826,12 @@ dependencies = ["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"@@ -806,6 +850,15 @@ 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-docpath"version = "0.1.0"@@ -839,11 +892,20 @@ dependencies = ["serde",]+[[package]]+name = "craft-window"+version = "0.1.0"+source = "git+https://github.com/storytold/craft-libs?rev=1f805378d454dac48b5c214029d254055fdf961b#1f805378d454dac48b5c214029d254055fdf961b"+dependencies = [+ "egui",+ "wayland-client",+]+[[package]]name = "crc32fast"-version = "1.5.2"+version = "1.5.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"dependencies = ["cfg-if",]@@ -948,7 +1010,7 @@ dependencies = ["bitflags 2.13.2","block2 0.6.2","libc",- "objc2 0.6.4",+ "objc2 0.6.5",][[package]]@@ -959,7 +1021,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -1021,7 +1083,7 @@ dependencies = ["image","js-sys","log",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-foundation 0.3.2","parking_lot",@@ -1089,7 +1151,7 @@ dependencies = ["bytemuck","egui","log",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-foundation 0.3.2","objc2-ui-kit 0.3.2","profiling",@@ -1151,9 +1213,9 @@ dependencies = [[[package]]name = "either"-version = "1.18.0"+version = "1.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"[[package]]name = "emath"@@ -1222,7 +1284,7 @@ dependencies = ["ecolor","emath","epaint_default_fonts",- "font-types 0.12.5",+ "font-types 0.12.7","harfrust 0.12.0","log","nohash-hasher",@@ -1244,9 +1306,9 @@ checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"[[package]]name = "equivalent"-version = "1.0.2"+version = "1.0.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"[[package]]name = "errno"@@ -1322,9 +1384,9 @@ checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"[[package]]name = "find-msvc-tools"-version = "0.1.14"+version = "0.1.15"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"[[package]]name = "fixedbitset"@@ -1381,9 +1443,9 @@ dependencies = [[[package]]name = "font-types"-version = "0.12.5"+version = "0.12.7"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6"+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"dependencies = ["bytemuck",]@@ -1417,7 +1479,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -1468,7 +1530,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -1540,6 +1602,7 @@ dependencies = ["cfg-if","libc","r-efi 6.0.0",+ "rand_core",][[package]]@@ -1622,7 +1685,7 @@ dependencies = ["glutin_glx_sys","glutin_wgl_sys","libloading",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-core-foundation","objc2-foundation 0.3.2",@@ -2286,9 +2349,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"[[package]]name = "libc"-version = "0.2.189"+version = "0.2.191"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"[[package]]name = "libloading"@@ -2315,7 +2378,7 @@ dependencies = ["bitflags 2.13.2","libc","plain",- "redox_syscall 0.9.4",+ "redox_syscall 0.9.5",][[package]]@@ -2357,9 +2420,9 @@ checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"[[package]]name = "litrs"-version = "1.0.0"+version = "1.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"+checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70"[[package]]name = "lock_api"@@ -2449,7 +2512,7 @@ dependencies = ["crossbeam-channel","dpi","keyboard-types",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-core-foundation","objc2-foundation 0.3.2",@@ -2581,9 +2644,9 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"[[package]]name = "objc2"-version = "0.5.2"+version = "0.5.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"+checksum = "19d5490aaf8f1d7cf7688dfa9b0ce07900e168852c45cd2c03f534dfd27cfd0b"dependencies = ["objc-sys","objc2-encode",@@ -2591,9 +2654,9 @@ dependencies = [[[package]]name = "objc2"-version = "0.6.4"+version = "0.6.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"+checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8"dependencies = ["objc2-encode",]@@ -2607,7 +2670,7 @@ dependencies = ["bitflags 2.13.2","block2 0.5.1","libc",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-core-data","objc2-core-image","objc2-foundation 0.2.2",@@ -2622,7 +2685,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"dependencies = ["bitflags 2.13.2","block2 0.6.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-core-graphics","objc2-foundation 0.3.2",@@ -2636,7 +2699,7 @@ checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-core-location","objc2-foundation 0.2.2",]@@ -2648,7 +2711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"dependencies = ["block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2",]@@ -2660,7 +2723,7 @@ checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2",]@@ -2672,7 +2735,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"dependencies = ["bitflags 2.13.2","dispatch2",- "objc2 0.6.4",+ "objc2 0.6.5",][[package]]@@ -2683,7 +2746,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"dependencies = ["bitflags 2.13.2","dispatch2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-io-surface",]@@ -2695,7 +2758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"dependencies = ["block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2","objc2-metal 0.2.2",]@@ -2707,7 +2770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"dependencies = ["block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-contacts","objc2-foundation 0.2.2",]@@ -2737,7 +2800,7 @@ dependencies = ["block2 0.5.1","dispatch","libc",- "objc2 0.5.2",+ "objc2 0.5.3",][[package]]@@ -2748,7 +2811,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"dependencies = ["bitflags 2.13.2","block2 0.6.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation",]@@ -2759,7 +2822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"dependencies = ["bitflags 2.13.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation",]@@ -2770,7 +2833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"dependencies = ["block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-app-kit 0.2.2","objc2-foundation 0.2.2",]@@ -2783,7 +2846,7 @@ checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2",]@@ -2795,7 +2858,7 @@ checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"dependencies = ["bitflags 2.13.2","block2 0.6.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-foundation 0.3.2",]@@ -2807,7 +2870,7 @@ checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2","objc2-metal 0.2.2",]@@ -2819,7 +2882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"dependencies = ["bitflags 2.13.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-core-graphics","objc2-foundation 0.3.2",@@ -2832,7 +2895,7 @@ version = "0.2.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"dependencies = [- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2",]@@ -2844,7 +2907,7 @@ checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-cloud-kit","objc2-core-data","objc2-core-image",@@ -2864,7 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"dependencies = ["bitflags 2.13.2",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-foundation 0.3.2",]@@ -2876,7 +2939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"dependencies = ["block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-foundation 0.2.2",]@@ -2888,7 +2951,7 @@ checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"dependencies = ["bitflags 2.13.2","block2 0.5.1",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-core-location","objc2-foundation 0.2.2",]@@ -3213,15 +3276,6 @@ dependencies = ["zerovec",]-[[package]]-name = "ppv-lite86"-version = "0.2.21"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"-dependencies = [- "zerocopy",-]-[[package]]name = "presser"version = "0.3.1"@@ -3254,16 +3308,17 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"[[package]]name = "proptest"-version = "1.11.0"+version = "1.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"+checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0"dependencies = [- "bit-set 0.8.0",- "bit-vec 0.8.0",+ "bit-set 0.11.1",+ "bit-vec 0.10.1","bitflags 2.13.2",+ "chacha20",+ "core_detect","num-traits","rand",- "rand_chacha","rand_xorshift","regex-syntax","rusty-fork",@@ -3330,38 +3385,25 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"[[package]]name = "rand"-version = "0.9.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"-dependencies = [- "rand_chacha",- "rand_core",-]--[[package]]-name = "rand_chacha"-version = "0.9.0"+version = "0.10.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"+checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"dependencies = [- "ppv-lite86",+ "getrandom 0.4.3","rand_core",][[package]]name = "rand_core"-version = "0.9.5"+version = "0.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"-dependencies = [- "getrandom 0.3.4",-]+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"[[package]]name = "rand_xorshift"-version = "0.4.0"+version = "0.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"+checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf"dependencies = ["rand_core",]@@ -3384,7 +3426,7 @@ version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"dependencies = [- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-foundation 0.3.2","objc2-quartz-core 0.3.2",@@ -3427,7 +3469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"dependencies = ["bytemuck",- "font-types 0.12.5",+ "font-types 0.12.7","once_cell",]@@ -3438,7 +3480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"dependencies = ["bytemuck",- "font-types 0.12.5",+ "font-types 0.12.7","once_cell",]@@ -3449,7 +3491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d5a0cf4bb6cbce4c29756270d189a5e400ac05e91192161d83a0bcb6e68492e8"dependencies = ["bytemuck",- "font-types 0.12.5",+ "font-types 0.12.7","once_cell",]@@ -3473,9 +3515,9 @@ dependencies = [[[package]]name = "redox_syscall"-version = "0.9.4"+version = "0.9.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e"+checksum = "580c875845b41ecb1564ad1ae4703044cef774145e3d7a94dc2b3fa7c97868fd"dependencies = ["bitflags 2.13.2",]@@ -3517,7 +3559,7 @@ dependencies = ["js-sys","libc","log",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-core-foundation","objc2-foundation 0.3.2",@@ -3726,14 +3768,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]name = "serde_json"-version = "1.0.151"+version = "1.0.154"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"dependencies = ["itoa","memchr",@@ -3750,14 +3792,14 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]name = "serde_spanned"-version = "1.1.1"+version = "1.1.2"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"+checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"dependencies = ["serde_core",]@@ -3769,7 +3811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"dependencies = ["cfg-if",- "cpufeatures",+ "cpufeatures 0.2.17","digest",]@@ -3873,9 +3915,9 @@ dependencies = [[[package]]name = "smallvec"-version = "1.16.2"+version = "1.16.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"+checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b"dependencies = ["serde",]@@ -3912,7 +3954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"dependencies = ["bitflags 2.13.2",- "calloop 0.14.4",+ "calloop 0.14.5","calloop-wayland-source 0.4.1","cursor-icon","libc",@@ -4064,9 +4106,9 @@ dependencies = [[[package]]name = "syn"-version = "3.0.6"+version = "3.0.9"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"dependencies = ["proc-macro2","quote",@@ -4081,7 +4123,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -4143,7 +4185,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -4225,18 +4267,18 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"[[package]]name = "tokio"-version = "1.53.1"+version = "1.54.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"+checksum = "a0c168a474b95bfecfe908a65d4bdffc523144b649a74c09c286afb35d53e0bc"dependencies = ["pin-project-lite",][[package]]name = "toml"-version = "1.1.6+spec-1.1.0"+version = "1.1.8+spec-1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a"+checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"dependencies = ["indexmap","serde_core",@@ -4249,18 +4291,18 @@ dependencies = [[[package]]name = "toml_datetime"-version = "1.1.1+spec-1.1.0"+version = "1.1.2+spec-1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"dependencies = ["serde_core",][[package]]name = "toml_edit"-version = "0.25.15+spec-1.1.0"+version = "0.25.17+spec-1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614"+checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c"dependencies = ["indexmap","toml_datetime",@@ -4270,18 +4312,18 @@ dependencies = [[[package]]name = "toml_parser"-version = "1.1.3+spec-1.1.0"+version = "1.1.5+spec-1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"dependencies = ["winnow",][[package]]name = "toml_writer"-version = "1.1.2+spec-1.1.0"+version = "1.1.3+spec-1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"+checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"[[package]]name = "tracing"@@ -4399,15 +4441,15 @@ checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"[[package]]name = "unicode-ident"-version = "1.0.26"+version = "1.0.27"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"[[package]]name = "unicode-normalization"-version = "0.1.25"+version = "0.1.26"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"+checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d"dependencies = ["tinyvec",]@@ -4512,9 +4554,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"[[package]]name = "uuid"-version = "1.26.1"+version = "1.28.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"+checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606"dependencies = ["js-sys","serde_core",@@ -4529,12 +4571,13 @@ dependencies = ["block2 0.6.2","clipboard-win","craft-print",+ "craft-window","eframe","egui","image","log","muda",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-core-foundation","objc2-core-text",@@ -5166,7 +5209,7 @@ dependencies = ["bumpalo","proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9","wasm-bindgen-shared",]@@ -5181,12 +5224,12 @@ dependencies = [[[package]]name = "wasm-encoder"-version = "0.261.0"+version = "0.262.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2608e8bb6d67fd68f5a8d0eb1363d6e7bcbc1f8ded5a0bd3a1e382462b876b22"+checksum = "4495a6f85dd94c411c749303efcbc5defade0b0cbdbc0541495241ab917a9b5a"dependencies = ["leb128fmt",- "wasmparser 0.261.0",+ "wasmparser 0.262.0",][[package]]@@ -5241,9 +5284,9 @@ dependencies = [[[package]]name = "wasmparser"-version = "0.261.0"+version = "0.262.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4f20f20e44f7e8aeb6744823ea9d869ede51e51be4fdaedede2852282e54d2d8"+checksum = "974d643b125b272607e2fff8012ea14a8328acd7621e4bafa7afb32500052b1b"dependencies = ["bitflags 2.13.2","indexmap",@@ -5252,9 +5295,9 @@ dependencies = [[[package]]name = "wast"-version = "261.0.0"+version = "262.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "776443145731a4062e5b0d392892a2005909b6ab72d9fdc3cad53dd1a714e44a"+checksum = "30612a0c29249b5f185888a107e8a519d920226b7d07f9d351fd094e9f75eb23"dependencies = ["bumpalo","leb128fmt",@@ -5265,9 +5308,9 @@ dependencies = [[[package]]name = "wat"-version = "1.261.0"+version = "1.262.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a7b4d1a49ea73a8f3326e74e3a05db667001b16bd1035ed3356fc1a0ed05ca7f"+checksum = "e228027f2b07bbaf946980ebbe2437fca73be6f54c40c2a8d4f42f277075f8d1"dependencies = ["wast",]@@ -5436,7 +5479,7 @@ dependencies = ["jni","log","ndk-context",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-app-kit 0.3.2","objc2-foundation 0.3.2","url",@@ -5577,7 +5620,7 @@ dependencies = ["naga","naga-types","ndk-sys",- "objc2 0.6.4",+ "objc2 0.6.5","objc2-core-foundation","objc2-core-graphics","objc2-foundation 0.3.2",@@ -5759,7 +5802,7 @@ version = "0.52.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"dependencies = [- "windows-targets 0.52.6",+ "windows-targets",][[package]]@@ -5768,16 +5811,7 @@ version = "0.59.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"dependencies = [- "windows-targets 0.52.6",-]--[[package]]-name = "windows-sys"-version = "0.60.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"-dependencies = [- "windows-targets 0.53.5",+ "windows-targets",][[package]]@@ -5795,31 +5829,14 @@ version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"dependencies = [- "windows_aarch64_gnullvm 0.52.6",- "windows_aarch64_msvc 0.52.6",- "windows_i686_gnu 0.52.6",- "windows_i686_gnullvm 0.52.6",- "windows_i686_msvc 0.52.6",- "windows_x86_64_gnu 0.52.6",- "windows_x86_64_gnullvm 0.52.6",- "windows_x86_64_msvc 0.52.6",-]--[[package]]-name = "windows-targets"-version = "0.53.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"-dependencies = [- "windows-link",- "windows_aarch64_gnullvm 0.53.1",- "windows_aarch64_msvc 0.53.1",- "windows_i686_gnu 0.53.1",- "windows_i686_gnullvm 0.53.1",- "windows_i686_msvc 0.53.1",- "windows_x86_64_gnu 0.53.1",- "windows_x86_64_gnullvm 0.53.1",- "windows_x86_64_msvc 0.53.1",+ "windows_aarch64_gnullvm",+ "windows_aarch64_msvc",+ "windows_i686_gnu",+ "windows_i686_gnullvm",+ "windows_i686_msvc",+ "windows_x86_64_gnu",+ "windows_x86_64_gnullvm",+ "windows_x86_64_msvc",][[package]]@@ -5837,96 +5854,48 @@ version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"-[[package]]-name = "windows_aarch64_gnullvm"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"-[[package]]name = "windows_aarch64_msvc"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"-[[package]]-name = "windows_aarch64_msvc"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"-[[package]]name = "windows_i686_gnu"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"-[[package]]-name = "windows_i686_gnu"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"-[[package]]name = "windows_i686_gnullvm"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"-[[package]]-name = "windows_i686_gnullvm"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"-[[package]]name = "windows_i686_msvc"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"-[[package]]-name = "windows_i686_msvc"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"-[[package]]name = "windows_x86_64_gnu"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"-[[package]]-name = "windows_x86_64_gnu"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"-[[package]]name = "windows_x86_64_gnullvm"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"-[[package]]-name = "windows_x86_64_gnullvm"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"-[[package]]name = "windows_x86_64_msvc"version = "0.52.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"-[[package]]-name = "windows_x86_64_msvc"-version = "0.53.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"-[[package]]name = "winit"version = "0.30.13"@@ -5950,7 +5919,7 @@ dependencies = ["libc","memmap2","ndk",- "objc2 0.5.2",+ "objc2 0.5.3","objc2-app-kit 0.2.2","objc2-foundation 0.2.2","objc2-ui-kit 0.2.2",@@ -5990,9 +5959,9 @@ dependencies = [[[package]]name = "winresource"-version = "0.1.31"+version = "0.1.34"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0986a8b1d586b7d3e4fe3d9ea39fb451ae22869dcea4aa109d287a374d866087"+checksum = "a2bc6d36480b829272a5bdabf08e6dca8004761c1da7e35efef800540c66221b"dependencies = ["toml","version_check",@@ -6142,13 +6111,13 @@ dependencies = [[[package]]name = "yoke-derive"-version = "0.8.3"+version = "0.8.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "33811428bee40dbceb6d545e95754741d17a6aef9a4849f0fd62e2ba4f412a78"+checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9","synstructure",]@@ -6220,7 +6189,7 @@ dependencies = ["proc-macro-crate","proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9","zbus_names","zvariant","zvariant_utils",@@ -6228,9 +6197,9 @@ dependencies = [[[package]]name = "zbus_names"-version = "4.3.4"+version = "4.3.5"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"+checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd"dependencies = ["serde","winnow",@@ -6260,18 +6229,18 @@ dependencies = [[[package]]name = "zerocopy"-version = "0.8.59"+version = "0.8.63"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"dependencies = ["zerocopy-derive",][[package]]name = "zerocopy-derive"-version = "0.8.59"+version = "0.8.63"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"dependencies = ["proc-macro2","quote",@@ -6295,7 +6264,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9","synstructure",]@@ -6331,7 +6300,7 @@ checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"dependencies = ["proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9",][[package]]@@ -6363,9 +6332,9 @@ dependencies = [[[package]]name = "zvariant"-version = "5.15.0"+version = "5.15.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"+checksum = "80bf6d6cd6a4b601acb64cfb8284cdc643fcfa75ef26ae3c46ec8aa4e8a1fbb7"dependencies = ["endi","enumflags2",@@ -6378,14 +6347,14 @@ dependencies = [[[package]]name = "zvariant_derive"-version = "5.15.0"+version = "5.15.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"+checksum = "ef2672456ba1cb54b5eaec136e63135b3c7495fb938e53b28a62e633496d486d"dependencies = ["proc-macro-crate","proc-macro2","quote",- "syn 3.0.6",+ "syn 3.0.9","zvariant_utils",]@@ -6398,6 +6367,6 @@ dependencies = ["proc-macro2","quote","serde",- "syn 3.0.6",+ "syn 3.0.9","winnow",]diff --git a/Cargo.toml b/Cargo.tomlindex 30eff51df..63f7a91dc 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -15,6 +15,9 @@ craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b77craft-print = { git = "https://github.com/storytold/craft-libs", rev = "d991bf6792f8ade99c51358bf3c1d902c8cd96b5" }craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }+# Decides who draws the window frame (desktop vs. app) so the suite shares one native titlebar per+# desktop. The `egui` feature adds `craft_window::decorate`. (craft-libs#217.)+craft-window = { git = "https://github.com/storytold/craft-libs", rev = "1f805378d454dac48b5c214029d254055fdf961b", features = ["egui"] }# internalvectorcraft-geom = { path = "crates/geom" }vectorcraft-color = { path = "crates/color" }diff --git a/apps/vectorcraft/Cargo.toml b/apps/vectorcraft/Cargo.tomlindex 345968911..9cac2c235 100644--- a/apps/vectorcraft/Cargo.toml+++ b/apps/vectorcraft/Cargo.toml@@ -20,6 +20,9 @@ windows7 = ["eframe/glow"]vectorcraft-engine = { workspace = true }vectorcraft-ui-egui = { workspace = true }vectorcraft-text = { workspace = true }+# Shared across the Craft suite: decides who draws the window frame per desktop (compositor vs app)+# so VectorCraft matches the rest on Linux. `egui` adds `craft_window::decorate`. See #217.+craft-window = { workspace = true }eframe = { workspace = true, features = ["default_fonts", "wayland", "x11"] }egui = { workspace = true }serde_json = { workspace = true }diff --git a/apps/vectorcraft/src/main.rs b/apps/vectorcraft/src/main.rsindex 450d52b9b..906374f4d 100644--- a/apps/vectorcraft/src/main.rs+++ b/apps/vectorcraft/src/main.rs@@ -624,13 +624,73 @@ fn adapter_summary(info: &eframe::wgpu::AdapterInfo) -> String {/// Windows and Linux: no OS title bar; the app bar is the title bar (`vectorcraft_ui_egui::titlebar`)./// macOS keeps its traffic lights over the integrated title strip.+///+/// Used on macOS and Windows (where VectorCraft keeps today's frame regardless of the+/// `craft-window` probe) and by the tests; Linux and the BSDs take the decision from the probe.+#[cfg_attr(not(any(target_os = "macos", target_os = "windows")), allow(dead_code))]const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos");-/// Whether this start draws its own title bar: Windows and Linux do, unless Preferences ›-/// User Interface › System Title Bar asks for the system's. Read from the saved preferences-/// before the window opens; a missing or unreadable value keeps the default.+/// Whether the user asked for the system title bar in Preferences › User Interface › System Title+/// Bar. Read from the saved preferences before the window opens; a missing or unreadable value is+/// `false` (the default). This preference forces the desktop/native frame back on.+fn opted_into_system_title_bar(saved: Option<&vectorcraft_ui_egui::UiState>) -> bool {+ saved.map(|ui| ui.engine_prefs.get("systemTitleBar").and_then(serde_json::Value::as_bool).unwrap_or(false)).unwrap_or(false)+}++/// Whether this start draws its own title bar, given the frame the shared `craft-window` crate+/// decided and the user's System Title Bar preference.+///+/// The suite-wide rule (`craft_window::Choice`) is: the desktop draws the frame+/// ([`craft_window::Frame::Desktop`]) on macOS, Windows, X11 and any Wayland compositor with+/// server-side decorations (KDE, Sway, Hyprland, COSMIC); the app draws it+/// ([`craft_window::Frame::App`]) only where the compositor leaves it to the app (GNOME's Mutter),+/// or when `VECTORCRAFT_TITLEBAR` overrides the probe. VectorCraft draws its own title bar exactly+/// when `craft-window` says the app owns the frame **and** the user has not opted into the system+/// title bar; the preference always forces the native frame back on.+///+/// macOS and Windows keep today's behavior and are decided by [`CUSTOM_TITLEBAR`] rather than the+/// probe: `craft-window` returns `Frame::Desktop` for both (the OS always draws a frame), but+/// VectorCraft insets its content under the macOS traffic lights and draws its own caption buttons+/// on Windows — an overdraw on an OS-decorated window that is VectorCraft's choice, not+/// `craft-window`'s. Only Linux and the BSDs take the decision from the probe.+#[cfg(not(any(target_os = "macos", target_os = "windows")))]+fn custom_titlebar_from(frame: &craft_window::Frame, opted_into_system: bool) -> bool {+ matches!(frame, craft_window::Frame::App(_)) && !opted_into_system+}++/// macOS and Windows: today's behavior, independent of the `craft-window` probe (see+/// [`custom_titlebar_from`]). macOS never draws its own frame (`CUSTOM_TITLEBAR` is `false`);+/// Windows draws its own caption unless the user opted into the system title bar.+#[cfg(any(target_os = "macos", target_os = "windows"))]+fn custom_titlebar_from(_frame: &craft_window::Frame, opted_into_system: bool) -> bool {+ CUSTOM_TITLEBAR && !opted_into_system+}++/// Whether this start draws its own title bar. Probes the shared `craft-window` crate once (its+/// override variable is `VECTORCRAFT_TITLEBAR`) and combines its decision with the saved System+/// Title Bar preference. Call once at startup, before [`native_options`].+///+/// On Linux, Preferences › Performance › Linux Display Server › X11 opens the window through+/// XWayland (below). A GNOME/Wayland probe would say `Frame::App` there, but the window really runs+/// on X11, whose window manager draws the frame — so when XWayland is being forced, keep the native+/// frame, the same as a real X11 session. An explicit `VECTORCRAFT_TITLEBAR` override still wins.fn custom_titlebar(saved: Option<&vectorcraft_ui_egui::UiState>) -> bool {- CUSTOM_TITLEBAR && !saved.map(|ui| ui.engine_prefs.get("systemTitleBar").and_then(serde_json::Value::as_bool).unwrap_or(false)).unwrap_or(false)+ let choice = craft_window::Choice::probe(craft_window::Prefix::new("VECTORCRAFT"));+ let opted_into_system = opted_into_system_title_bar(saved);+ #[cfg(target_os = "linux")]+ {+ let pref = saved.and_then(|ui| ui.engine_prefs.get("linuxDisplayServer")).and_then(serde_json::Value::as_str);+ // `overridden() == None` means the probe decided (no VECTORCRAFT_TITLEBAR). When the window+ // will actually open on X11 (XWayland) — the user asked for it *and* the X11 libraries are+ // present, the same two conditions the launch path checks below — that run is effectively+ // X11, so keep the native frame. If the libraries are missing, startup stays on Wayland, so+ // the probe's own decision (app-drawn on GNOME) must stand.+ let forced_to_x11 = xwayland::wanted(pref, |name| std::env::var_os(name), xwayland::pen_attached) && xwayland::x11_libraries_found();+ if choice.overridden().is_none() && forced_to_x11 {+ return custom_titlebar_from(&craft_window::Frame::Desktop, opted_into_system);+ }+ }+ custom_titlebar_from(choice.frame(), opted_into_system)}fn native_options(custom_titlebar: bool) -> eframe::NativeOptions {@@ -1043,17 +1103,41 @@ mod tests {#[test]fn the_system_title_bar_preference_keeps_the_window_decorations() {- // Preferences › User Interface › System Title Bar gives the window back its system- // decorations on Windows and Linux; macOS always has them.- assert_eq!(super::custom_titlebar(None), super::CUSTOM_TITLEBAR, "no preferences: the default");+ use craft_window::{Frame, Layout};++ // The System Title Bar preference (Preferences › User Interface) is read the same way on+ // every platform; a missing or unreadable value is `false`.+ assert!(!super::opted_into_system_title_bar(None), "no preferences: the default");let off = ui_state_with_prefs(serde_json::json!({"systemTitleBar": false}));- assert_eq!(super::custom_titlebar(Some(&off)), super::CUSTOM_TITLEBAR);+ assert!(!super::opted_into_system_title_bar(Some(&off)));let on = ui_state_with_prefs(serde_json::json!({"systemTitleBar": true}));- assert!(!super::custom_titlebar(Some(&on)));- assert_eq!(super::native_options(false).viewport.decorations, Some(true));- if super::CUSTOM_TITLEBAR {- assert_eq!(super::native_options(true).viewport.decorations, Some(false));+ assert!(super::opted_into_system_title_bar(Some(&on)));++ // The suite-wide mapping (Frame + preference -> whether VectorCraft draws its own title+ // bar). The desktop frame (macOS, Windows, X11, KDE/Wayland, …) always keeps native+ // decorations; the app frame (GNOME/Wayland, or a `VECTORCRAFT_TITLEBAR` override) draws+ // our own title bar — unless the user opted into the system title bar, which forces the+ // native frame back on.+ let app = Frame::App(Layout::default());+ let desktop = Frame::Desktop;+ #[cfg(not(any(target_os = "macos", target_os = "windows")))]+ {+ assert!(super::custom_titlebar_from(&app, false), "GNOME/Wayland: VectorCraft draws its own");+ assert!(!super::custom_titlebar_from(&app, true), "System Title Bar preference forces native");+ assert!(!super::custom_titlebar_from(&desktop, false), "KDE/X11/…: keep the compositor's frame");+ assert!(!super::custom_titlebar_from(&desktop, true));}+ // macOS and Windows keep today's behavior, independent of the probed frame: the pref still+ // forces the native frame back on where a custom one would otherwise be drawn.+ #[cfg(any(target_os = "macos", target_os = "windows"))]+ {+ assert_eq!(super::custom_titlebar_from(&desktop, false), super::CUSTOM_TITLEBAR);+ assert_eq!(super::custom_titlebar_from(&app, false), super::CUSTOM_TITLEBAR, "the probe does not change macOS/Windows");+ assert!(!super::custom_titlebar_from(&desktop, true));+ }++ assert_eq!(super::native_options(false).viewport.decorations, Some(true));+ assert_eq!(super::native_options(true).viewport.decorations, Some(false));}/// The file extensions the macOS bundle declares: its document types and its own exported type.