diff --git a/Cargo.lock b/Cargo.lock index 6049f51098..ddc3cc6889 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,15 +20,15 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "becf0eb5215b6ecb0a739c31c21bd83c4f326524c9b46b7e882d77559b60a529" +checksum = "e25ae84c0260bdf5df07796d7cc4882460de26a2b406ec0e6c42461a723b271b" [[package]] name = "accesskit_atspi_common" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9928251cd5651ae983a77aeaa528471eed47cf705885e0b03249b72fe4e8e1" +checksum = "29bd41de2e54451a8ca0dd95ebf45b54d349d29ebceb7f20be264eee14e3d477" dependencies = [ "accesskit", "accesskit_consumer", @@ -40,20 +40,19 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bf66a7bf0b7ea4fd7742d50b64782a88f99217cf246b3f93b4162528dde520" +checksum = "8bfae7c152994a31dc7d99b8eeac7784a919f71d1b306f4b83217e110fd3824c" dependencies = [ "accesskit", "hashbrown", - "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e230718177753b4e4ad9e1d9f6cfc2f4921212d4c1c480b253f526babb258d" +checksum = "692dd318ff8a7a0ffda67271c4bd10cf32249656f4e49390db0b26ca92b095f2" dependencies = [ "accesskit", "accesskit_consumer", @@ -65,9 +64,9 @@ dependencies = [ [[package]] name = "accesskit_unix" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef06642e9f02f1708ad55e1eaeb8ad6956c22917699c4f313afa4f8f1b5e664" +checksum = "c5f7474c36606d0fe4f438291d667bae7042ea2760f506650ad2366926358fc8" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -83,24 +82,23 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65178f3df98a51e4238e584fcb255cb1a4f9111820848eeddd37663be40a625f" +checksum = "70a042b62c9c05bf7b616f015515c17d2813f3ba89978d6f4fc369735d60700a" dependencies = [ "accesskit", "accesskit_consumer", "hashbrown", - "paste", "static_assertions", - "windows", - "windows-core", + "windows 0.61.1", + "windows-core 0.61.0", ] [[package]] name = "accesskit_winit" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d941bb8c414caba6e206de669c7dc0dbeb305640ea890772ee422a40e6b89f" +checksum = "5c1f0d3d13113d8857542a4f8d1a1c24d1dc1527b77aee8426127f4901588708" dependencies = [ "accesskit", "accesskit_macos", @@ -544,9 +542,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" dependencies = [ "bytemuck_derive", ] @@ -657,6 +655,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c387f6cef110ee8eaf12fca5586d3d303c07c594f4a5f02c768b6470b70dbd" +[[package]] +name = "color" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "010263546cea9f9f8385a5b7aad534b9e6448e62a0d3bf9da29d583308dd11bb" + [[package]] name = "combine" version = "4.6.7" @@ -1001,6 +1005,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "font-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7" +dependencies = [ + "bytemuck", +] + [[package]] name = "fontconfig-cache-parser" version = "0.2.0" @@ -1014,22 +1027,23 @@ dependencies = [ [[package]] name = "fontique" version = "0.3.0" -source = "git+https://github.com/linebender/parley?rev=eabfb8175848183dde2516d562c6b7eab7f0df84#eabfb8175848183dde2516d562c6b7eab7f0df84" +source = "git+https://github.com/linebender/parley?rev=4977a349eb5e5ad276e850825ff87e7b7b709d52#4977a349eb5e5ad276e850825ff87e7b7b709d52" dependencies = [ "bytemuck", "fontconfig-cache-parser", "hashbrown", "icu_locid", "memmap2", + "objc2 0.6.1", "objc2-core-foundation", "objc2-core-text", - "objc2-foundation 0.3.0", - "peniko", - "read-fonts", + "objc2-foundation 0.3.1", + "peniko 0.4.0", + "read-fonts 0.29.0", "roxmltree", "smallvec", - "windows", - "windows-core", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -1197,7 +1211,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows", + "windows 0.58.0", ] [[package]] @@ -1331,7 +1345,7 @@ dependencies = [ "log", "presser", "thiserror 1.0.69", - "windows", + "windows 0.58.0", ] [[package]] @@ -1366,9 +1380,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "allocator-api2", "equivalent", @@ -1642,15 +1656,6 @@ dependencies = [ "zune-jpeg", ] -[[package]] -name = "immutable-chunkmap" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" -dependencies = [ - "arrayvec", -] - [[package]] name = "indexmap" version = "2.7.0" @@ -1755,9 +1760,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kurbo" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +checksum = "1077d333efea6170d9ccb96d3c3026f300ca0773da4938cc4c811daa6df68b0c" dependencies = [ "arrayvec", "smallvec", @@ -2169,9 +2174,9 @@ dependencies = [ [[package]] name = "objc2" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59" +checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551" dependencies = [ "objc2-encode", ] @@ -2230,9 +2235,9 @@ dependencies = [ [[package]] name = "objc2-core-foundation" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925" +checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" dependencies = [ "bitflags 2.8.0", ] @@ -2263,9 +2268,9 @@ dependencies = [ [[package]] name = "objc2-core-text" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fde15abfe00bf9f1eda220addbdfa6c62b0e5595e98208e8cdbc2ec0f6970a6" +checksum = "3ba833d4a1cb1aac330f8c973fd92b6ff1858e4aef5cdd00a255eefb28022fb5" dependencies = [ "bitflags 2.8.0", "objc2-core-foundation", @@ -2292,12 +2297,12 @@ dependencies = [ [[package]] name = "objc2-foundation" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998" +checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c" dependencies = [ "bitflags 2.8.0", - "objc2 0.6.0", + "objc2 0.6.1", ] [[package]] @@ -2487,13 +2492,13 @@ dependencies = [ [[package]] name = "parley" version = "0.3.0" -source = "git+https://github.com/linebender/parley?rev=eabfb8175848183dde2516d562c6b7eab7f0df84#eabfb8175848183dde2516d562c6b7eab7f0df84" +source = "git+https://github.com/linebender/parley?rev=4977a349eb5e5ad276e850825ff87e7b7b709d52#4977a349eb5e5ad276e850825ff87e7b7b709d52" dependencies = [ "accesskit", "fontique", "hashbrown", - "peniko", - "skrifa", + "peniko 0.4.0", + "skrifa 0.31.0", "swash", ] @@ -2505,11 +2510,23 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "peniko" -version = "0.3.1" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1f594c54ccdc9bd177a726885f066bf28d20e17169e31a8a1456217b1316b4" +dependencies = [ + "color 0.2.3", + "kurbo", + "peniko 0.4.0", + "smallvec", +] + +[[package]] +name = "peniko" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec061f435b573ff602b2c5690f1a5bfcf461327194654cfbfce4412b95cf2a1" +checksum = "1f9529efd019889b2a205193c14ffb6e2839b54ed9d2720674f10f4b04d87ac9" dependencies = [ - "color", + "color 0.3.0", "kurbo", "smallvec", ] @@ -2672,6 +2689,15 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.37.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +dependencies = [ + "memchr", +] + [[package]] name = "quinn" version = "0.11.6" @@ -2799,7 +2825,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f" dependencies = [ "bytemuck", - "font-types", + "font-types 0.8.2", +] + +[[package]] +name = "read-fonts" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce8e2ca6b24313587a03ca61bb74c384e2a815bd90cf2866cfc9f5fb7a11fa0" +dependencies = [ + "bytemuck", + "font-types 0.9.0", ] [[package]] @@ -3161,7 +3197,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cc1aa86c26dbb1b63875a7180aa0819709b33348eb5b1491e4321fae388179d" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.25.3", +] + +[[package]] +name = "skrifa" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe6666ab11018ab91ff7b03f1a3b9fdbecfb610848436fefa5ce50343d3d913" +dependencies = [ + "bytemuck", + "read-fonts 0.29.0", ] [[package]] @@ -3184,9 +3230,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "smithay-client-toolkit" @@ -3311,11 +3357,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e25b48fd1c222c9fdb61148e2203b750f9840c07922fd61b87c6015560b8f6" +checksum = "fae9a562c7b46107d9c78cd78b75bbe1e991c16734c0aee8ff0ee711fb8b620a" dependencies = [ - "skrifa", + "skrifa 0.26.6", "yazi", "zeno", ] @@ -3824,9 +3870,9 @@ dependencies = [ "bytemuck", "futures-intrusive", "log", - "peniko", + "peniko 0.3.2", "png", - "skrifa", + "skrifa 0.26.6", "static_assertions", "thiserror 2.0.11", "vello_encoding", @@ -3843,8 +3889,8 @@ checksum = "847f24259aa73e1d5baf453856034f471eeffbf006072e41f7c8397da4f89f65" dependencies = [ "bytemuck", "guillotiere", - "peniko", - "skrifa", + "peniko 0.3.2", + "skrifa 0.26.6", "smallvec", ] @@ -3964,9 +4010,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" dependencies = [ "cc", "downcast-rs", @@ -3978,9 +4024,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.7" +version = "0.31.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" +checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" dependencies = [ "bitflags 2.8.0", "rustix", @@ -4012,9 +4058,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.5" +version = "0.32.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" +checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" dependencies = [ "bitflags 2.8.0", "wayland-backend", @@ -4024,9 +4070,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" +checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175" dependencies = [ "bitflags 2.8.0", "wayland-backend", @@ -4050,20 +4096,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.37.5", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" dependencies = [ "dlib", "log", @@ -4191,8 +4237,8 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "windows", - "windows-core", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -4255,23 +4301,68 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core", + "windows-core 0.58.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419" +dependencies = [ + "windows-collections", + "windows-core 0.61.0", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.0", +] + [[package]] name = "windows-core" version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +dependencies = [ + "windows-implement 0.60.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.2", + "windows-strings 0.4.0", +] + +[[package]] +name = "windows-future" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32" +dependencies = [ + "windows-core 0.61.0", + "windows-link", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -4283,6 +4374,17 @@ dependencies = [ "syn", ] +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-interface" version = "0.58.0" @@ -4294,14 +4396,41 @@ dependencies = [ "syn", ] +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.0", + "windows-link", +] + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", - "windows-strings", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -4314,16 +4443,34 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-strings" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -4531,9 +4678,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.9" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a809eacf18c8eca8b6635091543f02a5a06ddf3dad846398795460e6e0ae3cc0" +checksum = "b0d05bd8908e14618c9609471db04007e644fd9cce6529756046cfc577f9155e" dependencies = [ "ahash", "android-activity", @@ -4700,7 +4847,7 @@ name = "xilem_web" version = "0.1.0" dependencies = [ "futures", - "peniko", + "peniko 0.3.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4855,7 +5002,7 @@ version = "5.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589e9a02bfafb9754bb2340a9e3b38f389772684c63d9637e76b1870377bec29" dependencies = [ - "quick-xml", + "quick-xml 0.36.2", "serde", "static_assertions", "zbus_names", diff --git a/Cargo.toml b/Cargo.toml index 60da40b8c2..29da9001bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,20 +92,20 @@ tree_arena = { version = "0.1.0", path = "tree_arena" } vello = "0.4.0" wgpu = "23.0.1" kurbo = "0.11.1" -parley = { git = "https://github.com/linebender/parley", rev = "eabfb8175848183dde2516d562c6b7eab7f0df84", features = [ +parley = { git = "https://github.com/linebender/parley", rev = "4977a349eb5e5ad276e850825ff87e7b7b709d52", features = [ "accesskit", ] } -peniko = "0.3.1" -winit = "0.30.9" +peniko = "0.3.2" +winit = "0.30.10" tracing = { version = "0.1.40", default-features = false } smallvec = "1.13.2" -hashbrown = "0.15.2" +hashbrown = "0.15.3" dpi = "0.1.1" image = { version = "0.25.2", default-features = false } web-time = "1.1.0" bitflags = "2.6.0" -accesskit = "0.18.0" -accesskit_winit = "0.25.0" +accesskit = "0.19.0" +accesskit_winit = "0.27.0" time = "0.3.36" [profile.ci] diff --git a/masonry/examples/custom_widget.rs b/masonry/examples/custom_widget.rs index d053f527cd..7527e121d5 100644 --- a/masonry/examples/custom_widget.rs +++ b/masonry/examples/custom_widget.rs @@ -129,7 +129,7 @@ impl Widget for CustomWidget { // To render text, we first create a LayoutBuilder and set the text properties. let mut lcx = parley::LayoutContext::new(); - let mut text_layout_builder = lcx.ranged_builder(ctx.text_contexts().0, &self.0, 1.0); + let mut text_layout_builder = lcx.ranged_builder(ctx.text_contexts().0, &self.0, 1.0, true); text_layout_builder.push_default(StyleProperty::FontStack(FontStack::Single( FontFamily::Generic(parley::style::GenericFamily::Serif), diff --git a/masonry/screenshots/example_calc_masonry_initial.png b/masonry/screenshots/example_calc_masonry_initial.png index 25225b9174..8cefd40286 100644 --- a/masonry/screenshots/example_calc_masonry_initial.png +++ b/masonry/screenshots/example_calc_masonry_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63fd5c557c3cd8575e3e34678aa36408385c53d401708c390574de30c91bc6c1 -size 11107 +oid sha256:f7b9774b19781d64d6bbd4faa67bb136b899fb70661fe2574207a48313950355 +size 6103 diff --git a/masonry/screenshots/example_grid_masonry_initial.png b/masonry/screenshots/example_grid_masonry_initial.png index bfdf31cc98..52369dd610 100644 --- a/masonry/screenshots/example_grid_masonry_initial.png +++ b/masonry/screenshots/example_grid_masonry_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fb1e0aad3dc074028a723304a04af836d4496a547bc6377acd4f0ea4caeaacd -size 17713 +oid sha256:c4bdc6ed0d16ab941fdbf3ac089119d82f8bbb85ca69670bd5446379224bece9 +size 17746 diff --git a/masonry_core/screenshots/prose_alignment_flex.png b/masonry_core/screenshots/prose_alignment_flex.png index ff36a6f7e8..50738f9ab9 100644 --- a/masonry_core/screenshots/prose_alignment_flex.png +++ b/masonry_core/screenshots/prose_alignment_flex.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e5182d941a3be69f634a39cf97625e734fcf4e4c7ca0d3e5c505eb5029c043e -size 1137 +oid sha256:3040d971481e6fec69744783e9744dbc82ee1e5767f6c0f3e151fd36d3b3d92e +size 1134 diff --git a/masonry_core/screenshots/textbox_outline.png b/masonry_core/screenshots/textbox_outline.png index ccb60d7a65..155155903e 100644 --- a/masonry_core/screenshots/textbox_outline.png +++ b/masonry_core/screenshots/textbox_outline.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1b66b9135f40393a67bdc84e03df22d4fff994ce9a0034fd465dbd4327d83da -size 1429 +oid sha256:ef9f2879c28bb2718470bab4f41caf32a5552ae94f402e6b8fc550db35b6aec5 +size 1431 diff --git a/masonry_core/screenshots/textbox_selection.png b/masonry_core/screenshots/textbox_selection.png index 75b84d8ed5..ff40036e3f 100644 --- a/masonry_core/screenshots/textbox_selection.png +++ b/masonry_core/screenshots/textbox_selection.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a276946962c366ab4508baf08e71d746c8ffd5923d8953e4895c70b7af82c23 -size 1584 +oid sha256:c9614ac6458af2dc3385bb657dbd13cc99f6ccd16a5dba2a732812d511901d9a +size 1583 diff --git a/masonry_core/screenshots/virtual_scroll_basic.png b/masonry_core/screenshots/virtual_scroll_basic.png index 7289a20cb7..b075d7c174 100644 --- a/masonry_core/screenshots/virtual_scroll_basic.png +++ b/masonry_core/screenshots/virtual_scroll_basic.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e046e98457a12cee9128560232cd8778ecfd86289ea76ac03d04683332d5cfd3 -size 1465 +oid sha256:ee278e0d45902b31037400993741da8f6ee7bd1760f81aac7d7b23e62c109fa2 +size 1555 diff --git a/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png b/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png index 17017be9e3..bcda21677b 100644 --- a/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png +++ b/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecb40fb682d66737f40db36ce2c8f9ca4fe9e3bb3e6683db3e6db675337d630a -size 612 +oid sha256:d6f23310ee20640233ef2450cd00cad125d6f256c4812f87938212ac5278e6fa +size 606 diff --git a/masonry_core/screenshots/virtual_scroll_moved.png b/masonry_core/screenshots/virtual_scroll_moved.png index 1259a91daa..713b5524ef 100644 --- a/masonry_core/screenshots/virtual_scroll_moved.png +++ b/masonry_core/screenshots/virtual_scroll_moved.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dac8b5e64c1843e669c4f5d3dd2297f9668a91b49c759af148e7a4e970b96e1 -size 2049 +oid sha256:b084fed1b9ccc9a3a5e05ad0193b8537a11b56f6391b322b1d05f3e952e28bd4 +size 2110 diff --git a/masonry_core/screenshots/virtual_scroll_scrolled.png b/masonry_core/screenshots/virtual_scroll_scrolled.png index eb24a3a0be..d4987ec6ca 100644 --- a/masonry_core/screenshots/virtual_scroll_scrolled.png +++ b/masonry_core/screenshots/virtual_scroll_scrolled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee3e308e1a6fb34a6fe3b5482abf2ae492f4017937fbaf1ec969bc7100f9003b -size 2879 +oid sha256:105a926fa430d7a0ae4d0b34b34124922409b46ce9b3b3ab99a3985b1c04284c +size 2894 diff --git a/masonry_core/src/widgets/label.rs b/masonry_core/src/widgets/label.rs index bf56b9243a..b6a7e2d4a8 100644 --- a/masonry_core/src/widgets/label.rs +++ b/masonry_core/src/widgets/label.rs @@ -379,7 +379,7 @@ impl Widget for Label { if self.styles_changed { let (font_ctx, layout_ctx) = ctx.text_contexts(); // TODO: Should we use a different scale? - let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0); + let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0, true); for prop in self.styles.inner().values() { builder.push_default(prop.to_owned()); } diff --git a/masonry_core/src/widgets/text_area.rs b/masonry_core/src/widgets/text_area.rs index 0a0305ad7a..70b76e150c 100644 --- a/masonry_core/src/widgets/text_area.rs +++ b/masonry_core/src/widgets/text_area.rs @@ -952,7 +952,7 @@ impl Widget for TextArea { let origin = Vec2::new(self.padding.get_left(is_rtl), self.padding.top); let transform = Affine::translate(origin); if ctx.is_focus_target() { - for rect in self.editor.selection_geometry().iter() { + for (rect, _) in self.editor.selection_geometry().iter() { // TODO: If window not focused, use a different color // TODO: Make configurable scene.fill(