Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed icons

Browse source
This commit is contained in:
Mikayla Maki 2022-08-04 08:42:42 -07:00
parent 96cc6d5ce5
commit 314c26e4ec
8 changed files with 55 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

85
crates/context_menu/src/context_menu.rs
View file

@ -22,21 +22,20 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_action(ContextMenu::cancel);
}
//
pub enum ContextMenuItem {
Item {
label: String,
action: Box<dyn Action>,
icon: Option<String>,
},
Separator,
}
impl ContextMenuItem {
pub fn item(label: impl ToString, icon: Option<&str>, action: impl 'static + Action) -> Self {
pub fn item(label: impl ToString, action: impl 'static + Action) -> Self {
Self::Item {
label: label.to_string(),
action: Box::new(action),
icon: icon.map(|item| item.to_string()),
}
}
@ -256,31 +255,15 @@ impl ContextMenu {
Flex::column()
.with_children(self.items.iter().enumerate().map(|(ix, item)| {
match item {
ContextMenuItem::Item { label, icon, .. } => {
ContextMenuItem::Item { label, .. } => {
let style = style
.item
.style_for(Default::default(), Some(ix) == self.selected_index);
let mut line = Flex::row();
if let Some(_) = icon {
line.add_child(
Empty::new()
.constrained()
.with_width(style.icon_width)
.boxed(),
);
}
line.add_child(
Label::new(label.to_string(), style.label.clone())
.contained()
.with_style(style.container)
.with_margin_left(if icon.is_some() {
style.icon_spacing
} else {
0.
})
.boxed(),
);
line.boxed()
Label::new(label.to_string(), style.label.clone())
.contained()
.with_style(style.container)
.boxed()
}
ContextMenuItem::Separator => Empty::new()
.collapsed()
@ -333,50 +316,30 @@ impl ContextMenu {
Flex::column()
.with_children(self.items.iter().enumerate().map(|(ix, item)| {
match item {
ContextMenuItem::Item {
label,
action,
icon,
} => {
ContextMenuItem::Item { label, action } => {
let action = action.boxed_clone();
MouseEventHandler::new::<MenuItem, _, _>(ix, cx, |state, _| {
let style =
style.item.style_for(state, Some(ix) == self.selected_index);
let mut line = Flex::row();
if let Some(icon_file) = icon {
line.add_child(
Svg::new(format!("icons/{}", icon_file))
.with_color(style.label.color)
.constrained()
.with_width(style.icon_width)
.aligned()
Flex::row()
.with_child(
Label::new(label.to_string(), style.label.clone())
.contained()
.boxed(),
)
}
line.with_child(
Label::new(label.to_string(), style.label.clone())
.contained()
.with_margin_left(if icon.is_some() {
style.icon_spacing
} else {
0.
})
.boxed(),
)
.with_child({
KeystrokeLabel::new(
action.boxed_clone(),
style.keystroke.container,
style.keystroke.text.clone(),
)
.flex_float()
.with_child({
KeystrokeLabel::new(
action.boxed_clone(),
style.keystroke.container,
style.keystroke.text.clone(),
)
.flex_float()
.boxed()
})
.contained()
.with_style(style.container)
.boxed()
})
.contained()
.with_style(style.container)
.boxed()
})
.with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, cx| {