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

chore: Update GPUI 2025/03/31 (#752)

Browse source
This commit is contained in:
Floyd Wang 2025-03-31 10:31:39 +08:00 committed by GitHub
parent 417e097b1a
commit 13de7d5a7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 164 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
Cargo.lock generated
View file

@ -561,7 +561,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.10.5",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log", "log",
@ -584,7 +584,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.10.5",
"log", "log",
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@ -959,6 +959,15 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "cgl"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "charts-rs" name = "charts-rs"
version = "0.3.19" version = "0.3.19"
@ -1105,7 +1114,7 @@ dependencies = [
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"indexmap 2.7.1", "indexmap 2.7.1",
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
@ -1276,17 +1285,44 @@ dependencies = [
] ]
[[package]] [[package]]
name = "core-text" name = "core-graphics2"
version = "20.1.0" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" checksum = "7e4583956b9806b69f73fcb23aee05eb3620efc282972f08f6a6db7504f8334d"
dependencies = [ dependencies = [
"core-foundation 0.9.4", "bitflags 2.6.0",
"core-graphics 0.23.2", "block",
"cfg-if",
"core-foundation 0.10.0",
"libc",
]
[[package]]
name = "core-text"
version = "21.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130"
dependencies = [
"core-foundation 0.10.0",
"core-graphics 0.24.0",
"foreign-types", "foreign-types",
"libc", "libc",
] ]
[[package]]
name = "core-video"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef"
dependencies = [
"block",
"core-foundation 0.10.0",
"core-graphics2",
"io-surface",
"libc",
"metal",
]
[[package]] [[package]]
name = "core_maths" name = "core_maths"
version = "0.1.0" version = "0.1.0"
@ -1298,17 +1334,18 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.11.2" version = "0.13.2"
source = "git+https://github.com/pop-os/cosmic-text?rev=542b20c#542b20ca4376a3b5de5fa629db1a4ace44e18e0c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e418dd4f5128c3e93eab12246391c54a20c496811131f85754dc8152ee207892"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"fontdb 0.18.0", "fontdb 0.16.2",
"log", "log",
"rangemap", "rangemap",
"rayon",
"rustc-hash 1.1.0", "rustc-hash 1.1.0",
"rustybuzz 0.14.1", "rustybuzz 0.14.1",
"self_cell", "self_cell",
"smol_str",
"swash", "swash",
"sys-locale", "sys-locale",
"ttf-parser 0.21.1", "ttf-parser 0.21.1",
@ -1554,7 +1591,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1965,12 +2002,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]] [[package]]
name = "font-kit" name = "font-kit"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c0041d8a8572af2afa3de32ae088f0120" source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"byteorder", "byteorder",
"core-foundation 0.9.4", "core-foundation 0.10.0",
"core-graphics 0.23.2", "core-graphics 0.24.0",
"core-text", "core-text",
"dirs 5.0.1", "dirs 5.0.1",
"dwrote", "dwrote",
@ -1988,9 +2025,9 @@ dependencies = [
[[package]] [[package]]
name = "font-types" name = "font-types"
version = "0.7.2" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" checksum = "1fa6a5e5a77b5f3f7f9e32879f484aa5b3632ddfbe568a16266c904a6f32cdaf"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
] ]
@ -2006,16 +2043,16 @@ dependencies = [
[[package]] [[package]]
name = "fontdb" name = "fontdb"
version = "0.18.0" version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
dependencies = [ dependencies = [
"fontconfig-parser", "fontconfig-parser",
"log", "log",
"memmap2", "memmap2",
"slotmap", "slotmap",
"tinyvec", "tinyvec",
"ttf-parser 0.21.1", "ttf-parser 0.20.0",
] ]
[[package]] [[package]]
@ -2559,7 +2596,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui" name = "gpui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-raw-xcb-connection", "as-raw-xcb-connection",
@ -2576,10 +2613,11 @@ dependencies = [
"cbindgen", "cbindgen",
"cocoa 0.26.0", "cocoa 0.26.0",
"collections", "collections",
"core-foundation 0.9.4", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"core-graphics 0.23.2", "core-graphics 0.24.0",
"core-text", "core-text",
"core-video",
"cosmic-text", "cosmic-text",
"ctor", "ctor",
"derive_more", "derive_more",
@ -2602,6 +2640,8 @@ dependencies = [
"naga", "naga",
"num_cpus", "num_cpus",
"objc", "objc",
"objc2",
"objc2-metal",
"oo7", "oo7",
"open", "open",
"parking", "parking",
@ -2635,8 +2675,9 @@ dependencies = [
"wayland-cursor", "wayland-cursor",
"wayland-protocols", "wayland-protocols",
"wayland-protocols-plasma", "wayland-protocols-plasma",
"windows 0.60.0", "windows 0.61.1",
"windows-core 0.60.1", "windows-core 0.61.0",
"windows-numerics",
"x11-clipboard", "x11-clipboard",
"x11rb", "x11rb",
"xim", "xim",
@ -2676,7 +2717,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_macros" name = "gpui_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2944,7 +2985,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -2960,7 +3001,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/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"rustls", "rustls",
"rustls-platform-verifier", "rustls-platform-verifier",
@ -3206,6 +3247,19 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "io-surface"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8283575d5f0b2e7447ec0840363879d71c0fa325d4c699d5b45208ea4a51f45e"
dependencies = [
"cgl",
"core-foundation 0.10.0",
"core-foundation-sys",
"leaky-cow",
"libc",
]
[[package]] [[package]]
name = "ipnet" name = "ipnet"
version = "2.11.0" version = "2.11.0"
@ -3405,6 +3459,21 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "leak"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73"
[[package]]
name = "leaky-cow"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc"
dependencies = [
"leak",
]
[[package]] [[package]]
name = "lebe" name = "lebe"
version = "0.5.2" version = "0.5.2"
@ -3690,11 +3759,12 @@ dependencies = [
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen 0.70.1", "bindgen 0.70.1",
"core-foundation 0.9.4", "core-foundation 0.10.0",
"core-video",
"ctor", "ctor",
"foreign-types", "foreign-types",
"metal", "metal",
@ -3727,9 +3797,9 @@ dependencies = [
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.31.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"block", "block",
@ -5268,9 +5338,9 @@ dependencies = [
[[package]] [[package]]
name = "read-fonts" name = "read-fonts"
version = "0.22.5" version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229" checksum = "f6f9e8a4f503e5c8750e4cd3b32a4e090035c46374b305a15c70bad833dca05f"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"font-types", "font-types",
@ -5299,7 +5369,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@ -5392,7 +5462,7 @@ dependencies = [
[[package]] [[package]]
name = "reqwest_client" name = "reqwest_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -5867,7 +5937,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]] [[package]]
name = "semantic_version" name = "semantic_version"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -6076,9 +6146,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
[[package]] [[package]]
name = "skrifa" name = "skrifa"
version = "0.22.3" version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" checksum = "8cc1aa86c26dbb1b63875a7180aa0819709b33348eb5b1491e4321fae388179d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"read-fonts", "read-fonts",
@ -6142,6 +6212,12 @@ dependencies = [
"futures-lite 2.6.0", "futures-lite 2.6.0",
] ]
[[package]]
name = "smol_str"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
[[package]] [[package]]
name = "snafu" name = "snafu"
version = "0.8.5" version = "0.8.5"
@ -6334,7 +6410,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]] [[package]]
name = "sum_tree" name = "sum_tree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"log", "log",
@ -6437,9 +6513,9 @@ dependencies = [
[[package]] [[package]]
name = "swash" name = "swash"
version = "0.1.19" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" checksum = "13d5bbc2aa266907ed8ee977c9c9e16363cc2b001266104e13397b57f1d15f71"
dependencies = [ dependencies = [
"skrifa", "skrifa",
"yazi", "yazi",
@ -6929,6 +7005,12 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "ttf-parser"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
[[package]] [[package]]
name = "ttf-parser" name = "ttf-parser"
version = "0.21.1" version = "0.21.1"
@ -7126,7 +7208,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "util" name = "util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huacnlee/zed.git?branch=webview#064bc875f23528152a8e7db481a9eaefca955f1e" source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-fs 2.1.2", "async-fs 2.1.2",
@ -7626,12 +7708,12 @@ dependencies = [
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.60.0" version = "0.61.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529" checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
dependencies = [ dependencies = [
"windows-collections", "windows-collections",
"windows-core 0.60.1", "windows-core 0.61.0",
"windows-future", "windows-future",
"windows-link", "windows-link",
"windows-numerics", "windows-numerics",
@ -7639,11 +7721,11 @@ dependencies = [
[[package]] [[package]]
name = "windows-collections" name = "windows-collections"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec" checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
dependencies = [ dependencies = [
"windows-core 0.60.1", "windows-core 0.61.0",
] ]
[[package]] [[package]]
@ -7670,24 +7752,24 @@ dependencies = [
[[package]] [[package]]
name = "windows-core" name = "windows-core"
version = "0.60.1" version = "0.61.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247" checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
dependencies = [ dependencies = [
"windows-implement 0.59.0", "windows-implement 0.60.0",
"windows-interface 0.59.1", "windows-interface 0.59.1",
"windows-link", "windows-link",
"windows-result 0.3.2", "windows-result 0.3.2",
"windows-strings 0.3.1", "windows-strings 0.4.0",
] ]
[[package]] [[package]]
name = "windows-future" name = "windows-future"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0" checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
dependencies = [ dependencies = [
"windows-core 0.60.1", "windows-core 0.61.0",
"windows-link", "windows-link",
] ]
@ -7704,9 +7786,9 @@ dependencies = [
[[package]] [[package]]
name = "windows-implement" name = "windows-implement"
version = "0.59.0" version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7743,11 +7825,11 @@ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
[[package]] [[package]]
name = "windows-numerics" name = "windows-numerics"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
dependencies = [ dependencies = [
"windows-core 0.60.1", "windows-core 0.61.0",
"windows-link", "windows-link",
] ]
@ -7792,9 +7874,9 @@ dependencies = [
[[package]] [[package]]
name = "windows-strings" name = "windows-strings"
version = "0.3.1" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
dependencies = [ dependencies = [
"windows-link", "windows-link",
] ]
@ -8226,8 +8308,9 @@ dependencies = [
[[package]] [[package]]
name = "xkbcommon" name = "xkbcommon"
version = "0.7.0" version = "0.8.0"
source = "git+https://github.com/ConradIrwin/xkbcommon-rs?rev=fcbb4612185cc129ceeff51d22f7fb51810a03b2#fcbb4612185cc129ceeff51d22f7fb51810a03b2" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"libc", "libc",
@ -8269,9 +8352,9 @@ dependencies = [
[[package]] [[package]]
name = "yazi" name = "yazi"
version = "0.1.6" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
[[package]] [[package]]
name = "yeslogic-fontconfig-sys" name = "yeslogic-fontconfig-sys"
@ -8349,9 +8432,9 @@ dependencies = [
[[package]] [[package]]
name = "zeno" name = "zeno"
version = "0.2.3" 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 = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" checksum = "cc0de2315dc13d00e5df3cd6b8d2124a6eaec6a2d4b6a1c5f37b7efad17fcc17"
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"

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

@ -1,7 +1,7 @@
use gpui::{ use gpui::{
px, relative, App, Axis, Bounds, ContentMask, Corners, Edges, Element, ElementId, EntityId, px, relative, App, Axis, BorderStyle, Bounds, ContentMask, Corners, Edges, Element, ElementId,
GlobalElementId, Hitbox, Hsla, IntoElement, IsZero as _, LayoutId, PaintQuad, Pixels, Point, EntityId, GlobalElementId, Hitbox, Hsla, IntoElement, IsZero as _, LayoutId, PaintQuad, Pixels,
Position, ScrollHandle, ScrollWheelEvent, Style, Window, Point, Position, ScrollHandle, ScrollWheelEvent, Style, Window,
}; };
use crate::AxisExt; use crate::AxisExt;
@ -110,6 +110,7 @@ impl Element for ScrollableMask {
border_color: color, border_color: color,
background: gpui::transparent_white().into(), background: gpui::transparent_white().into(),
corner_radii: Corners::all(px(0.)), corner_radii: Corners::all(px(0.)),
border_style: BorderStyle::default(),
}); });
} }

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

@ -6,9 +6,10 @@ use std::{
use crate::ActiveTheme; use crate::ActiveTheme;
use gpui::{ use gpui::{
fill, point, px, relative, App, Bounds, ContentMask, CursorStyle, Edges, Element, EntityId, fill, point, px, relative, App, BorderStyle, Bounds, ContentMask, CursorStyle, Edges, Element,
Hitbox, Hsla, IntoElement, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, Pixels, EntityId, Hitbox, Hsla, IntoElement, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad,
Point, Position, ScrollHandle, ScrollWheelEvent, Style, UniformListScrollHandle, Window, Pixels, Point, Position, ScrollHandle, ScrollWheelEvent, Style, UniformListScrollHandle,
Window,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -661,7 +662,7 @@ impl Element for Scrollbar {
let margin_end = state.margin_end; let margin_end = state.margin_end;
let is_vertical = axis.is_vertical(); let is_vertical = axis.is_vertical();
window.set_cursor_style(CursorStyle::default(), &state.bar_hitbox); window.set_cursor_style(CursorStyle::default(), Some(&state.bar_hitbox));
window.paint_layer(hitbox_bounds, |cx| { window.paint_layer(hitbox_bounds, |cx| {
cx.paint_quad(fill(state.bounds, state.bg)); cx.paint_quad(fill(state.bounds, state.bg));
@ -686,6 +687,7 @@ impl Element for Scrollbar {
} }
}, },
border_color: state.border, border_color: state.border,
border_style: BorderStyle::default(),
}); });
cx.paint_quad( cx.paint_quad(

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

@ -107,7 +107,7 @@ impl RenderOnce for WindowBorder {
CursorStyle::ResizeUpRightDownLeft CursorStyle::ResizeUpRightDownLeft
} }
}, },
&hitbox, Some(&hitbox),
); );
}, },
) )