diff --git a/Cargo.lock b/Cargo.lock index b7fc82ad..14be49b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "accesskit" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a" +checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320" dependencies = [ "uuid", ] @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10" +checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60" +checksum = "f950720ce064757a1b629caad3a408e8d2c63bb01f29b8a3ff8daa331053ffeb" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -79,12 +79,12 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.32.1" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21" +checksum = "36e93ac7bf50b964f1cbb75f741629a4e950571baa1ef1274457ab5a80d9bcc2" dependencies = [ "accesskit", - "accesskit_consumer 0.35.0", + "accesskit_consumer 0.37.0", "hashbrown 0.16.1", "static_assertions", "windows 0.62.2", @@ -274,19 +274,16 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.12.3" +version = "0.13.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a3c86f3fd70c0ffa500ed189abfa90b5a52398a45d5dc372fcc38ebeb7a645" +checksum = "281e6645758940dee594495e28807a7672ce40f11ebf4df6c22c4fcd59e2689f" dependencies = [ - "async-fs", - "async-net", "enumflags2", "futures-channel", "futures-util", - "rand 0.9.2", + "getrandom 0.4.2", "serde", "serde_repr", - "url", "wayland-backend", "wayland-client", "wayland-protocols", @@ -786,30 +783,15 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "bit-set" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" -dependencies = [ - "bit-vec 0.8.0", -] - [[package]] name = "bit-set" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" dependencies = [ - "bit-vec 0.9.1", + "bit-vec", ] -[[package]] -name = "bit-vec" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" - [[package]] name = "bit-vec" version = "0.9.1" @@ -1262,17 +1244,6 @@ dependencies = [ "objc", ] -[[package]] -name = "codespan-reporting" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" -dependencies = [ - "serde", - "termcolor", - "unicode-width", -] - [[package]] name = "codespan-reporting" version = "0.13.1" @@ -1287,8 +1258,9 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ + "gpui_util", "indexmap", "rustc-hash 2.1.1", ] @@ -1686,7 +1658,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -1841,7 +1812,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "proc-macro2", "quote", @@ -1891,15 +1862,6 @@ dependencies = [ "dirs-sys 0.3.7", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" @@ -1920,18 +1882,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", -] - [[package]] name = "dirs-sys" version = "0.5.0" @@ -1941,7 +1891,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -2174,7 +2124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2438,7 +2388,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -2836,16 +2786,6 @@ dependencies = [ "wasip3", ] -[[package]] -name = "gif" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.14.1" @@ -3063,7 +3003,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "accesskit", "anyhow", @@ -3095,6 +3035,7 @@ dependencies = [ "gpui_macros", "gpui_shared_string", "gpui_util", + "heapless", "http_client", "image", "inventory", @@ -3104,7 +3045,6 @@ dependencies = [ "mach2", "media", "metal 0.29.0", - "naga 25.0.1", "num_cpus", "objc", "parking", @@ -3128,7 +3068,7 @@ dependencies = [ "smallvec", "spin 0.10.0", "stacksafe", - "strum 0.27.2", + "strum", "sum_tree", "taffy", "thiserror 2.0.18", @@ -3140,7 +3080,7 @@ dependencies = [ "waker-fn", "web-time", "windows 0.61.3", - "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269)", + "zed-font-kit", "zed-scap", ] @@ -3292,7 +3232,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "accesskit", "accesskit_unix", @@ -3308,8 +3248,10 @@ dependencies = [ "filedescriptor", "futures", "gpui", + "gpui_util", "gpui_wgpu", "http_client", + "image", "itertools 0.14.0", "libc", "log", @@ -3317,13 +3259,14 @@ dependencies = [ "open", "parking_lot", "pathfinder_geometry", + "pollster 0.4.0", "profiling", "raw-window-handle", "smallvec", "smol", - "strum 0.27.2", + "strum", "swash", - "util", + "url", "uuid", "wayland-backend", "wayland-client", @@ -3335,7 +3278,7 @@ dependencies = [ "x11-clipboard", "x11rb", "xkbcommon", - "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5)", + "zed-font-kit", "zed-scap", "zed-xim", ] @@ -3343,7 +3286,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "accesskit", "accesskit_macos", @@ -3365,6 +3308,7 @@ dependencies = [ "foreign-types", "futures", "gpui", + "gpui_util", "image", "itertools 0.14.0", "libc", @@ -3373,21 +3317,23 @@ dependencies = [ "media", "metal 0.29.0", "objc", + "objc2 0.6.4", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", "parking_lot", "pathfinder_geometry", "raw-window-handle", "semver", "smallvec", - "strum 0.27.2", - "util", + "strum", "uuid", - "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5)", + "zed-font-kit", ] [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3398,7 +3344,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "console_error_panic_hook", "gpui", @@ -3411,7 +3357,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "schemars", "serde", @@ -3421,16 +3367,17 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "log", + "which", ] [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3454,7 +3401,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "bytemuck", @@ -3477,20 +3424,23 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "wgpu", + "zed-font-kit", ] [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "accesskit", "accesskit_windows", "anyhow", "collections", + "dunce", "etagere", "futures", "gpui", + "gpui_util", "image", "itertools 0.14.0", "log", @@ -3498,7 +3448,6 @@ dependencies = [ "rand 0.9.2", "raw-window-handle", "smallvec", - "util", "uuid", "windows 0.61.3", "windows-core 0.61.2", @@ -3791,7 +3740,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "async-compression", @@ -4042,7 +3991,7 @@ dependencies = [ "byteorder-lite", "color_quant", "exr", - "gif 0.14.1", + "gif", "image-webp", "moxcms", "num-traits", @@ -4052,8 +4001,8 @@ dependencies = [ "rayon", "rgb", "tiff", - "zune-core 0.5.1", - "zune-jpeg 0.5.14", + "zune-core", + "zune-jpeg", ] [[package]] @@ -4068,9 +4017,9 @@ dependencies = [ [[package]] name = "imagesize" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" +checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c" [[package]] name = "imgref" @@ -4368,12 +4317,13 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62" +checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2" dependencies = [ "arrayvec", "euclid", + "polycool", "smallvec", ] @@ -4391,9 +4341,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin 0.9.8", -] [[package]] name = "lazycell" @@ -4804,7 +4751,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "bindgen", @@ -4926,39 +4873,16 @@ dependencies = [ [[package]] name = "naga" -version = "25.0.1" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632" -dependencies = [ - "arrayvec", - "bit-set 0.8.0", - "bitflags 2.11.0", - "cfg_aliases", - "codespan-reporting 0.12.0", - "half", - "hashbrown 0.15.5", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "once_cell", - "rustc-hash 1.1.0", - "strum 0.26.3", - "thiserror 2.0.18", - "unicode-ident", -] - -[[package]] -name = "naga" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df" dependencies = [ "arrayvec", - "bit-set 0.9.1", + "bit-set", "bitflags 2.11.0", "cfg-if", "cfg_aliases", - "codespan-reporting 0.13.1", + "codespan-reporting", "half", "hashbrown 0.16.1", "hexf-parse", @@ -5130,7 +5054,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5180,16 +5104,16 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.6" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +checksum = "a7f9a86e097b0d187ad0e65667c2f58b9254671e86e7dbb78036b16692eae099" dependencies = [ - "lazy_static", "libm", "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "once_cell", + "rand 0.9.2", "serde", "smallvec", "zeroize", @@ -5563,9 +5487,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "oo7" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3299dd401feaf1d45afd8fd1c0586f10fcfb22f244bb9afa942cec73503b89d" +checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd" dependencies = [ "aes", "ashpd", @@ -5579,15 +5503,15 @@ dependencies = [ "endi", "futures-lite 2.6.1", "futures-util", - "getrandom 0.3.4", + "getrandom 0.4.2", "hkdf", "hmac", "md-5", "num", "num-bigint-dig", "pbkdf2", - "rand 0.9.2", "serde", + "serde_bytes", "sha2", "subtle", "zbus", @@ -5754,7 +5678,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "collections", "serde", @@ -6094,6 +6018,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" +[[package]] +name = "polycool" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6" +dependencies = [ + "arrayvec", +] + [[package]] name = "portable-atomic" version = "1.13.1" @@ -6735,7 +6668,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "derive_refineable", ] @@ -6802,11 +6735,11 @@ dependencies = [ [[package]] name = "resvg" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43" +checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419" dependencies = [ - "gif 0.13.3", + "gif", "image-webp", "log", "pico-args", @@ -6814,7 +6747,7 @@ dependencies = [ "svgtypes", "tiny-skia", "usvg", - "zune-jpeg 0.4.21", + "zune-jpeg", ] [[package]] @@ -6884,6 +6817,15 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" +[[package]] +name = "roxmltree" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb" +dependencies = [ + "memchr", +] + [[package]] name = "rust-embed" version = "8.11.0" @@ -7027,7 +6969,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7040,7 +6982,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -7108,7 +7050,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7180,7 +7122,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "async-task", "backtrace", @@ -7325,6 +7267,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" +dependencies = [ + "serde", + "serde_core", +] + [[package]] name = "serde_core" version = "1.0.228" @@ -7624,7 +7576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7696,6 +7648,7 @@ dependencies = [ "cfg-if", "libc", "psm", + "windows-sys 0.52.0", "windows-sys 0.59.0", ] @@ -7772,35 +7725,13 @@ dependencies = [ "quote", ] -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros 0.26.4", -] - [[package]] name = "strum" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros 0.27.2", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.117", + "strum_macros", ] [[package]] @@ -7824,7 +7755,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "heapless", "log", @@ -7919,9 +7850,9 @@ checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb" [[package]] name = "svgtypes" -version = "0.15.3" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc" +checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d" dependencies = [ "kurbo", "siphasher 1.0.2", @@ -8131,7 +8062,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8214,7 +8145,7 @@ dependencies = [ "half", "quick-error", "weezl", - "zune-jpeg 0.5.14", + "zune-jpeg", ] [[package]] @@ -9032,7 +8963,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9162,9 +9093,9 @@ dependencies = [ [[package]] name = "usvg" -version = "0.45.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" +checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f" dependencies = [ "base64", "data-url", @@ -9174,7 +9105,7 @@ dependencies = [ "kurbo", "log", "pico-args", - "roxmltree", + "roxmltree 0.21.1", "rustybuzz", "simplecss", "siphasher 1.0.2", @@ -9202,7 +9133,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "async-fs", @@ -9241,7 +9172,7 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "perf", "quote", @@ -9757,8 +9688,9 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07" dependencies = [ "arrayvec", "bitflags 2.11.0", @@ -9769,7 +9701,7 @@ dependencies = [ "hashbrown 0.16.1", "js-sys", "log", - "naga 29.0.3", + "naga", "parking_lot", "portable-atomic", "profiling", @@ -9786,12 +9718,13 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7" dependencies = [ "arrayvec", - "bit-set 0.9.1", - "bit-vec 0.9.1", + "bit-set", + "bit-vec", "bitflags 2.11.0", "bytemuck", "cfg_aliases", @@ -9799,7 +9732,7 @@ dependencies = [ "hashbrown 0.16.1", "indexmap", "log", - "naga 29.0.3", + "naga", "once_cell", "parking_lot", "portable-atomic", @@ -9818,37 +9751,41 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set 0.9.1", + "bit-set", "bitflags 2.11.0", "block2 0.6.2", "bytemuck", @@ -9864,7 +9801,7 @@ dependencies = [ "libc", "libloading", "log", - "naga 29.0.3", + "naga", "ndk-sys", "objc2 0.6.4", "objc2-core-foundation", @@ -9895,17 +9832,19 @@ dependencies = [ [[package]] name = "wgpu-naga-bridge" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161" dependencies = [ - "naga 29.0.3", + "naga", "wgpu-types", ] [[package]] name = "wgpu-types" -version = "29.0.3" -source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5" dependencies = [ "bitflags 2.11.0", "bytemuck", @@ -9949,7 +9888,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -10256,15 +10195,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -10316,21 +10246,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -10397,12 +10312,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -10421,12 +10330,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -10445,12 +10348,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -10481,12 +10378,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -10505,12 +10396,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -10529,12 +10414,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -10553,12 +10432,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -11010,30 +10883,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zed-font-kit" -version = "0.14.1-zed" -source = "git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5#110523127440aefb11ce0cf280ae7c5071337ec5" -dependencies = [ - "bitflags 2.11.0", - "byteorder", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "core-text", - "dirs 5.0.1", - "dwrote", - "float-ord", - "freetype-sys", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi", - "yeslogic-fontconfig-sys", -] - [[package]] name = "zed-font-kit" version = "0.14.1-zed" @@ -11256,7 +11105,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "anyhow", "chrono", @@ -11273,7 +11122,7 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" dependencies = [ "tracing", "tracing-subscriber", @@ -11284,13 +11133,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558" - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" +source = "git+https://github.com/BumpyClock/gpui?rev=24cfa81ca2a9f954b96320e14b393dd519078618#24cfa81ca2a9f954b96320e14b393dd519078618" [[package]] name = "zune-core" @@ -11307,22 +11150,13 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zune-jpeg" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" -dependencies = [ - "zune-core 0.4.12", -] - [[package]] name = "zune-jpeg" version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7a1c0af6e5d8d1363f4994b7a091ccf963d8b694f7da5b0b9cceb82da2c0a6" dependencies = [ - "zune-core 0.5.1", + "zune-core", ] [[package]] @@ -11334,7 +11168,7 @@ dependencies = [ "endi", "enumflags2", "serde", - "url", + "serde_bytes", "winnow 1.0.0", "zvariant_derive", "zvariant_utils", diff --git a/Cargo.toml b/Cargo.toml index 0da074b3..5fe438bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,8 +28,8 @@ gpui-component-macros = { path = "crates/macros", version = "0.5.1" } gpui-component-assets = { path = "crates/assets", version = "0.5.1" } story = { path = "crates/story" } -gpui = { git = "https://github.com/BumpyClock/gpui", rev = "510dedc3b44fcf80c791ab17e59530ae66e80558", features = ["font-kit"] } -gpui_platform = { git = "https://github.com/BumpyClock/gpui", rev = "510dedc3b44fcf80c791ab17e59530ae66e80558", features = ["font-kit"] } +gpui = { git = "https://github.com/BumpyClock/gpui", rev = "24cfa81ca2a9f954b96320e14b393dd519078618", features = ["font-kit"] } +gpui_platform = { git = "https://github.com/BumpyClock/gpui", rev = "24cfa81ca2a9f954b96320e14b393dd519078618", features = ["font-kit"] } gpui-macros = "0.2.2" sum-tree = { version = "0.2.0", package = "zed-sum-tree" } # reqwest = { version = "0.12.15-zed", package = "zed-reqwest" } diff --git a/crates/ui/src/dock/tab_panel.rs b/crates/ui/src/dock/tab_panel.rs index 2c7a37ad..87e852f1 100644 --- a/crates/ui/src/dock/tab_panel.rs +++ b/crates/ui/src/dock/tab_panel.rs @@ -783,7 +783,7 @@ impl TabPanel { div() .id("tab-bar-empty-space") .h_full() - .flex_grow() + .flex_grow(1.) .min_w_16() .when(state.droppable, |this| { this.drag_over::(|this, _, _, cx| { diff --git a/crates/ui/src/form/field.rs b/crates/ui/src/form/field.rs index 1814793f..2bc5977b 100644 --- a/crates/ui/src/form/field.rs +++ b/crates/ui/src/form/field.rs @@ -1,7 +1,7 @@ use std::rc::Rc; use gpui::{ - AlignItems, AnyElement, AnyView, App, Axis, Div, Element, ElementId, InteractiveElement as _, + AlignItems, AnyElement, AnyView, App, Axis, Div, ElementId, InteractiveElement as _, IntoElement, ParentElement, Pixels, Rems, RenderOnce, SharedString, Styled, Window, div, prelude::FluentBuilder as _, px, }; @@ -53,7 +53,7 @@ impl RenderOnce for FieldBuilder { match self { FieldBuilder::String(value) => value.into_any_element(), FieldBuilder::Element(builder) => builder(window, cx), - FieldBuilder::View(view) => view.into_any(), + FieldBuilder::View(view) => view.into_any_element(), } } } diff --git a/crates/ui/src/input/state.rs b/crates/ui/src/input/state.rs index 04bcad54..3284360d 100644 --- a/crates/ui/src/input/state.rs +++ b/crates/ui/src/input/state.rs @@ -2239,7 +2239,7 @@ impl Render for InputState { .id("input-state") .flex_1() .when(self.mode.is_multi_line(), |this| this.h_full()) - .flex_grow() + .flex_grow(1.) .overflow_x_hidden() .child(TextElement::new(cx.entity()).placeholder(self.placeholder.clone())) .children(self.diagnostic_popover.clone()) diff --git a/crates/ui/src/list/list.rs b/crates/ui/src/list/list.rs index 08012b23..2c6690f1 100644 --- a/crates/ui/src/list/list.rs +++ b/crates/ui/src/list/list.rs @@ -503,7 +503,7 @@ where let scroll_handle = self.scroll_handle.clone(); v_flex() - .flex_grow() + .flex_grow(1.) .relative() .size_full() .when_some(self.options.max_height, |this, h| this.max_h(h)) diff --git a/crates/ui/src/resizable/panel.rs b/crates/ui/src/resizable/panel.rs index 3bd1733d..c890cca9 100644 --- a/crates/ui/src/resizable/panel.rs +++ b/crates/ui/src/resizable/panel.rs @@ -250,7 +250,7 @@ impl RenderOnce for ResizablePanel { div() .id(("resizable-panel", self.panel_ix)) .flex() - .flex_grow() + .flex_grow(1.) .size_full() .relative() .when(self.axis.is_vertical(), |this| { @@ -262,7 +262,7 @@ impl RenderOnce for ResizablePanel { // 1. initial_size is None, to use auto size. // 2. initial_size is Some and size is none, to use the initial size of the panel for first time render. // 3. initial_size is Some and size is Some, use `size`. - .when(self.initial_size.is_none(), |this| this.flex_shrink()) + .when(self.initial_size.is_none(), |this| this.flex_shrink(1.)) .when_some(self.initial_size, |this, initial_size| { // The `self.size` is None, that mean the initial size for the panel, // so we need set `flex_shrink_0` To let it keep the initial size. diff --git a/crates/ui/src/table/state.rs b/crates/ui/src/table/state.rs index 789d8313..b51afecc 100644 --- a/crates/ui/src/table/state.rs +++ b/crates/ui/src/table/state.rs @@ -1818,7 +1818,7 @@ where this.children(empty_view) } else { this.child( - h_flex().id("table-body").flex_grow().size_full().child( + h_flex().id("table-body").flex_grow(1.).size_full().child( uniform_list( "table-uniform-list", render_rows_count, @@ -1894,7 +1894,7 @@ where }, ), ) - .flex_grow() + .flex_grow(1.) .size_full() .with_sizing_behavior(ListSizingBehavior::Auto) .track_scroll(&self.vertical_scroll_handle) diff --git a/crates/ui/src/tree.rs b/crates/ui/src/tree.rs index 74481d9b..d7727488 100644 --- a/crates/ui/src/tree.rs +++ b/crates/ui/src/tree.rs @@ -499,7 +499,7 @@ impl Render for TreeState { items }) }) - .flex_grow() + .flex_grow(1.) .size_full() .track_scroll(&self.scroll_handle) .with_sizing_behavior(ListSizingBehavior::Auto) diff --git a/crates/webview/src/lib.rs b/crates/webview/src/lib.rs index 83d08f33..382b0c38 100644 --- a/crates/webview/src/lib.rs +++ b/crates/webview/src/lib.rs @@ -246,14 +246,14 @@ impl Element for WebViewElement { )), }) { let message: SharedString = format!("Failed to resize webview: {err}").into(); - let _ = self.parent.update(cx, |parent, cx| { + self.parent.update(cx, |parent, cx| { parent.set_error(message.clone()); cx.notify(); }); return None; } - let _ = self.parent.update(cx, |parent, cx| { + self.parent.update(cx, |parent, cx| { if parent.last_error.is_some() { parent.clear_error(); cx.notify(); diff --git a/examples/webview/src/main.rs b/examples/webview/src/main.rs index b7f888d6..9f786d29 100644 --- a/examples/webview/src/main.rs +++ b/examples/webview/src/main.rs @@ -1,3 +1,4 @@ +use gpui::prelude::FluentBuilder as _; use gpui::*; use gpui_component::{ ActiveTheme as _, Root, h_flex, diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..12dd5258 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.95.0" +profile = "minimal" +components = ["rustfmt", "clippy"] diff --git a/vendor/gpui b/vendor/gpui index 510dedc3..24cfa81c 160000 --- a/vendor/gpui +++ b/vendor/gpui @@ -1 +1 @@ -Subproject commit 510dedc3b44fcf80c791ab17e59530ae66e80558 +Subproject commit 24cfa81ca2a9f954b96320e14b393dd519078618