diff --git a/Cargo.lock b/Cargo.lock index 4d3732cb..583adc7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4" +checksum = "54413ede23c2daf518f35156dfde027feb2374004d63bd497f983c8db9c0e313" dependencies = [ "find-msvc-tools", "jobserver", @@ -1339,7 +1339,7 @@ dependencies = [ "hmac 0.12.1", "nostr", "nostr-sdk", - "rand 0.10.2", + "rand 0.10.3", "serde", "serde_json", "sha2 0.10.9", @@ -2190,9 +2190,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d" +checksum = "ef25905e51abafe4dcea6c15fec58c57b601cdbd0ee53d22ea1d3016c587d39b" [[package]] name = "fixedbitset" @@ -2711,14 +2711,16 @@ dependencies = [ [[package]] name = "gpui-base" -version = "0.6.1" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d45dcaaeac889bf1e7757db1beb26c9043c8ea3156651facc11c6be56bb6722" +checksum = "c9e904ee0d351f4e85b967e26ae986d3aa195a8d9d35fcd18184a2c40989694e" dependencies = [ "aho-corasick", "anyhow", + "ashpd", "async-channel", "chrono", + "data-url", "futures", "gpui-pre", "gpui-pre-macros", @@ -2742,13 +2744,14 @@ dependencies = [ "tracing", "unicode-segmentation", "web-time", + "windows 0.58.0", ] [[package]] name = "gpui-pre" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9ca98fdcad06276de623c2f48ebd710f1e7724eebef2f2673c583e85dc8335" +checksum = "a0437c0b83e636a92bd1a39fa1d05fb632ae671289537497b35871ffbe231b84" dependencies = [ "accesskit", "anyhow", @@ -2774,7 +2777,6 @@ dependencies = [ "gpui-pre-sum-tree", "gpui-pre-util", "gpui-pre-util-macros", - "gpui-pre-ztracing", "heapless 0.9.3", "image", "inventory", @@ -2782,6 +2784,8 @@ dependencies = [ "log", "lyon", "num_cpus", + "objc2-core-foundation", + "objc2-core-video", "parking", "parking_lot", "pin-project", @@ -2802,7 +2806,6 @@ dependencies = [ "strum", "taffy", "thiserror 2.0.20", - "tracing", "ttf-parser", "url", "usvg", @@ -2816,9 +2819,9 @@ dependencies = [ [[package]] name = "gpui-pre-apple" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fc4da82c5c2dbb25443655cfbc4305a2e2d1380bc0b815e80664fdfbf4cfdb" +checksum = "3af534f0746eb9e014114bcc0ee00dc250c4b8d75df2e437180c403aa65649c1" dependencies = [ "anyhow", "block", @@ -2830,7 +2833,6 @@ dependencies = [ "etagere", "foreign-types", "gpui-pre", - "gpui-pre-collections", "image", "log", "metal", @@ -2841,9 +2843,9 @@ dependencies = [ [[package]] name = "gpui-pre-collections" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626a09f683ff6f3b2f708341bdcea9d479af5b14a6a2fccec9cff935ec0751b7" +checksum = "15e7a65204039187d1f4b3d4c2e0233eeac54d4acb0b13f9dc1a3b5adad26c1f" dependencies = [ "gpui-pre-util", "indexmap", @@ -2852,9 +2854,9 @@ dependencies = [ [[package]] name = "gpui-pre-derive-refineable" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d06116a2b857588f6ea7bfb447b3554ba985e780b5995ae47780252da152f3" +checksum = "79dfb4a05f3cd9893d7768dbf5dba1bbbe99cab7394e89b360ccb3b2bcb6b34e" dependencies = [ "proc-macro2", "quote", @@ -2863,9 +2865,9 @@ dependencies = [ [[package]] name = "gpui-pre-http-client" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d2071c582c1a0f71b8c7c00607a3b9cd18f81fb3510d41845db3447b2a11c9" +checksum = "cfd5a7542c77887a5aff997d78c95884119c8463409569b63fcf060956da1682" dependencies = [ "anyhow", "async-compression", @@ -2884,9 +2886,9 @@ dependencies = [ [[package]] name = "gpui-pre-http-client-tls" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6f3936802580259d5af9bcb2ab37fb0d7002caeed449eaabb007c62aea7341" +checksum = "72aed510adb5e7723f8f57b9751007e3451d46a84edb59b92227178cf59cc19c" dependencies = [ "log", "rustls", @@ -2896,9 +2898,9 @@ dependencies = [ [[package]] name = "gpui-pre-linux" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b427589681ec1fed27951fd82edc70a7e288bb2487ede26dbbd07c2ce23d4f" +checksum = "aab655cda1d6dcd549ac869e8678babc84cf573ab6794a1fe1a39c6c70c60b48" dependencies = [ "accesskit", "accesskit_unix", @@ -2943,15 +2945,14 @@ dependencies = [ [[package]] name = "gpui-pre-macos" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806eac0cb5c0eebc0b032c6450c11d283264f9ac05754dda83fc80d0b86b4ee8" +checksum = "951d17e41a72067ad2d35c60e08a62e8ad7fa9400b41c802e26cfb459f6c05da" dependencies = [ "accesskit", "accesskit_macos", "anyhow", "async-task", - "block", "block2 0.6.2", "cocoa 0.26.1", "core-foundation 0.10.1", @@ -2965,17 +2966,17 @@ dependencies = [ "gpui-pre", "gpui-pre-apple", "gpui-pre-collections", - "gpui-pre-media", "gpui-pre-util", "image", "itertools 0.14.0", "libc", "log", "mach2", - "metal", "objc", "objc2 0.6.4", "objc2-app-kit 0.3.2", + "objc2-core-graphics", + "objc2-core-media", "objc2-foundation 0.3.2", "objc2-screen-capture-kit", "objc2-user-notifications", @@ -2991,9 +2992,9 @@ dependencies = [ [[package]] name = "gpui-pre-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06139051bf1db51949bfbb4ee338208bd64b4c35340d8c1a6a8200744e28fe1" +checksum = "6324092b40ea8ec7c327a4a28427e366a489b4d5d23b5d1bd0243fc2f4ca7a9e" dependencies = [ "heck 0.5.0", "proc-macro-crate", @@ -3002,26 +3003,11 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "gpui-pre-media" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500acb13f818ff234021c1b9eae8592b0cbe017a64e26908c736b7421b1c6213" -dependencies = [ - "anyhow", - "bindgen", - "core-foundation 0.10.1", - "core-video", - "foreign-types", - "metal", - "objc", -] - [[package]] name = "gpui-pre-perf" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0973bbb02bf46940ac0861d9dce0fc03a3109634172b69108d1bc13fa29d76c" +checksum = "b94bff26ccd8105f6206144f8dab16a2dc02e7a68f39dada02cdf492f0afd940" dependencies = [ "gpui-pre-collections", "serde", @@ -3030,9 +3016,9 @@ dependencies = [ [[package]] name = "gpui-pre-platform" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b613512e29f1e7b825bfa7e50a447388ff1347044350a475e4c98a892a985c8d" +checksum = "8423d1e0a693d2f9f16c0326bb01b5e81ec0531854d596a18476934ac6880478" dependencies = [ "console_error_panic_hook", "gpui-pre", @@ -3044,9 +3030,9 @@ dependencies = [ [[package]] name = "gpui-pre-refineable" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428f23703ead5601618ffea73c137897b98a94ce8d30e257f22be947732dfbf9" +checksum = "93b4b0a8d296a3ee5beb1136bc48f8167a6028eb1e243b56851dcd8c9fc6d7a1" dependencies = [ "gpui-pre-derive-refineable", ] @@ -3103,9 +3089,9 @@ dependencies = [ [[package]] name = "gpui-pre-reqwest-client" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05d4e3d2eb2ab777597879e46047247447b9d93cef568e63d545c9deb1b3e57" +checksum = "8f32ccea5d1a7c8d2868d7b346c2c1f76aa3f86ec9e0575c4e7340af3afd9e9d" dependencies = [ "anyhow", "bytes", @@ -3121,9 +3107,9 @@ dependencies = [ [[package]] name = "gpui-pre-scheduler" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd1b7ff2e7bf43302ae982cd786a22c16c52e16682e67b66cfbe2cb2bc3a72d" +checksum = "ff7b10b3d2fc3fda24847a04436eca9531612c8414874a37ddc005f20e521e12" dependencies = [ "async-task", "backtrace", @@ -3138,9 +3124,9 @@ dependencies = [ [[package]] name = "gpui-pre-shared-string" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424a4dd6a570473d57acf1df2bfb9f3028d4b568abcaeb9252e0f13047b50c03" +checksum = "fe17f81bd98a0253140ea79f7f76442d7499bd8d17db302861af8e46c11d38df" dependencies = [ "schemars", "serde", @@ -3149,9 +3135,9 @@ dependencies = [ [[package]] name = "gpui-pre-sum-tree" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4855718e82630d29198b515d2b027361ef63dd19b6021cefe945789dcff82372" +checksum = "0a6d35e998a51d24248dad731de1f09d386cbbf46a04edde3b67f469b2ce3f16" dependencies = [ "gpui-pre-ztracing", "heapless 0.9.3", @@ -3162,9 +3148,9 @@ dependencies = [ [[package]] name = "gpui-pre-util" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e973148165346c0f9b3f5072b321d7c2f33807c93daea67fe298c005c0e0c2a8" +checksum = "6a026a30c578930d20974fd8c3d77de36223ac7ba193bd4259e7238929bc8806" dependencies = [ "anyhow", "log", @@ -3173,9 +3159,9 @@ dependencies = [ [[package]] name = "gpui-pre-util-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f71f6212d3772a70988c7d64627c7284dec73c17992ac4f9f0cdfdd46cbb677" +checksum = "5cbf79627a6afc626d4e887dad9d2d92bb069413e8cc692ba3e90bff219eb7a9" dependencies = [ "gpui-pre-perf", "quote", @@ -3184,9 +3170,9 @@ dependencies = [ [[package]] name = "gpui-pre-web" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0daada903f106be946d87e25f5bc85ad6cf60d6d82cb8f8aed945417a9c1a3" +checksum = "34be433b9fcb370b1fe9a1c7fe911f0eb6058791ef8167dcf6c5a5deb624975c" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3213,9 +3199,9 @@ dependencies = [ [[package]] name = "gpui-pre-wgpu" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640b666a16ddf9504e2eb3e7a997acb2b2adfaa7859925bdd36fc3acfd8f30a7" +checksum = "05515b32799b1767d69300921c1b562cd53104965211a0e8905acdc7aa18e693" dependencies = [ "anyhow", "bytemuck", @@ -3240,9 +3226,9 @@ dependencies = [ [[package]] name = "gpui-pre-windows" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12c7d84ec422feb2f064117d572447998381e5c219fcad69fe19f10d0b7aaea" +checksum = "27662e65bfcf4445d2cccfad91f1570ec07f4b1b5de98400a9f207fd19c464cf" dependencies = [ "accesskit", "accesskit_windows", @@ -3269,9 +3255,9 @@ dependencies = [ [[package]] name = "gpui-pre-zlog" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98352858fac3d4d05b46d6014ad04bad313652a691d4e21dc55fa96fb4acb7cf" +checksum = "f3a5af0b734a391a84872eb770b3ee9830091ec2487b79d06371fe14eefb2b5d" dependencies = [ "anyhow", "chrono", @@ -3281,9 +3267,9 @@ dependencies = [ [[package]] name = "gpui-pre-ztracing" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d63a3c7276875b4d7e6d3961e92a138e9233e86a591bf318f2e54df4ad58102" +checksum = "a24cb19f78c5bc3aab8ddf1e8e0bd6b402fbcb9c7f112f64ddbedef8f8768a59" dependencies = [ "gpui-pre-zlog", "gpui-pre-ztracing-macro", @@ -3293,9 +3279,9 @@ dependencies = [ [[package]] name = "gpui-pre-ztracing-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e2a5ff79002223edfcfa76c6f9f79f4f60f6ec545ccc27832f12bd46348b39" +checksum = "a1bb25850ad31b88bbdef454afb93ec4cdb81f5e200ba5b3f1a0368111780d2c" [[package]] name = "gpui-updater-core" @@ -3621,9 +3607,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.9" +version = "0.27.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" dependencies = [ "http", "hyper", @@ -4131,9 +4117,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6480ccc157a1389bb2e4891b24751b0f798ba640d22386f23143fbcc89da195a" +checksum = "61ff90caf6077a803a240f62fdbe88645a890bbca49ef8174c3cb0404362171d" dependencies = [ "libc", ] @@ -4617,8 +4603,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" -version = "0.45.4" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.5" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "aes", "base64 0.22.1", @@ -4630,7 +4616,7 @@ dependencies = [ "chacha20poly1305", "faster-hex", "opaquerr 0.2.0", - "rand 0.10.2", + "rand 0.10.3", "scrypt", "secp256k1", "serde", @@ -4643,8 +4629,8 @@ dependencies = [ [[package]] name = "nostr-blossom" -version = "0.45.0" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.1" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "base64 0.22.1", "bitcoin_hashes 1.2.0", @@ -4656,8 +4642,8 @@ dependencies = [ [[package]] name = "nostr-connect" -version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.2" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "async-utility", "futures-core", @@ -4670,8 +4656,8 @@ dependencies = [ [[package]] name = "nostr-database" -version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.2" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "nostr", "opaquerr 0.2.0", @@ -4679,8 +4665,8 @@ dependencies = [ [[package]] name = "nostr-gossip" -version = "0.45.0" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.1" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "nostr", "opaquerr 0.2.0", @@ -4688,8 +4674,8 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" -version = "0.45.0" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.1" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "indexmap", "lru", @@ -4700,8 +4686,8 @@ dependencies = [ [[package]] name = "nostr-lmdb" -version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.3" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "async-utility", "flatbuffers", @@ -4715,8 +4701,8 @@ dependencies = [ [[package]] name = "nostr-memory" -version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.2" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "btreecap", "nostr", @@ -4726,8 +4712,8 @@ dependencies = [ [[package]] name = "nostr-sdk" -version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#b230cecf9dbb38e0228e6fff4544ed9d261326fc" +version = "0.45.4" +source = "git+https://github.com/rust-nostr/nostr#01f1950c671b35f3d1186ca907373dd86ee3b336" dependencies = [ "async-utility", "async-wsocket", @@ -4739,7 +4725,7 @@ dependencies = [ "nostr-database", "nostr-gossip", "opaquerr 0.2.0", - "rand 0.10.2", + "rand 0.10.3", "tokio", "tokio-stream", "tracing", @@ -4990,6 +4976,28 @@ dependencies = [ "objc2-foundation 0.3.2", ] +[[package]] +name = "objc2-core-audio" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2" +dependencies = [ + "dispatch2", + "objc2 0.6.4", + "objc2-core-audio-types", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-core-audio-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c" +dependencies = [ + "bitflags 2.13.2", + "objc2 0.6.4", +] + [[package]] name = "objc2-core-data" version = "0.2.2" @@ -5069,6 +5077,21 @@ dependencies = [ "objc2-foundation 0.3.2", ] +[[package]] +name = "objc2-core-media" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ec576860167a15dd9fce7fbee7512beb4e31f532159d3482d1f9c6caedf31d" +dependencies = [ + "bitflags 2.13.2", + "dispatch2", + "objc2 0.6.4", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-core-video", +] + [[package]] name = "objc2-core-text" version = "0.3.2" @@ -5193,8 +5216,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74b7c5390f477482f001bc354d6571a70db7e4f8d5288e860c45521fbce11394" dependencies = [ "block2 0.6.2", + "dispatch2", "objc2 0.6.4", "objc2-core-graphics", + "objc2-core-media", "objc2-foundation 0.3.2", ] @@ -5902,7 +5927,7 @@ dependencies = [ "bytes", "getrandom 0.4.3", "lru-slab", - "rand 0.10.2", + "rand 0.10.3", "rand_pcg", "ring", "rustc-hash 2.1.3", @@ -5973,9 +5998,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ "chacha20 0.10.2", "getrandom 0.4.3", @@ -8004,9 +8029,9 @@ checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" [[package]] name = "unicode-id" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ba288e709927c043cbe476718d37be306be53fb1fafecd0dbe36d072be2580" +checksum = "65dd75ab2d9d379dbe86d4059e91d8b5a6e7054865eaba1ddbfc7a817ff96392" [[package]] name = "unicode-ident" @@ -8790,6 +8815,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.61.3" @@ -8858,6 +8893,19 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.61.2" @@ -8917,6 +8965,17 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-implement" version = "0.60.2" @@ -8939,6 +8998,17 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -9013,6 +9083,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.3.4" @@ -9031,6 +9110,16 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-strings" version = "0.3.1" diff --git a/crates/ui/src/dock/mod.rs b/crates/ui/src/dock/mod.rs index 575f0f84..a30bcdca 100644 --- a/crates/ui/src/dock/mod.rs +++ b/crates/ui/src/dock/mod.rs @@ -14,7 +14,7 @@ use gpui::{ pub use gpui_base::dock::{DockArea, DockLayout, DockPlacement}; use gpui_base::dock::{ DockAreaRenderer, DockContext, DragPanel, DropIndicator, InsertTarget, NodeId, PaneNode, - PaneRef, PanelId, TabGroupContext, TabGroupRenderer, TileContext, TilesRenderer, + PaneRef, PanelId, TabGroupContext, TabGroupRenderer, }; use gpui_base::{Placement, ResizeHandleContext, Side}; use theme::{ActiveTheme, TABBAR_HEIGHT}; @@ -167,7 +167,6 @@ fn left_top_group(node: &PaneNode) -> Option { match node.kind() { PaneRef::Tabs { .. } => Some(node.id()), PaneRef::Split { children, .. } => children.first().and_then(left_top_group), - PaneRef::Tiles { .. } => None, } } @@ -182,7 +181,6 @@ fn right_top_group(node: &PaneNode) -> Option { }; child.and_then(right_top_group) } - PaneRef::Tiles { .. } => None, } } @@ -263,18 +261,6 @@ impl DockAreaRenderer for DockSkin { fn tab_group_renderer(&self) -> Rc { Rc::new(TabGroupSkin::new(self.shared.clone())) } - - fn tiles_renderer(&self) -> Rc { - Rc::new(NoTiles) - } -} - -struct NoTiles; - -impl TilesRenderer for NoTiles { - fn render_drag_bar(&self, _: &TileContext, _: &mut Window, _: &mut App) -> AnyElement { - Empty.into_any_element() - } } /// The payload a dock's resize handle drags; the handle is the affordance.