diff --git a/Cargo.lock b/Cargo.lock index f909077c..35e62c93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,13 +24,22 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" +[[package]] +name = "accesskit" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320" +dependencies = [ + "uuid", +] + [[package]] name = "accesskit_atspi_common" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "890d241cf51fc784f0ac5ac34dfc847421f8d39da6c7c91a0fcc987db62a8267" dependencies = [ - "accesskit", + "accesskit 0.21.1", "accesskit_consumer", "atspi-common", "serde", @@ -44,7 +53,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43" dependencies = [ - "accesskit", + "accesskit 0.21.1", "hashbrown 0.15.5", ] @@ -54,7 +63,7 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575" dependencies = [ - "accesskit", + "accesskit 0.21.1", "accesskit_consumer", "hashbrown 0.15.5", "objc2 0.5.2", @@ -68,7 +77,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301e55b39cfc15d9c48943ce5f572204a551646700d0e8efa424585f94fec528" dependencies = [ - "accesskit", + "accesskit 0.21.1", "accesskit_atspi_common", "async-channel", "async-executor", @@ -86,7 +95,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971" dependencies = [ - "accesskit", + "accesskit 0.21.1", "accesskit_consumer", "hashbrown 0.15.5", "static_assertions", @@ -100,7 +109,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0" dependencies = [ - "accesskit", + "accesskit 0.21.1", "accesskit_macos", "accesskit_unix", "accesskit_windows", @@ -642,7 +651,7 @@ name = "base16-egui-themes" version = "0.1.0" source = "git+https://github.com/LGUG2Z/base16-egui-themes?rev=3f157904c641f0dc80f043449fe0214fc4182425#3f157904c641f0dc80f043449fe0214fc4182425" dependencies = [ - "egui", + "egui 0.33.3", "schemars 1.2.2", "serde", "strum", @@ -930,7 +939,7 @@ name = "catppuccin-egui" version = "5.6.0" source = "git+https://github.com/LGUG2Z/catppuccin-egui?rev=b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a#b2f95cbf441d1dd99f3c955ef10dcb84ce23c20a" dependencies = [ - "egui", + "egui 0.33.3", ] [[package]] @@ -1093,6 +1102,15 @@ dependencies = [ "unicode-width 0.2.2", ] +[[package]] +name = "color" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec7c5eb7a16992b1904d76c517d170ab353b0e0b3d5a0c81a8a0cd1037893cf" +dependencies = [ + "bytemuck", +] + [[package]] name = "color-eyre" version = "0.6.5" @@ -1637,7 +1655,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e" dependencies = [ "bytemuck", - "emath", + "emath 0.33.3", +] + +[[package]] +name = "ecolor" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc883f505d446814c0226bef4b64564b9adb9966fc00c88c57ce6d827dd152d6" +dependencies = [ + "emath 0.36.1", ] [[package]] @@ -1673,7 +1700,7 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui", + "egui 0.33.3", "egui-wgpu", "egui-winit", "egui_glow", @@ -1705,11 +1732,11 @@ version = "0.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3" dependencies = [ - "accesskit", + "accesskit 0.21.1", "ahash", "bitflags 2.13.1", - "emath", - "epaint", + "emath 0.33.3", + "epaint 0.33.3", "log", "nohash-hasher", "profiling", @@ -1717,12 +1744,32 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "egui" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c977ac91dfaa651633fd9722e4ce9ccb32cda4c748b89a5cb57e504036e37c13" +dependencies = [ + "accesskit 0.24.1", + "ahash", + "bitflags 2.13.1", + "emath 0.36.1", + "epaint 0.36.1", + "itertools 0.15.0", + "log", + "nohash-hasher", + "profiling", + "smallvec", + "unicode-segmentation", + "web-sys", +] + [[package]] name = "egui-phosphor" version = "0.10.0" source = "git+https://github.com/amPerl/egui-phosphor?rev=d13688738478ecd12b426e3e74c59d6577a85b59#d13688738478ecd12b426e3e74c59d6577a85b59" dependencies = [ - "egui", + "egui 0.33.3", ] [[package]] @@ -1734,8 +1781,8 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui", - "epaint", + "egui 0.33.3", + "epaint 0.33.3", "log", "profiling", "thiserror 2.0.20", @@ -1754,7 +1801,7 @@ dependencies = [ "accesskit_winit", "arboard", "bytemuck", - "egui", + "egui 0.33.3", "log", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -1769,13 +1816,14 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.33.3" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01d34e845f01c62e3fded726961092e70417d66570c499b9817ab24674ca4ed" +checksum = "1e651e08ddf6bb8bfd964ad70e33bc721c093f2b77ab59580e7140c008dab68c" dependencies = [ "ahash", - "egui", + "egui 0.36.1", "enum-map", + "itertools 0.15.0", "log", "mime_guess2", "profiling", @@ -1788,7 +1836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6420863ea1d90e750f75075231a260030ad8a9f30a7cef82cdc966492dc4c4eb" dependencies = [ "bytemuck", - "egui", + "egui 0.33.3", "glow", "log", "memoffset", @@ -1813,6 +1861,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "emath" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce03cf1604f74515830012c29991beb0b58f69e4e43f5afe22fa7afed65ccd5" + [[package]] name = "encoding_rs" version = "0.8.35" @@ -1878,8 +1932,8 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor", - "emath", + "ecolor 0.33.3", + "emath 0.33.3", "epaint_default_fonts", "log", "nohash-hasher", @@ -1887,6 +1941,29 @@ dependencies = [ "profiling", ] +[[package]] +name = "epaint" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11863a6b2b7823010c1090ddf4706947bdda46766742def0673195cbf7ff4a73" +dependencies = [ + "ahash", + "ecolor 0.36.1", + "emath 0.36.1", + "font-types", + "harfrust", + "log", + "nohash-hasher", + "parking_lot", + "profiling", + "self_cell", + "skrifa", + "smallvec", + "unicode-general-category", + "unicode-segmentation", + "vello_cpu", +] + [[package]] name = "epaint_default_fonts" version = "0.33.3" @@ -1935,6 +2012,15 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b5343afd4a8365a643ac588dab4cf234a190c7f6c88c9f6dd6ffe00837661b7" +[[package]] +name = "euclid" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06" +dependencies = [ + "num-traits", +] + [[package]] name = "event-listener" version = "5.4.2" @@ -2014,6 +2100,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "fearless_simd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693" + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -2114,6 +2206,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "font-types" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64eb721ca85a34323425f4041adc5d82704d3782d5f8f03793bc012419dce23" +dependencies = [ + "bytemuck", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -2400,6 +2501,22 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "glifo" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a" +dependencies = [ + "bytemuck", + "foldhash 0.2.0", + "hashbrown 0.17.1", + "log", + "peniko", + "skrifa", + "smallvec", + "vello_common", +] + [[package]] name = "glob" version = "0.3.4" @@ -2535,6 +2652,15 @@ dependencies = [ "bitflags 2.13.1", ] +[[package]] +name = "guillotiere" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b17e70c989c36bad147b27a58d148c0741c51448aa5653436547323e524d0ab" +dependencies = [ + "euclid", +] + [[package]] name = "h2" version = "0.4.18" @@ -2566,6 +2692,18 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "harfrust" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03d949a14aa089bbb282f7dd76a498a7f684428e4257202efc119ec010376f9" +dependencies = [ + "bitflags 2.13.1", + "bytemuck", + "read-fonts", + "smallvec", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2605,6 +2743,9 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "heck" @@ -3077,6 +3218,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" @@ -3482,6 +3632,18 @@ dependencies = [ "libc", ] +[[package]] +name = "kurbo" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2" +dependencies = [ + "arrayvec", + "euclid", + "polycool", + "smallvec", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -3568,6 +3730,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linebender_resource_handle" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4877,6 +5045,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +[[package]] +name = "peniko" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839c8299360d2e998bdb106dc0a6cd71dcc5f4df51df1b620361bf50e283cca6" +dependencies = [ + "bytemuck", + "color", + "kurbo", + "linebender_resource_handle", + "smallvec", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -5084,6 +5265,15 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "polycool" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6" +dependencies = [ + "arrayvec", +] + [[package]] name = "portable-atomic" version = "1.15.0" @@ -5379,7 +5569,7 @@ dependencies = [ "built", "cfg-if 1.0.4", "interpolate_name", - "itertools", + "itertools 0.14.0", "libc", "libfuzzer-sys", "log", @@ -5448,6 +5638,17 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "read-fonts" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" +dependencies = [ + "bytemuck", + "font-types", + "once_cell", +] + [[package]] name = "reborrow" version = "0.5.5" @@ -5836,6 +6037,12 @@ dependencies = [ "libc", ] +[[package]] +name = "self_cell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813" + [[package]] name = "semver" version = "1.0.28" @@ -6129,6 +6336,16 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +[[package]] +name = "skrifa" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.12" @@ -6952,6 +7169,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +[[package]] +name = "unicode-general-category" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -7069,6 +7292,33 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[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.20", +] + +[[package]] +name = "vello_cpu" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea" +dependencies = [ + "bytemuck", + "glifo", + "hashbrown 0.17.1", + "vello_common", +] + [[package]] name = "version_check" version = "0.9.5" @@ -7530,7 +7780,7 @@ name = "win32-display-data" version = "0.1.0" source = "git+https://github.com/LGUG2Z/win32-display-data?rev=8c42d8db257d30fe95bc98c2e5cd8f75da861021#8c42d8db257d30fe95bc98c2e5cd8f75da861021" dependencies = [ - "itertools", + "itertools 0.14.0", "serde", "thiserror 2.0.20", "windows 0.62.2", diff --git a/Cargo.toml b/Cargo.toml index a3e9d1c4..667d09ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ crossbeam-channel = "0.5" crossbeam-utils = "0.8" color-eyre = "0.6" eframe = "0.33" -egui_extras = "0.33" +egui_extras = "0.36" dirs = "6" dunce = "1" hotwatch = "0.5"