reya/coop
1
0
Fork 1
Code Issues Pull Requests Releases 4 Activity

chore: simplify import dialog & sidebar menu

Browse Source
This commit is contained in:
reya
2026-10-26 19:59:48 +07:00
parent bfa34959cf
commit b0121f8df2
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/dialogs/import.rs
+4 -5
View File
@@ -29,8 +29,7 @@ pub fn open_unlock(window: &mut Window, cx: &mut App) {
let import = cx.new(|cx| ImportIdentity::new_unlock(window, cx));
window.open_dialog(cx, move |this, _window, _cx| {
this.width(px(450.))
.close_button(false)
this.close_button(false)
.overlay_closable(false)
.keyboard(false)
.title("Unlock your identity")
@@ -322,7 +321,7 @@ impl Render for ImportIdentity {
}),
)
.child({
let content = v_flex().child(
let content = v_flex().gap_1().child(
Button::new("login")
.label(if is_unlock { "Unlock" } else { "Continue" })
.primary()
@@ -337,7 +336,7 @@ impl Render for ImportIdentity {
let content = content.when(!is_unlock, |this| {
this.child(
Button::new("proxy")
.label("Connect via Web Extension (Experimental)")
.label("Connect via Web Extension")
.ghost()
.disabled(self.loading)
.on_click(cx.listener(move |this, _ev, _window, cx| {
@@ -350,7 +349,7 @@ impl Render for ImportIdentity {
let content = content.when(!is_unlock, |this| {
this.child(
Button::new("extension")
.label("Continue with Browser Extension (NIP-07)")
.label("Continue with Browser Extension")
.ghost()
.disabled(self.loading)
.on_click(cx.listener(move |this, _ev, _window, cx| {
crates/workspace/src/sidebar/header.rs
+15 -18
View File
@@ -13,7 +13,7 @@ use gpui_kit::component::dialog::DialogButtonProps;
use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
use gpui_kit::component::{ActiveTheme, Icon, Selectable, Sizable, WindowExt, h_flex, v_flex};
use nostr_sdk::prelude::*;
use state::NostrRegistry;
use state::{CLIENT_NAME, NostrRegistry};
use ui::{Avatar, IconName};
use super::Sidebar;
@@ -38,31 +38,28 @@ impl Sidebar {
.h(TAB_BAR_HEIGHT)
.flex_shrink_0()
.justify_between()
.px_2()
.px_2p5()
.when(cfg!(target_os = "macos"), |this| this.pl(px(80.)))
.child(
Button::new("current-user")
Button::new("user")
.text()
.dropdown_caret(true)
.min_w_0()
.flex_shrink_1()
.child(Avatar::new(avatar).seed(profile.avatar_seed()).small())
.dropdown_menu(move |this, _window, _cx| {
this.menu_with_icon(
"Profile",
IconName::Profile,
Box::new(Command::ShowProfile),
)
.menu_with_icon("Relays", IconName::Relay, Box::new(Command::ShowRelayList))
.separator()
.item(
PopupMenuItem::element(|_, cx| {
div().text_color(cx.theme().danger).child("Log out")
})
.on_click(|_, window, cx| {
open_logout_dialog(window, cx);
}),
)
this.menu("Profile", Box::new(Command::ShowProfile))
.menu("Relays", Box::new(Command::ShowRelayList))
.separator()
.label(format!("{CLIENT_NAME} {}", env!("CARGO_PKG_VERSION")))
.item(
PopupMenuItem::element(|_, cx| {
div().text_color(cx.theme().danger).child("Log out")
})
.on_click(|_, window, cx| {
open_logout_dialog(window, cx);
}),
)
}),
)
.child({