dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Upgrade GPUI 2025/05/26 with inspector changes. (#895)

Browse source 
https://github.com/zed-industries/zed/pull/31315
This commit is contained in:
Jason Lee 2025-05-26 13:40:27 +08:00 committed by GitHub
parent 6f28df6a7d
commit a95482fdd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 294 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

227
Cargo.lock generated
View file

@ -169,7 +169,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -263,6 +263,20 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "async-compression"
version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
dependencies = [
"deflate64",
"flate2",
"futures-core",
"futures-io",
"memchr",
"pin-project-lite",
]
[[package]]
name = "async-executor"
version = "1.13.1"
@ -424,7 +438,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -459,7 +473,20 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
name = "async_zip"
version = "0.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
dependencies = [
"async-compression",
"crc32fast",
"futures-lite 2.6.0",
"pin-project",
"thiserror 1.0.66",
]
[[package]]
@ -605,7 +632,7 @@ dependencies = [
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
"itertools 0.10.5",
"lazy_static",
"lazycell",
"log",
@ -615,7 +642,7 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
"syn 2.0.96",
"syn 2.0.101",
"which",
]
@ -628,7 +655,7 @@ dependencies = [
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
"itertools 0.10.5",
"log",
"prettyplease",
"proc-macro2",
@ -636,7 +663,7 @@ dependencies = [
"regex",
"rustc-hash 2.1.0",
"shlex",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -730,7 +757,7 @@ source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -860,7 +887,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -954,7 +981,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
"syn 2.0.96",
"syn 2.0.101",
"tempfile",
"toml",
]
@ -1083,7 +1110,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1185,7 +1212,7 @@ dependencies = [
[[package]]
name = "collections"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"indexmap 2.7.1",
"rustc-hash 2.1.0",
@ -1570,7 +1597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1619,7 +1646,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1630,7 +1657,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1667,6 +1694,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
[[package]]
name = "deflate64"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
[[package]]
name = "deranged"
version = "0.3.11"
@ -1686,17 +1719,17 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
name = "derive_refineable"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.101",
"workspace-hack",
]
@ -1834,7 +1867,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1914,7 +1947,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -1935,12 +1968,12 @@ dependencies = [
[[package]]
name = "errno"
version = "0.3.9"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@ -2211,7 +2244,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -2346,7 +2379,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -2611,7 +2644,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -2710,7 +2743,7 @@ dependencies = [
[[package]]
name = "gpui"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"as-raw-xcb-connection",
@ -2834,11 +2867,11 @@ dependencies = [
[[package]]
name = "gpui_macros"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.101",
"workspace-hack",
]
@ -2897,7 +2930,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -3063,7 +3096,7 @@ dependencies = [
"markup5ever 0.12.1",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -3103,7 +3136,7 @@ dependencies = [
[[package]]
name = "http_client"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"bytes",
@ -3120,7 +3153,7 @@ dependencies = [
[[package]]
name = "http_client_tls"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"rustls",
"rustls-platform-verifier",
@ -3345,7 +3378,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -3708,6 +3741,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "linux-raw-sys"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
[[package]]
name = "lock_api"
version = "0.4.12"
@ -3881,7 +3920,7 @@ dependencies = [
[[package]]
name = "media"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"bindgen 0.71.1",
@ -4195,7 +4234,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -4267,7 +4306,7 @@ dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -4978,7 +5017,7 @@ dependencies = [
"phf_shared 0.11.3",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -5031,7 +5070,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -5171,7 +5210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
dependencies = [
"proc-macro2",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -5257,7 +5296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
dependencies = [
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -5626,7 +5665,7 @@ dependencies = [
[[package]]
name = "refineable"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"derive_refineable",
"workspace-hack",
@ -5721,7 +5760,7 @@ dependencies = [
[[package]]
name = "reqwest_client"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"bytes",
@ -5829,7 +5868,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"syn 2.0.96",
"syn 2.0.101",
"walkdir",
]
@ -5872,7 +5911,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -5952,6 +5991,19 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "rustix"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
dependencies = [
"bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.9.4",
"windows-sys 0.59.0",
]
[[package]]
name = "rustls"
version = "0.23.26"
@ -6145,7 +6197,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6241,7 +6293,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]]
name = "semantic_version"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"serde",
@ -6271,7 +6323,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6282,7 +6334,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6307,6 +6359,19 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_json_lenient"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e033097bf0d2b59a62b42c18ebbb797503839b26afdda2c4e1415cb6c813540"
dependencies = [
"indexmap 2.7.1",
"itoa 1.0.11",
"memchr",
"ryu",
"serde",
]
[[package]]
name = "serde_repr"
version = "0.1.19"
@ -6315,7 +6380,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6684,7 +6749,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6697,7 +6762,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6709,7 +6774,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "sum_tree"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"arrayvec",
"log",
@ -6835,9 +6900,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.96"
version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
@ -6971,7 +7036,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -6988,14 +7053,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
version = "3.13.0"
version = "3.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
dependencies = [
"cfg-if",
"fastrand 2.1.1",
"getrandom 0.3.1",
"once_cell",
"rustix 0.38.38",
"rustix 1.0.7",
"windows-sys 0.59.0",
]
@ -7051,7 +7116,7 @@ checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -7062,7 +7127,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -7309,7 +7374,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -7547,10 +7612,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "util"
version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#df7153e30716d90a3ab84c8c65143a97dd962d93"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#70dc53188211a51899fac2192116129fdd745e21"
dependencies = [
"anyhow",
"async-fs 2.1.2",
"async_zip",
"collections",
"dirs 4.0.0",
"dunce",
@ -7564,10 +7630,13 @@ dependencies = [
"rust-embed",
"serde",
"serde_json",
"serde_json_lenient",
"smol 2.0.2",
"take-until",
"tempfile",
"tendril",
"unicase",
"walkdir",
"workspace-hack",
]
@ -7735,7 +7804,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
"wasm-bindgen-shared",
]
@ -7769,7 +7838,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -7976,7 +8045,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8161,7 +8230,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8172,7 +8241,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8183,7 +8252,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8194,7 +8263,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8205,7 +8274,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8216,7 +8285,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8925,7 +8994,7 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
"zbus_names",
"zvariant",
"zvariant_utils",
@ -8976,7 +9045,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -8987,7 +9056,7 @@ checksum = "712c8386f4f4299382c9abee219bee7084f78fb939d88b6840fcc1320d5f6da2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -9007,7 +9076,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
]
[[package]]
@ -9059,7 +9128,7 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.96",
"syn 2.0.101",
"zvariant_utils",
]
@ -9073,6 +9142,6 @@ dependencies = [
"quote",
"serde",
"static_assertions",
"syn 2.0.96",
"syn 2.0.101",
"winnow 0.7.3",
]

7
crates/ui/src/clipboard.rs
View file

@ -87,9 +87,14 @@ impl Element for Clipboard {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
global_id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) {
@ -153,6 +158,7 @@ impl Element for Clipboard {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
element: &mut Self::RequestLayoutState,
window: &mut Window,
@ -164,6 +170,7 @@ impl Element for Clipboard {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
element: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/dock/dock.rs
View file

@ -419,9 +419,14 @@ impl Element for DockElement {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut gpui::Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -431,6 +436,7 @@ impl Element for DockElement {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_window: &mut gpui::Window,
@ -442,6 +448,7 @@ impl Element for DockElement {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/input/element.rs
View file

@ -386,9 +386,14 @@ impl Element for TextElement {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) {
@ -417,6 +422,7 @@ impl Element for TextElement {
fn prepaint(
&mut self,
_id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -635,6 +641,7 @@ impl Element for TextElement {
fn paint(
&mut self,
_id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
input_bounds: Bounds<Pixels>,
_request_layout: &mut Self::RequestLayoutState,
prepaint: &mut Self::PrepaintState,

11
crates/ui/src/menu/context_menu.rs
View file

@ -3,8 +3,8 @@ use std::{cell::RefCell, rc::Rc};
use gpui::{
anchored, deferred, div, prelude::FluentBuilder, px, relative, AnyElement, App, Context,
Corner, DismissEvent, DispatchPhase, Element, ElementId, Entity, Focusable, FocusableWrapper,
GlobalElementId, InteractiveElement, IntoElement, MouseButton, MouseDownEvent, ParentElement,
Pixels, Point, Position, Stateful, Style, Window,
GlobalElementId, InspectorElementId, InteractiveElement, IntoElement, MouseButton,
MouseDownEvent, ParentElement, Pixels, Point, Position, Stateful, Style, Window,
};
use crate::menu::popup_menu::PopupMenu;
@ -99,9 +99,14 @@ impl Element for ContextMenu {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -178,6 +183,7 @@ impl Element for ContextMenu {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -191,6 +197,7 @@ impl Element for ContextMenu {
fn paint(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&InspectorElementId>,
bounds: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/popover.rs
View file

@ -223,9 +223,14 @@ impl<M: ManagedView> Element for Popover<M> {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -324,6 +329,7 @@ impl<M: ManagedView> Element for Popover<M> {
fn prepaint(
&mut self,
_id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_bounds: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -356,6 +362,7 @@ impl<M: ManagedView> Element for Popover<M> {
fn paint(
&mut self,
id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_bounds: Bounds<Pixels>,
request_layout: &mut Self::RequestLayoutState,
prepaint: &mut Self::PrepaintState,

7
crates/ui/src/resizable/panel.rs
View file

@ -286,9 +286,14 @@ impl Element for ResizePanelGroupElement {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -298,6 +303,7 @@ impl Element for ResizePanelGroupElement {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_window: &mut Window,
@ -309,6 +315,7 @@ impl Element for ResizePanelGroupElement {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/resizable/resize_handle.rs
View file

@ -88,9 +88,14 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -165,6 +170,7 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
fn prepaint(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -176,6 +182,7 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
fn paint(
&mut self,
id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: gpui::Bounds<Pixels>,
request_layout: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/scroll/scrollable.rs
View file

@ -149,9 +149,14 @@ where
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -214,6 +219,7 @@ where
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
element: &mut Self::RequestLayoutState,
window: &mut Window,
@ -227,6 +233,7 @@ where
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
element: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/scroll/scrollable_mask.rs
View file

@ -53,9 +53,14 @@ impl Element for ScrollableMask {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) {
@ -73,6 +78,7 @@ impl Element for ScrollableMask {
fn prepaint(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
window: &mut Window,
@ -93,6 +99,7 @@ impl Element for ScrollableMask {
fn paint(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
hitbox: &mut Self::PrepaintState,

7
crates/ui/src/scroll/scrollbar.rs
View file

@ -433,9 +433,14 @@ impl Element for Scrollbar {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -452,6 +457,7 @@ impl Element for Scrollbar {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
window: &mut Window,
@ -633,6 +639,7 @@ impl Element for Scrollbar {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
prepaint: &mut Self::PrepaintState,

36
crates/ui/src/svg_img.rs
View file

@ -210,20 +210,26 @@ impl Element for SvgImg {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
let layout_id = self.interactivity.request_layout(
global_id,
inspector_id,
window,
cx,
|style, window, cx| window.request_layout(style, None, cx),
);
let global_id = global_id.unwrap();
let layout_id =
self.interactivity
.request_layout(Some(global_id), window, cx, |style, window, cx| {
window.request_layout(style, None, cx)
});
let source = &self.source;
let source_hash = hash(source);
@ -283,6 +289,7 @@ impl Element for SvgImg {
fn prepaint(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
state: &mut Self::RequestLayoutState,
window: &mut Window,
@ -290,6 +297,7 @@ impl Element for SvgImg {
) -> Self::PrepaintState {
let hitbox = self.interactivity.prepaint(
global_id,
inspector_id,
bounds,
bounds.size,
window,
@ -303,6 +311,7 @@ impl Element for SvgImg {
fn paint(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
state: &mut Self::PrepaintState,
@ -315,8 +324,14 @@ impl Element for SvgImg {
};
let size = image.size(0).map(|x| x.0 as f32);
self.interactivity
.paint(global_id, bounds, hitbox, window, cx, |_, window, _| {
self.interactivity.paint(
global_id,
inspector_id,
bounds,
hitbox,
window,
cx,
|_, window, _| {
// To calculate the ratio of the original image size to the container bounds size.
// Scale by shortest side (width or height) to get a fit image.
// And center the image in the container bounds.
@ -342,7 +357,8 @@ impl Element for SvgImg {
if let Err(err) = window.paint_image(img_bounds, px(0.).into(), image, 0, false) {
eprintln!("failed to paint svg image: {:?}", err);
}
})
},
)
}
}

7
crates/ui/src/switch.rs
View file

@ -108,9 +108,14 @@ impl Element for Switch {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
global_id: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) {
@ -257,6 +262,7 @@ impl Element for Switch {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
element: &mut Self::RequestLayoutState,
window: &mut Window,
@ -268,6 +274,7 @@ impl Element for Switch {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
element: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/text/html.rs
View file

@ -149,9 +149,14 @@ impl Element for HtmlElement {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut gpui::App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -185,6 +190,7 @@ impl Element for HtmlElement {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -196,6 +202,7 @@ impl Element for HtmlElement {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/text/markdown.rs
View file

@ -89,9 +89,14 @@ impl Element for MarkdownElement {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
id: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut gpui::App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -125,6 +130,7 @@ impl Element for MarkdownElement {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -136,6 +142,7 @@ impl Element for MarkdownElement {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<gpui::Pixels>,
request_layout: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

7
crates/ui/src/title_bar.rs
View file

@ -291,9 +291,14 @@ impl Element for TitleBarElement {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -310,6 +315,7 @@ impl Element for TitleBarElement {
fn prepaint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
_: gpui::Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_window: &mut Window,
@ -321,6 +327,7 @@ impl Element for TitleBarElement {
fn paint(
&mut self,
_: Option<&gpui::GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: gpui::Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
_: &mut Self::PrepaintState,

13
crates/ui/src/virtual_list.rs
View file

@ -173,9 +173,14 @@ impl Element for VirtualList {
Some(self.id.clone())
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (gpui::LayoutId, Self::RequestLayoutState) {
@ -244,7 +249,9 @@ impl Element for VirtualList {
};
// println!("layout: {} {:?}", item_sizes.len(), start.elapsed());
let (layout_id, _) = self.base.request_layout(global_id, window, cx);
let (layout_id, _) = self
.base
.request_layout(global_id, inspector_id, window, cx);
(
layout_id,
@ -259,6 +266,7 @@ impl Element for VirtualList {
fn prepaint(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
layout: &mut Self::RequestLayoutState,
window: &mut Window,
@ -303,6 +311,7 @@ impl Element for VirtualList {
self.base.interactivity().prepaint(
global_id,
inspector_id,
bounds,
content_size,
window,
@ -452,6 +461,7 @@ impl Element for VirtualList {
fn paint(
&mut self,
global_id: Option<&GlobalElementId>,
inspector_id: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
layout: &mut Self::RequestLayoutState,
hitbox: &mut Self::PrepaintState,
@ -460,6 +470,7 @@ impl Element for VirtualList {
) {
self.base.interactivity().paint(
global_id,
inspector_id,
bounds,
hitbox.as_ref(),
window,

7
crates/ui/src/webview.rs
View file

@ -139,9 +139,14 @@ impl Element for WebViewElement {
None
}
fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
None
}
fn request_layout(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
window: &mut Window,
cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) {
@ -158,6 +163,7 @@ impl Element for WebViewElement {
fn prepaint(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
window: &mut Window,
@ -187,6 +193,7 @@ impl Element for WebViewElement {
fn paint(
&mut self,
_: Option<&GlobalElementId>,
_: Option<&gpui::InspectorElementId>,
bounds: Bounds<Pixels>,
_: &mut Self::RequestLayoutState,
hitbox: &mut Self::PrepaintState,

2
crates/ui/src/window_border.rs
View file

@ -153,7 +153,7 @@ impl RenderOnce for WindowBorder {
.when(!tiling.left, |div| div.border_l(BORDER_SIZE))
.when(!tiling.right, |div| div.border_r(BORDER_SIZE))
.when(!tiling.is_tiled(), |div| {
div.shadow(smallvec::smallvec![gpui::BoxShadow {
div.shadow(vec![gpui::BoxShadow {
color: Hsla {
h: 0.,
s: 0.,