diff --git a/.gitignore b/.gitignore index 37fc2290..7bdcf1b4 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ TODO .cursor .idea +# kittest snapshots: +**/*.diff.png +**/*.old.png diff --git a/Cargo.lock b/Cargo.lock index df3eebc6..7642581a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,57 +20,48 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" +checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a" dependencies = [ "enumn", "serde", + "uuid", ] [[package]] name = "accesskit_atspi_common" -version = "0.14.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890d241cf51fc784f0ac5ac34dfc847421f8d39da6c7c91a0fcc987db62a8267" +checksum = "842fd8203e6dfcf531d24f5bac792088edfba7d6b35844fead191603fb32a260" dependencies = [ "accesskit", - "accesskit_consumer 0.31.0", + "accesskit_consumer", "atspi-common", + "phf", "serde", - "thiserror 1.0.69", "zvariant", ] [[package]] name = "accesskit_consumer" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd06f5fea9819250fffd4debf926709f3593ac22f8c1541a2573e5ee0ca01cd" -dependencies = [ - "accesskit", - "hashbrown 0.15.5", -] - -[[package]] -name = "accesskit_consumer" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43" +checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10" dependencies = [ "accesskit", - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] name = "accesskit_macos" -version = "0.22.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575" +checksum = "534bc3fdc89a64a1db3c46b33c198fde2b7c3c7d094e5809c8c8bf2970c18243" dependencies = [ "accesskit", - "accesskit_consumer 0.31.0", - "hashbrown 0.15.5", + "accesskit_consumer", + "hashbrown 0.16.1", "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", @@ -78,9 +69,9 @@ dependencies = [ [[package]] name = "accesskit_unix" -version = "0.17.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301e55b39cfc15d9c48943ce5f572204a551646700d0e8efa424585f94fec528" +checksum = "90e549dd7c6562b6a2ea807b44726e6241707db054a817dc4c7e2b8d3b39bfac" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -96,23 +87,23 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.29.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971" +checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21" dependencies = [ "accesskit", - "accesskit_consumer 0.31.0", - "hashbrown 0.15.5", + "accesskit_consumer", + "hashbrown 0.16.1", "static_assertions", - "windows 0.61.3", - "windows-core 0.61.2", + "windows", + "windows-core", ] [[package]] name = "accesskit_winit" -version = "0.29.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0" +checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313" dependencies = [ "accesskit", "accesskit_macos", @@ -142,6 +133,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-activity" version = "0.6.0" @@ -243,7 +240,7 @@ dependencies = [ "clipboard-win", "image", "log", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-core-graphics", @@ -470,20 +467,19 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atspi" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83247582e7508838caf5f316c00791eee0e15c0bf743e6880585b867e16815c" +checksum = "c77886257be21c9cd89a4ae7e64860c6f0eefca799bb79127913052bd0eefb3d" dependencies = [ "atspi-common", - "atspi-connection", "atspi-proxies", ] [[package]] name = "atspi-common" -version = "0.9.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33dfc05e7cdf90988a197803bf24f5788f94f7c94a69efa95683e8ffe76cfdfb" +checksum = "20c5617155740c98003016429ad13fe43ce7a77b007479350a9f8bf95a29f63d" dependencies = [ "enumflags2", "serde", @@ -495,23 +491,11 @@ dependencies = [ "zvariant", ] -[[package]] -name = "atspi-connection" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4193d51303d8332304056ae0004714256b46b6635a5c556109b319c0d3784938" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite", - "zbus", -] - [[package]] name = "atspi-proxies" -version = "0.9.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eebcb9e7e76f26d0bcfd6f0295e1cd1e6f33bedbc5698a971db8dc43d7751c" +checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc" dependencies = [ "atspi-common", "serde", @@ -524,26 +508,20 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - [[package]] name = "bit-set" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" dependencies = [ "bit-vec", ] [[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 = "bitflags" @@ -560,12 +538,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block2" version = "0.5.1" @@ -581,7 +553,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "objc2 0.6.3", + "objc2 0.6.4", ] [[package]] @@ -756,15 +728,24 @@ dependencies = [ [[package]] name = "codespan-reporting" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" +checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", "unicode-width", ] +[[package]] +name = "color" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18ef4657441fb193b65f34dc39b3781f0dfec23d3bd94d0eeb4e88cde421edb" +dependencies = [ + "bytemuck", +] + [[package]] name = "colorchoice" version = "1.0.4" @@ -834,7 +815,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "core-graphics-types 0.1.3", + "core-graphics-types", "foreign-types", "libc", ] @@ -850,17 +831,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.10.1", - "libc", -] - [[package]] name = "crc32fast" version = "1.5.0" @@ -937,7 +907,6 @@ dependencies = [ "custom_plot_manipulation", "eframe", "egui", - "egui_chip", "env_logger", "examples_utils", "filled_area", @@ -962,9 +931,9 @@ dependencies = [ [[package]] name = "dify" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11217d469eafa3b809ad84651eb9797ccbb440b4a916d5d85cb1b994e89787f6" +checksum = "90ce0fb972943b4e88cd03b8f92953df0c71bb05e0bde8e5b684895d808013cc" dependencies = [ "anyhow", "colored", @@ -988,7 +957,7 @@ dependencies = [ "bitflags 2.10.0", "block2 0.6.2", "libc", - "objc2 0.6.3", + "objc2 0.6.4", ] [[package]] @@ -1034,9 +1003,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "ecolor" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084980ebede2fb1ad6c4f54285b3e489052ef2b6aa4016e4c19349417adc75c5" +checksum = "bbb993f120d46ca077a18f166175b94c6edeb994d812cbd07a4a03cfced2713c" dependencies = [ "bytemuck", "emath", @@ -1045,9 +1014,9 @@ dependencies = [ [[package]] name = "eframe" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f60ee3c69cd01d5725b4ef476ed6a3a6009968c57843a2f1beb96f021e4a54b" +checksum = "9fd6562766ec6b921232ceb960acdb405f91971f59c17604840fd9485fee0dc3" dependencies = [ "ahash", "bytemuck", @@ -1063,9 +1032,9 @@ dependencies = [ "image", "js-sys", "log", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", + "objc2 0.6.4", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", "pollster", @@ -1085,9 +1054,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75645894de4ca1695ab3ab7201c7953bb95c1725aafeefa6822dc901ad2a81b" +checksum = "6b71aaacbe69e214aebf7b8d5eacd6256d0d2ca5ff9525c28d1dd7f377f430a9" dependencies = [ "accesskit", "ahash", @@ -1105,9 +1074,9 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdaac35a6e0ff458aaa5776b2bda578e38334a9d1258f7795042a70372745b7" +checksum = "111e54ac54bf9d767ce8970a454f720878875bca1f2e63f781c722e98f466971" dependencies = [ "ahash", "bytemuck", @@ -1125,18 +1094,18 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4772ed5f16fa8ec2ba295e58f62b58ee83fcf49e67ec13d2b7ddf4e9a2dea34e" +checksum = "8ed6af7dad7dd045b77731fe6dc291b835489a104d3cd2428a945e71e2265df3" dependencies = [ "accesskit_winit", "arboard", "bytemuck", "egui", "log", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-ui-kit", + "objc2 0.6.4", + "objc2-foundation 0.3.2", + "objc2-ui-kit 0.3.2", "profiling", "raw-window-handle", "serde", @@ -1146,23 +1115,11 @@ dependencies = [ "winit", ] -[[package]] -name = "egui_chip" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e35f20a867cf197c0ccbd0618aa54808ac882173d9ffac7950199e0d5445af" -dependencies = [ - "egui", - "serde", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "egui_glow" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b94ff67a1d18933fff2519f5f57c388f932c093036c381fb9ae2853b3e1e09" +checksum = "91c5dea15932abd0a953fefc8d8490002204808a2e087147aac48608eea9ef79" dependencies = [ "bytemuck", "egui", @@ -1177,9 +1134,9 @@ dependencies = [ [[package]] name = "egui_kittest" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3366a5f2a1d12fdf7d7420d1974ce506aa80410d1bb15f50f9f7f9ad0a1124" +checksum = "1077ec995dbc754f22afcca9bbab1329071737d749a953e7b430d9b825d40c32" dependencies = [ "dify", "eframe", @@ -1189,7 +1146,9 @@ dependencies = [ "kittest", "open", "pollster", + "serde", "tempfile", + "toml", "wgpu", ] @@ -1216,9 +1175,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "emath" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e561352ae95c22ad179fb56c38d6e6eecd86cf4925cf5c70e738dd01df9b620" +checksum = "8490360fc83eb3a2b20aba120457f7d91c3042d7c628e4f90b43a97b6adf1255" dependencies = [ "bytemuck", "serde", @@ -1286,28 +1245,32 @@ dependencies = [ [[package]] name = "epaint" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a909ce8cee63e8350fb0c251ad39277a5b24f19add60787e84a3b3ab3f2bd83a" +checksum = "d76f9fdbf72eaf0dc3198d90e7bff267b45866f660f8cf49caeb9dcab93342e0" dependencies = [ - "ab_glyph", "ahash", "bytemuck", "ecolor", "emath", "epaint_default_fonts", + "font-types", "log", "nohash-hasher", "parking_lot", "profiling", + "self_cell", "serde", + "skrifa", + "smallvec", + "vello_cpu", ] [[package]] name = "epaint_default_fonts" -version = "0.33.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9649446c23368ae138716910e3e28143995691b598fbb9de16b42b0722cbcc" +checksum = "3a1a65f42685d25419a67fd3175e11dfecdd268b0478aaba76785b0a896884e0" [[package]] name = "equivalent" @@ -1331,6 +1294,15 @@ version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" +[[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.1" @@ -1396,6 +1368,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "fearless_simd" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903" +dependencies = [ + "bytemuck", +] + [[package]] name = "filled_area" version = "0.1.0" @@ -1434,6 +1415,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +[[package]] +name = "font-types" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73829a7b5c91198af28a99159b7ae4afbb252fb906159ff7f189f3a2ceaa3df2" +dependencies = [ + "bytemuck", + "serde", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1544,7 +1535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ "rustix 1.1.2", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1581,9 +1572,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" +checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5" dependencies = [ "js-sys", "slotmap", @@ -1605,7 +1596,7 @@ dependencies = [ "glutin_glx_sys", "glutin_wgl_sys", "libloading", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -1657,35 +1648,18 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.10.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.10.0", -] - [[package]] name = "gpu-allocator" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795" dependencies = [ + "ash", + "hashbrown 0.16.1", "log", "presser", - "thiserror 1.0.69", - "windows 0.58.0", + "thiserror 2.0.17", + "windows", ] [[package]] @@ -1735,6 +1709,8 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ + "allocator-api2", + "equivalent", "foldhash 0.2.0", ] @@ -2014,9 +1990,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", @@ -2041,13 +2017,23 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kittest" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd6dd2cce251a360101038acb9334e3a50cd38cd02fefddbf28aa975f043c8" +checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5" dependencies = [ "accesskit", - "accesskit_consumer 0.30.1", - "parking_lot", + "accesskit_consumer", +] + +[[package]] +name = "kurbo" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7564e90fe3c0d5771e1f0bc95322b21baaeaa0d9213fa6a0b61c99f8b17b3bfb" +dependencies = [ + "arrayvec", + "euclid", + "smallvec", ] [[package]] @@ -2089,7 +2075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2109,6 +2095,12 @@ dependencies = [ "redox_syscall 0.5.18", ] +[[package]] +name = "linebender_resource_handle" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" + [[package]] name = "lines" version = "0.1.0" @@ -2168,15 +2160,6 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - [[package]] name = "markers" version = "0.1.0" @@ -2211,21 +2194,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metal" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" -dependencies = [ - "bitflags 2.10.0", - "block", - "core-graphics-types 0.2.0", - "foreign-types", - "log", - "objc", - "paste", -] - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -2248,9 +2216,9 @@ dependencies = [ [[package]] name = "naga" -version = "27.0.3" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +checksum = "85b4372fed0bd362d646d01b6926df0e837859ccc522fed720c395e0460f29c8" dependencies = [ "arrayvec", "bit-set", @@ -2353,15 +2321,6 @@ dependencies = [ "syn", ] -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - [[package]] name = "objc-sys" version = "0.3.5" @@ -2380,9 +2339,9 @@ dependencies = [ [[package]] name = "objc2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" dependencies = [ "objc2-encode", ] @@ -2400,7 +2359,7 @@ dependencies = [ "objc2-core-data", "objc2-core-image", "objc2-foundation 0.2.2", - "objc2-quartz-core", + "objc2-quartz-core 0.2.2", ] [[package]] @@ -2411,7 +2370,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.10.0", "block2 0.6.2", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", @@ -2461,7 +2420,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2 0.6.4", ] [[package]] @@ -2472,7 +2431,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ "bitflags 2.10.0", "dispatch2", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-core-foundation", "objc2-io-surface", ] @@ -2486,7 +2445,7 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", - "objc2-metal", + "objc2-metal 0.2.2", ] [[package]] @@ -2527,7 +2486,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "block2 0.6.2", + "objc2 0.6.4", "objc2-core-foundation", ] @@ -2538,7 +2498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ "bitflags 2.10.0", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-core-foundation", ] @@ -2566,6 +2526,18 @@ dependencies = [ "objc2-foundation 0.2.2", ] +[[package]] +name = "objc2-metal" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" +dependencies = [ + "bitflags 2.10.0", + "block2 0.6.2", + "objc2 0.6.4", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-quartz-core" version = "0.2.2" @@ -2576,7 +2548,20 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", - "objc2-metal", + "objc2-metal 0.2.2", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", ] [[package]] @@ -2604,12 +2589,24 @@ dependencies = [ "objc2-core-location", "objc2-foundation 0.2.2", "objc2-link-presentation", - "objc2-quartz-core", + "objc2-quartz-core 0.2.2", "objc2-symbols", "objc2-uniform-type-identifiers", "objc2-user-notifications", ] +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-uniform-type-identifiers" version = "0.2.2" @@ -2720,21 +2717,28 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.1", + "windows-link", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pathdiff" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" +[[package]] +name = "peniko" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2b6aadb221872732e87d465213e9be5af2849b0e8cc5300a8ba98fffa2e00a" +dependencies = [ + "bytemuck", + "color", + "kurbo", + "linebender_resource_handle", + "smallvec", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -2751,6 +2755,49 @@ dependencies = [ "examples_utils", ] +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_macros", + "phf_shared", + "serde", +] + +[[package]] +name = "phf_generator" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +dependencies = [ + "fastrand", + "phf_shared", +] + +[[package]] +name = "phf_macros" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -2996,6 +3043,18 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "raw-window-metal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135" +dependencies = [ + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + [[package]] name = "rayon" version = "1.11.0" @@ -3016,6 +3075,16 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "read-fonts" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -3051,7 +3120,7 @@ dependencies = [ "dispatch2", "js-sys", "log", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -3066,14 +3135,15 @@ dependencies = [ [[package]] name = "ron" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" +checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" dependencies = [ - "base64", "bitflags 2.10.0", + "once_cell", "serde", "serde_derive", + "typeid", "unicode-ident", ] @@ -3167,6 +3237,12 @@ dependencies = [ "tiny-skia", ] +[[package]] +name = "self_cell" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" + [[package]] name = "serde" version = "1.0.228" @@ -3208,6 +3284,15 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_spanned" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876ac351060d4f882bb1032b6369eb0aef79ad9df1ea8bc404874d8cc3d0cd98" +dependencies = [ + "serde_core", +] + [[package]] name = "shlex" version = "1.3.0" @@ -3229,6 +3314,22 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "siphasher" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" + +[[package]] +name = "skrifa" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.11" @@ -3249,6 +3350,9 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] [[package]] name = "smithay-client-toolkit" @@ -3324,9 +3428,9 @@ dependencies = [ [[package]] name = "spirv" -version = "0.3.0+sdk-1.3.268.0" +version = "0.4.0+sdk-1.4.341.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f" dependencies = [ "bitflags 2.10.0", ] @@ -3492,6 +3596,19 @@ dependencies = [ "zerovec", ] +[[package]] +name = "toml" +version = "1.1.0+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8195ca05e4eb728f4ba94f3e3291661320af739c4e43779cbdfae82ab239fcc" +dependencies = [ + "serde_core", + "serde_spanned", + "toml_datetime 1.1.0+spec-1.1.0", + "toml_parser", + "winnow 1.0.0", +] + [[package]] name = "toml_datetime" version = "0.7.3" @@ -3501,6 +3618,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.1.0+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" version = "0.23.7" @@ -3508,18 +3634,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ "indexmap", - "toml_datetime", + "toml_datetime 0.7.3", "toml_parser", - "winnow", + "winnow 0.7.14", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" dependencies = [ - "winnow", + "winnow 1.0.0", ] [[package]] @@ -3569,6 +3695,12 @@ dependencies = [ "rustc-hash 2.1.1", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "uds_windows" version = "1.1.0" @@ -3639,6 +3771,32 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "vello_common" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b" +dependencies = [ + "bytemuck", + "fearless_simd", + "hashbrown 0.16.1", + "log", + "peniko", + "skrifa", + "smallvec", +] + +[[package]] +name = "vello_cpu" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc" +dependencies = [ + "bytemuck", + "hashbrown 0.16.1", + "vello_common", +] + [[package]] name = "version_check" version = "0.9.5" @@ -3666,9 +3824,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -3679,11 +3837,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.56" +version = "0.4.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -3692,9 +3851,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3702,9 +3861,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", @@ -3715,9 +3874,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] @@ -3859,9 +4018,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.83" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -3887,7 +4046,7 @@ dependencies = [ "jni", "log", "ndk-context", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-foundation 0.3.2", "url", "web-sys", @@ -3901,12 +4060,13 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "27.0.1" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +checksum = "78f9f386699b1fb8b8a05bfe82169b24d151f05702d2905a0bf93bc454fcc825" dependencies = [ "arrayvec", "bitflags 2.10.0", + "bytemuck", "cfg-if", "cfg_aliases", "document-features", @@ -3930,9 +4090,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "27.0.3" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +checksum = "c7c34181b0acb8f98168f78f8e57ec66f57df5522b39143dbe5f2f45d7ca927c" dependencies = [ "arrayvec", "bit-set", @@ -3957,55 +4117,54 @@ dependencies = [ "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", "wgpu-hal", + "wgpu-naga-bridge", "wgpu-types", ] [[package]] name = "wgpu-core-deps-apple" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +checksum = "43acd053312501689cd92a01a9638d37f3e41a5fd9534875efa8917ee2d11ac0" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +checksum = "ef043bf135cc68b6f667c55ff4e345ce2b5924d75bad36a47921b0287ca4b24a" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +checksum = "725d5c006a8c02967b6d93ef04f6537ec4593313e330cfe86d9d3f946eb90f28" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "27.0.4" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +checksum = "058b6047337cf323a4f092486443a9337f3d81325347e5d77deed7e563aeaedc" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", "bitflags 2.10.0", - "block", + "block2 0.6.2", "bytemuck", "cfg-if", "cfg_aliases", - "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", - "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", @@ -4014,10 +4173,13 @@ dependencies = [ "libc", "libloading", "log", - "metal", "naga", "ndk-sys", - "objc", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", "once_cell", "ordered-float", "parking_lot", @@ -4026,27 +4188,40 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", + "raw-window-metal", "renderdoc-sys", "smallvec", "thiserror 2.0.17", "wasm-bindgen", + "wayland-sys", "web-sys", + "wgpu-naga-bridge", + "wgpu-types", + "windows", + "windows-core", +] + +[[package]] +name = "wgpu-naga-bridge" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b8e1e505095f24cb4a578f04b1421d456257dca7fac114d9d9dd3d978c34b8" +dependencies = [ + "naga", "wgpu-types", - "windows 0.58.0", - "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "27.0.1" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +checksum = "d15ece45db77dd5451f11c0ce898334317ce8502d304a20454b531fdc0652fae" dependencies = [ "bitflags 2.10.0", "bytemuck", "js-sys", "log", - "thiserror 2.0.17", + "raw-window-handle", "web-sys", ] @@ -4083,84 +4258,49 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.61.3" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ "windows-collections", - "windows-core 0.61.2", + "windows-core", "windows-future", - "windows-link 0.1.3", "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.2", -] - -[[package]] -name = "windows-core" -version = "0.58.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "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", + "windows-core", ] [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] name = "windows-future" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", + "windows-core", + "windows-link", "windows-threading", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -4172,17 +4312,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-interface" version = "0.59.3" @@ -4194,12 +4323,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -4208,49 +4331,30 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[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.2", - "windows-link 0.1.3", -] - -[[package]] -name = "windows-result" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-targets 0.52.6", + "windows-core", + "windows-link", ] [[package]] name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -4295,7 +4399,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -4335,7 +4439,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -4348,11 +4452,11 @@ dependencies = [ [[package]] name = "windows-threading" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -4495,9 +4599,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winit" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732" +checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d" dependencies = [ "ahash", "android-activity", @@ -4519,7 +4623,7 @@ dependencies = [ "objc2 0.5.2", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", - "objc2-ui-kit", + "objc2-ui-kit 0.2.2", "orbclient", "percent-encoding", "pin-project", @@ -4554,6 +4658,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" + [[package]] name = "wit-bindgen" version = "0.46.0" @@ -4680,7 +4790,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow", + "winnow 0.7.14", "zbus_macros", "zbus_names", "zvariant", @@ -4733,7 +4843,7 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" dependencies = [ "serde", "static_assertions", - "winnow", + "winnow 0.7.14", "zvariant", ] @@ -4849,7 +4959,7 @@ dependencies = [ "enumflags2", "serde", "url", - "winnow", + "winnow 0.7.14", "zvariant_derive", "zvariant_utils", ] @@ -4877,5 +4987,5 @@ dependencies = [ "quote", "serde", "syn", - "winnow", + "winnow 0.7.14", ] diff --git a/Cargo.toml b/Cargo.toml index 09f72d75..78137a46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,11 @@ [workspace] resolver = "2" -members = ["egui_plot", "demo", "examples/*", "examples_utils"] +members = [ + "egui_plot", + "demo", + "examples_utils", + "examples/*", +] [workspace.package] @@ -47,10 +52,10 @@ ahash = { version = "0.8.12", default-features = false, features = [ ] } assertables = "9.8.2" document-features = "0.2.12" -eframe = { version = "0.33", default-features = false } -egui = { version = "0.33", default-features = false } -egui_kittest = { version = "0.33", default-features = false } -emath = { version = "0.33", default-features = false } +eframe = { version = "0.34.0", default-features = false } +egui = { version = "0.34.0", default-features = false } +egui_kittest = { version = "0.34.0", default-features = false } +emath = { version = "0.34.0", default-features = false } env_logger = { version = "0.11.8", default-features = false, features = [ "auto-color", "humantime", diff --git a/demo/Cargo.toml b/demo/Cargo.toml index a7139d83..c9d1e2a4 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -24,7 +24,7 @@ eframe = { workspace = true, default-features = false, features = [ image.workspace = true log.workspace = true -egui_chip = "0.3.1" +# Avoid depending on 3rd party egui crates here, as it complicates doing a release of egui_plot. examples_utils.workspace = true # Example dependencies diff --git a/demo/src/app.rs b/demo/src/app.rs index da605d95..f8c6294d 100644 --- a/demo/src/app.rs +++ b/demo/src/app.rs @@ -1,5 +1,4 @@ use eframe::egui; -use egui::Color32; use egui::RichText; use egui::ScrollArea; use egui::TextEdit; @@ -21,8 +20,16 @@ pub struct DemoGallery { } impl eframe::App for DemoGallery { - fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { - self.ui(ctx); + fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { + let screen_rect = ui.max_rect(); + let is_small_screen = screen_rect.width() < 1024.0; + + Self::top_bar(ui); + if !is_small_screen && let Some(index) = self.current_example { + self.info_panel(ui, index); + } + self.thumbnails_panel(ui, screen_rect.width() / 3.0); + self.demo_panel(ui); } } @@ -62,20 +69,8 @@ impl DemoGallery { } } - fn ui(&mut self, ctx: &egui::Context) { - let screen_rect = ctx.available_rect(); - let is_small_screen = screen_rect.width() < 1024.0; - - Self::top_bar(ctx); - if !is_small_screen && let Some(index) = self.current_example { - self.info_panel(ctx, index); - } - self.thumbnails_panel(ctx, screen_rect.width() / 3.0); - self.demo_panel(ctx); - } - - fn top_bar(ctx: &egui::Context) { - egui::TopBottomPanel::top("top_panel").show(ctx, |ui| { + fn top_bar(ui: &mut egui::Ui) { + egui::Panel::top("top_panel").show_inside(ui, |ui| { egui::MenuBar::new().ui(ui, |ui| { egui::widgets::global_theme_preference_buttons(ui); @@ -85,16 +80,16 @@ impl DemoGallery { }); } - fn thumbnails_panel(&mut self, ctx: &egui::Context, default_width: f32) { - egui::SidePanel::left("examples_panel") - .default_width(default_width) - // Set min_width so the heading is well rendered. - .min_width(100.0) + fn thumbnails_panel(&mut self, ui: &mut egui::Ui, default_width: f32) { + egui::Panel::left("examples_panel") + .default_size(default_width) + // Set min_size so the heading is well rendered. + .min_size(100.0) // 3 columns + some space extra for buttons. // TODO(#193): get rid of "extra space" calc. - .max_width(Self::COL_WIDTH * 3. + 30.) + .max_size(Self::COL_WIDTH * 3. + 30.) .resizable(true) - .show(ctx, |ui| { + .show_inside(ui, |ui| { ScrollArea::vertical().show(ui, |ui| { let available_width = ui.available_width(); let num_columns = 1.max((available_width / Self::COL_WIDTH).floor() as usize); @@ -116,28 +111,26 @@ impl DemoGallery { }); } - fn info_panel(&mut self, ctx: &egui::Context, index: usize) { - egui::SidePanel::right("info_panel") + fn info_panel(&mut self, ui: &mut egui::Ui, index: usize) { + egui::Panel::right("info_panel") .resizable(true) - .default_width(600.0) - .show(ctx, |ui| { + .default_size(600.0) + .show_inside(ui, |ui| { let example = &mut self.examples[index]; ui.label(RichText::new(example.title()).heading()); ui.separator(); ui.label(RichText::new(example.description()).line_height(Some(20.0))); - ui.horizontal(|ui| { + ui.horizontal_wrapped(|ui| { ui.label("Tags:"); - #[expect(clippy::expect_used, reason = "tags are non-empty strings")] - egui_chip::ChipEditBuilder::new(",") - .expect("failed to create ChipEditBuilder") - .texts(example.tags()) - .chip_size(Some([80.0, 20.0])) - .chip_colors(Color32::WHITE, Color32::BLACK) - .widget_colors(Color32::TRANSPARENT, Color32::TRANSPARENT) - .build() - .show(ui); + for &tag in example.tags() { + ui.label( + RichText::new(tag) + .background_color(ui.visuals().widgets.inactive.bg_fill) + .small(), + ); + } }); ui.separator(); @@ -156,8 +149,8 @@ impl DemoGallery { }); } - fn demo_panel(&mut self, ctx: &egui::Context) { - egui::CentralPanel::default().show(ctx, |ui| { + fn demo_panel(&mut self, ui: &mut egui::Ui) { + egui::CentralPanel::default().show_inside(ui, |ui| { if let Some(index) = self.current_example { ui.vertical(|ui| { self.examples[index].show_controls(ui); diff --git a/egui_plot/src/items/mod.rs b/egui_plot/src/items/mod.rs index 99513430..cc9cbc58 100644 --- a/egui_plot/src/items/mod.rs +++ b/egui_plot/src/items/mod.rs @@ -305,7 +305,7 @@ pub(super) fn rulers_and_tooltip_at_value( PopupAnchor::Pointer, ); - let tooltip_width = plot_area_response.ctx.style().spacing.tooltip_width; + let tooltip_width = plot_area_response.ctx.global_style().spacing.tooltip_width; tooltip.popup = tooltip.popup.width(tooltip_width); diff --git a/egui_plot/src/plot.rs b/egui_plot/src/plot.rs index 86a8d891..16b30c0c 100644 --- a/egui_plot/src/plot.rs +++ b/egui_plot/src/plot.rs @@ -884,11 +884,11 @@ impl<'a> Plot<'a> { fn load_or_init_memory(&self, ui: &Ui, plot_id: Id, plot_rect: Rect) -> PlotMemory { // Load or initialize the memory. - ui.ctx().check_for_id_clash(plot_id, plot_rect, "Plot"); + ui.check_for_id_clash(plot_id, plot_rect, "Plot"); if self.reset { if let Some((name, _)) = self.linked_axes.as_ref() { - ui.ctx().data_mut(|data| { + ui.data_mut(|data| { let link_groups: &mut BoundsLinkGroups = data.get_temp_mut_or_default(Id::NULL); link_groups.0.remove(name); }); @@ -997,7 +997,7 @@ impl<'a> Plot<'a> { // Transfer the bounds from a link group. if let Some((id, axes)) = self.linked_axes.as_ref() { - ui.ctx().data_mut(|data| { + ui.data_mut(|data| { let link_groups: &mut BoundsLinkGroups = data.get_temp_mut_or_default(Id::NULL); if let Some(linked_bounds) = link_groups.0.get(id) { if axes.x { @@ -1288,7 +1288,7 @@ impl<'a> Plot<'a> { fn collect_cursors(&self, ui: &Ui, plot_id: Id) -> Vec { if let Some((id, _)) = self.linked_cursors.as_ref() { - ui.ctx().data_mut(|data| { + ui.data_mut(|data| { let frames: &mut CursorLinkGroups = data.get_temp_mut_or_default(Id::NULL); let cursors = frames.0.entry(*id).or_default(); @@ -1633,7 +1633,7 @@ impl<'a> Plot<'a> { // Call the plot build function. let mut plot_ui = PlotUi { - ctx: ui.ctx().clone(), + ctx: ui.clone(), items: Vec::new(), next_auto_color_idx: 0, last_plot_transform, diff --git a/examples/borrow_points/screenshot.png b/examples/borrow_points/screenshot.png index 44c57ec3..055cc61e 100644 --- a/examples/borrow_points/screenshot.png +++ b/examples/borrow_points/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0708739b715706bcc8bf8856505d5b632be7e8a66d7e0caba7830692fbb12d1 -size 53720 +oid sha256:738dbcf3695fe27c272e024c34b327bd405c1e75bd125e2bc7d19c00b6e7d46f +size 52947 diff --git a/examples/borrow_points/screenshot_thumb.png b/examples/borrow_points/screenshot_thumb.png index 523f1cc4..89d452d0 100644 --- a/examples/borrow_points/screenshot_thumb.png +++ b/examples/borrow_points/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6dbeacd95cbd2b6fc173ce60bfdc7fc46cffe62936a7ac55e082731e26ae7cf -size 7071 +oid sha256:3cfefeaf24443f12a9a8ea9959024a1e6402b3490ec94f7ee4e7fe4e224717cc +size 7010 diff --git a/examples/box_plot/screenshot.png b/examples/box_plot/screenshot.png index b7ea6915..6b8dd5d1 100644 --- a/examples/box_plot/screenshot.png +++ b/examples/box_plot/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6126490bfe422102f406de40e6a6a9308e15895aed1237df967cfdaa75f92bb -size 64449 +oid sha256:d129dc1c9a5dfb5a55b725078e9bda58a6f107ea6abc3c25e8919ad0b56a1e52 +size 64063 diff --git a/examples/box_plot/screenshot_thumb.png b/examples/box_plot/screenshot_thumb.png index 2f842ee4..1e4a25c7 100644 --- a/examples/box_plot/screenshot_thumb.png +++ b/examples/box_plot/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c661e40bfff8bc2fbe88293005b7d1a5520c60e94892eaef9fa24074e0c4361 -size 10228 +oid sha256:7b1fd3e8bf93a19da54928ed6383637f597e27cb77e4fafc82aa398a73955476 +size 9927 diff --git a/examples/custom_axes/screenshot.png b/examples/custom_axes/screenshot.png index 31563dea..51ff531e 100644 --- a/examples/custom_axes/screenshot.png +++ b/examples/custom_axes/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e7ae4d645f27414531568da225562a0027c14378278046826cb210e7ddc67fa -size 68270 +oid sha256:c4ca9893fe47b698705e9d2d782f009c1b2e80713e2454dd3b0e17a279ad8ea7 +size 65859 diff --git a/examples/custom_axes/screenshot_thumb.png b/examples/custom_axes/screenshot_thumb.png index 396acd98..1c08d162 100644 --- a/examples/custom_axes/screenshot_thumb.png +++ b/examples/custom_axes/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11a445f07acb173d343221beabc7efb72303980532361cd44e42e56ce1569e7b -size 9735 +oid sha256:ae4c6bb09a7b2cd7665257f3b4c722328283ef169bc70dadcb0fd9a789f3a765 +size 9233 diff --git a/examples/custom_plot_manipulation/screenshot.png b/examples/custom_plot_manipulation/screenshot.png index 00f9a63f..15a9d6e2 100644 --- a/examples/custom_plot_manipulation/screenshot.png +++ b/examples/custom_plot_manipulation/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f27509a263280af60643e177e8022b0187e80726b7c7d3f9a90f14133be01a8 -size 48293 +oid sha256:06724a6516487fd0cb1d37fc8504503504b29518e39cb7d3a6b067cac776f5a8 +size 47131 diff --git a/examples/custom_plot_manipulation/screenshot_thumb.png b/examples/custom_plot_manipulation/screenshot_thumb.png index c3cb61e9..2d1d56ba 100644 --- a/examples/custom_plot_manipulation/screenshot_thumb.png +++ b/examples/custom_plot_manipulation/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:049812c200c883049d607a5c136064522f8e1e3c04a3c8082ed0bfd34bddb10b -size 7830 +oid sha256:8eec13eb3ab8132cfbbac090b8e624b2e95c7a5ee59081a7aa74323c3231e54b +size 7737 diff --git a/examples/custom_plot_manipulation/src/app.rs b/examples/custom_plot_manipulation/src/app.rs index 3d0cc7b3..0e978c31 100644 --- a/examples/custom_plot_manipulation/src/app.rs +++ b/examples/custom_plot_manipulation/src/app.rs @@ -31,12 +31,12 @@ impl Default for CustomPlotManipulationExample { impl CustomPlotManipulationExample { pub fn show_plot(&self, ui: &mut egui::Ui) -> Response { - let (scroll, pointer_down, modifiers) = ui.ctx().input(|i| { + let (scroll, pointer_down, modifiers) = ui.input(|i| { let scroll = i.events.iter().find_map(|e| match e { Event::MouseWheel { - unit: _, + unit: _, // TODO(anyone): we should respect this delta, - modifiers: _, + .. } => Some(*delta), _ => None, }); diff --git a/examples/filled_area/screenshot.png b/examples/filled_area/screenshot.png index 439bb8f1..864fd45b 100644 --- a/examples/filled_area/screenshot.png +++ b/examples/filled_area/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37ce32164e02f3106d97b5211d958b9130671909466c0a6eefc0461ad4255995 -size 70933 +oid sha256:c04b244245b5ca135bdcc34c1c48ccecd709bf2e1f6a84e3c4d2bfd7ccd13864 +size 69455 diff --git a/examples/filled_area/screenshot_thumb.png b/examples/filled_area/screenshot_thumb.png index 5a3e48e9..db91a161 100644 --- a/examples/filled_area/screenshot_thumb.png +++ b/examples/filled_area/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6513df7fc03a4a43821fbcd71f4590b95eef02572b19ec6ea211b9a3da01375b -size 13220 +oid sha256:bde5bc008d2a4f892007a63fa12af9b4941adccfe5953b7414fd2c0c29d90ead +size 12931 diff --git a/examples/heatmap/screenshot.png b/examples/heatmap/screenshot.png index 4840575f..fcf7deee 100644 --- a/examples/heatmap/screenshot.png +++ b/examples/heatmap/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c67f3e809896646298f8410b2359d674a7851f1c29c5b90cb528b62e8e97f05 -size 26153 +oid sha256:252bc752ebba394b845a991efbee75a6637a13051ccb0b58784f41c1f5fb04d0 +size 24521 diff --git a/examples/heatmap/screenshot_thumb.png b/examples/heatmap/screenshot_thumb.png index 69761b99..7a4eb8ca 100644 --- a/examples/heatmap/screenshot_thumb.png +++ b/examples/heatmap/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56ab037b9f98452304f24ab04af3fa59d8c23fb0fb90a9825fb98af79f3e63d9 -size 12148 +oid sha256:950456b0ad71d0ce5e3b0790c25912477a38f93d5e77691679b57ecbe48f75fb +size 10558 diff --git a/examples/heatmap/src/app.rs b/examples/heatmap/src/app.rs index fa871d04..4f1ddd30 100644 --- a/examples/heatmap/src/app.rs +++ b/examples/heatmap/src/app.rs @@ -47,7 +47,7 @@ impl HeatmapDemo { ui.vertical(|ui| { ui.checkbox(&mut self.animate, "Animate"); if self.animate { - ui.ctx().request_repaint(); + ui.request_repaint(); self.tick += 1.0; } ui.checkbox(&mut self.show_labels, "Show labels"); diff --git a/examples/histogram/screenshot.png b/examples/histogram/screenshot.png index 085438a7..a0b20a59 100644 --- a/examples/histogram/screenshot.png +++ b/examples/histogram/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8432f5a26b2fb194a1ad106efb644682a311bee2ab7c0b2ffbe82b4813055cd -size 62528 +oid sha256:75a8f22a863da9d28700be4aeea06256e662959f6cdaa8d12d91bdf188e3f1a5 +size 62159 diff --git a/examples/histogram/screenshot_thumb.png b/examples/histogram/screenshot_thumb.png index f1a7d8ca..2a609583 100644 --- a/examples/histogram/screenshot_thumb.png +++ b/examples/histogram/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea8cf5b6e6b7fb398296c05eee521192e0eef3951d300e203267b375ed58920 -size 6779 +oid sha256:8f0a76162ebb1297ed79a77020cd9dc833f5ea87456bee8109ba634238cf42a9 +size 6586 diff --git a/examples/interaction/screenshot.png b/examples/interaction/screenshot.png index dcbb3b9d..94c27320 100644 --- a/examples/interaction/screenshot.png +++ b/examples/interaction/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24eb6ad7ae52ebea72a85f9bf90b0f3db95087607d837ed3ae8e0a2af2e6ab11 -size 35860 +oid sha256:5e649a38df3a8fc71641e62ae2b16c1480d30c18f42f6d41cd3d95d81288d038 +size 35804 diff --git a/examples/items/screenshot.png b/examples/items/screenshot.png index 620778df..203997c2 100644 --- a/examples/items/screenshot.png +++ b/examples/items/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04219a6e92c151fa65cde735b70f8da76031d566d46cc65d394224d42bd74e9f -size 129974 +oid sha256:0f06a09dc1edbdd795827c8441a29a70175a92a2d94a674dceea56fa78acd6ed +size 128702 diff --git a/examples/items/screenshot_thumb.png b/examples/items/screenshot_thumb.png index 5f6496aa..4896566c 100644 --- a/examples/items/screenshot_thumb.png +++ b/examples/items/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc7751c0a7fc00755c4ab5315254f1f8536d2cbc2ddfd0f8d113c507d29559cf -size 26436 +oid sha256:60444586408546a29e5e8e3fb1322a17503d2be65f98c649c114acb4baf290c0 +size 25696 diff --git a/examples/items/src/app.rs b/examples/items/src/app.rs index e5617361..9b5d2373 100644 --- a/examples/items/src/app.rs +++ b/examples/items/src/app.rs @@ -50,10 +50,9 @@ impl ItemsExample { Arrows::new("arrows", arrow_origins, arrow_tips) }; - let texture: &egui::TextureHandle = self.texture.get_or_insert_with(|| { - ui.ctx() - .load_texture("plot_demo", egui::ColorImage::example(), Default::default()) - }); + let texture: &egui::TextureHandle = self + .texture + .get_or_insert_with(|| ui.load_texture("plot_demo", egui::ColorImage::example(), Default::default())); let image = PlotImage::new( "image", texture, diff --git a/examples/legend/screenshot.png b/examples/legend/screenshot.png index ea3f80c5..f78b676f 100644 --- a/examples/legend/screenshot.png +++ b/examples/legend/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8577ddfdf8e60e92050250fee71be868a5a877b034a58ea030e3d849cb362d21 -size 104493 +oid sha256:56d509ffff0e00889fbc7176dd5400573eb7dba152132f4692828238ffadea63 +size 102132 diff --git a/examples/legend/screenshot_thumb.png b/examples/legend/screenshot_thumb.png index 761ec1e4..79298583 100644 --- a/examples/legend/screenshot_thumb.png +++ b/examples/legend/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efa80be6d0270eb34a039b1cfaadd945e28a0daf9d5a4ef6538dc793b7566083 -size 16475 +oid sha256:1ec97e538edaad63b8e0ca128d37e42cb512443fbdf9e8d90a58bc65018df6c2 +size 16014 diff --git a/examples/legend_sort/screenshot.png b/examples/legend_sort/screenshot.png index bfd0a795..52e6771d 100644 --- a/examples/legend_sort/screenshot.png +++ b/examples/legend_sort/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77749a163893d5fbcd6d08d920cbbab074eaf3d6415393ee8f72fb222fd76180 -size 84497 +oid sha256:e9db4173250585c696943bf1901544dd54977142ff7404dba7c572b16b684a63 +size 84188 diff --git a/examples/legend_sort/screenshot_thumb.png b/examples/legend_sort/screenshot_thumb.png index ca25acb9..8ecf49f8 100644 --- a/examples/legend_sort/screenshot_thumb.png +++ b/examples/legend_sort/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ace5aa2e4a346af3085850f3d1a7da10a88efc1993ad3c3978ff5dc57f8a05d -size 14575 +oid sha256:ee5e769cfc3ef1c2dab83db179377051de451d35b0728de4e3aec4255ac7a852 +size 14325 diff --git a/examples/lines/screenshot.png b/examples/lines/screenshot.png index e0cc99a5..a8e51331 100644 --- a/examples/lines/screenshot.png +++ b/examples/lines/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d28a4e5c7689d1e3702472335a3058e60656eac6c79d100f96a84e1e8d794b2 -size 118611 +oid sha256:33e3d020b0a12edc9dec5c8ca20191a390a51b084f8a38656e4a57b3588ed212 +size 117508 diff --git a/examples/lines/screenshot_thumb.png b/examples/lines/screenshot_thumb.png index b460b9bd..d5070b86 100644 --- a/examples/lines/screenshot_thumb.png +++ b/examples/lines/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92aa44a177e3cd17f4fcc62ebbcbf7fc394c2a81139392c8b3f5d0f6806e9115 -size 20310 +oid sha256:dd87c1810c7178b9c2c5d6e744b058fecc391c30e5057614f165affa1b3a9a98 +size 20045 diff --git a/examples/lines/src/app.rs b/examples/lines/src/app.rs index 471f7e74..4198ea65 100644 --- a/examples/lines/src/app.rs +++ b/examples/lines/src/app.rs @@ -159,7 +159,7 @@ impl LineExample { pub fn show_plot(&mut self, ui: &mut egui::Ui) -> Response { if self.animate { - ui.ctx().request_repaint(); + ui.request_repaint(); self.time += ui.input(|i| i.unstable_dt).at_most(1.0 / 30.0) as f64; } let mut plot = Plot::new("lines_demo") diff --git a/examples/linked_axes/screenshot.png b/examples/linked_axes/screenshot.png index 414fc9ca..51c03cab 100644 --- a/examples/linked_axes/screenshot.png +++ b/examples/linked_axes/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d79069c88a28ac8a17273690bd270257b0515e3442d839178fdbd4f584812c1 -size 66367 +oid sha256:7fe879c4297bfb69793523263d3c0421f03c4e3b918001df23fb7038bd6b87b7 +size 65878 diff --git a/examples/linked_axes/screenshot_thumb.png b/examples/linked_axes/screenshot_thumb.png index 398a6db9..9c8ce3f4 100644 --- a/examples/linked_axes/screenshot_thumb.png +++ b/examples/linked_axes/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:553baef060b04f0e8a6f9bfd9989f0cb2d4a984dcbdc3e6b83a08a37a6ccde06 -size 14139 +oid sha256:3245631670c445ccf476b692753f798db0b2f52b542227ddcae7f3e37bb94d5d +size 14097 diff --git a/examples/markers/screenshot.png b/examples/markers/screenshot.png index 6791b3d9..c504eebe 100644 --- a/examples/markers/screenshot.png +++ b/examples/markers/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:203f8cbc09ac194aa91135a989f12576148ee72dedbbe438f74896c93d5d70ea -size 78233 +oid sha256:73fefbd7065f965f33bfc9bde8fa9d8062dbace329deeeb9eae4c9e5ab0657ea +size 77725 diff --git a/examples/markers/screenshot_thumb.png b/examples/markers/screenshot_thumb.png index cc3990f8..44309d26 100644 --- a/examples/markers/screenshot_thumb.png +++ b/examples/markers/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6db6275161fd32ee8688fa981ac6477f3a4bef13ceae052066604e635daa42f -size 22938 +oid sha256:9f9c967f9fb3f4765a9a96157967338ee5db923d0b7925381449e71b4fa741ea +size 22387 diff --git a/examples/performance/screenshot.png b/examples/performance/screenshot.png index a3d8e314..b3eecdf4 100644 --- a/examples/performance/screenshot.png +++ b/examples/performance/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99f4a5341475ec47085193cdafc2676fd57816afe4310f360a90a8e3d6a9284e -size 29101 +oid sha256:e8843dac3e2248739797b48f65e9149940058bf30cc5d5898cf42bab2023860c +size 28533 diff --git a/examples/performance/screenshot_thumb.png b/examples/performance/screenshot_thumb.png index 298e5a2f..e032eac2 100644 --- a/examples/performance/screenshot_thumb.png +++ b/examples/performance/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bd75d96b5afc30f43645001a8dcf7932fea780c4c55f4324e4a3f7838a762c0 -size 7963 +oid sha256:e6df1a66ed847ad3f1cd75ff3f4627108606cc20990a53f983a7229d64377c8b +size 7899 diff --git a/examples/performance/src/app.rs b/examples/performance/src/app.rs index 878d6324..b9bce3d6 100644 --- a/examples/performance/src/app.rs +++ b/examples/performance/src/app.rs @@ -53,8 +53,8 @@ impl PerformanceDemo { } pub fn show_controls(&mut self, ui: &mut egui::Ui) -> Response { - ui.ctx().request_repaint(); // Continuous repaint for FPS counter - let fps = (1.0 / ui.ctx().input(|i| i.stable_dt)).round(); + ui.request_repaint(); // Continuous repaint for FPS counter + let fps = (1.0 / ui.input(|i| i.stable_dt)).round(); ui.horizontal(|ui| { ui.label("Markers:"); diff --git a/examples/plot_span/screenshot.png b/examples/plot_span/screenshot.png index 7420fb80..75889c43 100644 --- a/examples/plot_span/screenshot.png +++ b/examples/plot_span/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f873eaec908d24aa91fd941edcd31c635480bc9849898563bd2a3cff89d5ce -size 47585 +oid sha256:f6048d61f0661e9f0cce621d0d6bcd065b14286a2771d6f3d9f621462ff284fd +size 46474 diff --git a/examples/plot_span/screenshot_thumb.png b/examples/plot_span/screenshot_thumb.png index 7f288962..414a115b 100644 --- a/examples/plot_span/screenshot_thumb.png +++ b/examples/plot_span/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:681cce5fb8a2e489163eb18781374d39788b40fc2411a6ba28fd7fd9be669702 -size 7476 +oid sha256:586867b79ac075939768ad154b8a1cea76c388c14804197ec956ba77a4844fc3 +size 7383 diff --git a/examples/save_plot/screenshot.png b/examples/save_plot/screenshot.png index 44c57ec3..055cc61e 100644 --- a/examples/save_plot/screenshot.png +++ b/examples/save_plot/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0708739b715706bcc8bf8856505d5b632be7e8a66d7e0caba7830692fbb12d1 -size 53720 +oid sha256:738dbcf3695fe27c272e024c34b327bd405c1e75bd125e2bc7d19c00b6e7d46f +size 52947 diff --git a/examples/save_plot/screenshot_thumb.png b/examples/save_plot/screenshot_thumb.png index 523f1cc4..89d452d0 100644 --- a/examples/save_plot/screenshot_thumb.png +++ b/examples/save_plot/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6dbeacd95cbd2b6fc173ce60bfdc7fc46cffe62936a7ac55e082731e26ae7cf -size 7071 +oid sha256:3cfefeaf24443f12a9a8ea9959024a1e6402b3490ec94f7ee4e7fe4e224717cc +size 7010 diff --git a/examples/save_plot/src/app.rs b/examples/save_plot/src/app.rs index 9afcef70..f0882e6f 100644 --- a/examples/save_plot/src/app.rs +++ b/examples/save_plot/src/app.rs @@ -70,8 +70,7 @@ impl SavePlotExample { pub fn show_controls(&self, ui: &mut egui::Ui) -> Response { let response = ui.button("Save Plot"); if response.clicked() { - ui.ctx() - .send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default())); + ui.send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default())); } response } diff --git a/examples/stacked_bar/screenshot.png b/examples/stacked_bar/screenshot.png index dd68eee6..df5fe1f1 100644 --- a/examples/stacked_bar/screenshot.png +++ b/examples/stacked_bar/screenshot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8ee5915cdc236bddcc563477913b9e37d801af7c3b01e139e45923dc3fcd210 -size 97472 +oid sha256:abd3693d78af331bd885ae6a6a768801ac9132cf9c1e73d32e407c8cf918ced1 +size 97215 diff --git a/examples/stacked_bar/screenshot_thumb.png b/examples/stacked_bar/screenshot_thumb.png index df414d88..c5225d55 100644 --- a/examples/stacked_bar/screenshot_thumb.png +++ b/examples/stacked_bar/screenshot_thumb.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c99f809af744e9110b51b09649db56df51ab6bba5f0e5668f07bcfa0a1940b11 -size 8586 +oid sha256:dfbf87eeca86b2ae8113675ebc826dba8016c452f5e93ddad1c85f2f6f5766bc +size 8524 diff --git a/examples_utils/src/lib.rs b/examples_utils/src/lib.rs index be208c65..37fc5e70 100644 --- a/examples_utils/src/lib.rs +++ b/examples_utils/src/lib.rs @@ -88,8 +88,8 @@ macro_rules! make_main { } impl eframe::App for AppWrapper { - fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show(ctx, |ui| { + fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { + egui::CentralPanel::default().show_inside(ui, |ui| { if self.plot_only { self.inner.show_plot(ui); } else {