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

Make row_count of toolbaritem dynamic (WIP).

Browse source 
Move result count to the left hand side.
This commit is contained in:
Piotr Osiewicz 2023-07-27 16:03:26 +02:00
parent 8ca1e0b15b
commit dff9bf7d7e
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/search/src/project_search.rs
View file

@ -374,7 +374,9 @@ impl Item for ProjectSearchView {
query_text.into() query_text.into()
}); });
Label::new( Label::new(
tab_name.unwrap_or("Project search".into()), tab_name
.filter(|name| !name.is_empty())
.unwrap_or("Project search".into()),
tab_theme.label.clone(), tab_theme.label.clone(),
) )
.aligned() .aligned()
@ -425,6 +427,7 @@ impl Item for ProjectSearchView {
project: ModelHandle<Project>, project: ModelHandle<Project>,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Task<anyhow::Result<()>> { ) -> Task<anyhow::Result<()>> {
self.results_editor self.results_editor
.update(cx, |editor, cx| editor.reload(project, cx)) .update(cx, |editor, cx| editor.reload(project, cx))
} }
@ -825,6 +828,7 @@ impl ProjectSearchView {
} }
fn model_changed(&mut self, cx: &mut ViewContext<Self>) { fn model_changed(&mut self, cx: &mut ViewContext<Self>) {
let match_ranges = self.model.read(cx).match_ranges.clone(); let match_ranges = self.model.read(cx).match_ranges.clone();
if match_ranges.is_empty() { if match_ranges.is_empty() {
self.active_match_index = None; self.active_match_index = None;
@ -1026,8 +1030,11 @@ impl ProjectSearchBar {
if let Some(search_view) = self.active_project_search.as_ref() { if let Some(search_view) = self.active_project_search.as_ref() {
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {
search_view.filters_enabled = !search_view.filters_enabled; search_view.filters_enabled = !search_view.filters_enabled;
search_view.included_files_editor.update(cx, |_, cx| {cx.notify()});
search_view.excluded_files_editor.update(cx, |_, cx| {cx.notify()});
search_view.semantic = None; search_view.semantic = None;
search_view.search(cx); search_view.search(cx);
cx.notify();
}); });
cx.notify(); cx.notify();
true true
@ -1325,12 +1332,12 @@ impl View for ProjectSearchBar {
let semantic_index = let semantic_index =
SemanticIndex::enabled(cx).then(|| self.render_semantic_search_button(cx)); SemanticIndex::enabled(cx).then(|| self.render_semantic_search_button(cx));
Flex::row() Flex::row()
.with_child(Flex::row().flex(1., true)) .with_child(Flex::column().with_child(Flex::row().with_children(matches).aligned()
.left()).flex(1., true))
.with_child( .with_child(
Flex::column() Flex::column()
.with_child( .with_child(
Flex::row() Flex::row()
.with_children(matches)
.with_child( .with_child(
Flex::row() Flex::row()
.with_child(query) .with_child(query)
@ -1413,8 +1420,14 @@ impl ToolbarItemView for ProjectSearchBar {
} }
} }
fn row_count(&self) -> usize { fn row_count(&self, cx: &ViewContext<Self>) -> usize {
2 self.active_project_search
.as_ref()
.map(|search| {
let offset = search.read(cx).filters_enabled as usize;
1 + offset
})
.unwrap_or_else(|| 1)
} }
} }

4
crates/workspace/src/toolbar.rs
View file

@ -25,7 +25,7 @@ pub trait ToolbarItemView: View {
/// Number of times toolbar's height will be repeated to get the effective height. /// Number of times toolbar's height will be repeated to get the effective height.
/// Useful when multiple rows one under each other are needed. /// Useful when multiple rows one under each other are needed.
/// The rows have the same width and act as a whole when reacting to resizes and similar events. /// The rows have the same width and act as a whole when reacting to resizes and similar events.
fn row_count(&self) -> usize { fn row_count(&self, _cx: &ViewContext<Self>) -> usize {
1 1
} }
} }
@ -362,7 +362,7 @@ impl<T: ToolbarItemView> ToolbarItemViewHandle for ViewHandle<T> {
} }
fn row_count(&self, cx: &WindowContext) -> usize { fn row_count(&self, cx: &WindowContext) -> usize {
self.read(cx).row_count() self.read_with(cx, |this, cx| this.row_count(cx))
} }
} }