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

chore: better dropdown menu #11

Merged
reya merged 2 commits from chore/improve-dropdown into master 2026-02-28 06:05:45 +00:00
Conversation 0 Commits 2 Files Changed 2 +24 -27
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5310ae6369 - Show all commits

18
crates/coop/src/workspace.rs
View File

@@ -18,7 +18,7 @@ use ui::button::{Button, ButtonVariants};
use ui::dock_area::dock::DockPlacement; use ui::dock_area::dock::DockPlacement;
use ui::dock_area::panel::PanelView; use ui::dock_area::panel::PanelView;
use ui::dock_area::{ClosePanel, DockArea, DockItem}; use ui::dock_area::{ClosePanel, DockArea, DockItem};
use ui::menu::DropdownMenu; use ui::menu::{DropdownMenu, PopupMenuItem};
use ui::{h_flex, v_flex, IconName, Root, Sizable, WindowExtension}; use ui::{h_flex, v_flex, IconName, Root, Sizable, WindowExtension};
use crate::dialogs::settings; use crate::dialogs::settings;
@@ -382,17 +382,29 @@ impl Workspace {
.when_some(current_user.as_ref(), |this, public_key| { .when_some(current_user.as_ref(), |this, public_key| {
let persons = PersonRegistry::global(cx); let persons = PersonRegistry::global(cx);
let profile = persons.read(cx).get(public_key, cx); let profile = persons.read(cx).get(public_key, cx);
let avatar = profile.avatar();
let name = profile.name();
this.child( this.child(
Button::new("current-user") Button::new("current-user")
.child(Avatar::new(profile.avatar()).xsmall()) .child(Avatar::new(avatar.clone()).xsmall())
.small() .small()
.caret() .caret()
.compact() .compact()
.transparent() .transparent()
.dropdown_menu(move |this, _window, _cx| { .dropdown_menu(move |this, _window, _cx| {
let avatar = avatar.clone();
let name = name.clone();
this.min_w(px(256.)) this.min_w(px(256.))
.label(profile.name()) .item(PopupMenuItem::element(move |_window, cx| {
h_flex()
.gap_1p5()
.text_xs()
.text_color(cx.theme().text_muted)
.child(Avatar::new(avatar.clone()).xsmall())
.child(name.clone())
}))
.separator() .separator()
.menu_with_icon( .menu_with_icon(
"Profile", "Profile",

33
crates/ui/src/menu/popup_menu.rs
View File

@@ -1112,25 +1112,17 @@ impl PopupMenu {
.border_color(cx.theme().border) .border_color(cx.theme().border)
.disabled(true), .disabled(true),
PopupMenuItem::Label(label) => this.disabled(true).cursor_default().child( PopupMenuItem::Label(label) => this.disabled(true).cursor_default().child(
h_flex() h_flex().cursor_default().items_center().gap_x_1().child(
.cursor_default() div()
.items_center() .flex_1()
.gap_x_1() .text_xs()
.children(Self::render_icon(has_left_icon, false, None, window, cx)) .font_semibold()
.child( .text_color(cx.theme().text_muted)
div() .child(label.clone()),
.flex_1() ),
.text_xs()
.font_semibold()
.text_color(cx.theme().text_muted)
.child(label.clone()),
),
), ),
PopupMenuItem::ElementItem { PopupMenuItem::ElementItem {
render, render, disabled, ..
icon,
disabled,
..
} => this } => this
.when(!disabled, |this| { .when(!disabled, |this| {
this.on_click( this.on_click(
@@ -1144,13 +1136,6 @@ impl PopupMenu {
.min_h(item_height) .min_h(item_height)
.items_center() .items_center()
.gap_x_2() .gap_x_2()
.children(Self::render_icon(
has_left_icon,
is_left_check,
icon.clone(),
window,
cx,
))
.child((render)(window, cx)) .child((render)(window, cx))
.children(right_check_icon.map(|icon| icon.ml_3())), .children(right_check_icon.map(|icon| icon.ml_3())),
), ),