From 5b60dc1453b70f7e6cd5356fdc4001a2f36f6b67 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Thu, 30 Jul 2026 10:47:54 +0700 Subject: [PATCH] update ui --- Cargo.lock | 137 +++++++++++----------- crates/state/src/lib.rs | 11 +- crates/theme/src/lib.rs | 2 +- crates/ui/src/dock/tab_panel.rs | 1 + crates/workspace/src/dialogs/screening.rs | 3 +- crates/workspace/src/panels/relay_list.rs | 2 +- crates/workspace/src/sidebar/mod.rs | 20 ++-- 7 files changed, 89 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d868c6c..d2b4a84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" +checksum = "3976abdc8fe7d1133d43d304afd42abdf5bc3e1319d263d223bde07b5efc4be8" dependencies = [ "compression-codecs", "compression-core", @@ -469,8 +469,9 @@ dependencies = [ [[package]] name = "async-wsocket" -version = "0.15.0" -source = "git+https://github.com/shadowylab/async-wsocket?rev=16818f3100544bde3fe8338cd80306f3d320426b#16818f3100544bde3fe8338cd80306f3d320426b" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa9ef232c1731ddbe4a306b5b5dcf9e50a924d6bd086d4784939d14f8e78daa" dependencies = [ "futures", "futures-util", @@ -1132,9 +1133,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "157a8ba7b480713b56f4c09fd13fc3e0a22a5dfab8097ba61cbc5feef950788a" dependencies = [ "glob", "libc", @@ -1230,7 +1231,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "gpui_util", "indexmap", @@ -1653,9 +1654,9 @@ dependencies = [ [[package]] name = "ctor" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9bb72bb94fdc1bd619f4c18cc91ecf6302aeb333d31b3c6ec0bb841cd920209" +checksum = "2d83cb7e7a873830708d6b02a78cd36a592c6fa14bf267b68725103b85c0d77f" dependencies = [ "link-section", "linktime-proc-macro", @@ -1714,7 +1715,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "proc-macro2", "quote", @@ -2610,7 +2611,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "accesskit", "anyhow", @@ -2692,7 +2693,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "accesskit", "accesskit_unix", @@ -2744,7 +2745,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "accesskit", "accesskit_macos", @@ -2793,7 +2794,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2804,7 +2805,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "console_error_panic_hook", "gpui", @@ -2817,7 +2818,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "schemars", "serde", @@ -2827,7 +2828,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "gpui", @@ -2838,7 +2839,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "log", @@ -2848,7 +2849,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2871,7 +2872,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "bytemuck", @@ -2901,7 +2902,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "accesskit", "accesskit_windows", @@ -3157,9 +3158,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" dependencies = [ "bytes", "itoa", @@ -3191,7 +3192,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "async-compression", @@ -3211,7 +3212,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3795,9 +3796,9 @@ checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" [[package]] name = "link-section" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc98458dfe90986c5e2f6ddcf68360c7e5c4252600153e06aa4ee8176c0f8d1" +checksum = "5ee1a0d6e252afe82e7bc2db42fba60e02ddf3b1accaf8cb21d96e34ba61f3d4" [[package]] name = "linkify" @@ -3810,9 +3811,9 @@ dependencies = [ [[package]] name = "linktime-proc-macro" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7b0a3383c2a1002d11349c92c85a666a5fb679e96c79d782cf0dbe557fd6ee" +checksum = "348d0075b1fc163b26d72a7f75fc5141daf2fd1bdf128d873cbaf6785d495bdf" [[package]] name = "linux-raw-sys" @@ -4018,7 +4019,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "bindgen", @@ -4211,8 +4212,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "aes", "base64", @@ -4236,8 +4237,8 @@ dependencies = [ [[package]] name = "nostr-blossom" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "base64", "nostr", @@ -4248,8 +4249,8 @@ dependencies = [ [[package]] name = "nostr-connect" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "async-utility", "futures-core", @@ -4262,8 +4263,8 @@ dependencies = [ [[package]] name = "nostr-database" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "btreecap", "flatbuffers", @@ -4273,8 +4274,8 @@ dependencies = [ [[package]] name = "nostr-gossip" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "nostr", "opaquerr", @@ -4282,8 +4283,8 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "indexmap", "lru", @@ -4294,8 +4295,8 @@ dependencies = [ [[package]] name = "nostr-lmdb" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "async-utility", "flume 0.12.0", @@ -4308,8 +4309,8 @@ dependencies = [ [[package]] name = "nostr-memory" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "btreecap", "nostr", @@ -4319,8 +4320,8 @@ dependencies = [ [[package]] name = "nostr-sdk" -version = "0.45.0-alpha.6" -source = "git+https://github.com/rust-nostr/nostr#f9ee89e9865d10a22b06cbc087bc50f1b73a6460" +version = "0.45.0-alpha.7" +source = "git+https://github.com/rust-nostr/nostr#c15db19db55df326d56bbe11543583e0bd0276e5" dependencies = [ "async-utility", "async-wsocket", @@ -4921,7 +4922,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "collections", "serde", @@ -5733,7 +5734,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "derive_refineable", ] @@ -5815,7 +5816,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "bytes", @@ -5985,9 +5986,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.42" +version = "0.23.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" +checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06" dependencies = [ "aws-lc-rs", "log", @@ -6130,7 +6131,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "async-task", "backtrace", @@ -6223,10 +6224,12 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "secp256k1" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ + "bitcoin_hashes", + "rand 0.8.7", "secp256k1-sys", ] @@ -6754,7 +6757,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "heapless 0.9.3", "log", @@ -7203,13 +7206,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6328af13490e73a9b4694030fafd93f8c8c6a9dede33e821c3fc63eddf8042ba" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -7755,7 +7758,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "perf", "quote", @@ -8093,15 +8096,15 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72" +checksum = "ef62a3d5f7b2411119a11b6f62570dbff91d7105e011a20fb83fbf8f5761c40f" dependencies = [ - "core-foundation 0.10.1", "jni 0.22.4", "log", "ndk-context", "objc2 0.6.4", + "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "url", "web-sys", @@ -9488,7 +9491,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "anyhow", "chrono", @@ -9505,7 +9508,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" dependencies = [ "tracing", "tracing-subscriber", @@ -9516,7 +9519,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#06b6160d46ae8a9074cd367ed64f742b47beca64" +source = "git+https://github.com/zed-industries/zed#b535bec7bf42bff5692f90022dc6c1049fdc1e91" [[package]] name = "zune-core" diff --git a/crates/state/src/lib.rs b/crates/state/src/lib.rs index 1f236f4..9186a89 100644 --- a/crates/state/src/lib.rs +++ b/crates/state/src/lib.rs @@ -1,9 +1,9 @@ use std::collections::HashMap; -use instant::Duration; use anyhow::{Error, anyhow}; use common::config_dir; use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, Window}; +use instant::Duration; use nostr_connect::prelude::*; use nostr_gossip_memory::prelude::*; #[cfg(not(target_arch = "wasm32"))] @@ -130,8 +130,12 @@ impl NostrRegistry { // Connect to bootstrap relays after the window is ready cx.defer_in(window, |this, _window, cx| { this.connect_bootstrap_relays(cx); - #[cfg(not(target_arch = "wasm32"))] - this.get_user_credential(cx); + + if cfg!(target_arch = "wasm32") { + cx.emit(StateEvent::NoSigner); + } else { + this.get_user_credential(cx); + } }); Self { @@ -222,7 +226,6 @@ impl NostrRegistry { } /// Check the user's credential and set the signer if valid - #[cfg(not(target_arch = "wasm32"))] fn get_user_credential(&mut self, cx: &mut Context) { let user_keyring = cx.read_credentials(USER_KEYRING); let master_keyring = self.get_master_key(cx); diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs index 9804f3e..830901a 100644 --- a/crates/theme/src/lib.rs +++ b/crates/theme/src/lib.rs @@ -34,7 +34,7 @@ pub const CLIENT_SIDE_DECORATION_BORDER: Pixels = px(1.0); pub const TITLEBAR_HEIGHT: Pixels = px(36.0); /// Defines workspace tabbar height -pub const TABBAR_HEIGHT: Pixels = px(36.0); +pub const TABBAR_HEIGHT: Pixels = px(44.0); /// Defines default sidebar width pub const SIDEBAR_WIDTH: Pixels = px(240.); diff --git a/crates/ui/src/dock/tab_panel.rs b/crates/ui/src/dock/tab_panel.rs index 24f6387..4b96597 100644 --- a/crates/ui/src/dock/tab_panel.rs +++ b/crates/ui/src/dock/tab_panel.rs @@ -688,6 +688,7 @@ impl TabPanel { let panel = panel.clone(); move |view, _ev, window, cx| { view.remove_panel(&panel, window, cx); + view.set_active_ix(ix, window, cx); } })), ) diff --git a/crates/workspace/src/dialogs/screening.rs b/crates/workspace/src/dialogs/screening.rs index 744e4cd..d0f0b1e 100644 --- a/crates/workspace/src/dialogs/screening.rs +++ b/crates/workspace/src/dialogs/screening.rs @@ -234,7 +234,8 @@ impl Screening { } .to_tag(); - let event = EventBuilder::report(vec![tag], "") + let event = EventBuilder::new(Kind::Reporting, "") + .tag(tag) .finalize_async(&signer) .await?; diff --git a/crates/workspace/src/panels/relay_list.rs b/crates/workspace/src/panels/relay_list.rs index d066771..27b7b7e 100644 --- a/crates/workspace/src/panels/relay_list.rs +++ b/crates/workspace/src/panels/relay_list.rs @@ -216,7 +216,7 @@ impl RelayListPanel { self.set_updating(true, cx); let task: Task> = cx.background_spawn(async move { - let event = EventBuilder::relay_list(relays) + let event = nip65::RelayList::new(relays) .finalize_async(&signer) .await?; diff --git a/crates/workspace/src/sidebar/mod.rs b/crates/workspace/src/sidebar/mod.rs index 9409d36..df959d9 100644 --- a/crates/workspace/src/sidebar/mod.rs +++ b/crates/workspace/src/sidebar/mod.rs @@ -504,7 +504,7 @@ impl Render for Sidebar { .size_full() .gap_2() .child( - h_flex().px_2().child( + h_flex().px_2().py_1().child( Input::new(&self.find_input) .small() .text_xs() @@ -530,7 +530,6 @@ impl Render for Sidebar { Button::new("search-results") .icon(IconName::Search) .tooltip("All search results") - .small() .ghost_alt() .font_semibold() .flex_1() @@ -546,9 +545,8 @@ impl Render for Sidebar { this.icon(IconName::Inbox) } }) - .when(!show_find_panel, |this| this.label("Inbox")) + .when(!show_find_panel, |this| this.label("Inbox").small()) .tooltip("All ongoing conversations") - .small() .ghost_alt() .font_semibold() .flex_1() @@ -568,9 +566,8 @@ impl Render for Sidebar { this.icon(IconName::Fistbump) } }) - .when(!show_find_panel, |this| this.label("Requests")) + .when(!show_find_panel, |this| this.label("Requests").small()) .tooltip("Incoming new conversations") - .small() .ghost_alt() .font_semibold() .flex_1() @@ -657,7 +654,7 @@ impl Render for Sidebar { .font_semibold() .text_color(cx.theme().text_muted) .child(Icon::new(IconName::ChevronDown).small()) - .child(SharedString::from("Suggestions")), + .child("Contacts"), ) .child( uniform_list( @@ -698,13 +695,12 @@ impl Render for Sidebar { .left_0() .h_9() .w_full() - .px_2() + .p_4() .child( Button::new("create") .label(button_label) .primary() - .small() - .shadow_lg() + .shadow_md() .on_click(cx.listener(move |this, _ev, window, cx| { this.create_room(window, cx); })), @@ -727,9 +723,7 @@ impl Render for Sidebar { .h_9() .justify_center() .bg(cx.theme().background.opacity(0.85)) - .border_color(cx.theme().border_disabled) - .border_1() - .when(cx.theme().shadow, |this| this.shadow_xs()) + .when(cx.theme().shadow, |this| this.shadow_md()) .rounded_full() .text_xs() .font_semibold()