diff --git a/Cargo.lock b/Cargo.lock index 8c4c5653..3f5699d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,7 +150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.6.0", + "bitflags 2.9.4", "cc", "cesu8", "jni", @@ -915,9 +915,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -1090,18 +1093,18 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", @@ -1126,7 +1129,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "log", "polling", "rustix", @@ -1324,12 +1327,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -1624,7 +1621,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "core-foundation 0.10.0", "core-graphics-types 0.2.0", "foreign-types", @@ -1648,25 +1645,25 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "core-foundation 0.10.0", "libc", ] [[package]] name = "cosmic-text" -version = "0.12.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" +checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "fontdb 0.16.2", "log", "rangemap", - "rayon", "rustc-hash 1.1.0", "rustybuzz", "self_cell", + "smol_str", "swash", "sys-locale", "ttf-parser 0.21.1", @@ -1758,6 +1755,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "cryoglyph" +version = "0.1.0" +source = "git+https://github.com/iced-rs/cryoglyph.git?rev=a456d1c17bbcf33afcca41d9e5e299f9f1193819#a456d1c17bbcf33afcca41d9e5e299f9f1193819" +dependencies = [ + "cosmic-text", + "etagere", + "lru 0.12.5", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -2079,7 +2088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357422a457ccb850dc8f1c1680e0670079560feaad6c2e247e3f345c4fab8a3f" dependencies = [ "heck 0.5.0", - "indexmap 2.6.0", + "indexmap 1.9.3", "itertools 0.13.0", "proc-macro-crate 3.2.0", "proc-macro2", @@ -2312,7 +2321,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytemuck", "drm-ffi", "drm-fourcc", @@ -3426,9 +3435,9 @@ checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" [[package]] name = "font-types" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" +checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7" dependencies = [ "bytemuck", ] @@ -3857,9 +3866,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ "js-sys", "slotmap", @@ -3876,25 +3885,13 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=09712a70df7431e9a3b1ac1bbd4fb634096cb3b4#09712a70df7431e9a3b1ac1bbd4fb634096cb3b4" -dependencies = [ - "cosmic-text", - "etagere", - "lru 0.12.5", - "rustc-hash 2.0.0", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "gpu-alloc-types", ] @@ -3904,7 +3901,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -3925,7 +3922,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "gpu-descriptor-types", "hashbrown 0.15.2", ] @@ -3936,7 +3933,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -4227,7 +4224,7 @@ dependencies = [ "ipconfig", "moka", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand 0.9.0", "resolv-conf", "smallvec", @@ -4509,39 +4506,79 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "iced_core", + "iced_debug", + "iced_devtools", "iced_futures", "iced_renderer", + "iced_runtime", "iced_widget", "iced_winit", "thiserror 1.0.69", ] +[[package]] +name = "iced_beacon" +version = "0.14.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" +dependencies = [ + "bincode", + "futures", + "iced_core", + "log", + "semver", + "serde", + "thiserror 1.0.69", + "tokio", +] + [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytes", "dark-light", "glam", "lilt", "log", "num-traits", - "palette", "rustc-hash 2.0.0", + "serde", "smol_str", "thiserror 1.0.69", "web-time", ] +[[package]] +name = "iced_debug" +version = "0.14.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" +dependencies = [ + "iced_beacon", + "iced_core", + "iced_futures", + "log", +] + +[[package]] +name = "iced_devtools" +version = "0.14.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" +dependencies = [ + "iced_debug", + "iced_program", + "iced_widget", + "log", +] + [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "futures", "iced_core", @@ -4549,15 +4586,15 @@ dependencies = [ "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", - "wasm-timer", + "wasmtimer", ] [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytemuck", "cosmic-text", "half", @@ -4571,10 +4608,19 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "iced_program" +version = "0.14.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" +dependencies = [ + "iced_graphics", + "iced_runtime", +] + [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -4586,10 +4632,11 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "bytes", "iced_core", + "iced_debug", "iced_futures", "raw-window-handle", "thiserror 1.0.69", @@ -4598,10 +4645,11 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "bytemuck", "cosmic-text", + "iced_debug", "iced_graphics", "kurbo 0.10.4", "log", @@ -4614,14 +4662,15 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytemuck", + "cryoglyph", "futures", "glam", - "glyphon", "guillotiere", + "iced_debug", "iced_graphics", "log", "lyon", @@ -4634,7 +4683,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ "iced_renderer", "iced_runtime", @@ -4649,11 +4698,10 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=940a079#940a079d83f904bef0eb9514fce50cd0109219c9" +source = "git+https://github.com/iced-rs/iced?rev=8ba993a#8ba993adad7918499cbcc5dbf0457c77452b10d2" dependencies = [ - "iced_futures", - "iced_graphics", - "iced_runtime", + "iced_debug", + "iced_program", "log", "rustc-hash 2.0.0", "thiserror 1.0.69", @@ -4992,7 +5040,7 @@ dependencies = [ "atomic-waker", "backon", "bytes", - "cfg_aliases 0.2.1", + "cfg_aliases", "concurrent-queue", "crypto_box", "data-encoding", @@ -5078,7 +5126,7 @@ checksum = "63407d73331e8e38980be7e39b1db8e173fc28545b3ea0c48c9a718f95877b8e" dependencies = [ "anyhow", "bytes", - "cfg_aliases 0.2.1", + "cfg_aliases", "derive_more 1.0.0", "hickory-resolver", "iroh-base", @@ -5106,7 +5154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76c6245c9ed906506ab9185e8d7f64857129aee4f935e899f398a3bd3b70338d" dependencies = [ "bytes", - "cfg_aliases 0.2.1", + "cfg_aliases", "iroh-quinn-proto", "iroh-quinn-udp", "pin-project-lite", @@ -5146,12 +5194,12 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c53afaa1049f7c83ea1331f5ebb9e6ebc5fdd69c468b7a22dd598b02c9bcc973" dependencies = [ - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5162,7 +5210,7 @@ checksum = "21d282c04a71a83a90b8fe6872ba30ae341853255aa908375a3e6181f7215d7b" dependencies = [ "anyhow", "bytes", - "cfg_aliases 0.2.1", + "cfg_aliases", "data-encoding", "derive_more 1.0.0", "hickory-resolver", @@ -5317,10 +5365,11 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -5534,7 +5583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5549,7 +5598,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "libc", "redox_syscall 0.5.7", ] @@ -5637,7 +5686,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "libc", ] @@ -5897,11 +5946,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block", "core-graphics-types 0.1.3", "foreign-types", @@ -5997,7 +6046,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "loom 0.7.2", - "parking_lot 0.12.3", + "parking_lot", "portable-atomic", "rustc_version", "smallvec", @@ -6012,7 +6061,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399e11dc3b0e8d9d65b27170d22f5d779d52d9bed888db70d7e0c2c7ce3dfc52" dependencies = [ - "cfg_aliases 0.2.1", + "cfg_aliases", "derive_more 1.0.0", "futures-buffered", "futures-lite", @@ -6029,22 +6078,23 @@ dependencies = [ [[package]] name = "naga" -version = "23.1.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f" +checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", + "bitflags 2.9.4", + "cfg_aliases", "codespan-reporting", "hexf-parse", "indexmap 2.6.0", "log", "rustc-hash 1.1.0", "spirv", + "strum 0.26.3", "termcolor", - "thiserror 1.0.69", + "thiserror 2.0.12", "unicode-xid", ] @@ -6063,7 +6113,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "jni-sys", "log", "ndk-sys 0.6.0+11769913", @@ -6199,7 +6249,7 @@ checksum = "0b7879c2cfdf30d92f2be89efa3169b3d78107e3ab7f7b9a37157782569314e1" dependencies = [ "atomic-waker", "bytes", - "cfg_aliases 0.2.1", + "cfg_aliases", "derive_more 1.0.0", "iroh-quinn-udp", "js-sys", @@ -6241,7 +6291,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "cfg-if", "libc", ] @@ -6252,9 +6302,9 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset", ] @@ -6462,7 +6512,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "libc", "objc2", @@ -6478,7 +6528,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-core-location", @@ -6502,7 +6552,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-foundation", @@ -6544,7 +6594,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "dispatch", "libc", @@ -6569,7 +6619,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-foundation", @@ -6581,7 +6631,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-foundation", @@ -6604,7 +6654,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-cloud-kit", @@ -6636,7 +6686,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "objc2", "objc2-core-location", @@ -6738,6 +6788,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -6868,17 +6927,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -6886,21 +6934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -7271,7 +7305,7 @@ dependencies = [ "atomic 0.5.3", "crossbeam-queue", "futures", - "parking_lot 0.12.3", + "parking_lot", "pin-project", "static_assertions", "thiserror 1.0.69", @@ -7562,7 +7596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.3", + "parking_lot", "scheduled-thread-pool", ] @@ -7731,23 +7765,14 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.22.3" +version = "0.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb94d9ac780fdcf9b6b252253f7d8f221379b84bd3573131139b383df69f85e1" +checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d" dependencies = [ "bytemuck", "font-types", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -7763,7 +7788,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -8081,7 +8106,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -8132,7 +8157,7 @@ version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "errno", "libc", "linux-raw-sys 0.4.14", @@ -8223,7 +8248,7 @@ dependencies = [ "security-framework 3.2.0", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8276,7 +8301,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytemuck", "libm", "smallvec", @@ -8348,7 +8373,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.3", + "parking_lot", ] [[package]] @@ -8446,7 +8471,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -8459,7 +8484,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -8487,6 +8512,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "send_wrapper" @@ -8530,7 +8558,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float", + "ordered-float 2.10.1", "serde", ] @@ -8750,7 +8778,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01607fe2e61894468c6dc0b26103abb073fb08b79a3d9e4b6d76a1a341549958" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -8799,9 +8827,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skrifa" -version = "0.22.3" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" +checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607" dependencies = [ "bytemuck", "read-fonts", @@ -8837,7 +8865,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "calloop", "calloop-wayland-source", "cursor-icon", @@ -8894,7 +8922,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08" dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases 0.2.1", + "cfg_aliases", "core-graphics 0.24.0", "drm", "fastrand", @@ -8954,7 +8982,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -9173,7 +9201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fda78103d8016bb25c331ddc54af634e801806463682cc3e549d335df644d95" dependencies = [ "hex", - "parking_lot 0.12.3", + "parking_lot", "pnet_packet", "rand 0.9.0", "socket2", @@ -9200,9 +9228,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.19" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" +checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" dependencies = [ "skrifa", "yazi", @@ -9283,7 +9311,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "core-foundation 0.9.4", "system-configuration-sys 0.6.0", ] @@ -9519,7 +9547,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -9735,7 +9763,7 @@ name = "tor-cell" version = "0.20.0" source = "git+https://github.com/benthecarman/arti.git?rev=e0f1f7a9a44ae0543c0b6716f0f4201142fd6133#e0f1f7a9a44ae0543c0b6716f0f4201142fd6133" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "bytes", "caret", "derive_more 0.99.18", @@ -10146,7 +10174,7 @@ name = "tor-netdir" version = "0.20.0" source = "git+https://github.com/benthecarman/arti.git?rev=e0f1f7a9a44ae0543c0b6716f0f4201142fd6133#e0f1f7a9a44ae0543c0b6716f0f4201142fd6133" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "derive_more 0.99.18", "digest", "futures", @@ -10179,7 +10207,7 @@ source = "git+https://github.com/benthecarman/arti.git?rev=e0f1f7a9a44ae0543c0b6 dependencies = [ "amplify", "base64ct", - "bitflags 2.6.0", + "bitflags 2.9.4", "cipher", "derive_builder_fork_arti", "derive_more 0.99.18", @@ -10888,24 +10916,25 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.95", @@ -10926,9 +10955,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10936,9 +10965,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", @@ -10949,9 +10978,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" @@ -10967,18 +10999,17 @@ dependencies = [ ] [[package]] -name = "wasm-timer" -version = "0.2.5" +name = "wasmtimer" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" dependencies = [ "futures", "js-sys", - "parking_lot 0.11.2", + "parking_lot", "pin-utils", + "slab", "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", ] [[package]] @@ -11001,7 +11032,7 @@ version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "rustix", "wayland-backend", "wayland-scanner", @@ -11013,7 +11044,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "cursor-icon", "wayland-backend", ] @@ -11035,7 +11066,7 @@ version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "wayland-backend", "wayland-client", "wayland-scanner", @@ -11047,7 +11078,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "wayland-backend", "wayland-client", "wayland-protocols", @@ -11060,7 +11091,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "wayland-backend", "wayland-client", "wayland-protocols", @@ -11098,9 +11129,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" dependencies = [ "js-sys", "wasm-bindgen", @@ -11148,17 +11179,18 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "23.0.1" +version = "24.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a" +checksum = "6b0b3436f0729f6cdf2e6e9201f3d39dc95813fad61d826c1ed07918b4539353" dependencies = [ "arrayvec", - "cfg_aliases 0.1.1", + "bitflags 2.9.4", + "cfg_aliases", "document-features", "js-sys", "log", "naga", - "parking_lot 0.12.3", + "parking_lot", "profiling", "raw-window-handle", "smallvec", @@ -11173,43 +11205,43 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "23.0.1" +version = "24.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a" +checksum = "7f0aa306497a238d169b9dc70659105b4a096859a34894544ca81719242e1499" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", + "bitflags 2.9.4", + "cfg_aliases", "document-features", "indexmap 2.6.0", "log", "naga", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "profiling", "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.12", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "23.0.1" +version = "24.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821" +checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.6.0", + "bitflags 2.9.4", "block", "bytemuck", - "cfg_aliases 0.1.1", + "cfg_aliases", "core-graphics-types 0.1.3", "glow", "glutin_wgl_sys", @@ -11226,14 +11258,15 @@ dependencies = [ "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", - "parking_lot 0.12.3", + "ordered-float 4.6.0", + "parking_lot", "profiling", "range-alloc", "raw-window-handle", "renderdoc-sys", "rustc-hash 1.1.0", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.12", "wasm-bindgen", "web-sys", "wgpu-types", @@ -11243,12 +11276,13 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "23.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" +checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "js-sys", + "log", "web-sys", ] @@ -11280,7 +11314,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -11761,11 +11795,11 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.6.0", + "bitflags 2.9.4", "block2", "bytemuck", "calloop", - "cfg_aliases 0.2.1", + "cfg_aliases", "concurrent-queue", "core-foundation 0.9.4", "core-graphics 0.23.2", @@ -11857,7 +11891,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", ] [[package]] @@ -11989,7 +12023,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "dlib", "log", "once_cell", @@ -12034,9 +12068,9 @@ dependencies = [ [[package]] name = "yazi" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" +checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" [[package]] name = "yoke" @@ -12196,9 +12230,9 @@ dependencies = [ [[package]] name = "zeno" -version = "0.2.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" +checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" diff --git a/harbor-ui/Cargo.toml b/harbor-ui/Cargo.toml index 93f4dd11..1b73fd28 100644 --- a/harbor-ui/Cargo.toml +++ b/harbor-ui/Cargo.toml @@ -13,7 +13,7 @@ fd-lock = "4.0.2" log = { workspace = true } simplelog = "0.12" -iced = { git = "https://github.com/iced-rs/iced", rev = "940a079", features = ["debug", "tokio", "svg", "qr_code", "advanced"] } +iced = { git = "https://github.com/iced-rs/iced", rev = "8ba993a", features = ["debug", "tokio", "svg", "qr_code", "advanced"] } lyon_algorithms = "1.0" tokio = { workspace = true } palette = "0.7" diff --git a/harbor-ui/src/components/indicator.rs b/harbor-ui/src/components/indicator.rs index bdd916a3..c81f6fe0 100644 --- a/harbor-ui/src/components/indicator.rs +++ b/harbor-ui/src/components/indicator.rs @@ -185,6 +185,7 @@ where tree: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, + viewport: &Rectangle, translation: Vector, ) -> Option> { let mut children = tree.children.iter_mut(); @@ -193,6 +194,7 @@ where children.next().unwrap(), layout, renderer, + viewport, translation, ); diff --git a/harbor-ui/src/components/styles.rs b/harbor-ui/src/components/styles.rs index f2457929..76bec94b 100644 --- a/harbor-ui/src/components/styles.rs +++ b/harbor-ui/src/components/styles.rs @@ -40,11 +40,11 @@ const BOLD_FONT: Font = Font { style: font::Style::Normal, }; -pub fn bold_text(content: String, size: u16) -> Text<'static> { +pub fn bold_text(content: String, size: u32) -> Text<'static> { text(content).font(BOLD_FONT).size(size) } -pub fn regular_text(content: String, size: u16) -> Text<'static> { +pub fn regular_text(content: String, size: u32) -> Text<'static> { text(content).font(REGULAR_FONT).size(size) } diff --git a/harbor-ui/src/components/toast.rs b/harbor-ui/src/components/toast.rs index e19ffc44..520944da 100644 --- a/harbor-ui/src/components/toast.rs +++ b/harbor-ui/src/components/toast.rs @@ -277,6 +277,7 @@ impl Widget for ToastManager<'_> { state: &'b mut Tree, layout: Layout<'_>, renderer: &Renderer, + viewport: &Rectangle, translation: Vector, ) -> Option> { let instants = state.state.downcast_mut::>>(); @@ -287,6 +288,7 @@ impl Widget for ToastManager<'_> { &mut content_state[0], layout, renderer, + viewport, translation, ); diff --git a/harbor-ui/src/components/util.rs b/harbor-ui/src/components/util.rs index 60e10f6f..931f0fe4 100644 --- a/harbor-ui/src/components/util.rs +++ b/harbor-ui/src/components/util.rs @@ -27,11 +27,12 @@ pub fn lighten(color: Color, amount: f32) -> Color { } fn to_hsl(color: Color) -> Hsl { - Hsl::from_color(Rgb::from(color)) + Hsl::from_color(Rgb::new(color.r, color.g, color.b)) } fn from_hsl(hsl: Hsl) -> Color { - Rgb::from_color(hsl).into() + let rgb = Rgb::from_color(hsl); + Color::from_rgb(rgb.red, rgb.green, rgb.blue) } pub fn format_timestamp(timestamp: &u64) -> String { diff --git a/harbor-ui/src/main.rs b/harbor-ui/src/main.rs index 96a0fe6e..85a0e013 100644 --- a/harbor-ui/src/main.rs +++ b/harbor-ui/src/main.rs @@ -92,19 +92,24 @@ pub fn main() -> iced::Result { #[cfg(not(target_os = "macos"))] let window_settings = window::Settings::default(); - iced::application("Harbor", HarborWallet::update, HarborWallet::view) - .font(include_bytes!("../assets/fonts/Inter-Regular.ttf").as_slice()) - .font(include_bytes!("../assets/fonts/Inter-Bold.ttf").as_slice()) - .theme(HarborWallet::theme) - .window(window_settings) - .default_font(Font { - family: iced::font::Family::Name("Inter-Regular.ttf"), - weight: iced::font::Weight::Normal, - stretch: iced::font::Stretch::Normal, - style: iced::font::Style::Normal, - }) - .subscription(HarborWallet::subscription) - .run() + iced::application( + HarborWallet::default, + HarborWallet::update, + HarborWallet::view, + ) + .title("Harbor") + .font(include_bytes!("../assets/fonts/Inter-Regular.ttf").as_slice()) + .font(include_bytes!("../assets/fonts/Inter-Bold.ttf").as_slice()) + .theme(HarborWallet::theme) + .window(window_settings) + .default_font(Font { + family: iced::font::Family::Name("Inter-Regular.ttf"), + weight: iced::font::Weight::Normal, + stretch: iced::font::Stretch::Normal, + style: iced::font::Style::Normal, + }) + .subscription(HarborWallet::subscription) + .run() } #[derive(Default, Debug, Clone, PartialEq)]