From 314c26e4ec3673fad9535c8e1bc772169c67d13b Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 4 Aug 2022 08:42:42 -0700 Subject: [PATCH] Removed icons --- assets/keymaps/default.json | 2 +- crates/context_menu/src/context_menu.rs | 85 +++++++---------------- crates/editor/src/mouse_context_menu.rs | 9 ++- crates/project_panel/src/project_panel.rs | 18 +++-- crates/search/src/project_search.rs | 8 ++- crates/workspace/src/pane.rs | 19 ++--- crates/workspace/src/workspace.rs | 1 + crates/zed/src/menus.rs | 2 +- 8 files changed, 55 insertions(+), 89 deletions(-) diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json index f9735e7cee05fada9613da6de18f48e3e837e010..2782dd7d6a76c47c3f1e13f739969f4d8586acc5 100644 --- a/assets/keymaps/default.json +++ b/assets/keymaps/default.json @@ -300,7 +300,7 @@ 8 ], "cmd-b": "workspace::ToggleLeftSidebar", - "cmd-shift-f": "project_search::Deploy", + "cmd-shift-f": "workspace::NewSearch", "cmd-k cmd-t": "theme_selector::Toggle", "cmd-k cmd-s": "zed::OpenKeymap", "cmd-t": "project_symbols::Toggle", diff --git a/crates/context_menu/src/context_menu.rs b/crates/context_menu/src/context_menu.rs index e66388ecd1fc37cce6358decb1d21aca4c339bcd..d49f817de64a2fd0d9817e101a37f124f4d75d91 100644 --- a/crates/context_menu/src/context_menu.rs +++ b/crates/context_menu/src/context_menu.rs @@ -22,21 +22,20 @@ pub fn init(cx: &mut MutableAppContext) { cx.add_action(ContextMenu::cancel); } +// pub enum ContextMenuItem { Item { label: String, action: Box, - icon: Option, }, 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::(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| { diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs index d96deb359d342ca0ebb39de089ed0455c0812624..513a9ed99ce06e0ac25d2f70d5f4d829155f1426 100644 --- a/crates/editor/src/mouse_context_menu.rs +++ b/crates/editor/src/mouse_context_menu.rs @@ -48,13 +48,12 @@ pub fn deploy_context_menu( menu.show( position, vec![ - ContextMenuItem::item("Rename Symbol", None, Rename), - ContextMenuItem::item("Go To Definition", None, GoToDefinition), - ContextMenuItem::item("Go To Type Definition", None, GoToTypeDefinition), - ContextMenuItem::item("Find All References", None, FindAllReferences), + ContextMenuItem::item("Rename Symbol", Rename), + ContextMenuItem::item("Go To Definition", GoToDefinition), + ContextMenuItem::item("Go To Type Definition", GoToTypeDefinition), + ContextMenuItem::item("Find All References", FindAllReferences), ContextMenuItem::item( "Code Actions", - None, ToggleCodeActions { deployed_from_indicator: false, }, diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 2b5a607bed42528de5004e945d8901f93bc9a164..0a32a8427bf489111065ca80b76c9086557e2ab8 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -269,32 +269,30 @@ impl ProjectPanel { if !project.is_remote() { menu_entries.push(ContextMenuItem::item( "Add Folder to Project", - None, workspace::AddFolderToProject, )); if is_root { menu_entries.push(ContextMenuItem::item( "Remove from Project", - None, workspace::RemoveWorktreeFromProject(worktree_id), )); } } - menu_entries.push(ContextMenuItem::item("New File", None, AddFile)); - menu_entries.push(ContextMenuItem::item("New Folder", None, AddDirectory)); + menu_entries.push(ContextMenuItem::item("New File", AddFile)); + menu_entries.push(ContextMenuItem::item("New Folder", AddDirectory)); menu_entries.push(ContextMenuItem::Separator); - menu_entries.push(ContextMenuItem::item("Copy", None, Copy)); - menu_entries.push(ContextMenuItem::item("Copy Path", None, CopyPath)); - menu_entries.push(ContextMenuItem::item("Cut", None, Cut)); + menu_entries.push(ContextMenuItem::item("Copy", Copy)); + menu_entries.push(ContextMenuItem::item("Copy Path", CopyPath)); + menu_entries.push(ContextMenuItem::item("Cut", Cut)); if let Some(clipboard_entry) = self.clipboard_entry { if clipboard_entry.worktree_id() == worktree.id() { - menu_entries.push(ContextMenuItem::item("Paste", None, Paste)); + menu_entries.push(ContextMenuItem::item("Paste", Paste)); } } menu_entries.push(ContextMenuItem::Separator); - menu_entries.push(ContextMenuItem::item("Rename", None, Rename)); + menu_entries.push(ContextMenuItem::item("Rename", Rename)); if !is_root { - menu_entries.push(ContextMenuItem::item("Delete", None, Delete)); + menu_entries.push(ContextMenuItem::item("Delete", Delete)); } } diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index 0becd0d1840aa28b2f716ea5a20f65287dea27fe..ab130c135081f4b88225b2dbfc9e1409fb1baa46 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -24,7 +24,7 @@ use workspace::{ Item, ItemHandle, ItemNavHistory, Pane, ToolbarItemLocation, ToolbarItemView, Workspace, }; -actions!(project_search, [Deploy, SearchInNew, ToggleFocus]); +actions!(project_search, [SearchInNew, ToggleFocus]); #[derive(Default)] struct ActiveSearches(HashMap, WeakViewHandle>); @@ -431,7 +431,11 @@ impl ProjectSearchView { // Re-activate the most recently activated search or the most recent if it has been closed. // If no search exists in the workspace, create a new one. - fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext) { + fn deploy( + workspace: &mut Workspace, + _: &workspace::NewSearch, + cx: &mut ViewContext, + ) { // Clean up entries for dropped projects cx.update_global(|state: &mut ActiveSearches, cx| { state.0.retain(|project, _| project.is_upgradable(cx)) diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 3abd05da26eb080a08aae56c15080f5372b8efcf..caccda8ecf58a10d10284d6abd09434b19115cec 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -1,5 +1,5 @@ use super::{ItemHandle, SplitDirection}; -use crate::{toolbar::Toolbar, Item, NewFile, NewTerminal, WeakItemHandle, Workspace}; +use crate::{toolbar::Toolbar, Item, NewFile, NewSearch, NewTerminal, WeakItemHandle, Workspace}; use anyhow::Result; use collections::{HashMap, HashSet, VecDeque}; use context_menu::{ContextMenu, ContextMenuItem}; @@ -188,7 +188,7 @@ pub struct NavigationEntry { impl Pane { pub fn new(cx: &mut ViewContext) -> Self { let handle = cx.weak_handle(); - let split_menu = cx.add_view(|cx| ContextMenu::new(cx)); + let context_menu = cx.add_view(|cx| ContextMenu::new(cx)); Self { items: Vec::new(), is_active: true, @@ -203,7 +203,7 @@ impl Pane { pane: handle.clone(), })), toolbar: cx.add_view(|_| Toolbar::new(handle)), - context_menu: split_menu, + context_menu, } } @@ -841,10 +841,10 @@ impl Pane { menu.show( action.position, vec![ - ContextMenuItem::item("Split Right", None, SplitRight), - ContextMenuItem::item("Split Left", None, SplitLeft), - ContextMenuItem::item("Split Up", None, SplitUp), - ContextMenuItem::item("Split Down", None, SplitDown), + ContextMenuItem::item("Split Right", SplitRight), + ContextMenuItem::item("Split Left", SplitLeft), + ContextMenuItem::item("Split Up", SplitUp), + ContextMenuItem::item("Split Down", SplitDown), ], cx, ); @@ -856,8 +856,9 @@ impl Pane { menu.show( action.position, vec![ - ContextMenuItem::item("New File", Some("circle_info_12.svg"), NewFile), - ContextMenuItem::item("New Terminal", Some("terminal_12.svg"), NewTerminal), + ContextMenuItem::item("New File", NewFile), + ContextMenuItem::item("New Terminal", NewTerminal), + ContextMenuItem::item("New Search", NewSearch), ], cx, ); diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index c2821e1365cf9d07acb1343f6397e8a12a28b9c2..045e9c6f90de3cc5ed54411607519391a76fea6b 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -97,6 +97,7 @@ actions!( ToggleLeftSidebar, ToggleRightSidebar, NewTerminal, + NewSearch ] ); diff --git a/crates/zed/src/menus.rs b/crates/zed/src/menus.rs index f4a5e5e24dfd270430b593429e52a7735c9dde6f..71ab1d14e5213a73c0214778811843d2fda60a1a 100644 --- a/crates/zed/src/menus.rs +++ b/crates/zed/src/menus.rs @@ -136,7 +136,7 @@ pub fn menus() -> Vec> { }, MenuItem::Action { name: "Find In Project", - action: Box::new(search::project_search::Deploy), + action: Box::new(workspace::NewSearch), }, MenuItem::Separator, MenuItem::Action {