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

Toggle buffer search via quick actions

Browse source
This commit is contained in:
Kirill Bulatov 2023-08-10 00:15:37 +03:00
parent 5c3d563f0f
commit 6a326c1bd8
2 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/zed/src/quick_action_bar.rs
View file

@ -6,17 +6,17 @@ use gpui::{
}; };
use search::{buffer_search, BufferSearchBar}; use search::{buffer_search, BufferSearchBar};
use workspace::{item::ItemHandle, ToolbarItemLocation, ToolbarItemView, Workspace}; use workspace::{item::ItemHandle, Pane, ToolbarItemLocation, ToolbarItemView};
pub struct QuickActionBar { pub struct QuickActionBar {
workspace: ViewHandle<Workspace>, pane: ViewHandle<Pane>,
active_item: Option<Box<dyn ItemHandle>>, active_item: Option<Box<dyn ItemHandle>>,
} }
impl QuickActionBar { impl QuickActionBar {
pub fn new(workspace: ViewHandle<Workspace>) -> Self { pub fn new(pane: ViewHandle<Pane>) -> Self {
Self { Self {
workspace, pane,
active_item: None, active_item: None,
} }
} }
@ -60,23 +60,40 @@ impl View for QuickActionBar {
)); ));
if editor.read(cx).buffer().read(cx).is_singleton() { if editor.read(cx).buffer().read(cx).is_singleton() {
let buffer_search_bar = self
.pane
.read(cx)
.toolbar()
.read(cx)
.item_of_type::<BufferSearchBar>();
let search_bar_shown = buffer_search_bar
.as_ref()
.map(|bar| !bar.read(cx).is_dismissed())
.unwrap_or(false);
let search_action = buffer_search::Deploy { focus: true }; let search_action = buffer_search::Deploy { focus: true };
// TODO kb: this opens the search bar in a differently focused pane (should be the same) + should be toggleable
let pane = self.workspace.read(cx).active_pane().clone();
bar = bar.with_child(render_quick_action_bar_button( bar = bar.with_child(render_quick_action_bar_button(
1, 1,
"icons/magnifying_glass_12.svg", "icons/magnifying_glass_12.svg",
false, search_bar_shown,
( (
"Search in buffer".to_string(), "Toggle buffer search".to_string(),
Some(Box::new(search_action.clone())), Some(Box::new(search_action.clone())),
), ),
cx, cx,
move |_, cx| { move |this, cx| {
pane.update(cx, |pane, cx| { if search_bar_shown {
BufferSearchBar::deploy(pane, &search_action, cx); if let Some(buffer_search_bar) = buffer_search_bar.as_ref() {
}); buffer_search_bar.update(cx, |buffer_search_bar, cx| {
buffer_search_bar.dismiss(&buffer_search::Dismiss, cx);
});
}
} else {
this.pane.update(cx, |pane, cx| {
BufferSearchBar::deploy(pane, &search_action, cx);
});
}
}, },
)); ));
} }
@ -130,7 +147,6 @@ impl ToolbarItemView for QuickActionBar {
) -> ToolbarItemLocation { ) -> ToolbarItemLocation {
match active_pane_item { match active_pane_item {
Some(active_item) => { Some(active_item) => {
dbg!("@@@@@@@@@@ TODO kb", active_item.id());
self.active_item = Some(active_item.boxed_clone()); self.active_item = Some(active_item.boxed_clone());
ToolbarItemLocation::PrimaryRight { flex: None } ToolbarItemLocation::PrimaryRight { flex: None }
} }

7
crates/zed/src/zed.rs
View file

@ -258,15 +258,14 @@ pub fn initialize_workspace(
workspace_handle.update(&mut cx, |workspace, cx| { workspace_handle.update(&mut cx, |workspace, cx| {
let workspace_handle = cx.handle(); let workspace_handle = cx.handle();
cx.subscribe(&workspace_handle, { cx.subscribe(&workspace_handle, {
let workspace_handle = workspace_handle.clone();
move |workspace, _, event, cx| { move |workspace, _, event, cx| {
if let workspace::Event::PaneAdded(pane) = event { if let workspace::Event::PaneAdded(pane_handle) = event {
pane.update(cx, |pane, cx| { pane_handle.update(cx, |pane, cx| {
pane.toolbar().update(cx, |toolbar, cx| { pane.toolbar().update(cx, |toolbar, cx| {
let breadcrumbs = cx.add_view(|_| Breadcrumbs::new(workspace)); let breadcrumbs = cx.add_view(|_| Breadcrumbs::new(workspace));
toolbar.add_item(breadcrumbs, cx); toolbar.add_item(breadcrumbs, cx);
let quick_action_bar = let quick_action_bar =
cx.add_view(|_| QuickActionBar::new(workspace_handle.clone())); cx.add_view(|_| QuickActionBar::new(pane_handle.clone()));
toolbar.add_item(quick_action_bar, cx); toolbar.add_item(quick_action_bar, cx);
let buffer_search_bar = cx.add_view(BufferSearchBar::new); let buffer_search_bar = cx.add_view(BufferSearchBar::new);
toolbar.add_item(buffer_search_bar, cx); toolbar.add_item(buffer_search_bar, cx);