gpui: bump dependency pin to latest main

This commit is contained in:
2026-11-16 09:46:45 +07:00
parent 5d28046d4a
commit 1df87c65a1
7 changed files with 106 additions and 112 deletions
+2 -2
View File
@@ -26,7 +26,7 @@ jobs:
run: | run: |
cargo check -p gpui-native-core --no-default-features cargo check -p gpui-native-core --no-default-features
cargo check -p gpui-native-core --all-features cargo check -p gpui-native-core --all-features
for f in button checkbox switch radio toggle link slider progress avatar input popover tooltip menu dialog toast; do for f in button checkbox context_menu switch radio toggle link slider progress avatar badge input clipboard popover scroll_area scrollbar segmented separator spinner field status_dot combobox command_palette tooltip menu dropdown_menu select dialog empty_state grain alert toast speech; do
cargo check -p gpui-native-core --no-default-features --features "$f" cargo check -p gpui-native-core --no-default-features --features "$f"
done done
- name: Feature checks (data) - name: Feature checks (data)
@@ -40,7 +40,7 @@ jobs:
run: | run: |
cargo check -p gpui-native-layout --no-default-features cargo check -p gpui-native-layout --no-default-features
cargo check -p gpui-native-layout --all-features cargo check -p gpui-native-layout --all-features
for f in dock resize_handle shell window_controls; do for f in grain panel resize_handle resizable shell titlebar toast alert window_controls; do
cargo check -p gpui-native-layout --no-default-features --features "$f" cargo check -p gpui-native-layout --no-default-features --features "$f"
done done
- name: Feature checks (facade) - name: Feature checks (facade)
Generated
+55 -89
View File
@@ -489,7 +489,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "bench_metrics" name = "bench_metrics"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"criterion", "criterion",
@@ -624,9 +624,9 @@ checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.20.3" version = "3.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" checksum = "87a0cf66fd1eb2fb7b822cb78370d82303750809bc6ba855f3f58e517d3238db"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
@@ -719,9 +719,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.11.1" version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155" checksum = "33ef9e3e8154a45c7a95cff4c1299702106ad94062d7bb85fdc5d3a5afd91d45"
dependencies = [ dependencies = [
"find-msvc-tools", "find-msvc-tools",
"jobserver", "jobserver",
@@ -852,7 +852,7 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"gpui_util", "gpui_util",
"indexmap", "indexmap",
@@ -1161,9 +1161,9 @@ dependencies = [
[[package]] [[package]]
name = "ctor" name = "ctor"
version = "1.0.13" version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" checksum = "ea691ed9f36489d087419b8b2ba3ef27d89621380b4178c73e2445a379e4e0f4"
dependencies = [ dependencies = [
"link-section", "link-section",
"linktime-proc-macro", "linktime-proc-macro",
@@ -1212,7 +1212,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1401,9 +1401,9 @@ checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.14" version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.61.2", "windows-sys 0.61.2",
@@ -1523,12 +1523,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
[[package]]
name = "float_next_after"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
[[package]] [[package]]
name = "flume" name = "flume"
version = "0.12.0" version = "0.12.0"
@@ -1893,7 +1887,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.2.2" version = "0.2.2"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"anyhow", "anyhow",
@@ -1921,7 +1915,7 @@ dependencies = [
"itertools 0.14.0", "itertools 0.14.0",
"libc", "libc",
"log", "log",
"lyon", "lyon_path",
"num_cpus", "num_cpus",
"objc2-core-foundation", "objc2-core-foundation",
"objc2-core-video", "objc2-core-video",
@@ -1949,6 +1943,7 @@ dependencies = [
"sum_tree", "sum_tree",
"taffy", "taffy",
"thiserror 2.0.21", "thiserror 2.0.21",
"tiny-skia-path",
"ttf-parser", "ttf-parser",
"unicode-segmentation", "unicode-segmentation",
"url", "url",
@@ -2069,7 +2064,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_apple" name = "gpui_apple"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-task", "async-task",
@@ -2108,7 +2103,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_ios" name = "gpui_ios"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"block2 0.6.2", "block2 0.6.2",
@@ -2129,7 +2124,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_linux" name = "gpui_linux"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"anyhow", "anyhow",
@@ -2156,7 +2151,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macos" name = "gpui_macos"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_macos", "accesskit_macos",
@@ -2188,6 +2183,7 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"scheduler", "scheduler",
"semver", "semver",
"serde_json",
"smallvec", "smallvec",
"strum", "strum",
"uuid", "uuid",
@@ -2196,7 +2192,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macros" name = "gpui_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@@ -2207,7 +2203,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_platform" name = "gpui_platform"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"console_error_panic_hook", "console_error_panic_hook",
@@ -2222,7 +2218,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_shared_string" name = "gpui_shared_string"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"schemars", "schemars",
"serde", "serde",
@@ -2232,7 +2228,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_util" name = "gpui_util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -2242,7 +2238,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_web" name = "gpui_web"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-channel", "async-channel",
@@ -2271,7 +2267,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_wgpu" name = "gpui_wgpu"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytemuck", "bytemuck",
@@ -2281,6 +2277,7 @@ dependencies = [
"gpui", "gpui",
"gpui_util", "gpui_util",
"itertools 0.14.0", "itertools 0.14.0",
"js-sys",
"log", "log",
"parking_lot", "parking_lot",
"profiling", "profiling",
@@ -2296,7 +2293,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_windows" name = "gpui_windows"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_windows", "accesskit_windows",
@@ -2483,7 +2480,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@@ -2501,7 +2498,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client_tls" name = "http_client_tls"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"log", "log",
"rustls", "rustls",
@@ -3073,9 +3070,9 @@ checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
[[package]] [[package]]
name = "link-section" name = "link-section"
version = "0.19.3" version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39c29a617ce3df32c08497bdc1ab6e2376e0b17948ac166a2fbe5977c5954cd9" checksum = "4d9aae57673c1a235149777a74d152f3210ebd3e3b13346d2cdb6809e566bd3c"
[[package]] [[package]]
name = "linktime-proc-macro" name = "linktime-proc-macro"
@@ -3134,26 +3131,6 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f" checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
[[package]]
name = "lyon"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0578bdecb7d6d88987b8b2b1e3a4e2f81df9d0ece1078623324a567904e7b7"
dependencies = [
"lyon_algorithms",
"lyon_tessellation",
]
[[package]]
name = "lyon_algorithms"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a6b9d4e8b48acd531fbf1241ad9b270df6e60b6b92bdea1469f4f40899d805"
dependencies = [
"lyon_path",
"num-traits",
]
[[package]] [[package]]
name = "lyon_geom" name = "lyon_geom"
version = "1.0.20" version = "1.0.20"
@@ -3175,17 +3152,6 @@ dependencies = [
"num-traits", "num-traits",
] ]
[[package]]
name = "lyon_tessellation"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd4872650e70dc907dd4f7ebc449d7d657a0d2658e423b2e724970870bbbf75b"
dependencies = [
"float_next_after",
"lyon_path",
"num-traits",
]
[[package]] [[package]]
name = "mac-notification-sys" name = "mac-notification-sys"
version = "0.6.15" version = "0.6.15"
@@ -3294,9 +3260,9 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "1.2.4" version = "1.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" checksum = "20521a903f02b0a573cd6840e9d0a5a0cc043d361fe924092cd70f8556cc9c4a"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@@ -3461,14 +3427,14 @@ dependencies = [
"mac-notification-sys", "mac-notification-sys",
"serde", "serde",
"tauri-winrt-notification", "tauri-winrt-notification",
"zbus 6.2.1", "zbus 6.3.0",
] ]
[[package]] [[package]]
name = "notify-types" name = "notify-types"
version = "2.3.0" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c491a384baf9fec20df565cdb8138a12809d4c7439763b566eb8114c5d59979" checksum = "cbd044e85df3d939d8e32a1c35a3b737c7d0a4eeb7acd737bd207644e00f4e5f"
dependencies = [ dependencies = [
"bitflags 2.13.2", "bitflags 2.13.2",
] ]
@@ -4411,7 +4377,7 @@ dependencies = [
"core_detect", "core_detect",
"num-traits", "num-traits",
"proptest-macro", "proptest-macro",
"rand 0.10.3", "rand 0.10.4",
"rand_xorshift", "rand_xorshift",
"regex-syntax", "regex-syntax",
"rusty-fork", "rusty-fork",
@@ -4507,7 +4473,7 @@ dependencies = [
"bytes", "bytes",
"getrandom 0.4.3", "getrandom 0.4.3",
"lru-slab", "lru-slab",
"rand 0.10.3", "rand 0.10.4",
"rand_pcg", "rand_pcg",
"ring", "ring",
"rustc-hash 2.1.3", "rustc-hash 2.1.3",
@@ -4578,9 +4544,9 @@ dependencies = [
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.10.3" version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11"
dependencies = [ dependencies = [
"chacha20", "chacha20",
"getrandom 0.4.3", "getrandom 0.4.3",
@@ -4813,7 +4779,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@@ -4856,7 +4822,7 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]] [[package]]
name = "reqwest_client" name = "reqwest_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@@ -5041,9 +5007,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
[[package]] [[package]]
name = "rustls-webpki" name = "rustls-webpki"
version = "0.103.16" version = "0.103.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" checksum = "e3a0760a887c14823fca5a1c970b01d47c328c696c0c64829d1df50e8f853fd5"
dependencies = [ dependencies = [
"aws-lc-rs", "aws-lc-rs",
"ring", "ring",
@@ -5114,7 +5080,7 @@ dependencies = [
[[package]] [[package]]
name = "scheduler" name = "scheduler"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"async-task", "async-task",
"backtrace", "backtrace",
@@ -5557,7 +5523,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "sum_tree" name = "sum_tree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"heapless", "heapless",
"rayon", "rayon",
@@ -7364,9 +7330,9 @@ dependencies = [
[[package]] [[package]]
name = "zbus" name = "zbus"
version = "6.2.1" version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ddb2961d9587ef9f24ad14cde1c3bc4c5edc9f1525932a8cffdd5bd98886eb9" checksum = "6b4aae740b23927ceabed962431abab2cdefb9f7f885e5bbab062da09bf580e4"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitflags 2.13.2", "bitflags 2.13.2",
@@ -7383,7 +7349,7 @@ dependencies = [
"uuid", "uuid",
"windows-sys 0.61.2", "windows-sys 0.61.2",
"winnow 1.0.5", "winnow 1.0.5",
"zbus_macros 6.2.1", "zbus_macros 6.3.0",
"zbus_utils", "zbus_utils",
"zcheapstr", "zcheapstr",
"zruntime", "zruntime",
@@ -7406,9 +7372,9 @@ dependencies = [
[[package]] [[package]]
name = "zbus_macros" name = "zbus_macros"
version = "6.2.1" version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "083b38add47c340fc12ec560124fb1d9c23acb584f7021099f85ec6587a03c54" checksum = "37c9dd4beaf145c16fcb2902862f50da86e54aed13dd368ddf64a1d17e6b8529"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -7651,9 +7617,9 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
[[package]] [[package]]
name = "zruntime" name = "zruntime"
version = "0.2.2" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23ef5ed7d628cdf0af82f93dfe03330a8e37383bf7422a1d3d6eb72326680be5" checksum = "ce6a55d4f521760475a30f7b96779508fe8c40dc834478709454dd1d5f0ebc72"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-io", "futures-io",
@@ -7665,7 +7631,7 @@ dependencies = [
[[package]] [[package]]
name = "ztracing" name = "ztracing"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
dependencies = [ dependencies = [
"tracing", "tracing",
"ztracing_macro", "ztracing_macro",
@@ -7674,7 +7640,7 @@ dependencies = [
[[package]] [[package]]
name = "ztracing_macro" name = "ztracing_macro"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" source = "git+https://github.com/zed-industries/zed#053d91cb14b5fd138f221ec02bd76efb15e7b2af"
[[package]] [[package]]
name = "zune-core" name = "zune-core"
+3 -3
View File
@@ -24,9 +24,9 @@ gpui-native-icons = { path = "crates/icons" }
gpui-native-theme = { path = "crates/theme" } gpui-native-theme = { path = "crates/theme" }
[workspace.dependencies] [workspace.dependencies]
gpui = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" } gpui = { git = "https://github.com/zed-industries/zed" }
gpui_platform = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc", features = ["font-kit"] } gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit"] }
reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" } reqwest_client = { git = "https://github.com/zed-industries/zed" }
gpui-native-core = { path = "crates/core", default-features = false } gpui-native-core = { path = "crates/core", default-features = false }
gpui-native-data = { path = "crates/data", default-features = false } gpui-native-data = { path = "crates/data", default-features = false }
+2 -2
View File
@@ -87,6 +87,6 @@ select = ["menu"]
dialog = ["button", "scroll_area", "grain"] dialog = ["button", "scroll_area", "grain"]
empty_state = [] empty_state = []
grain = ["dep:image"] grain = ["dep:image"]
alert = [] alert = ["button"]
toast = [] toast = ["button"]
speech = ["spinner", "tooltip", "dep:flume", "dep:cpal"] speech = ["spinner", "tooltip", "dep:flume", "dep:cpal"]
+6 -10
View File
@@ -8,8 +8,8 @@ use gpui::prelude::FluentBuilder as _;
use gpui::{ use gpui::{
Animation, AnimationElement, AnimationExt as _, App, Canvas, ElementId, Hsla, Animation, AnimationElement, AnimationExt as _, App, Canvas, ElementId, Hsla,
InteractiveElement as _, IntoElement, ParentElement as _, Path, PathBuilder, Pixels, Point, InteractiveElement as _, IntoElement, ParentElement as _, Path, PathBuilder, Pixels, Point,
RenderOnce, Role, SharedString, StatefulInteractiveElement as _, Styled as _, Transformation, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, Styled as _, Window, canvas,
Window, canvas, div, percentage, point, px, div, point, px,
}; };
use gpui_native_icons::{Icon, IconRole, icon}; use gpui_native_icons::{Icon, IconRole, icon};
use gpui_native_theme::{ActiveTheme as _, SPINNER_PERIOD, Size}; use gpui_native_theme::{ActiveTheme as _, SPINNER_PERIOD, Size};
@@ -184,15 +184,11 @@ fn spinning_ring(side: Pixels, stroke: Pixels, accent: Hsla) -> AnimationElement
) )
} }
fn spinning_icon(side: Pixels, accent: Hsla) -> AnimationElement<Icon> { fn spinning_icon(side: Pixels, accent: Hsla) -> Icon {
icon(IconRole::Loader) icon(IconRole::Loader)
.size(side) .size(side)
.color(accent) .color(accent)
.with_animation( .with_rotation_animation(SPINNER_PERIOD)
"spin",
Animation::new(SPINNER_PERIOD).repeat().with_max_fps(60.),
|glyph, delta| glyph.with_transformation(Transformation::rotate(percentage(delta))),
)
} }
fn paint_circle( fn paint_circle(
@@ -222,7 +218,7 @@ fn arc_path(
stroke: Pixels, stroke: Pixels,
start: f32, start: f32,
sweep: f32, sweep: f32,
) -> Option<Path<Pixels>> { ) -> Option<Path> {
let mut builder = PathBuilder::stroke(stroke); let mut builder = PathBuilder::stroke(stroke);
builder.move_to(ring_point(center, radius, start)); builder.move_to(ring_point(center, radius, start));
builder.arc_to( builder.arc_to(
@@ -236,7 +232,7 @@ fn arc_path(
} }
/// A stroked full circle; `None` on degenerate geometry. /// A stroked full circle; `None` on degenerate geometry.
fn circle_path(center: Point<Pixels>, radius: Pixels, stroke: Pixels) -> Option<Path<Pixels>> { fn circle_path(center: Point<Pixels>, radius: Pixels, stroke: Pixels) -> Option<Path> {
let mut builder = PathBuilder::stroke(stroke); let mut builder = PathBuilder::stroke(stroke);
builder.move_to(ring_point(center, radius, 0.0)); builder.move_to(ring_point(center, radius, 0.0));
builder.arc_to( builder.arc_to(
+36 -5
View File
@@ -2,10 +2,12 @@
//! and the crate resolves each role to a glyph for the current platform. //! and the crate resolves each role to a glyph for the current platform.
//! Apps ship their own icon set by implementing [`IconNamed`]. //! Apps ship their own icon set by implementing [`IconNamed`].
use std::time::Duration;
use gpui::prelude::FluentBuilder as _; use gpui::prelude::FluentBuilder as _;
use gpui::{ use gpui::{
AnyElement, AssetSource, Hsla, IntoElement, ParentElement as _, Pixels, RenderOnce, AnyElement, AssetSource, Hsla, IntoElement, ParentElement as _, Pixels, RenderOnce,
SharedString, Styled as _, Transformation, Window, div, px, svg, SharedString, Styled as _, TimedTransformation, Transformation, Window, div, px, svg,
}; };
#[cfg_attr(not(target_os = "linux"), allow(dead_code))] #[cfg_attr(not(target_os = "linux"), allow(dead_code))]
@@ -16,6 +18,8 @@ mod segoe;
const SMALL_ICON_SIZE: Pixels = px(14.0); const SMALL_ICON_SIZE: Pixels = px(14.0);
const DEFAULT_ICON_SIZE: Pixels = px(16.0); const DEFAULT_ICON_SIZE: Pixels = px(16.0);
const LARGE_ICON_SIZE: Pixels = px(20.0); const LARGE_ICON_SIZE: Pixels = px(20.0);
/// The spin presents at most this rate, rotating a sprite needs no more frames.
const SPIN_MAX_FPS: f32 = 60.0;
/// The semantic glyphs UI components need. /// The semantic glyphs UI components need.
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -539,6 +543,7 @@ pub struct Icon {
size: Pixels, size: Pixels,
color: Option<Hsla>, color: Option<Hsla>,
transformation: Option<Transformation>, transformation: Option<Transformation>,
rotation_period: Option<Duration>,
} }
/// Creates an icon for the role at the default size. /// Creates an icon for the role at the default size.
@@ -548,6 +553,7 @@ pub fn icon(role: IconRole) -> Icon {
size: DEFAULT_ICON_SIZE, size: DEFAULT_ICON_SIZE,
color: None, color: None,
transformation: None, transformation: None,
rotation_period: None,
} }
} }
@@ -562,6 +568,7 @@ impl Icon {
size: DEFAULT_ICON_SIZE, size: DEFAULT_ICON_SIZE,
color: None, color: None,
transformation: None, transformation: None,
rotation_period: None,
} }
} }
@@ -593,12 +600,18 @@ impl Icon {
self self
} }
/// An extra SVG transformation, e.g. a spinner's rotation. /// An extra static SVG transformation.
pub fn with_transformation(mut self, transformation: Transformation) -> Self { pub fn with_transformation(mut self, transformation: Transformation) -> Self {
self.transformation = Some(transformation); self.transformation = Some(transformation);
self self
} }
/// Spins the icon clockwise, one full turn per `period`.
pub fn with_rotation_animation(mut self, period: Duration) -> Self {
self.rotation_period = Some(period);
self
}
/// The asset key a resolved freedesktop file is served under. /// The asset key a resolved freedesktop file is served under.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn freedesktop_asset_path(size: Pixels, role: &IconRole) -> Option<SharedString> { fn freedesktop_asset_path(size: Pixels, role: &IconRole) -> Option<SharedString> {
@@ -611,6 +624,7 @@ impl Icon {
size: Pixels, size: Pixels,
color: Option<Hsla>, color: Option<Hsla>,
transformation: Option<Transformation>, transformation: Option<Transformation>,
rotation_period: Option<Duration>,
role: IconRole, role: IconRole,
) -> AnyElement { ) -> AnyElement {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
@@ -619,12 +633,14 @@ impl Icon {
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
if let Some(path) = Self::freedesktop_asset_path(size, &role) { if let Some(path) = Self::freedesktop_asset_path(size, &role) {
return Self::render_svg_path(size, color, transformation, path).into_any_element(); return Self::render_svg_path(size, color, transformation, rotation_period, path)
.into_any_element();
} }
Self::render_svg_path( Self::render_svg_path(
size, size,
color, color,
transformation, transformation,
rotation_period,
SharedString::from(role.asset_path()), SharedString::from(role.asset_path()),
) )
.into_any_element() .into_any_element()
@@ -653,6 +669,7 @@ impl Icon {
size: Pixels, size: Pixels,
color: Option<Hsla>, color: Option<Hsla>,
transformation: Option<Transformation>, transformation: Option<Transformation>,
rotation_period: Option<Duration>,
path: SharedString, path: SharedString,
) -> AnyElement { ) -> AnyElement {
div() div()
@@ -665,6 +682,15 @@ impl Icon {
.when_some(color, |el, color| el.text_color(color)) .when_some(color, |el, color| el.text_color(color))
.when_some(transformation, |el, transformation| { .when_some(transformation, |el, transformation| {
el.with_transformation(transformation) el.with_transformation(transformation)
})
.when_some(rotation_period, |el, period| {
el.with_timed_transformation(
TimedTransformation::rotation(
period,
transformation.unwrap_or_default(),
)
.with_max_fps(SPIN_MAX_FPS),
)
}), }),
) )
.into_any_element() .into_any_element()
@@ -687,13 +713,18 @@ impl RenderOnce for Icon {
size, size,
color, color,
transformation, transformation,
rotation_period,
} = self; } = self;
let color = color.unwrap_or_else(|| window.text_style().color); let color = color.unwrap_or_else(|| window.text_style().color);
match glyph { match glyph {
Glyph::Named(path) => Self::render_svg_path(size, Some(color), transformation, path), Glyph::Named(path) => {
Glyph::Role(role) => Self::render_role(size, Some(color), transformation, role), Self::render_svg_path(size, Some(color), transformation, rotation_period, path)
}
Glyph::Role(role) => {
Self::render_role(size, Some(color), transformation, rotation_period, role)
}
} }
} }
} }
+2 -1
View File
@@ -124,7 +124,8 @@ fn dragging_the_divider_resizes_the_panels(cx: &mut TestAppContext) {
.expect("main panel laid out"); .expect("main panel laid out");
// Press the divider between the islands and drag it 100px to the right. // Press the divider between the islands and drag it 100px to the right.
let seam = point(before.right() + px(13.0), px(400.0)); let handle = cx.debug_bounds("resize-handle").expect("divider laid out");
let seam = point(handle.center().x, px(400.0));
cx.simulate_event(MouseDownEvent { cx.simulate_event(MouseDownEvent {
position: seam, position: seam,
button: MouseButton::Left, button: MouseButton::Left,