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

menu: Fix icon width to tidy indent in PopupMenuItem. (#1620)

Browse source 
Fix the issue of alignment after selection.

| Before | After |
| - | - |
| <img width="291" height="299" alt="image"
src="https://github.com/user-attachments/assets/ed1237dc-d4b9-4934-b2f1-1e5b558c757c"
/> | <img width="292" height="297" alt="SCR-20251117-kjik"
src="https://github.com/user-attachments/assets/200071c2-717e-4033-bf1a-906b43c77f19"
/> |
This commit is contained in:
Floyd Wang 2025-11-17 11:32:14 +08:00 committed by GitHub
parent 6c4de54fa4
commit db22454b3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/ui/src/menu/popup_menu.rs
View file

@ -970,26 +970,17 @@ impl PopupMenu {
_: &mut Window, _: &mut Window,
_: &mut Context<Self>, _: &mut Context<Self>,
) -> Option<impl IntoElement> { ) -> Option<impl IntoElement> {
let icon_placeholder = if has_icon { Some(Icon::empty()) } else { None };
if !has_icon { if !has_icon {
return None; return None;
} }
let icon = h_flex() let icon = if let Some(icon) = icon {
.w_3p5() icon.clone()
.h_3p5() } else {
.justify_center() Icon::empty()
.text_sm() };
.map(|this| {
if let Some(icon) = icon {
this.child(icon.clone().xsmall())
} else {
this.children(icon_placeholder.clone())
}
});
Some(icon) Some(icon.xsmall())
} }
#[inline] #[inline]
@ -1070,7 +1061,7 @@ impl PopupMenu {
.items_center() .items_center()
.gap_x_1() .gap_x_1()
.children(Self::render_icon(has_icon, None, window, cx)) .children(Self::render_icon(has_icon, None, window, cx))
.child(label.clone()), .child(div().flex_1().child(label.clone())),
), ),
PopupMenuItem::ElementItem { PopupMenuItem::ElementItem {
render, render,